 Johann Hoffmann
|
068aa03b4f
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
|
2024-06-06 11:02:56 +02:00 |
|
|
Harald Bamberger
|
0cbb8997e2
|
migratecontract config und config check auch in MigrateHourlyRate verwenden
|
2024-06-03 17:14:55 +02:00 |
|
|
Andreas Österreicher
|
5453579c7b
|
Merge branch 'feature-36963/BIS_check_duales_Studium'
|
2024-05-28 09:29:44 +02:00 |
|
|
KarpAlex
|
d8ba92e343
|
Merge branch 'master' into feature-36963/BIS_check_duales_Studium
|
2024-05-27 19:42:48 +02:00 |
|
|
cgfhtw
|
d5e8227918
|
Bugfix: api/frontend/fas controller do not inherit from FHCAPI_Controller
|
2024-05-27 12:45:10 +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 |
|
|
Johann Hoffmann
|
7530a74ff3
|
demo stand gf;
|
2024-05-16 16:39:54 +02:00 |
|
|
Harald Bamberger
|
f2a2469e6e
|
MigrateContract: keine ZeitaufzeichnungsVbs erstellen wenn za oder azg flag null ist. MigrateHourlyRate: kalkulatorische Stundensaetze nur migrieren wenn SAP Sync Tabelle existiert.
|
2024-05-15 17:25:26 +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
|
58f52dfaae
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2024-05-13 11:07:16 +02:00 |
|
|
Harald Bamberger
|
93b111af93
|
fix handleSystemError is not a function
|
2024-05-06 16:48:38 +02:00 |
|
|
Harald Bamberger
|
6a8a96b748
|
fix long lasting request getPrestudents to block browser when timedout once
|
2024-05-06 16:04:45 +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 |
|
|
Andreas Österreicher
|
40c0393bc0
|
Voller Name der Kritikalität des Services wird angezeigt im
Servicekatalog
|
2024-05-02 16:31:34 +02:00 |
|
|
Andreas Österreicher
|
c6193530db
|
Merge branch 'feature-39288/Servicekatalog_Kritikalitaet'
|
2024-05-02 16:27:09 +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 |
|
|
Harald Bamberger
|
3a3d28e9e6
|
Merge branch 'feature-37246/APIs_Konsolidierung'
|
2024-04-30 21:45:48 +02:00 |
|
|
Harald Bamberger
|
3b8776f947
|
Merge branch 'master' into feature-37246/APIs_Konsolidierung
|
2024-04-30 16:26:15 +02:00 |
|
|
Andreas Österreicher
|
23255ed84f
|
Merge branch 'feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen'
|
2024-04-30 16:17:00 +02:00 |
|
|
Andreas Österreicher
|
a3b5996c50
|
Stundensatz wird abhängig vom Studiensemester der Projektarbeit /
Lehreinheit ermittelt
|
2024-04-30 16:16:03 +02:00 |
|
|
Andreas Österreicher
|
a606add6eb
|
Merge branch 'master' into feature-17727/FasDefaultStundensatzProjektbetreuungAnzeigen
|
2024-04-30 10:55:58 +02:00 |
|
|
KarpAlex
|
18dabf26e4
|
service uebersicht in cis: loading only one moodle config instead of all addon configs to avoid php notices
|
2024-04-29 14:00:30 +02:00 |
|
|
Harald Bamberger
|
ef5040557d
|
Merge branch 'master' into feature-37246/APIs_Konsolidierung
|
2024-04-29 09:37:06 +02:00 |
|
|
Andreas Österreicher
|
8999b59f4e
|
Renamed Field
|
2024-04-26 13:41:33 +02:00 |
|
|
Andreas Österreicher
|
d55cb56a1a
|
Merge branch 'bug-39609/automatischer_abgewiesener_status_setzen'
|
2024-04-25 14:24:43 +02:00 |
|
|
ma0048
|
8bac75ae52
|
- bug behoben, damit keine leeren "Status Abgewiesen gesetzt" Mails verschickt werden
|
2024-04-25 14:20:18 +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 |
|
|
Harald Bamberger
|
c33a11e952
|
Merge branch 'master' into feature-37246/APIs_Konsolidierung
|
2024-04-24 08:30:25 +02:00 |
|
|
Harald Bamberger
|
844c07be9c
|
Merge branch 'feature-39174/Studstatus_AbmeldungStglFuerUnterbrecher'
|
2024-04-24 08:25:51 +02:00 |
|
|
Johann Hoffmann
|
633b9eeafe
|
loading STG permissions for assistenz into frontend and only fetching entschuldigungsdata for those; new data fetch api methods for lektor to visualize graphs: getAllByLva & getAllByStudiengang. old one renamed to getAllByLvaAssigned; automatic email to responsible adress on entschuldigung upload of a student; focused on pie charts for reusable landing page design; fixed entschuldigungen date filter validation; WIP extension specific phrases;
|
2024-04-23 17:00:32 +02:00 |
|
|
Harald Bamberger
|
5175dcdbe4
|
Merge branch 'master' into feature-37246/APIs_Konsolidierung
|
2024-04-23 15:57:50 +02:00 |
|
|
Andreas Österreicher
|
0655118f2b
|
Merge branch 'feature-39349/tdb_phrasen'
|
2024-04-19 10:38:39 +02:00 |
|
|
Alexei Karpenko
|
412bb10a06
|
Servicekatalog: renamed Kategorie column to Kritikalität in vilesci, added column Kritikalitaet in cis overview
|
2024-04-18 15:38:22 +02:00 |
|
|
Andreas Österreicher
|
3a4492671d
|
Fixed Signing Documents via CIS
|
2024-04-18 08:53:22 +02:00 |
|
|
Andreas Österreicher
|
8a115626ba
|
CDATA bei Lernergebnisse hinzugefügt
|
2024-04-16 10:33:27 +02:00 |
|
|
Andreas Österreicher
|
20aba9aa90
|
Merge branch 'feature-27349/DiplomaSupplementQuereinstiegerRahmenvertrag'
|
2024-04-16 10:22:48 +02:00 |
|
|
Andreas Österreicher
|
8057ecbc60
|
Merge branch 'feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten'
|
2024-04-15 15:41:53 +02:00 |
|
|
Johann Hoffmann
|
563e7bebc0
|
setupComponent currently uses globalProperties as model for le selection; lektorComponent uses globalProperties for le_id; le_selection now has sophisticated info String detailing every group associated with le for lektor; WIP assistenz filter setup; WIP checking in router guard for missing le_id when they have not loaded yet;
|
2024-04-12 15:01:37 +02:00 |
|
|
cgfhtw
|
e0c7691e04
|
missing catch
|
2024-04-11 15:14:15 +02:00 |
|
|
Andreas Österreicher
|
c03e6deb95
|
Removed useless code
|
2024-04-10 16:45:46 +02:00 |
|
|
ma0068
|
941dce6032
|
Diplomasupplement: Adaptierung Wording Niveau
|
2024-04-10 14:48:04 +02:00 |
|
|
Andreas Österreicher
|
637392c844
|
Merge branch 'master' into feature-15490/lehrauftragsliste_stammkostenstelle_bei_fix_angestellten
|
2024-04-10 09:56:58 +02:00 |
|
|
Andreas Österreicher
|
e41eada893
|
Removed unused Code
|
2024-04-09 14:08:58 +02:00 |
|
|
Andreas Österreicher
|
a32e78c9b8
|
Merge branch 'master' into feature-27349/DiplomaSupplementQuereinstiegerRahmenvertrag
|
2024-04-09 13:53:37 +02:00 |
|
|
Cris
|
1d0c2be449
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2024-04-09 11:33:38 +02:00 |
|
|
Andreas Österreicher
|
bdb0a5702d
|
Fehler behoben wodurch keine Note im Freigabemail angezeigt wurde
Fehler behoben wodurch keine Punkteübernahme bie Nachprüfungen möglich
war
|
2024-04-09 11:24:44 +02:00 |
|
|
Andreas Österreicher
|
8a9477eaf0
|
Fixed PHP7.4 Warning
|
2024-04-08 12:54:05 +02:00 |
|
|
Johann Hoffmann
|
cf0c7a2f8c
|
put le_ids aswell as viewdata for le selection in globalProperties to share between components; using FhcApi Plugin for API calls; le selection in setup now with info (gruppe_kurzbz, lehrform_kurzbz, semester, verband, gruppe); fixed setting foto in viewData after refreshing sum eg after kontrolle;
|
2024-04-08 12:25:25 +02:00 |
|