Commit Graph

203 Commits

Author SHA1 Message Date
Harald Bamberger e78c2e1bf7 Merge branch 'master' into feature-25999/C4_cleanup 2024-10-30 17:19:01 +01:00
Harald Bamberger d4494836b1 fix file permissions erroneously commited as a21a292da6 2024-10-17 15:34:00 +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 a8141e5dac Merge branch 'master' into feature-25999/C4 2024-09-09 11:45:10 +02:00
cgfhtw e5217afc09 ZGV Ausstellungsstaat 2024-08-13 13:10:11 +02:00
cgfhtw 7e302adf53 Bugfix in Prestudent model 2024-08-09 13:25:42 +02:00
cgfhtw ffabd681c8 setFirstStudent logic 2024-08-08 16:24:23 +02:00
cgfhtw f1a2ef25c7 Remove unused functions 2024-08-08 12:45:36 +02:00
cgfhtw 59314ae0aa correct rolle exists check 2024-08-07 15:56:07 +02:00
cgfhtw 24d74dd332 correct student check 2024-08-07 15:51:19 +02:00
cgfhtw 0621073f8d correct checkIfExistingAufgenommenerstatus 2024-08-07 15:40:11 +02:00
cgfhtw 1fc7f9d3e8 correct checkIfExistingBewerberstatus 2024-08-07 15:37:43 +02:00
cgfhtw ee78a94aa2 codesniff Prestudentstatus_model 2024-08-06 14:20:22 +02:00
ma0068 a728d20b70 codesniff Models 2024-08-06 08:42:20 +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
cgfhtw dd23bc26a2 Improvements: Status delete 2024-07-30 09:57:37 +02:00
cgfhtw d4db49e09e Status->isLastStatus corrected 2024-07-26 12:04:20 +02:00
cgfhtw 93b301ee08 Finish Status insert function 2024-07-24 13:24:15 +02:00
cgfhtw d9cba6bf5c Check orgform student/bewerber 2024-07-24 08:45:48 +02:00
ma0068 7498b327d4 dynamic Toolbars Interessent, Student, update actions interessent 2024-07-24 08:42:19 +02:00
cgfhtw 31abd39ba8 PrestudentstatusCheckLib: status history 2024-07-19 13:34:56 +02:00
ma0068 287d44f64a add formatted dates to sql query getHistoryPrestudent 2024-07-17 09:20:31 +02:00
cgfhtw 7031a4d9c4 Use only active Statusgruende & "--keine Auswahl--" 2024-07-16 09:59:10 +02:00
ma0068 58403ff00e bugfixes changeStatus, generateMatrikelnummer, updateLists, validations 2024-07-15 15:41:45 +02:00
ma0068 eb12b35e37 reload detailtab after changedStatus, update getUserLanguage() 2024-07-12 11:29:38 +02:00
ma0068 19775fac3f Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-07-12 09:23:00 +02:00
ma0068 0bb5cb1fdc bugfix generateMatrikelnnummer, Reihenfolge validierung turnIntoStudent 2024-07-12 09:20:42 +02:00
cgfhtw 78471a2c3a Use Prestudentstatus_model instead of Prestudent_model for status history 2024-07-12 08:30:57 +02:00
ma0068 a728bec15f BewerberZuStudent: new action turnIntoStudent 2024-07-11 10:52:59 +02:00
Alexei Karpenko 1a8a7cc260 prestudent model gethistoryprestudent: added order by for insertamum, ext_id 2024-07-08 12:42:32 +02:00
ma0068 18a6262eaf Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-06-27 14:20:26 +02:00
ma0068 8fa395a582 Refactor Logic Statuschanges 2024-06-27 14:20:11 +02:00
cgfhtw c8f0bdd6d7 Prestudent History: add prestudent_id 2024-06-26 11:08:00 +02:00
Alexei Karpenko e78598900a Studierendenverwaltung: added new prestudenstatus checks, created PrestudentstatusCheckLib 2024-06-19 20:42:14 +02:00
ma0068 b5dbb8a16a Refactor Functions in Prestudent Lib, Unterbrecher as single Action 2024-06-17 18:38:04 +02:00
ma0068 1036c97be7 Tab Status: change statusgrund_kurzbz to bezeichnung_mehrsprachig 2024-06-14 15:58:11 +02:00
ma0068 259a3c218a Funktionalitaet feature-39602 2024-05-27 14:57:18 +02:00
ma0068 9cade51ff4 Dropdown Status Aendern, Phrases 2024-05-21 11:47:24 +02:00
ma0068 4c671c2ee9 Phrases Validierungen 2024-05-14 14:13:38 +02:00
SimonGschnell 9db09a040a Merge branch 'master' into feature-25999/C4_ma0594_profilePage 2024-05-08 09:58:18 +02:00
ma0068 d1b813b1cc update editStatus: getHistory, setAbbrecher, dropdown newStatus, validations 2024-05-03 16:53:31 +02:00
cgfhtw 8e56b404b9 Merge branch 'feature-37246/APIs_Konsolidierung' into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-04-29 11:17:12 +02:00
cgfhtw f47f8d5da4 Konto: Phrases 2024-04-25 11:36:37 +02:00
cgfhtw 6025660e23 Konto counter & Zahlungsreferenz 2024-04-18 15:14:41 +02:00
cgfhtw e15f4981fb Konto new 2024-04-16 12:56:12 +02:00
cgfhtw efebaeeb27 Edit 2024-04-12 10:38:06 +02:00
cgfhtw ee6221e325 add konto tab 2024-04-08 12:40:23 +02:00
ma0068 3023cd2e94 Refactor status for api-controller, add phrases for alerts 2024-03-27 11:23:38 +01:00
ma0068 65c7db7ae4 bugfix phrases tabulator, refactor Prestudent.js using FHCAPI_CONTROLLER 2024-03-25 13:28:28 +01:00