4836ed8de0
adds LvMenu to the CalendarModel WIP
2024-09-13 13:44:53 +02:00
d6966b24fe
Merge branch 'master' into feature-39161/PV21_Valorisierung
2024-09-13 12:39:05 +02:00
27c312d7d3
filterPerson unrulyPerson api & person model
2024-09-12 15:42:21 +02:00
04aaefd5d8
refetches the Stundenplan events also for the Stundenplan and not only for the roomplan
2024-09-11 14:00:53 +02:00
d80761d952
Merge branch 'feature-39912/Room_planning_calendar' into feature-25999/C4_copy
2024-09-11 13:54:45 +02:00
f2a57f85a8
fixes the errors with the stundenplan/reservierungen data query
2024-09-11 10:19:46 +02:00
ac35ba3e27
puts the logic that adds the object informtion to the json reponse in the controllers instead of the models
2024-09-11 09:50:04 +02:00
1de658ace6
fixes the query for the reservierungen in the stundenplan and in the raum informations
2024-09-11 09:32:28 +02:00
715b8075b8
reworks the query for the reservierungen stundenplan/room
2024-09-10 12:30:40 +02:00
d9f5646ad1
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
...
# Conflicts:
# application/models/crm/Prestudentstatus_model.php
# public/js/api/fhcapifactory.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2024-09-10 10:17:55 +02:00
5f50d9f0ec
Merge branch 'feature-40311/Stundenplan_widget' into feature-25999/C4
2024-09-09 13:26:03 +02:00
996a49105b
Merge branch 'feature-40309/Cis_News_widget' into feature-25999/C4
2024-09-09 13:03:47 +02:00
ff51d3964f
Merge branch 'feature-40842/DashboardAmpeln' into feature-25999/C4
2024-09-09 12:56:55 +02:00
a8141e5dac
Merge branch 'master' into feature-25999/C4
2024-09-09 11:45:10 +02:00
ec8b3ccb6f
adds the organisations bezeichnung through a subquery to the lehrveranstaltungs events
2024-09-06 13:11:22 +02:00
122673d291
gets rid of the stunden dependency and uses the beginn and ende property of the queried events
2024-09-06 11:20:20 +02:00
8376e8b92d
bundles the room_events and the reservierungen api calls together with Promise.allSettled
2024-09-06 11:02:14 +02:00
f9b69fe08c
changes how the reservierungen are fetched from the database to have the same information as the room events
2024-09-05 14:57:57 +02:00
e33162d20e
changes the structure of the JSON data from the stundenplan
2024-09-04 14:59:56 +02:00
87f82b7f5d
also adds the stundenplan information as object in the response of the endpoint
2024-09-03 12:07:13 +02:00
f19c1b4eaf
adds the lector and the gruppe as objects to the endpoint result instead of just strings
2024-09-02 14:47:40 +02:00
de0fbdb72c
Form, Table and Queries for new Tab Pruefung
2024-08-29 09:53:34 +02:00
d254b9c10b
Start Tab Pruefung, Abfrage Pruefungen
2024-08-23 11:58:08 +02:00
0c4d1afded
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-08-21 13:46:41 +02:00
3963358d95
Added getTemplateLvTree method to Lehrveranstaltung_model.php
...
This method gets all Templates and unions with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
a template. This data structure can be used for nested tabulator data tree.
2024-08-21 13:16:22 +02:00
30396b3f0e
Merge remote-tracking branch 'origin/feature-40728/Issues_logik_auslagern_in_eigene_library' into feature-39161/PV21_Valorisierung
2024-08-13 18:32:15 +02:00
8a9e040554
added Gehaltstyp model
2024-08-13 16:57:05 +02:00
8bc8c67f8d
better comments
2024-08-13 15:10:23 +02:00
e5217afc09
ZGV Ausstellungsstaat
2024-08-13 13:10:11 +02:00
7e302adf53
Bugfix in Prestudent model
2024-08-09 13:25:42 +02:00
ffabd681c8
setFirstStudent logic
2024-08-08 16:24:23 +02:00
f1a2ef25c7
Remove unused functions
2024-08-08 12:45:36 +02:00
59314ae0aa
correct rolle exists check
2024-08-07 15:56:07 +02:00
24d74dd332
correct student check
2024-08-07 15:51:19 +02:00
ba2c450bd2
uses the codeigniter querybuilder to construct the active ampeln query
2024-08-07 15:43:20 +02:00
0621073f8d
correct checkIfExistingAufgenommenerstatus
2024-08-07 15:40:11 +02:00
1fc7f9d3e8
correct checkIfExistingBewerberstatus
2024-08-07 15:37:43 +02:00
ceb8eb9671
corrects the way how to active ampeln check whether an ampel was bestaetigt or not and adds the Ampel_Benutzer_Bestaetigt_model
2024-08-07 11:52:50 +02:00
46a0706057
updates roomEvents on change:range / groups the results of a studenplan query
2024-08-06 14:29:24 +02:00
ee78a94aa2
codesniff Prestudentstatus_model
2024-08-06 14:20:22 +02:00
7abe95ba5f
Adapted LvsByStudienplan query to retrieve also Lehreinheitgruppen
2024-08-06 10:48:20 +02:00
235a8a73e9
codessniff studentlehrverband_model
2024-08-06 08:49:23 +02:00
a728d20b70
codesniff Models
2024-08-06 08:42:20 +02:00
437fd64a6f
refactor setFunctions and processStudentlehrverband
2024-08-05 16:52:46 +02:00
b0821be465
Added methods getLastOrAktStudienjahr / getAktOrNextStudienjahr to retrieve the last or next Studienjahr during the summer term
2024-08-05 10:52:15 +02:00
90162ed2c9
refactor generate alias, add transaction to addStatus
2024-08-02 13:55:46 +02:00
c5f57a0689
adds the bestaetigt property of the ampel when fetching all the active ampeln
2024-08-02 12:52:21 +02:00
3bb87ef8d3
corrects the translation of the ampel queries
2024-08-02 11:44:58 +02:00
4811f223b9
corrects little typo
2024-08-02 11:01:32 +02:00
e6ba291549
adds the translation of the beschreibung and the buttontext in the Ampel_model and not in the Ampel controller
2024-08-02 11:00:11 +02:00
SimonGschnell