 ma0068
|
7d2da9e7f6
|
Merge master into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
|
2025-06-06 11:46:31 +02:00 |
|
|
ma0068
|
31af28a7c4
|
Merge branch 'feature-52533/PV21_Karteireiter_Vertraege' of github.com:FH-Complete/FHC-Core into feature-52533/PV21_Karteireiter_Vertraege
|
2025-02-19 16:37:47 +01:00 |
|
|
ma0068
|
f3527dc8ff
|
bugfix function getMitarbeiterUid
|
2025-02-19 16:37:30 +01:00 |
|
|
ma0068
|
660f9076ce
|
delete commented out sections
|
2025-02-14 09:38:33 +01:00 |
|
|
ma0068
|
24682fb559
|
changeFormat Dates, use different select for MitarbeiterHeader before PV21, adapt condition for multiselect addon
|
2025-02-12 17:05:18 +01:00 |
|
|
Harald Bamberger
|
36d3af91f1
|
Merge branch 'feature-25999/C4_cleanup' into merge_FHC4_C4
|
2025-02-11 09:44:38 +01:00 |
|
|
Johann Hoffmann
|
4936cfd61c
|
added roomInfo to app routes & remove old views; stundenplan reservierungen for MA working WIP roomInformation/roomContent link from lvinfo event ort_kurzbz;
|
2025-02-10 17:05:27 +01:00 |
|
|
ma0068
|
21ecbf482f
|
change dateformate Betriebsmittel
|
2025-02-07 13:16:59 +01:00 |
|
|
Harald Bamberger
|
519aa2f9b2
|
Merge branch 'feature-25999/C4_cleanup' into merge_FHC4_C4
|
2025-01-27 18:34:42 +01:00 |
|
|
Harald Bamberger
|
db70a7869c
|
Merge branch 'feature-54564/FHC-4_Studierendenverwaltung_Abschlusspruefung' into merge_FHC4_C4
|
2025-01-27 18:17:50 +01:00 |
|
|
Harald Bamberger
|
a60ce78d18
|
Merge branch 'feature-40280/FHC4_Studierendenverwaltung_Pruefung' into merge_FHC4_C4
|
2025-01-27 17:39:47 +01:00 |
|
|
ma0068
|
0d0071e8bf
|
refactoring and codesniff
|
2025-01-22 07:57:39 +01:00 |
|
|
ma0068
|
ffc99379ae
|
Injection ADDON KU for Multiselect and Print Honorarvertrag
|
2025-01-20 15:25:06 +01:00 |
|
|
ma0068
|
35d8f0524d
|
new page vertragsverwaltung with employee header and details components
|
2025-01-15 13:56:00 +01:00 |
|
|
SimonGschnell
|
a67cc8cc4e
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2025-01-08 11:17:29 +01:00 |
|
|
ma0068
|
faa705408d
|
Merge master into feature-54564/FHC-4_Studierendenverwaltung_Abschlusspruefung
|
2024-12-18 13:12:57 +01:00 |
|
|
ma0048
|
70b44c2202
|
Merge branch 'feature-40717/pep_faktor' into pep_deploy
# Conflicts:
# public/js/components/filter/Filter.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2024-12-13 11:50:53 +01:00 |
|
|
Johann Hoffmann
|
53de29f3d2
|
stundeplan_model byLva() query when providing lv_id irrespective of student, group, lector etc just fetch all & show them
|
2024-12-09 17:13:23 +01:00 |
|
|
ma0068
|
7cff70e88d
|
update search Mitarbeiter, form
|
2024-12-04 08:34:36 +01:00 |
|
|
ma0048
|
19b56ff252
|
- tags
- phrases
- stundensatzbydatum
- filter nur count
|
2024-12-03 12:36:54 +01:00 |
|
|
ma0068
|
f398a5699f
|
merge into feature-54564
|
2024-11-27 15:14:48 +01:00 |
|
|
ma0068
|
3318147ba0
|
Start tab Abschlusspruefung, Table and Form with Dropdowns and default data
|
2024-11-27 12:52:03 +01:00 |
|
|
SimonGschnell
|
8983af4aef
|
refactor(Stundenplan_model/getStundenplanQuery):removes wrong comments
|
2024-11-25 19:59:39 +01:00 |
|
|
SimonGschnell
|
90bdb68175
|
fix(Stundenplan_model/getStundenplanQuery):changes how the OR sql statments are added to the query
|
2024-11-25 15:24:36 +01:00 |
|
|
SimonGschnell
|
763d038b4c
|
fix(api/v1/Stundenplan/getStundenplan): fetches groups and studentlehrverbaende based on the date interval of the current and previous semesters
|
2024-11-21 12:19:22 +01:00 |
|
|
SimonGschnell
|
8d01995722
|
refactor(Studenplan Query):queries all studiensemester from start_date to end_date and matches the gruppen and studentlehrverbaende to the associated studiensemester in the query
|
2024-11-19 12:51:12 +01:00 |
|
|
Harald Bamberger
|
1691c75a84
|
replace dependencies on legacy code with ci model functions
|
2024-11-07 19:18:08 +01:00 |
|
|
Andreas Österreicher
|
f68d18f0a8
|
Stundenplan Bugfix to also load Entries of Semester and Verband
|
2024-11-07 10:25:42 +01:00 |
|
|
Johann Hoffmann
|
728e2f9b3a
|
fix getStundenplanQuery query building if benutzer gruppen are empty;
|
2024-10-21 13:48:32 +02:00 |
|
|
Harald Bamberger
|
d4494836b1
|
fix file permissions erroneously commited as a21a292da6
|
2024-10-17 15:34:00 +02:00 |
|
|
SimonGschnell
|
0528f3b262
|
checks the size of the arrays before using the current method and does not allow mitarbeiter to access the student stundenplan
|
2024-10-14 11:32:23 +02:00 |
|
|
SimonGschnell
|
5359539a09
|
makes Stundenplan query BLAZINGLY fast
|
2024-10-10 20:59:55 +02:00 |
|
|
SimonGschnell
|
7f9352b820
|
prototyp fuer die Stundenplan query fuer Studierende
|
2024-10-02 13:25:39 +02:00 |
|
|
SimonGschnell
|
c461480d1d
|
stundenplanQuery optimization
|
2024-10-02 10:35:58 +02:00 |
|
|
SimonGschnell
|
4836ed8de0
|
adds LvMenu to the CalendarModel WIP
|
2024-09-13 13:44:53 +02:00 |
|
|
SimonGschnell
|
d80761d952
|
Merge branch 'feature-39912/Room_planning_calendar' into feature-25999/C4_copy
|
2024-09-11 13:54:45 +02:00 |
|
|
SimonGschnell
|
f2a57f85a8
|
fixes the errors with the stundenplan/reservierungen data query
|
2024-09-11 10:19:46 +02:00 |
|
|
SimonGschnell
|
ac35ba3e27
|
puts the logic that adds the object informtion to the json reponse in the controllers instead of the models
|
2024-09-11 09:50:04 +02:00 |
|
|
SimonGschnell
|
1de658ace6
|
fixes the query for the reservierungen in the stundenplan and in the raum informations
|
2024-09-11 09:32:28 +02:00 |
|
|
SimonGschnell
|
715b8075b8
|
reworks the query for the reservierungen stundenplan/room
|
2024-09-10 12:30:40 +02:00 |
|
|
Harald Bamberger
|
5f50d9f0ec
|
Merge branch 'feature-40311/Stundenplan_widget' into feature-25999/C4
|
2024-09-09 13:26:03 +02:00 |
|
|
Harald Bamberger
|
996a49105b
|
Merge branch 'feature-40309/Cis_News_widget' into feature-25999/C4
|
2024-09-09 13:03:47 +02:00 |
|
|
Harald Bamberger
|
a8141e5dac
|
Merge branch 'master' into feature-25999/C4
|
2024-09-09 11:45:10 +02:00 |
|
|
SimonGschnell
|
ec8b3ccb6f
|
adds the organisations bezeichnung through a subquery to the lehrveranstaltungs events
|
2024-09-06 13:11:22 +02:00 |
|
|
SimonGschnell
|
122673d291
|
gets rid of the stunden dependency and uses the beginn and ende property of the queried events
|
2024-09-06 11:20:20 +02:00 |
|
|
SimonGschnell
|
8376e8b92d
|
bundles the room_events and the reservierungen api calls together with Promise.allSettled
|
2024-09-06 11:02:14 +02:00 |
|
|
SimonGschnell
|
f9b69fe08c
|
changes how the reservierungen are fetched from the database to have the same information as the room events
|
2024-09-05 14:57:57 +02:00 |
|
|
SimonGschnell
|
e33162d20e
|
changes the structure of the JSON data from the stundenplan
|
2024-09-04 14:59:56 +02:00 |
|
|
SimonGschnell
|
87f82b7f5d
|
also adds the stundenplan information as object in the response of the endpoint
|
2024-09-03 12:07:13 +02:00 |
|
|
SimonGschnell
|
f19c1b4eaf
|
adds the lector and the gruppe as objects to the endpoint result instead of just strings
|
2024-09-02 14:47:40 +02:00 |
|