Commit Graph

411 Commits

Author SHA1 Message Date
Harald Bamberger f59bdf812a add phrase mark_person_as_unruly 2024-10-22 17:18:02 +02:00
Harald Bamberger 8ba2a6852b Merge branch 'master' into feature-40896/kennzeichnung_unruly_person 2024-10-22 11:04:07 +02:00
Andreas Österreicher 9ca59f7928 Paragraph Verweis korrigiert für Master Plagiatsprüfung 2024-10-09 15:22:41 +02:00
Harald Bamberger a2f70be7e4 Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite 2024-10-08 09:28:56 +02:00
Johann Hoffmann dbf5935897 check correct grund phrase to trigger unruly api request; 2024-10-03 11:14:52 +02:00
Andreas Österreicher c754291c6d Merge branch 'feature-20228/erfassung_internationalisierungsmassnahmen_beurteilung' 2024-10-03 10:42:00 +02:00
ma0048 317796c919 - legende und phrasen hinzugefuegt 2024-10-02 14:13:44 +02:00
Harald Bamberger be412abebc Merge branch 'master' into feature-40896/kennzeichnung_unruly_person 2024-09-26 16:16:24 +02:00
ma0048 419f608322 - benotung international skills hinzugefügt
- phrase
2024-09-24 12:05:09 +02:00
Andreas Österreicher e6eea06900 Merge branch 'feature-40348/UHSTAT1_unbekannte_Eltern' 2024-09-18 12:41:05 +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
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
Johann Hoffmann 888e3878bd studstatus unruly als grund 2024-09-09 17:16:05 +02:00
Johann Hoffmann d03678e3dc WIP 2024-08-27 15:30:17 +02:00
Cris 0c4d1afded Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
# Conflicts:
#	system/phrasesupdate.php
2024-08-21 13:46:41 +02:00
Cris 7fb7263424 Added phrases for LV Templates Overview 2024-08-21 13:34:11 +02:00
KarpAlex 20ed9ffc41 UHSTAT Formular: added "unknown" options to every input 2024-08-11 21:59:13 +02:00
cgfhtw ac29247783 checkIfLastBewerberAndAufgenommenerShareSemesters 2024-08-07 16:19:15 +02:00
cgfhtw 21e69c6d94 Status: Unterbrecher & Student 2024-08-06 16:19:35 +02:00
cgfhtw 07400e7551 change all setAbbrecher to setAbbrecherNeu and rename 2024-08-06 14:49:20 +02:00
ma0068 9dc421e789 Form Validations addStudent 2024-08-02 08:25:53 +02:00
Cris 9bec0c61de Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung
# Conflicts:
#	system/phrasesupdate.php
2024-08-01 13:55:51 +02:00
cgfhtw 6f0e46ac57 Status: Max Semester 2024-08-01 12:57:06 +02:00
Johann Hoffmann c9471c344d added unruly person boolean column to tbl_person; studStatus/leitung added a checkbox to mark persons as unruly unrelated to studstatus datastate; 2024-07-31 14:37:26 +02:00
ma0068 3d27c68dee adapt functions toolbarInteressent, Phrases 2024-07-31 09:06:42 +02:00
Cris 6f216dbe52 Added phrases to Softwarebereitstellung 2024-07-30 15:38:36 +02:00
ma0068 e81856afb9 Phrases confirmChangeStatus 2024-07-29 11:58:42 +02:00
cgfhtw d286c3784d Popup for Status Confirm 2024-07-26 09:47:15 +02:00
cgfhtw 7f0373e0e9 bewerbung_abgeschicktamum rechte 2024-07-24 16:08:46 +02:00
cgfhtw 69b88b35b9 Status: person name in phrase for modal header 2024-07-18 13:28:18 +02:00
cgfhtw 6475eb838e Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-07-17 11:59:40 +02:00
ma0068 58403ff00e bugfixes changeStatus, generateMatrikelnummer, updateLists, validations 2024-07-15 15:41:45 +02:00
ma0068 780dce293d refactor addStudent, bugfix updateList after delete, check organisationsform ersterStudent 2024-07-15 11:57:16 +02:00
cgfhtw af127d666d Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-07-15 09:35:19 +02:00
Harald Bamberger 16ab9998b0 Merge branch 'master' into feature-39592/vereinfachte_Sicht_fuer_Assistenz 2024-07-11 14:44:44 +02:00
Harald Bamberger 115151473a backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch 2024-07-11 11:57:45 +02:00
ma0068 a728bec15f BewerberZuStudent: new action turnIntoStudent 2024-07-11 10:52:59 +02:00
Cris eead73f10c Added phrases for core and softwarebereitstellung to phrasesupdate.php 2024-07-10 14:44:01 +02:00
cgfhtw e79a70fc2f Betriebsmittel: stabilized 2024-07-09 14:06:29 +02:00
Cris 4e053a4769 Updated phrases: Added phrases for Softwareanforderung in category Softwarebereitstellung 2024-07-08 12:24:44 +02:00
Harald Bamberger dd0bdddbc6 backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch 2024-07-01 14:12:48 +02:00
ma0068 8fa395a582 Refactor Logic Statuschanges 2024-06-27 14:20:11 +02:00
Cris 7f32cca476 Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung 2024-06-26 11:54:51 +02:00
Cris 580f063efe Updated phrases: Added phrases for Softwareanforderung in category Softwarebereitstellung 2024-06-26 10:48:59 +02:00
ma0068 f1605011dd update phrases 2024-06-24 12:04:30 +02:00
Alexei Karpenko e78598900a Studierendenverwaltung: added new prestudenstatus checks, created PrestudentstatusCheckLib 2024-06-19 20:42:14 +02:00
ma0068 04c5ccc891 use setAbbrecher, set UnterbrecherFas 2024-06-14 14:34:15 +02:00
Harald Bamberger 1c385d22cd Merge branch 'feature-37133/Gehaltsbaender' into merge_37107_37133_39212 2024-06-14 10:41:48 +02:00
Harald Bamberger 0e5d4b30ed Merge branch 'master' into feature-37133/Gehaltsbaender 2024-06-13 13:26:48 +02:00
Harald Bamberger 4e233f760d Merge branch 'master' into feature-37107/Fristenmanagement 2024-06-13 13:26:02 +02:00