Cris
e501681ff8
Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
...
# Conflicts:
# system/dbupdate_3.3.php
2021-12-07 18:36:17 +01:00
Andreas Österreicher
61c1399f01
Improved Performance of dbupdate
2021-12-02 16:50:08 +01:00
Andreas Österreicher
419988aaf9
DB-Index für campus.tbl_zeitaufzeichnung.uid hinzugefügt
2021-12-02 16:17:24 +01:00
Andreas Österreicher
5c84196f96
Fixed Code Intentation
2021-12-01 14:28:17 +01:00
Monika70
be4beaff95
Update dbupdate_3.3.php
...
Erweiterung der Studiengangstypen
2021-11-30 13:37:50 +01:00
Cris
8d3c54fafc
Minor change: Removed default now() for updateamum, Changed code order
...
...for better maintainance
2021-11-24 11:48:57 +01:00
Cris
70f3cebd36
Changed DB default entry to NOW() for insertamum / updateaumum in tbl_zeitwunschgueltigkeit
2021-11-22 18:51:28 +01:00
Harald Bamberger
fbe4862a21
Merge branch 'feature-14001/KennzeichnungStudentDoubleDegree'
2021-11-15 16:40:48 +01:00
Andreas Österreicher
439d2dd999
Merge branch 'feature-15910/BPK_soll_mit_Berechtigung_im_FAS_sichtbar_editierbar_sein'
2021-11-04 17:09:04 +01:00
Andreas Österreicher
6d69d572ee
Merge branch 'feature-15795/DVUH_Mehrsprachigkeit'
2021-11-04 15:56:26 +01:00
Andreas Österreicher
46e3f91a6e
Zeitaufzeichnungsspalten zu Gegencheck hinzugefügt
2021-11-04 14:42:20 +01:00
Andreas Österreicher
38aa578528
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
2021-11-04 14:32:59 +01:00
KarpAlex
fce92f78d4
Merge branch 'master' into feature-15795/DVUH_Mehrsprachigkeit
2021-11-04 12:05:32 +01:00
Cris
b4f450b073
Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester
2021-11-03 11:16:13 +01:00
KarpAlex
a02e470970
displaying and editing BPK field in FAS with permission student/bpk
2021-11-02 11:28:10 +01:00
ma0068
38cdcef38e
Notenliste und Anwesenheitsliste um Mobilität DegreeProgram erweitert
2021-10-29 10:35:12 +02:00
Andreas Österreicher
a111503e04
Merge branch 'feature-15091/personen_zusammenlegen_fehlende_berechtigung'
2021-10-25 10:36:17 +02:00
Cris
8033c12665
Added / Adapted tables for Zeitwunsch Gueltigkeit pro Studiensemester
...
- Added table campus.tbl_zeitwunsch_gueltigkeit and migrated initial data
- Added column zeitwunsch_id (as new primary key) and zeitwunsch_gueltigkeit_id to campus.tbl_zeitwunsch
- Initially copied all Zeitwunsch entries
-- The basic entries are joined with Zeitwunsch Gueltigkeit for actual Studiensemester
-- The copied entries are joined with Zeitwunsch Gueltigkeit for next Studiensemester
This is necessary because the actual Zeitwunschplan represent for some lectors the plan for the actual semester, and for some - who have already planned forward - for the next semester.
2021-10-21 13:03:16 +02:00
KarpAlex
2a8d91119a
Öhbeitrag Management GUI: using phrases
2021-10-21 05:48:18 +02:00
Andreas Österreicher
4c62b003df
Merge branch 'master' into FHBGLD-set_gemeinde_skript
2021-10-15 17:18:20 +02:00
KarpAlex
4777c0414f
dbupdate_3.3.php: fixed line break
2021-10-13 09:15:58 +02:00
KarpAlex
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
ma0048
5954237851
update rechte tbl_person_lock fuer benutzer vilesci
2021-10-08 10:51:13 +02:00
KarpAlex
cb25efceca
added NOT NULL constraint to fehlercode field of tbl_fehler_zustaendigkeiten
2021-09-29 21:11:52 +02:00
Andreas Österreicher
307ba9ce83
Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter
2021-09-27 08:12:00 +02:00
Andreas Österreicher
61044e9a3d
Merge branch 'master' into feature-12808/LVNeuesAttributLehrmodus
2021-09-21 07:39:08 +02:00
KarpAlex
45e4d5576c
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-21 00:59:26 +02:00
KarpAlex
4c21d5364c
- added issue management functionality - adding, and displaying issues with filter widget.
2021-09-21 00:58:29 +02:00
Andreas Österreicher
32dc9e1a2d
Index für AnrechnungID in tbl_anrechnung_anrechnungstatus hinzugefügt
2021-09-17 10:38:19 +02:00
Andreas Österreicher
30dc436442
Berechtigung für basis/gemeinde hinzugefügt
...
Pfade korrigiert
2021-09-15 13:49:20 +02:00
Andreas Österreicher
6927b668e3
Merge branch 'master' into feature-14199/HomeofficeProMitarbeiter
2021-09-15 12:10:59 +02:00
Andreas Österreicher
e412125dd0
Merge branch 'feature/Wiederholer_features_12995_12997_12998_13864'
2021-09-15 10:34:06 +02:00
KarpAlex
493bf0edda
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-06 22:35:40 +02:00
KarpAlex
40d686cb21
Merge branch 'feature-13092/Monitoring_Schnittstellen_Dashboard' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# system/dbupdate_3.3.php
2021-09-06 22:33:47 +02:00
ma0068
30c2705b99
fix syntax error system/dbupdate_3.3.php
2021-09-02 11:43:43 +02:00
ma0068
d3158b8ce0
merge dbupdate_3.3.php
2021-09-02 11:31:58 +02:00
KarpAlex
25cc8c6d49
matr_aktiv field in dbupdate_3.3.php: only set to true if not NULL
2021-08-30 18:11:08 +02:00
Andreas Österreicher
484151bab2
Merge branch 'master' into feature/Anrechnungen_NEU
2021-08-26 11:32:47 +02:00
KarpAlex
b9ac73955a
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-08-24 01:19:26 +02:00
Paolo
6960a958f7
Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox
2021-08-22 20:58:38 +02:00
Andreas Österreicher
73ce635188
Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung
2021-08-20 10:34:55 +02:00
Harald Bamberger
d091374622
create merged branch with all features on topic Wiederholer - feature 13864
2021-08-19 15:26:20 +02:00
Harald Bamberger
1d9ba9c232
create merged branch with all features on topic Wiederholer - feature 12997
2021-08-19 14:58:00 +02:00
manu
4d08dc58db
merge master into feature-12808
2021-08-18 15:38:17 +02:00
Andreas Oesterreicher
d8804730ba
Merge branch 'master' into feature-13218/BewerbungstoolMasterDokumente
2021-08-18 11:18:33 +02:00
ma0048
6ff8df6ac3
merged master into anpassung_infocenter
2021-08-18 08:45:28 +02:00
Andreas Österreicher
9eae959b15
Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig
2021-07-28 12:10:28 +02:00
manu
7bd68775e9
statusgrund_kurzbz in dbupdate ergänzt
2021-07-23 13:44:28 +02:00
KarpAlex
e145a3854a
added system.tbl_issues for issue tracking
2021-07-15 16:13:43 +02:00
cris-technikum
f60e923829
Merge branch 'master' into feature-12997/Neue_Noten
2021-07-12 10:38:07 +02:00