Commit Graph

1901 Commits

Author SHA1 Message Date
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
Cris b4f450b073 Merge branch 'master' into feature-15390/Zeitwuensche_pro_Semester 2021-11-03 11:16:13 +01:00
Harald Bamberger ef93736891 eucovidqr phrases modified 2021-10-28 12:31:48 +02:00
Andreas Österreicher 70781d966d Merge branch 'feature/infocenter_anpassungen' 2021-10-25 10:50:09 +02:00
ma0048 54f6d88901 Merge branch 'feature-7423/infocenter_udf_schule_job' into feature/infocenter_anpassungen 2021-10-25 10:37:14 +02:00
Andreas Österreicher a111503e04 Merge branch 'feature-15091/personen_zusammenlegen_fehlende_berechtigung' 2021-10-25 10:36:17 +02:00
Harald Bamberger 52272932ed another euvocid phrase 2021-10-22 10:31:02 +02:00
ma0048 d7364d08dd Merge remote-tracking branch 'origin/feature-15389/infocenter_automatische_abfrage_ob_bewerberin_vorhanden' into feature/infocenter_anpassungen 2021-10-22 07:13:06 +02:00
Harald Bamberger 7de012c930 more phrases for eucovidqr 2021-10-21 18:31:48 +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
Harald Bamberger b0571e0a26 additional phrases for eucovidqr 2021-10-21 08:18:04 +02:00
Andreas Österreicher 4c62b003df Merge branch 'master' into FHBGLD-set_gemeinde_skript 2021-10-15 17:18:20 +02:00
Harald Bamberger 2bb357ccbd remove 3G from phrases 2021-10-13 15:14:13 +02:00
Andreas Österreicher e5ecbd9488 Merge branch 'feature-10450/DVUH_requestMatrikelnummer' 2021-10-13 14:18:06 +02:00
Harald Bamberger bd3ed4952b add phrases for eucovidqr errormsgs 2021-10-13 12:26:03 +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 3e00e4b3a1 infocenter warning falls bewerberIn bereits vorhanden ist 2021-10-12 13:08:17 +02:00
Harald Bamberger 4ef7f49bdb add missing phrase 2021-10-08 15:12:06 +02:00
Harald Bamberger 524a3dfd95 phrases for eucovidqr 2021-10-08 11:25:55 +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
KarpAlex cb3f3723ae issues table dataset:
- made more readable for assistance (added vorname, nachname, removed some fields)
- added default filters (all new, last 7 days...)
- issues displayed for children oes of permitted arrays as well
- query: more exact check for prestudents future status by using studiensemester start date
- typo fixes
2021-09-28 15:57:27 +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
ma0048 8a417e5cb8 fixed uebersicht nicht abgeschickt 2021-09-15 13:45:43 +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
Andreas Österreicher 04261e11e4 Wording für Anrechnungen angepasst 2021-09-03 17:38:52 +02:00
ma0068 30c2705b99 fix syntax error system/dbupdate_3.3.php 2021-09-02 11:43:43 +02:00
ma0068 778b5906f9 Merge Branche Cristina 2021-09-02 11:35:17 +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 fb00baae00 Merge branch 'master' into feature-12333/Change_legacy_jobs_database_log 2021-08-22 20:58:09 +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
cris-technikum 25ee1032e5 Added "homeoffice" to DB and bisverwendung Class
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-08-10 12:30:10 +02:00