e475fe568e
adds the dashboard menu punkt and adds greeting to the dashboard view
2024-10-17 09:58:28 +02:00
14aa98c223
Merge branch 'master' into feature-25999/C4
2024-10-15 10:46:17 +02:00
e2cee7ffa3
Merge branch 'master' into feature-25999/C4
2024-10-15 10:44:56 +02:00
5774cb78c9
Merge branch 'feature-40816/Plausicheck_Anpassungen'
2024-10-15 10:28:38 +02:00
27e3f1d1bc
take status rejected into account when calculating available semster slots for unterbrechung
2024-10-14 15:40:25 +02:00
301466f944
Merge branch 'master' into feature-40816/Plausicheck_Anpassungen
2024-10-14 15:20:16 +02:00
0528f3b262
checks the size of the arrays before using the current method and does not allow mitarbeiter to access the student stundenplan
2024-10-14 11:32:23 +02:00
5359539a09
makes Stundenplan query BLAZINGLY fast
2024-10-10 20:59:55 +02:00
469867e98c
Studstatus: status "EmailVersandt" is not an active status
2024-10-10 12:37:57 +02:00
a2f70be7e4
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-10-08 09:28:56 +02:00
9dbb5291f4
- added limit
2024-10-03 11:17:09 +02:00
c754291c6d
Merge branch 'feature-20228/erfassung_internationalisierungsmassnahmen_beurteilung'
2024-10-03 10:42:00 +02:00
7f9352b820
prototyp fuer die Stundenplan query fuer Studierende
2024-10-02 13:25:39 +02:00
c461480d1d
stundenplanQuery optimization
2024-10-02 10:35:58 +02:00
f38b0cf78f
changes all the Headers from the CISHTML-Header to the CISVUE-Header
2024-09-30 11:58:20 +02:00
4a5a019841
loads the menu for the CISVUE-Header in the server side and not in the client side
2024-09-30 11:33:55 +02:00
b184cee975
Offset für das Laden von Geschaeftsjahren hinzugefügt
2024-09-24 12:40:12 +02:00
2d3643d1f0
Bismeldestichtag: added method for getting next Meldestichtag, loading data only after tabulator is ready
2024-09-20 16:04:27 +02:00
7c85e981f9
- absteigende sortierung endabgabe
2024-09-17 11:17:44 +02:00
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
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
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
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
SimonGschnell