 SimonGschnell
|
8d01995722
|
refactor(Studenplan Query):queries all studiensemester from start_date to end_date and matches the gruppen and studentlehrverbaende to the associated studiensemester in the query
|
2024-11-19 12:51:12 +01:00 |
|
|
Harald Bamberger
|
1691c75a84
|
replace dependencies on legacy code with ci model functions
|
2024-11-07 19:18:08 +01:00 |
|
|
Andreas Österreicher
|
f68d18f0a8
|
Stundenplan Bugfix to also load Entries of Semester and Verband
|
2024-11-07 10:25:42 +01:00 |
|
|
SimonGschnell
|
eafbdcfffe
|
refactor(Cis Menu): changes method name and checks if the CIS4_MENU_ENTRY constant is defined
|
2024-11-04 13:39:13 +01:00 |
|
|
Harald Bamberger
|
e78c2e1bf7
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2024-10-30 17:19:01 +01:00 |
|
|
SimonGschnell
|
ff367339ea
|
makes MyLv more responsive
|
2024-10-29 14:31:20 +01:00 |
|
|
Harald Bamberger
|
1e55b13546
|
force use of insertamum column from antrag table
|
2024-10-28 15:58:20 +01:00 |
|
|
Harald Bamberger
|
8ba2a6852b
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
|
2024-10-22 11:04:07 +02:00 |
|
|
Johann Hoffmann
|
728e2f9b3a
|
fix getStundenplanQuery query building if benutzer gruppen are empty;
|
2024-10-21 13:48:32 +02:00 |
|
|
Harald Bamberger
|
d4494836b1
|
fix file permissions erroneously commited as a21a292da6
|
2024-10-17 15:34:00 +02:00 |
|
|
Harald Bamberger
|
0ab1ec1fc8
|
Merge branch 'master' into feature-25999/C4
|
2024-10-17 14:49:43 +02:00 |
|
|
SimonGschnell
|
e475fe568e
|
adds the dashboard menu punkt and adds greeting to the dashboard view
|
2024-10-17 09:58:28 +02:00 |
|
|
Harald Bamberger
|
24ce443e95
|
nur die letzte komm oder zusaetzlichen komm Pruefung einer LV beruecksichtigen
|
2024-10-15 17:40:11 +02:00 |
|
|
Harald Bamberger
|
439ae5113d
|
fix unterbrechung erstellen nicht möglich wenn ein abgelehnter unterbrechungsantrag existiert
|
2024-10-15 13:59:11 +02:00 |
|
|
Harald Bamberger
|
14aa98c223
|
Merge branch 'master' into feature-25999/C4
|
2024-10-15 10:46:17 +02:00 |
|
|
Harald Bamberger
|
e2cee7ffa3
|
Merge branch 'master' into feature-25999/C4
|
2024-10-15 10:44:56 +02:00 |
|
|
Andreas Österreicher
|
5774cb78c9
|
Merge branch 'feature-40816/Plausicheck_Anpassungen'
|
2024-10-15 10:28:38 +02:00 |
|
|
Harald Bamberger
|
27e3f1d1bc
|
take status rejected into account when calculating available semster slots for unterbrechung
|
2024-10-14 15:40:25 +02:00 |
|
|
Alexei Karpenko
|
301466f944
|
Merge branch 'master' into feature-40816/Plausicheck_Anpassungen
|
2024-10-14 15:20:16 +02:00 |
|
|
SimonGschnell
|
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 |
|
|
SimonGschnell
|
5359539a09
|
makes Stundenplan query BLAZINGLY fast
|
2024-10-10 20:59:55 +02:00 |
|
|
cgfhtw
|
469867e98c
|
Studstatus: status "EmailVersandt" is not an active status
|
2024-10-10 12:37:57 +02:00 |
|
|
Harald Bamberger
|
a2f70be7e4
|
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
|
2024-10-08 09:28:56 +02:00 |
|
|
ma0048
|
9dbb5291f4
|
- added limit
|
2024-10-03 11:17:09 +02:00 |
|
|
Andreas Österreicher
|
c754291c6d
|
Merge branch 'feature-20228/erfassung_internationalisierungsmassnahmen_beurteilung'
|
2024-10-03 10:42:00 +02:00 |
|
|
SimonGschnell
|
7f9352b820
|
prototyp fuer die Stundenplan query fuer Studierende
|
2024-10-02 13:25:39 +02:00 |
|
|
SimonGschnell
|
c461480d1d
|
stundenplanQuery optimization
|
2024-10-02 10:35:58 +02:00 |
|
|
SimonGschnell
|
f38b0cf78f
|
changes all the Headers from the CISHTML-Header to the CISVUE-Header
|
2024-09-30 11:58:20 +02:00 |
|
|
SimonGschnell
|
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 |
|
|
Harald Bamberger
|
be412abebc
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
|
2024-09-26 16:16:24 +02:00 |
|
|
Andreas Österreicher
|
b184cee975
|
Offset für das Laden von Geschaeftsjahren hinzugefügt
|
2024-09-24 12:40:12 +02:00 |
|
|
Alexei Karpenko
|
2d3643d1f0
|
Bismeldestichtag: added method for getting next Meldestichtag, loading data only after tabulator is ready
|
2024-09-20 16:04:27 +02:00 |
|
|
Johann Hoffmann
|
effad6f62d
|
only fetch person_id, vorname, nachname & unruly from tbl_person on checkUnruly()
|
2024-09-20 15:16:20 +02:00 |
|
|
Johann Hoffmann
|
79ea8c4521
|
renamed unrulyPerson api to checkPerson; built in logic into infoCenterDetails to trigger a number of checks about any changed data in the info center (in this case unruly) and update the page accordingly; Also fixed a bug when saving stammdaten without kontakt entries;
|
2024-09-17 14:09:49 +02:00 |
|
|
ma0048
|
7c85e981f9
|
- absteigende sortierung endabgabe
|
2024-09-17 11:17:44 +02:00 |
|
|
SimonGschnell
|
4836ed8de0
|
adds LvMenu to the CalendarModel WIP
|
2024-09-13 13:44:53 +02:00 |
|
|
Harald Bamberger
|
d6966b24fe
|
Merge branch 'master' into feature-39161/PV21_Valorisierung
|
2024-09-13 12:39:05 +02:00 |
|
|
Johann Hoffmann
|
27c312d7d3
|
filterPerson unrulyPerson api & person model
|
2024-09-12 15:42:21 +02:00 |
|
|
SimonGschnell
|
04aaefd5d8
|
refetches the Stundenplan events also for the Stundenplan and not only for the roomplan
|
2024-09-11 14:00:53 +02:00 |
|
|
SimonGschnell
|
d80761d952
|
Merge branch 'feature-39912/Room_planning_calendar' into feature-25999/C4_copy
|
2024-09-11 13:54:45 +02:00 |
|
|
SimonGschnell
|
f2a57f85a8
|
fixes the errors with the stundenplan/reservierungen data query
|
2024-09-11 10:19:46 +02:00 |
|
|
SimonGschnell
|
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 |
|
|
SimonGschnell
|
1de658ace6
|
fixes the query for the reservierungen in the stundenplan and in the raum informations
|
2024-09-11 09:32:28 +02:00 |
|
|
SimonGschnell
|
715b8075b8
|
reworks the query for the reservierungen stundenplan/room
|
2024-09-10 12:30:40 +02:00 |
|
|
Johann Hoffmann
|
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 |
|
|
Harald Bamberger
|
5f50d9f0ec
|
Merge branch 'feature-40311/Stundenplan_widget' into feature-25999/C4
|
2024-09-09 13:26:03 +02:00 |
|
|
Harald Bamberger
|
996a49105b
|
Merge branch 'feature-40309/Cis_News_widget' into feature-25999/C4
|
2024-09-09 13:03:47 +02:00 |
|
|
Harald Bamberger
|
ff51d3964f
|
Merge branch 'feature-40842/DashboardAmpeln' into feature-25999/C4
|
2024-09-09 12:56:55 +02:00 |
|
|
Harald Bamberger
|
a8141e5dac
|
Merge branch 'master' into feature-25999/C4
|
2024-09-09 11:45:10 +02:00 |
|
|
SimonGschnell
|
ec8b3ccb6f
|
adds the organisations bezeichnung through a subquery to the lehrveranstaltungs events
|
2024-09-06 13:11:22 +02:00 |
|