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
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
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
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
70c9489ef3
Corrected to retrieve latest Zeitwunschgueltigkeit correctly in getByUID function
...
...by changing query order
2021-11-29 17:38:16 +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
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
f3600a79ec
Disabled Output on Connection error
2021-11-18 13:40:27 +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
ab8d1b4863
fix indentation
2021-11-11 17:41:22 +01:00
c4da43aa65
do not return errormsg
2021-11-11 17:37:09 +01:00
0f40e1b80c
Funktion getLastVorgesetzter für Covid-Meldeformular
2021-11-11 09:03:38 +01:00
5107d0ddd5
do not distinguish between unknown and invalid consider both invalid
2021-11-08 11:06:26 +01:00
c84c2772be
Merge branch 'feature-5056/PHP7_Problems_old_Libraries'
2021-11-04 15:17:46 +01:00
38aa578528
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
2021-11-04 14:32:59 +01:00
d6e063dd0c
check empty uids array
2021-11-04 11:14:17 +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
4d1994ca63
menulayout, coding styles
2021-11-02 17:50:20 +01:00
b549fc1edd
Update Funktion getPrestudentIdFromBenutzerId
2021-11-02 15:14:00 +01:00
f37161dcc2
Vereinfachung Funktion getPrestudentFromBenutzer
2021-11-02 14:49:13 +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
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
794b3695c3
Merge branch 'master' into feature-15781/zeitaufzeichnung_projektuebersicht_export
2021-10-29 15:30:15 +02:00
e6a11d0dc2
abfrage ob die tbl vorhanden ist hinzugefuegt
2021-10-28 12:30:10 +02:00
139dac67a7
Merge remote-tracking branch 'origin/master'
2021-10-28 12:27:34 +02:00
9292570684
Log für Löschen von LV-Plan einträgen
2021-10-28 12:26:30 +02:00
530ede77ad
Merge branch 'master' into feature-14198/LVLeitungBeiLVInfoAnzeigen
2021-10-27 17:06:14 +02:00
875fc5c632
Maximale laufzeit für Auswertungen erhöht
2021-10-22 16:07:41 +02:00
d73dd4769a
Stipendien-Schnittstelle berücksichtigt auch Anzahlung und Restzahlung
2021-10-21 17:44:45 +02:00
4c62b003df
Merge branch 'master' into FHBGLD-set_gemeinde_skript
2021-10-15 17:18:20 +02:00
1c7bd4986a
Fehler beim Anlegen von neuen Studiengängen behoben
2021-10-15 15:12:23 +02:00
7805784214
sap projektnummer im export hinzugefuegt
2021-10-15 12:54:24 +02:00
901f9ba7fa
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-10-13 09:05:05 +02:00
11952fe063
Merge branch 'feature-14635/UDF_move_permissions_to_JSON_definition'
2021-10-08 14:02:17 +02:00
d7a33df898
When exporting in MS Excel format from FAS it is checked that the logged user
...
has the permissions to export UDFs.
If the logged user has no permissions on a UDF then the UDF is discarted
and it will not present into the MS Excel file
2021-10-06 10:58:58 +02:00
dfc55a8f95
Time Limit für Statistiken erhöht
2021-10-01 14:20:15 +02:00
196f604e05
Merge remote-tracking branch 'origin/master'
2021-09-29 18:36:23 +02:00
3b5936239e
Projekttiel in Funktion getProjectphaseForMitarbeiter
2021-09-29 18:33:55 +02:00
307ba9ce83
Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter
2021-09-27 08:12:00 +02:00
818567b355
Anmeldungen bei stornierten Prüfungen werden nicht mehr berücksichtigt
2021-09-22 12:02:54 +02:00
61044e9a3d
Merge branch 'master' into feature-12808/LVNeuesAttributLehrmodus
2021-09-21 07:39:08 +02:00
Cris