d2c87d6a98
Added Class Zeitwunsch_gueltigkeit_model
2021-12-20 09:43:37 +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
cc770e6324
Added param 'nurBevorstehende' to getStundenplanData method in Lehrstunden Class
...
If 'nurBevorstehende' true, only future Studenplandata will be queried.
2021-12-13 11:29:11 +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
976d8d333e
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-12-07 18:31:33 +01:00
6855686c66
Changed text and removed link mailto LV Planung
2021-12-07 18:25:55 +01:00
e9cc04783e
Refactored query to load a single Zeitwunschgueltigkeit
...
Instead of limiting returning rows by using ende of next Studiensemester,
it is limited by ordering and limiting query now.
2021-12-07 17:24:07 +01:00
40871c73a0
Added link to Vilesci Zeitwuensche in TEMPUS
...
Now, when rightclicking on 'Zeitwuensche einsehen' on a lector in Tempus,
the Vilesci Zeitwuensche of that lector is opened.
2021-12-07 17:16:15 +01:00
9c0da32841
Adapted TEMPUS queries to get correct Zeitwunsch (of given Zeitwunschgueltigkeit)
...
Now correct Zeitwunsch is displayed for
- Wochenplan and Semesterplan of a lector
- Wochenplan, when a LV is added, to which more lectors are assigned:
Now query checks to get correct Zeitwunsch of each lector
2021-12-06 15:51:45 +01:00
dd8876a375
Automatische Pause für einzelne typen hinzugefügt
2021-12-06 10:16:19 +01:00
0192835275
Merge branch 'feature-7423/infocenter_udf_schule_job'
2021-12-03 13:46:11 +01:00
88ad75295d
Merge branch 'master' into feature-7423/infocenter_udf_schule_job
2021-12-03 13:41:40 +01:00
78876fa807
Merge branch 'feature-16624/infocenter_firefox_anzeigefehler_dokumente'
2021-12-03 11:41:13 +01:00
84500652ef
Merge branch 'feature-16191/inofcenter_bachelor_die_megssage_an_die_studiengaenge_deaktivieren'
2021-12-03 11:38:01 +01:00
efa348456a
Merge branch 'feature-15889/infocenter_report_ueber_kuerzlich_abgewiesene'
2021-12-03 11:27:48 +01:00
25b890a25a
Merge branch 'feature-15888/infocenter_datum_fuer_parken'
2021-12-03 11:25:36 +01:00
b61a5a6f34
Merge branch 'feature-13735/message_ohne_gefundener_sprache'
2021-12-03 11:04:20 +01:00
554a27cc01
anzeigefehler fixed dokpruefung
2021-12-02 21:06:56 +01:00
61c1399f01
Improved Performance of dbupdate
2021-12-02 16:50:08 +01:00
419988aaf9
DB-Index für campus.tbl_zeitaufzeichnung.uid hinzugefügt
2021-12-02 16:17:24 +01:00
17dd939044
Moved to Addon
2021-12-02 15:24:27 +01:00
d697e189eb
Changed: Now function getByUID of ZWG class retrieves correct amount of ZWG
2021-12-02 09:43:06 +01:00
e3ecfbe782
Corrected constructor of Zeitwunsch_gueltigkeit Class
2021-12-02 09:39:00 +01:00
a4cb455e3e
Added creating/editing/viewing Zeitwunschgueltigkeiten in VILESCI
...
Admins can see and work on Zeitwunschgueltigkeiten of lector.
Added logic to save/update/display Zeitwuensche by
Zeitwunschgueltigkeiten.
2021-12-02 09:35:20 +01:00
b2d46af0d6
wording und datum angepasst
2021-12-01 19:31:31 +01:00
b4eb2d426a
Lehrauftragsverwaltung - Anzeige von Nachname und Vorname bei Betreuungen vertauscht
2021-12-01 17:00:28 +01:00
3ee409f06c
Merge branch 'feature-15907/lvs_vom_studierenden_anzeigen_fas'
2021-12-01 15:01:55 +01:00
8d1886039a
Projektarbeiten DropDown angepasst damit nach dem Laden die selben
...
LVEintträge angezeigt werden wie bei der Neuanlage
2021-12-01 15:00:02 +01:00
46962d5064
Merge branch 'master' into feature-15907/lvs_vom_studierenden_anzeigen_fas
2021-12-01 14:41:51 +01:00
d657378cba
Merge branch 'Monika70-db_update_tbl_studiengangstyp'
2021-12-01 14:28:47 +01:00
5c84196f96
Fixed Code Intentation
2021-12-01 14:28:17 +01:00
be4beaff95
Update dbupdate_3.3.php
...
Erweiterung der Studiengangstypen
2021-11-30 13:37:50 +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
93d9108db7
Added functionality to select Zeitwunschgueltigkeiten in VILESCI
...
. added Dropdown with all Zeitwunschgueltigkeiten
. adpated Table to display selected Zeitwunschgueltigkeit
2021-11-29 17:51:08 +01:00
70c9489ef3
Corrected to retrieve latest Zeitwunschgueltigkeit correctly in getByUID function
...
...by changing query order
2021-11-29 17:38:16 +01:00
eb923cab9b
Changed: Now using textphrases
2021-11-29 11:31:03 +01:00
ef675226e4
Corrected: Now Lehrstunde Class has property 'result'
...
. Errormessages were thrown without result property. Fixed now.
. Also added errormsg, when getStundenplanData query fails.
2021-11-25 14:36: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
e761211425
Merge branch 'FHBGLD-FHBGLD-vilesci/bis/studentenmeldung'
2021-11-24 18:04:47 +01:00
02ec36d40c
Merge branch 'FHBGLD-vilesci/bis/studentenmeldung' of https://github.com/FHBGLD/FHC-Core into FHBGLD-FHBGLD-vilesci/bis/studentenmeldung
2021-11-24 18:03: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
976e79447a
Added / Adapted methods of Zeitwunsch Class to use Zeitwunschgueltigkeit
...
Added:
- loadByZWG: Zeitwunsch einer Person zu bestimmter Zeitwunschgueltigkeit laden.
Adapted:
- loadPerson
- save
- exists
2021-11-23 15:48:53 +01:00
e485257458
Created Zeitwunsch_gueltigkeit Class
...
Methods:
- load: Ladet eine Zeitwunschgueltigkeit.
- save: Speichert eine Zeitwunschgueltigkeit (insert/update)
- getByUID: Ladet Zeitwunschgueltigkeiten einer UID mitsamt
den zugehoerigen Studiensemestern.
- getByStudiensemester: Ladet Zeitwunschgueltigkeiten einer UID und
eines bestimmten Semesters
2021-11-23 15:39:52 +01:00
d996e3ad31
Added new database dump system/FHComplete-3.3.sql
2021-11-23 10:54:17 +01:00
46eda3c14d
- Removed old database dump system/fhcomplete3.0.sql
...
- Added new database dump system/FHComplete-3.3.sql
2021-11-23 10:53:28 +01:00
Cris