642ba32e0b
Merge branch 'master' into feature-15391/Positive_Zeitsperre
2022-02-10 10:51:08 +01:00
5641d10cc1
Link zum Schlagwortdienst korrigiert
2022-02-09 14:33:25 +01:00
b0212627ce
Changed: Zeitverfuegbarkeit bei Zeitsperren im CIS nicht lösch-/editierbar machen
2022-02-09 09:56:19 +01:00
6d62019447
Changed: Zeitverfuegbarkeit bei Zeitsperren im CIS nicht anzeigen
2022-02-09 09:55:39 +01:00
6d806a52d9
Merge branch 'feature-17457/notenliste'
2022-02-01 17:25:54 +01:00
4ccc659dd9
Anzeige für Hauptberuf korrigiert
2022-02-01 17:13:16 +01:00
d9c056e7c2
bfi aenderungen notenlsite
2022-01-27 11:02:56 +01:00
3136cf354a
alle eingetragenen adressen nur beim mitarbeiter anzeigen
2022-01-27 11:00:26 +01:00
b6131283d9
Ampelsystem: Attribut Buttonbeschriftung berücksichtigen
2022-01-18 20:18:53 +01:00
1afcd5d4fe
DD Markierung korrigiert
2022-01-17 12:19:45 +01:00
26010e2347
Warning bei DD behoben
2022-01-17 12:12:09 +01:00
12034b7637
#16842 Legende in Notenliste um iar ergänzt
2022-01-12 12:22:36 +01:00
685ac404fb
Anzeige dd nur für das betreffende Studiensemester in Noten-, Anwesenheits- und Gesamtliste umgesetzt
2022-01-12 12:05:36 +01:00
841d6f9e89
Merge branch 'master' into feature-15391/Positive_Zeitsperre
2022-01-10 14:28:23 +01:00
7753ca8cf2
Merge branch 'master' into feature-14811/neuer_adresstyp_fuer_homeoffice
2022-01-03 13:45:34 +01:00
f73f26c668
Added STG mail receiver to be addressed, when lector changes Zeitwunsch...
...
...and when lector has already been assigned to a course.
Only addressing Studiengaenge that are concerned by Zeitwunsch change
of lector.
LV must be assigned in the selected Studiensemester, but not in the past
2021-12-20 11:53:03 +01:00
bb7922dd3a
Adapted to check only for future verplante LVs
...
Only if LVs are assigend in the future, the lector should be informed
and initially blocked to change their Zeitwunsch.
For past LVs it is not relevant anymore.
2021-12-13 11:40:32 +01:00
e501681ff8
Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
...
# Conflicts:
# system/dbupdate_3.3.php
2021-12-07 18:36:17 +01:00
6855686c66
Changed text and removed link mailto LV Planung
2021-12-07 18:25:55 +01:00
dd8876a375
Automatische Pause für einzelne typen hinzugefügt
2021-12-06 10:16:19 +01:00
525b8a04d3
Merge branch 'master' into feature-14811/neuer_adresstyp_fuer_homeoffice
2021-12-01 14:31:08 +01:00
76ca170678
Changed: when splitting Zeitwunschgueltigkeit, set ende of last ZWG to 'yesterday'
...
Before it was set to now(). But new ZWG starts with now, therefore last ZWG
should end with day before.
2021-11-29 19:08:56 +01:00
eb923cab9b
Changed: Now using textphrases
2021-11-29 11:31:03 +01:00
2e9bfc049b
Corrected: Now retrieving correct data for 'isVerplant'
...
. Correction in function isVerplant()
. Also changed var name to isVerplant
2021-11-25 14:33:23 +01:00
aa183a0a08
Added 'Alle Werte auf 1 setzen' and 'Aenderungen zuruecknehmen'
2021-11-25 10:56:50 +01:00
6db2748163
Added Zeitwunsch Edit lock of if LV had already been assigned
...
- Message is shown and form buttons for changing / copying Zeitwunsch
are disabled if LV had already been assigned to lector.
- Lector can unlock by clicking on link.
2021-11-24 17:47:01 +01:00
bd71650ac5
Colored Legende for Zeitwunsch-Tabelle
2021-11-24 16:26:22 +01:00
8d3c54fafc
Minor change: Removed default now() for updateamum, Changed code order
...
...for better maintainance
2021-11-24 11:48:57 +01:00
beb850ebe3
Adapted Zeitwunsch zu geteilte Dienste to Bootstrap Style
2021-11-24 09:33:25 +01:00
7c65e2ff53
Adapted Zeitwunsch GUI to use Zeitwunschgueltigkeit and save by Studiensemester
...
Major adaptation in GUI:
- Added Dropdown to select actual / next Studiensemester to edit Zeitwunsch
- Added Radiobuttons to allow changing or copying from earlier Studiensemester
- By selecting an earlier Studiensemester, the earlier Zeitwunsch is displayed in
the table and is ready to edit or just to save.
2021-11-23 15:56:07 +01:00
fb8512bcbc
Merge branch 'feature-14585/Zeitaufzeichnung_aktivitaeten'
2021-11-22 17:38:52 +01:00
ced19ecb2d
remove misplaced echo
2021-11-17 12:50:17 +01:00
fbe4862a21
Merge branch 'feature-14001/KennzeichnungStudentDoubleDegree'
2021-11-15 16:40:48 +01:00
20fb38ba8f
change labels
2021-11-15 16:34:42 +01:00
6342aa3f14
Merge branch 'feature-14001/KennzeichnungStudentDoubleDegree' of https://github.com/FH-Complete/FHC-Core into feature-14001/KennzeichnungStudentDoubleDegree
2021-11-03 09:27:41 +01:00
c0fd4f70b9
Ermittlung Prestudent_id mit load()
2021-11-03 09:26:48 +01:00
8d4a79f9b9
only show messages if covid udf is defined
2021-11-02 18:00:41 +01:00
811b59ef1b
styling
2021-11-02 17:56:33 +01:00
4d1994ca63
menulayout, coding styles
2021-11-02 17:50:20 +01:00
b549fc1edd
Update Funktion getPrestudentIdFromBenutzerId
2021-11-02 15:14:00 +01:00
341944d38b
Merge branch 'feature-15810/task-15839_Covidstatusliste_pro_LV_LE_depends_on_feature-14001' into feature-14001/KennzeichnungStudentDoubleDegree
2021-11-02 14:19:21 +01:00
776d448fba
Erweiterung Gesamtnotenliste um Double Degree Program
2021-11-02 10:41:41 +01:00
12f7f43e65
fix copy paste error
2021-11-01 15:52:52 +01:00
487da82e33
pass studiengang to lehrelisthelper
2021-11-01 15:51:20 +01:00
8c100ba993
moved db logic to lehrelisthelper class
2021-11-01 15:25:24 +01:00
98ffe525b3
first working version to add covid status to lvlists
2021-11-01 13:12:55 +01:00
080a7acdee
Removed the directories cis/private/lehre/ects and include/safehtml
2021-10-29 16:59:31 +02:00
c243f121f2
Merge branch 'feature-10515/zeiterfassung_automatische_pause_runden'
2021-10-29 15:40:37 +02:00
794b3695c3
Merge branch 'master' into feature-15781/zeitaufzeichnung_projektuebersicht_export
2021-10-29 15:30:15 +02:00
38cdcef38e
Notenliste und Anwesenheitsliste um Mobilität DegreeProgram erweitert
2021-10-29 10:35:12 +02:00
Cris