 Harald Bamberger
|
1c385d22cd
|
Merge branch 'feature-37133/Gehaltsbaender' into merge_37107_37133_39212
|
2024-06-14 10:41:48 +02:00 |
|
|
Harald Bamberger
|
0e5d4b30ed
|
Merge branch 'master' into feature-37133/Gehaltsbaender
|
2024-06-13 13:26:48 +02:00 |
|
|
Harald Bamberger
|
4e233f760d
|
Merge branch 'master' into feature-37107/Fristenmanagement
|
2024-06-13 13:26:02 +02:00 |
|
|
Harald Bamberger
|
fd2474cc38
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-06-13 11:51:10 +02:00 |
|
|
Werner Masik
|
eb327c3adc
|
update Handyverwaltung filter
|
2024-06-12 14:52:22 +02:00 |
|
|
Cris
|
cd0eacf947
|
Updated phrases: Added phrases 'lizenzserverPort' and 'raumSwZuordnung'
|
2024-06-11 13:52:03 +02:00 |
|
|
Cris
|
dd47cd2a7c
|
Updated filter: Added lizenzserver_kurzbz and lizenzserver_port to SoftwareManagement filter
|
2024-06-11 13:51:03 +02:00 |
|
|
ma0068
|
bef53dadb1
|
refactor Tab Contact
|
2024-06-11 09:27:40 +02:00 |
|
|
Johann Hoffmann
|
52a55a018c
|
merge fix
|
2024-06-10 15:13:30 +02:00 |
|
|
Johann Hoffmann
|
068aa03b4f
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
|
2024-06-06 11:02:56 +02:00 |
|
|
Werner Masik
|
cd8fffd2f7
|
added filter update for Handyverwaltung
|
2024-06-04 16:20:43 +02:00 |
|
|
Cris
|
884d930e71
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
|
2024-06-04 16:05:33 +02:00 |
|
|
Harald Bamberger
|
7b148b1a39
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-06-03 17:21:50 +02:00 |
|
|
Cris
|
9652f48044
|
Added phrases 'zugeklappt', 'softwareliste', 'raumverfuegbarkeit'
|
2024-06-03 16:27:31 +02:00 |
|
|
ma0068
|
5d8df75e86
|
refactor Tab Contact: backend
|
2024-05-29 12:34:20 +02:00 |
|
|
KarpAlex
|
d8ba92e343
|
Merge branch 'master' into feature-36963/BIS_check_duales_Studium
|
2024-05-27 19:42:48 +02:00 |
|
|
ma0068
|
259a3c218a
|
Funktionalitaet feature-39602
|
2024-05-27 14:57:18 +02:00 |
|
|
SimonGschnell
|
234ec03db9
|
adds the phrase noGrade
|
2024-05-24 09:37:07 +02:00 |
|
|
Johann Hoffmann
|
0536ff0044
|
load person_id & uid for students to navigate them with admin view; WIP studentDropdown selection; WIP changing studentComponent to work with different permissions;
|
2024-05-23 16:49:53 +02:00 |
|
|
Johann Hoffmann
|
59a1e84fb2
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
# Conflicts:
# public/js/components/filter/Filter.js
# public/js/plugin/FhcApi.js
# system/dbupdate_3.4.php
|
2024-05-22 15:42:19 +02:00 |
|
|
Harald Bamberger
|
8cba0aec5a
|
vertragsarten dvbund, dvanderegk und dvanderebet hinzugefuegt, MigrateContract default oe und ba1code mapping in config verschoben und config check implementiert
|
2024-05-22 15:32:28 +02:00 |
|
|
SimonGschnell
|
c566d07847
|
fixes little xml layout issue
|
2024-05-21 13:34:58 +02:00 |
|
|
ma0068
|
9cade51ff4
|
Dropdown Status Aendern, Phrases
|
2024-05-21 11:47:24 +02:00 |
|
|
SimonGschnell
|
48bb2ef7e1
|
adds the insert query for the new raum template and the update statement to update the template for every room content
|
2024-05-21 11:05:22 +02:00 |
|
|
SimonGschnell
|
393475e62c
|
adds the content update script for the room content to the checksystem
|
2024-05-21 10:49:27 +02:00 |
|
|
SimonGschnell
|
d07c568d5e
|
adds dbupdate queryies for the new raum template
|
2024-05-21 10:37:53 +02:00 |
|
|
Johann Hoffmann
|
7530a74ff3
|
demo stand gf;
|
2024-05-16 16:39:54 +02:00 |
|
|
ma0068
|
4c671c2ee9
|
Phrases Validierungen
|
2024-05-14 14:13:38 +02:00 |
|
|
Cris
|
c4c17f69c7
|
Added phrase softwaretypKurzbz
|
2024-05-14 13:41:33 +02:00 |
|
|
ma0068
|
33267de4be
|
Refactor Status, Adaptions Prestudent
|
2024-05-14 09:25:21 +02:00 |
|
|
Johann Hoffmann
|
3b762c8065
|
getStudentsForLvaInSemester data query; getLektorIsTeachingLE veryfication query; getLektorenForLvaInSemester selection query; moved setup from app to landing page, landing page thus unskippable; now checking qr code age in check in; charts smaller size now; more phrasen; lektor tabulator height fix; ma uid selection of lektors for admin and assistenz; tested and implemented QRDelete Cronjob;
|
2024-05-13 16:01:26 +02:00 |
|
|
Cris
|
6d728ae0e7
|
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
# Conflicts:
# public/js/components/Tabs.js
# public/js/components/filter/Filter.js
|
2024-05-13 12:07:37 +02:00 |
|
|
Cris
|
5643607845
|
Added phrases 'statusErfolgreichUebertragen' and 'statusUebertragenMsg' to Softwarebereitstellung app
|
2024-05-13 11:06:32 +02:00 |
|
|
ma0048
|
a0284c313a
|
- funktion fuer das alle markierten akzeptieren getrennt
- fehlende phrasen hinzugefuegt
|
2024-05-13 09:16:29 +02:00 |
|
|
SimonGschnell
|
730db74743
|
Merge branch 'feature-25999/C4_ma0594_profilePage' into feature-25999/C4_TEST
|
2024-05-08 11:14:41 +02:00 |
|
|
SimonGschnell
|
d1207ced02
|
Merge branch 'master' into feature-25999/C4_TEST
|
2024-05-08 11:06:34 +02:00 |
|
|
SimonGschnell
|
9db09a040a
|
Merge branch 'master' into feature-25999/C4_ma0594_profilePage
|
2024-05-08 09:58:18 +02:00 |
|
|
Johann Hoffmann
|
3846f38a6f
|
added PK to tbl_anwesenheit_check; chenged anwesenheiten sum function to account for timespans of the checks; added extension/anwesenheit_admin berechtigung; fotos are now being sent as links to bild.php; studentByLva table now with von & bis times of the check; now updating attendance check times when starting further checks on the same date; checking if time the code is being sent is in the timespan of the kontrolle; added method to delete QR codes older than certain ms to be called from QRDelete Cronjob;
|
2024-05-06 11:21:01 +02:00 |
|
|
ma0068
|
6e9ee7cf81
|
Notizcomponent: Api Controller for Notizzuordnungs_ids
|
2024-05-03 09:43:49 +02:00 |
|
|
Johann Hoffmann
|
2c08a482e3
|
finished phrasen in backend; setup component is no a modal in landing page and only for lektors with multiple LE assigned in an lva; assistenz skips landing page; tabulator formatting fixes; getAllAnwesenheitenByLektor now fetches students and their anwesenheiten entries seperately which is significantly faster;
|
2024-05-02 09:29:50 +02:00 |
|
|
SimonGschnell
|
20a2e369c5
|
adds new button to show all new and changed lehrauftraege in the orderLehrauftrag view, so that the user can set the initial filter himself
|
2024-04-29 15:53:56 +02:00 |
|
|
cgfhtw
|
8e56b404b9
|
Merge branch 'feature-37246/APIs_Konsolidierung' into feature-30660/FHC4_StudierendenGUI_Prototyp
|
2024-04-29 11:17:12 +02:00 |
|
|
ma0068
|
e4ee83c590
|
Multistatus Adaptions Design
|
2024-04-29 10:51:02 +02:00 |
|
|
Harald Bamberger
|
2ea3597a10
|
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
|
2024-04-25 15:11:41 +02:00 |
|
|
cgfhtw
|
4f4df8a8b7
|
Konto: more phrases
|
2024-04-25 13:09:10 +02:00 |
|
|
cgfhtw
|
1a6c107f0b
|
Bugfix: phrasesupdate missing insertvon
|
2024-04-25 11:55:50 +02:00 |
|
|
cgfhtw
|
e3ff62001b
|
StV Phrasen
|
2024-04-25 11:47:53 +02:00 |
|
|
cgfhtw
|
f47f8d5da4
|
Konto: Phrases
|
2024-04-25 11:36:37 +02:00 |
|
|
Johann Hoffmann
|
f5d534a409
|
added require branch update file in dbupdate_3.4.php; added phrasen everywhere in frontend, WIP translating backend messages;
|
2024-04-24 15:52:53 +02:00 |
|
|
Werner Masik
|
3b06519f2f
|
updated phrases for salary range
|
2024-04-24 15:25:42 +02:00 |
|