Commit Graph

18943 Commits

Author SHA1 Message Date
Harald Bamberger 0411befe8d Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc 2026-06-26 15:16:18 +02:00
Harald Bamberger 138c80c97a Merge branch 'master' into cis40_2026-02_rc 2026-06-26 15:15:47 +02:00
Harald Bamberger 97a88d1d0d Merge branch 'feature-54628/studstatus_einzelne_ablaeufe_aktivieren_deaktivieren' 2026-06-26 15:07:04 +02:00
Harald Bamberger a23d079001 Merge branch 'master' into feature-54628/studstatus_einzelne_ablaeufe_aktivieren_deaktivieren 2026-06-26 14:07:14 +02:00
Harald Bamberger f13f6ff0cc Merge branch 'feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren' 2026-06-26 13:40:17 +02:00
Harald Bamberger a595daa9b4 Merge branch 'master' into feature-71393/studierendenstatus_unterbrecher_ablehnungsgrund_in_den_emailtext_integrieren 2026-06-26 11:50:12 +02:00
Harald Bamberger 7e141f73d3 Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc 2026-06-24 15:52:01 +02:00
Harald Bamberger 7f9dcc43ad add Compat iframe controller and component 2026-06-24 15:41:47 +02:00
Harald Bamberger 274262262a iframe_content: only replace ../ to be able to use index.ci.php in menu entry 2026-06-24 15:35:31 +02:00
Johann Hoffmann 79c0f31ddc lv_id & sem_kurzbz are now optional route params; defer loading of LehreinheitenModule.js; fetch orgform for lva dropdown; added selected|filtered|total count to table; dropdowns have responsive labels now; left aligned columns with text; AuthInfo Api for uid; tableLayout without WidthGrow, fixed rowHeight at 30 for now; selectAll + filter interaction fixed; load studiensemester similar to abgabetool; clearFilter fix on LE deselect; modal formatting & loading toggle; 2026-06-23 18:59:51 +02:00
Johann Hoffmann 49d61342c2 lv_id & sem_kurzbz are now optional route params; defer loading of LehreinheitenModule.js; fetch orgform for lva dropdown; added selected|filtered|total count to table; dropdowns have responsive labels now; left aligned columns with text; AuthInfo Api for uid; tableLayout without WidthGrow, fixed rowHeight at 30 for now; selectAll + filter interaction fixed; load studiensemester similar to abgabetool; clearFilter fix on LE deselect; modal formatting & loading toggle; 2026-06-23 18:59:36 +02:00
Johann Hoffmann be0943f1ba Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4 2026-06-22 18:12:29 +02:00
Harald Bamberger 95e63f865c add CIS4 Header and Footer to application/views/lehre/pruefungsprotokollUebersicht.php 2026-06-22 15:25:51 +02:00
Harald Bamberger e3aa36cae0 Merge branch 'master' into cis40_2026-02_rc 2026-06-19 10:22:49 +02:00
Andreas Österreicher 0a232828c8 Merge branch 'feature-71619/Notenspiegel_ECTS_Summe' 2026-06-19 08:31:08 +02:00
Harald Bamberger 164c11e10a Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc 2026-06-18 13:20:25 +02:00
Harald Bamberger eb9c882fe9 Merge branch 'master' into cis40_2026-02_rc 2026-06-18 08:48:52 +02:00
Harald Bamberger 0687ef72ce Merge branch 'bug-77051/StudVw_Spezialgruppen_Studenten_ohne_Verbandszuweisung_werden_weggefiltert' 2026-06-17 09:40:23 +02:00
Harald Bamberger 9180b9bd63 Merge branch 'master' into bug-77051/StudVw_Spezialgruppen_Studenten_ohne_Verbandszuweisung_werden_weggefiltert 2026-06-16 13:11:40 +02:00
Andreas Österreicher 168fb00023 Merge branch 'feature-40852/MasterLehrgaenge_BeruflicheKompetenzen' 2026-06-15 09:18:17 +02:00
chfhtw f5d81e4a93 move prepareQuery (and addSelectPrioRel) into a library and make joins more flexible & change JOIN to LEFT JOIN for tbl_studentlehrverband (the actual bugfix) & change order of JOIN tbl_benutzergruppe in fetchStudents to speed up query 2026-06-12 09:53:59 +02:00
Andreas Österreicher b0f3fa0c46 Berufliche Qualifikation umbenannt 2026-06-12 09:41:34 +02:00
Andreas Österreicher 6d89e95afa Merge branch 'master' into feature-40852/MasterLehrgaenge_BeruflicheKompetenzen 2026-06-12 08:53:44 +02:00
Paolo 07bb0ddffd Merge branch 'master' into feature-71619/Notenspiegel_ECTS_Summe 2026-06-11 12:52:41 +02:00
adisposkofh f45782aeef removed redundant console log 2026-06-02 12:49:11 +02:00
adisposkofh c2faff5a03 minor fix 2026-06-02 11:52:13 +02:00
adisposkofh 1cff18112b removed auto-ban on sunday room reservations 2026-06-02 11:09:13 +02:00
adisposkofh 195b99e588 minor fix re: calendar event timeslot display 2026-06-01 13:52:54 +02:00
Andreas Österreicher 2f90112e4d Merge branch 'rc_reihungstest' 2026-06-01 10:58:33 +02:00
Andreas Österreicher 774eb90bcc Merge branch 'feature-76918/reihungstest_gebiete_nur_von_abegschickten_studiengaengen' into rc_reihungstest 2026-06-01 09:46:12 +02:00
Andreas Österreicher 1def930147 Merge branch 'feature-76920/reihungstest_fertig_nachricht_anzeigen_wenn_alle_gebiete_abgeschlossen_wurden' into rc_reihungstest 2026-06-01 09:11:02 +02:00
Andreas Österreicher 30b8a406a5 Merge branch 'feature-75888/reihungstest_mehrfachdurchfuehrung' into rc_reihungstest 2026-06-01 09:10:35 +02:00
Andreas Österreicher 093842274e Merge branch 'feature-75887/reihungstest_constructor_popups' into rc_reihungstest 2026-06-01 09:05:22 +02:00
Harald Bamberger 6019489ef1 Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc 2026-05-29 13:38:58 +02:00
adisposkofh fc79f92796 added 'add reservation'/'reservation not allowed' tooltips in calendar 2026-05-27 15:35:45 +02:00
ma0048 fd2f4187fa wording angepasst 2026-05-27 12:34:04 +02:00
adisposkofh 8e569a9ccd displaying forbidden room reservation slots 2026-05-27 10:43:28 +02:00
adisposkofh d7b2964e4e obsolete use of viewData object from cisRouterView 2026-05-26 17:33:38 +02:00
ma0048 b2bebb7fa3 alle gebiete wurden gestartet meldung 2026-05-26 13:32:21 +02:00
ma0048 e32cce57fe gebiete nur von abgeschickten stg 2026-05-26 13:26:16 +02:00
adisposkofh fa91e204f0 always displaying timeslot on calendar event in list view 2026-05-26 12:02:08 +02:00
adisposkofh 23506430b1 initializing stg org lv plan with provided url params 2026-05-26 09:30:50 +02:00
adisposkofh fa58635a22 positioning of profile cards 'quick links' and 'calendar sync' 2026-05-26 09:29:10 +02:00
Harald Bamberger 7f630f24d5 StundenplanLib: check array index access before 2026-05-26 07:54:41 +02:00
Harald Bamberger b0f90cafb6 Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc 2026-05-22 10:36:54 +02:00
Harald Bamberger c0c57ba378 remove irregular files 2026-05-22 10:36:28 +02:00
Harald Bamberger d56d1bc2bd Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc 2026-05-19 16:17:35 +02:00
Harald Bamberger 45eca862ac use table alias 2026-05-19 16:17:14 +02:00
Harald Bamberger 9f738f4871 Merge branch 'feature-69187/CIS_MA_Pruefungsprotokolle' into cis40_2026-05_ma_rc 2026-05-19 16:11:37 +02:00
Harald Bamberger 3533a3fd4b add missing comma 2026-05-19 16:11:08 +02:00