8ba2a6852b
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
2024-10-22 11:04:07 +02:00
24ce443e95
nur die letzte komm oder zusaetzlichen komm Pruefung einer LV beruecksichtigen
2024-10-15 17:40:11 +02:00
439ae5113d
fix unterbrechung erstellen nicht möglich wenn ein abgelehnter unterbrechungsantrag existiert
2024-10-15 13:59:11 +02:00
27e3f1d1bc
take status rejected into account when calculating available semster slots for unterbrechung
2024-10-14 15:40:25 +02:00
469867e98c
Studstatus: status "EmailVersandt" is not an active status
2024-10-10 12:37:57 +02:00
a2f70be7e4
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-10-08 09:28:56 +02:00
c754291c6d
Merge branch 'feature-20228/erfassung_internationalisierungsmassnahmen_beurteilung'
2024-10-03 10:42:00 +02:00
be412abebc
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
2024-09-26 16:16:24 +02:00
7c85e981f9
- absteigende sortierung endabgabe
2024-09-17 11:17:44 +02:00
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
0c4d1afded
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-08-21 13:46:41 +02:00
3963358d95
Added getTemplateLvTree method to Lehrveranstaltung_model.php
...
This method gets all Templates and unions with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
a template. This data structure can be used for nested tabulator data tree.
2024-08-21 13:16:22 +02:00
ffabd681c8
setFirstStudent logic
2024-08-08 16:24:23 +02:00
f1a2ef25c7
Remove unused functions
2024-08-08 12:45:36 +02:00
7abe95ba5f
Adapted LvsByStudienplan query to retrieve also Lehreinheitgruppen
2024-08-06 10:48:20 +02:00
235a8a73e9
codessniff studentlehrverband_model
2024-08-06 08:49:23 +02:00
437fd64a6f
refactor setFunctions and processStudentlehrverband
2024-08-05 16:52:46 +02:00
3213c051b3
Adapted getLvsByStudienplan query to get by given Lehrveranstaltungen
2024-08-01 13:48:06 +02:00
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
085ca2a16d
Adapted getLvsByStudienplan query to get all LVs, not only VZ
2024-07-31 11:44:42 +02:00
49bd14496a
Adapted db query to get Lehrveranstaltungen via Studienplan instead of Lehreinheit
2024-07-30 15:38:02 +02:00
0df9385f33
Adapted DB query to filter only Lehrveranstaltungen with lehrtyp_kurzbz 'lv'
2024-07-22 12:02:08 +02:00
ce7b368a8e
Adapted lv.orgform_kurzbz to selects in Lehrveranstaltung_model.php
2024-07-11 14:33:38 +02:00
4d48dfe018
Added method getLvsByStudiensemesterAndOes to Lehrveranstaltung_model.php
...
getLvsByStudiensemesterAndOes: Gets Lehrveranstaltungen with its Stg, OE and OE-type and filters by Studiensemester and Organisationseinheiten if necessary.
2024-07-08 12:26:41 +02:00
3a16c4ebf3
Added method getAutocompleteSuggestions to Lehrveranstaltung_model.php
...
Get Lehrveranstaltungen by eventQuery string. Use with autocomplete event queries.
2024-06-26 10:45:56 +02:00
0729f2ed1a
refactor actions prestudentLib
2024-06-18 16:24:57 +02:00
4c671c2ee9
Phrases Validierungen
2024-05-14 14:13:38 +02:00
d1b813b1cc
update editStatus: getHistory, setAbbrecher, dropdown newStatus, validations
2024-05-03 16:53:31 +02:00
8e56b404b9
Merge branch 'feature-37246/APIs_Konsolidierung' into feature-30660/FHC4_StudierendenGUI_Prototyp
2024-04-29 11:17:12 +02:00
b1e85fe92b
- international skills auf vuejs
...
- note uebernehmen hinzugefuegt
2024-04-24 14:18:55 +02:00
77221e507f
set tabulator to fixed height, fix missing grund when editing unterbrechung
2024-03-14 11:42:39 +01:00
bc5d42b310
Studstatus: ausbildungssemester in getAllPrestudentsWhereCommitteeExamFailed
2024-03-14 08:52:55 +01:00
87384f42f9
Update Logik Lehrverband: as function, with transactions
2024-03-13 13:31:53 +01:00
673fd889fe
Studstatus: get details without whitelist
2024-03-13 10:39:51 +01:00
ab7a5bac68
Unterbrechung studienjahr und semester anzeige
2024-03-13 08:37:40 +01:00
a49075bcb7
check Bismeldestichtag, refactor Lehrverband
2024-03-12 07:52:51 +01:00
7bec7016c3
merge master into branch FHC4
2024-03-05 16:31:41 +01:00
6500708f90
Code Quality
2024-02-29 09:02:20 +01:00
2d2098984a
Pause feature
2024-02-29 08:34:58 +01:00
88df5057fb
Update, Vorrücken, Delete, Refactoring Statusvalidations
2024-02-27 16:53:37 +01:00
c034efb8b0
Unterbrechung bei laufender Unterbrechung
2024-02-21 09:19:56 +01:00
658212a6eb
Show Antrag to Student when finished
2024-02-16 13:28:26 +01:00
824423f3ea
Update Fkt getTypenStg()
2024-02-12 11:00:35 +01:00
7dfb0429ae
Merge branch 'master' into feature-35768/Studstatus_Status_Abgebrochen_fuer_Wiederholerdeadline_verwenden
2024-02-08 08:25:11 +01:00
e90f0c75fa
fix missing entries due to missing prestudentstatus for target semester
2024-01-22 13:47:35 +01:00
1b27dbcb5f
Bugfix: WH Antrag Prüfungstest kleiner vs kleiner gleich
2024-01-19 13:17:41 +01:00
13b5b017b8
Expose Antrag Id
2024-01-11 08:34:00 +01:00
a3f9e19bd6
Noten manuell ändern
2024-01-09 13:22:37 +01:00
fde1623dc0
Merge branch 'feature-35545/Studstatus_Status_Abgemeldet'
2024-01-08 18:23:10 +01:00
5b62271711
s&d
2024-01-02 09:36:28 +01:00
Harald Bamberger