Commit Graph

137 Commits

Author SHA1 Message Date
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 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
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
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
cgfhtw a3f9e19bd6 Noten manuell ändern 2024-01-09 13:22: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
ma0068 6eaa8c4c01 Codesniffer and MassDetector 2023-07-24 16:04:46 +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
ma0068 1e0e93dfa3 Autocomplete Add-Button Finish 2023-07-05 13:20:46 +02:00
cgfhtw 61856473ea Leitungsansicht Autocomplete 1st draft 2023-07-05 08:30:33 +02:00
cgfhtw 64ce3d1f6a Cleaned up commit from 'feature-27351/Digitalisierung_Formulare_Abmeldung_Unterbrechung_Wiederholung' 2023-07-04 10:34:14 +02:00
ma0048 3293a75a79 - berechtigungsabfragen angepasst
- fit programme aus der config holen
2023-01-30 11:51:15 +01:00
ma0048 33b35286d3 Merge remote-tracking branch 'origin/master' into feature-18984/infocenter_tool_fuer_lehrgaenge_anpassen 2022-09-12 10:15:50 +02:00
Cris 7bba155bb5 Adapted function getPreviousFrom to return more than 1 previous semester if needed 2022-06-22 10:52:51 +02:00
ma0048 3d3f4d5453 erste version infocenter lehrgaenge 2022-05-24 13:51:39 +02:00
Harald Bamberger 10aa88e262 Merge branch 'feature-15391/Positive_Zeitsperre' 2022-04-19 13:46:38 +02:00
Cris 37f6a0caaa Merge branch 'master' into feature-15391/Positive_Zeitsperre
# Conflicts:
#	system/dbupdate_3.3.php
2022-03-23 16:29:10 +01:00
ma0048 9460fd19d8 kurzbz in absage dropdown und abgewiesene uebersicht angepasst 2022-03-08 11:43:34 +01:00
Andreas Österreicher 18731ede47 Laden von Studiengangsleitungen angepasst, Error Handling bei fehenden
Studiengangsleitungen
2022-02-25 11:59:38 +01:00
Cris 9abc018e08 Removed db->escape when using getLeitung/getAssistance method
...it throws an error since query was adapted to accept array and anyway, is
not necessary anymore.
2022-02-21 17:19:02 +01:00
Cris d2055f759e Added method getAssistance in Studiengang Model 2022-02-21 16:52:13 +01:00
Cris d57a62dbe3 Adapted method getLeitung in Studiengang Model to accept studiengang array 2022-02-21 16:51:17 +01:00
Cris ca51fef7f8 Added method to get actual Studiensemester to Studiensemester Model 2022-02-17 12:33:38 +01:00
Cris a4ffe9104b Fixed query to get Studiensemest correctly when using getByDate method 2021-12-20 09:49:49 +01:00
Andreas Österreicher 4b94dfbda7 Merge branch 'master' into feature/Anrechnungen_NEU 2021-09-03 11:08:29 +02:00