Commit Graph

2860 Commits

Author SHA1 Message Date
Harald Bamberger b40e1a2c65 fix syntax error 2025-05-27 11:05:24 +02:00
Harald Bamberger 4daf73ee6d Merge branch 'master' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-27 10:31:12 +02:00
Harald Bamberger f6dd79b9a3 Merge branch 'feature-61231/FHC4_Studierendenverwaltung_Aufnahmetermine' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-21 16:31:29 +02:00
Harald Bamberger ede656845a Merge branch 'feature-61230/FHC4_Studierendenverwaltung_LVTermine' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-21 16:25:36 +02:00
Harald Bamberger f5a3598c39 Merge branch 'feature-61229/FHC4_Studierendenverwaltung_GemeinsameStudien' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-21 16:18:43 +02:00
Harald Bamberger 55419c50f7 Merge branch 'feature-60875/FHC4_Studierendenverwaltung_Anrechnungen' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-21 15:42:17 +02:00
Andreas Österreicher 8786b60c4c Merge branch 'master' into feature-56330/Digi-Anw-Feedback 2025-05-21 14:11:50 +02:00
Harald Bamberger 375d56960a Merge branch 'feature-60874/FHC4_Studierendenverwaltung_Dokumente' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-21 13:49:58 +02:00
Harald Bamberger 1faab59716 Merge branch 'feature-55992/FHC4_Studierendenverwaltung_Messaging' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-21 13:34:34 +02:00
Harald Bamberger 1ac6e50784 Merge branch 'feature-55991/FHC4_Studierendenverwaltung_Gruppen' into merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231 2025-05-21 13:30:07 +02:00
Harald Bamberger 5ed1bae456 Merge branch 'master' into feature-61231/FHC4_Studierendenverwaltung_Aufnahmetermine 2025-05-21 13:26:47 +02:00
Harald Bamberger c861278aa8 Merge branch 'master' into feature-61230/FHC4_Studierendenverwaltung_LVTermine 2025-05-21 13:26:14 +02:00
Harald Bamberger 2297055949 Merge branch 'master' into feature-61229/FHC4_Studierendenverwaltung_GemeinsameStudien 2025-05-21 13:25:36 +02:00
Harald Bamberger bf3127d518 Merge branch 'master' into feature-60875/FHC4_Studierendenverwaltung_Anrechnungen 2025-05-21 13:24:52 +02:00
Harald Bamberger 10f731f2e2 Merge branch 'master' into feature-60874/FHC4_Studierendenverwaltung_Dokumente 2025-05-21 13:24:08 +02:00
Harald Bamberger b498da8603 Merge branch 'master' into feature-55992/FHC4_Studierendenverwaltung_Messaging 2025-05-21 13:18:43 +02:00
Harald Bamberger a2b77411cb Merge branch 'master' into feature-55991/FHC4_Studierendenverwaltung_Gruppen 2025-05-21 10:47:48 +02:00
Harald Bamberger 7d4fda4fe6 Merge branch 'master' into feature-55354/Studierendenverwaltung_Karteireiter_Archiv 2025-05-21 10:46:31 +02:00
Andreas Österreicher 2db7f812ab Fehlerkurzbz korrigiert 2025-05-20 11:31:28 +02:00
Andreas Österreicher 8b89d6f1cb Merge branch 'feature-48553/UHSTAT_Meldung_fuer_Privatuniversitaeten' 2025-05-20 11:11:39 +02:00
ma0068 9d4568e15e client side placementtest handling, filtering Dropdowns placementtests, Phrases, show future Placementtests, open Reihungstestverwaltung 2025-05-08 09:58:08 +02:00
Andreas Österreicher 6dfa7089e7 Merge branch 'master' into feature-54827/internationalisierungsmassnahmen_optimierungen 2025-05-05 11:08:25 +02:00
ma0068 bf0cd8e8e3 actions new, update and delete aufnahmetermine 2025-04-25 16:15:27 +02:00
ma0068 2ab01132b1 show List Admission Dates 2025-04-24 16:30:50 +02:00
ma0068 a4777724dc Merge branch 'master' into feature-61230/FHC4_Studierendenverwaltung_LVTermine 2025-04-24 07:59:13 +02:00
ma0068 854223a2d7 Merge master into feature-60874/FHC4_Studierendenverwaltung_Dokumente 2025-04-23 13:37:31 +02:00
ma0068 d780b472a6 Merge master into feature-60875/FHC4_Studierendenverwaltung_Anrechnungen 2025-04-23 11:11:35 +02:00
ma0068 874c91e21c Merge branch 'master' into feature-61229/FHC4_Studierendenverwaltung_GemeinsameStudien 2025-04-23 09:41:50 +02:00
ma0068 b9bd0e53d8 merge master into feature-55992/FHC4_Studierendenverwaltung_Messaging 2025-04-22 14:58:56 +02:00
ma0068 2b9805aeb3 merge master into feature-55991/FHC4_Studierendenverwaltung_Gruppen 2025-04-22 13:58:27 +02:00
ma0068 2d87663841 basic structure for Tab Admission Dates 2025-04-22 13:35:31 +02:00
Harald Bamberger 7b30869f7c make where clause more precise 2025-04-17 18:28:26 +02:00
Johann Hoffmann 47917e42c3 compare datetime timestamp for n-workdays ago calculation; more eager check on change of kontrollzeiten/termine if they match a termin; added missing phrase; fetch uploaddatum in same format as von/bis for entschuldigungen so date headerfilter can work as intended; zugangscode zeitlich abgelaufen show error message; 2025-04-17 12:07:54 +02:00
Harald Bamberger ac5e95e6b9 dbchanges: add columns lvexport and lvexport_sum to hr.tbl_gehalstyp, add gehaltstyp zulage_allin, set zulage_allin for gbs attached to vbs freitext allin 2025-04-17 08:20:30 +02:00
Alexei Karpenko 59f83c33b0 Merge branch 'master' into feature-55354/Studierendenverwaltung_Karteireiter_Archiv 2025-04-16 15:24:59 +02:00
Johann Hoffmann 3f607ec241 phrasen 2025-04-15 18:03:51 +02:00
ma0068 af30a3408c add switch stundenplan, excel export, phrases 2025-04-15 14:22:39 +02:00
ma0048 1888c51a48 master gemerged
phrase bugfix
2025-04-15 11:09:59 +02:00
ma0048 ad93a0a84c Merge branch 'refs/heads/master' into feature-54827/internationalisierungsmassnahmen_optimierungen 2025-04-15 11:09:05 +02:00
Johann Hoffmann 6b6ec311c7 Merge branch 'master' into feature-56330/Digi-Anw-Feedback 2025-04-14 15:23:31 +02:00
Johann Hoffmann 8218c915d5 anw phrasen 2025-04-14 15:14:49 +02:00
ma0068 419c199e84 new Tab GemeinsameStudien 2025-04-09 11:06:50 +02:00
ma0068 d75e26f8ae add basis framework for lv dates 2025-04-07 14:46:36 +02:00
ma0068 1991418931 New tab Dokumente 2025-04-03 16:54:56 +02:00
Harald Bamberger a54f7531bf add column betrag to table hr.tbl_sachaufwand 2025-04-02 16:07:09 +02:00
Andreas Österreicher 8a7290359a Merge branch 'master' into feature-56033/Beurteilungsformulare_neue_Kategorien_ab_SS2025 2025-04-01 10:52:04 +02:00
Alexei Karpenko b4b2d8da49 added UHSTAT issue resolvers, bugfix getuhstatdata: check for empty array 2025-03-30 23:38:35 +02:00
Johann Hoffmann ba806c13fb assistenz edit entschuldigung modal for editing von/bis date (on open excuse notes) & textarea for notiz - which is still limited to 255 characters; added student semester column to assistenz table; removed column width constraints & layout changed to fitData, persistence option is TRUE now; WIP von/bis/uplaoddate headerfilter; automatically send email to students on entschuldigungn status changed; added minimum time range for Kontrolle to be at least the length of 1 teaching unit(per config) - currently 45minutes; start new kontrolle modal more clearly shows when time & date values have been read from stundenplan; increased qr degeneration timer from 200 to 5000ms to avoid "missed" checkins due to network time; lektor can retrieve all entschuldigungen ranges & statuses of students when hovering their row; lektor can show anw qr window seperately now; into externalzuordnung admin/person_id fix in deleteEntschuldigung; moved fetch semesterinfo into global setup; fixed some vue template warnings; 2025-03-27 17:15:37 +01:00
Andreas Österreicher 392c15da77 Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite 2025-03-27 09:32:59 +01:00
Andreas Österreicher 410231a427 Merge branch 'master' into feature-37620/reihungslisten 2025-03-24 09:18:26 +01:00