Commit Graph

157 Commits

Author SHA1 Message Date
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 d4494836b1 fix file permissions erroneously commited as a21a292da6 2024-10-17 15:34:00 +02:00
Harald Bamberger e2cee7ffa3 Merge branch 'master' into feature-25999/C4 2024-10-15 10:44:56 +02:00
Harald Bamberger a2f70be7e4 Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite 2024-10-08 09:28:56 +02:00
Andreas Österreicher b184cee975 Offset für das Laden von Geschaeftsjahren hinzugefügt 2024-09-24 12:40:12 +02:00
Harald Bamberger a8141e5dac Merge branch 'master' into feature-25999/C4 2024-09-09 11:45:10 +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
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
Cris b0821be465 Added methods getLastOrAktStudienjahr / getAktOrNextStudienjahr to retrieve the last or next Studienjahr during the summer term 2024-08-05 10:52:15 +02:00
cgfhtw 6f0e46ac57 Status: Max Semester 2024-08-01 12:57:06 +02:00
cgfhtw 0534ab4ac2 corrected Studienpläne Query 2024-07-25 15:51:30 +02:00
cgfhtw af127d666d Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-07-15 09:35:19 +02:00
Alexei Karpenko e78598900a Studierendenverwaltung: added new prestudenstatus checks, created PrestudentstatusCheckLib 2024-06-19 20:42:14 +02:00
ma0068 58005d1832 change getStudienplaene from prestudent_id to array prestudent_ids 2024-06-19 14:31:47 +02:00
ma0068 0729f2ed1a refactor actions prestudentLib 2024-06-18 16:24:57 +02:00
cgfhtw b7dff7d2c3 Permission-Filter Verband 2024-06-11 10:22:52 +02:00
ma0068 bef53dadb1 refactor Tab Contact 2024-06-11 09:27:40 +02:00
Cris 6d728ae0e7 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	public/js/components/Tabs.js
#	public/js/components/filter/Filter.js
2024-05-13 12:07:37 +02:00
SimonGschnell 730db74743 Merge branch 'feature-25999/C4_ma0594_profilePage' into feature-25999/C4_TEST 2024-05-08 11:14:41 +02:00
SimonGschnell d1207ced02 Merge branch 'master' into feature-25999/C4_TEST 2024-05-08 11:06:34 +02:00
SimonGschnell 9db09a040a Merge branch 'master' into feature-25999/C4_ma0594_profilePage 2024-05-08 09:58:18 +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 d34ce78c94 s&d 2024-03-29 13:00:54 +01:00
ma0068 87384f42f9 Update Logik Lehrverband: as function, with transactions 2024-03-13 13:31:53 +01:00
ma0068 a49075bcb7 check Bismeldestichtag, refactor Lehrverband 2024-03-12 07:52:51 +01:00
ma0068 7bec7016c3 merge master into branch FHC4 2024-03-05 16:31:41 +01:00
SimonGschnell 04f6ee6156 Merge branch 'master' into feature-25999/C4_ma0594dev 2024-02-15 15:16:07 +01:00
Cris acb29c5c69 Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
#	application/views/templates/FHC-Footer.php
#	composer.json
#	public/js/components/Bootstrap/Modal.js
#	public/js/components/filter/Filter.js
#	public/js/plugin/FhcAlert.js
2024-02-13 11:54:55 +01:00
SimonGschnell a21a292da6 dokument upload 2024-01-29 16:48:41 +01:00
cgfhtw a3f9e19bd6 Noten manuell ändern 2024-01-09 13:22:37 +01:00
Simon Gschnell bff4fa5544 Merge branch 'master' into feature-25999/C4_ma0594dev 2023-12-13 14:34:37 +01:00
cgfhtw 14c24005fe Wiederholung wenn Studierende das letze Semester wiederholen 2023-12-12 11:02:12 +01:00
cgfhtw 4e73b40a84 Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp 2023-11-29 15:40:24 +01:00
ma0068 cc52a9a28b update search 2023-11-22 11:24:27 +01:00
ma0068 92fdf3da4c Autocomplete, überarbeitung Modal 2023-11-22 09:02:54 +01:00
cgfhtw 05744f3921 Bugfix 2023-11-08 09:35:23 +01:00
Harald Bamberger 31426d3c5e Merge branch 'master' into feature-27351/Digitalisierung_Formulare_Neu 2023-09-25 16:50:40 +02:00
Cris fa3a718ad4 Added getAutocompleteSuggestions method to OE Model
Get OEs by eventQuery string. Use with autocomplete event queries.
2023-09-21 14:40:05 +02:00
ma0048 26e63160ba - bug fix, bescheibung 2023-08-24 10:38:46 +02:00
cgfhtw b9bf2487c2 Stg-Ansicht: Status styled as link
Stg-Ansicht: Status styled as link
2023-08-22 11:13:56 +02:00
cgfhtw 8da161120f Abmeldung (Stg): Suche auch nach student_uid 2023-08-22 11:11:38 +02:00
cgfhtw 764628d5fb Merge branch 'feature-27351/Digitalisierung_Formulare_Neu' into feature-25999/C4 2023-07-25 10:40:38 +02:00
ma0068 6eaa8c4c01 Codesniffer and MassDetector 2023-07-24 16:04:46 +02:00
cgfhtw 8901791911 Merge branch 'feature-27351/Digitalisierung_Formulare_Neu' into feature-25999/C4 2023-07-19 14:37:59 +02:00
cgfhtw 72d0517701 Merge branch 'master' into feature-25999/C4 2023-07-19 10:55:35 +02:00
cgfhtw b04aefc105 Unterbrechung nur für das Aktuelle und kommende Semester 2023-07-13 16:13:40 +02:00
cgfhtw c8fc6c747f Table height & Bug: Allowed/Shown Stgs in Component 2023-07-13 13:57:17 +02:00
cgfhtw 3fce448451 Abmeldung durch Stgl: status => typ 2023-07-10 10:19:06 +02:00
cgfhtw 761af30a75 speed up student selection 2023-07-10 09:21:12 +02:00