blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-28 01:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,736 Commits 227 Branches 6 Tags
122673d29142a87c749b8f775bd1ab367ff71663
Commit Graph

55 Commits

Author SHA1 Message Date
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
SimonGschnell 8bc8c67f8d better comments 2024-08-13 15:10:23 +02:00
SimonGschnell 46a0706057 updates roomEvents on change:range / groups the results of a studenplan query 2024-08-06 14:29:24 +02:00
SimonGschnell 63f089dc27 changes the layout of the Stundenplan Events 2024-06-24 13:50:13 +02:00
SimonGschnell 008847e490 adds a sql query for the grouping algorithm 2024-06-24 13:08:44 +02:00
SimonGschnell 9c51f25c9e modifies how the slot template from the Calendar Page is passed to the CalendarApp and prints the reservierungen differently (but the reservierungen are not grouped yet) 2024-06-11 15:03:09 +02:00
SimonGschnell 022ad26dd2 reservierungen query also joins the studiengangs and mitarbeiter information 2024-06-10 13:01:55 +02:00
SimonGschnell 392d8f38d2 adding the reservierungen to the room plannung 2024-06-10 11:39:16 +02:00
SimonGschnell 8442690bc7 splits the multiple stg into different rows if there are more than one stg in one lv 2024-06-10 10:56:12 +02:00
SimonGschnell 70b0b3fae7 MVP algorithm for stundenplan gruppierung (testing) 2024-06-07 15:06:28 +02:00
SimonGschnell 1a5d270936 calendarDate preparation 2024-06-04 15:00:41 +02:00
SimonGschnell 3df1aaf371 uses the new fhcApi factory to make the roomInformation get request from the frontent/v1/stundenplan api and uses the CalendarDate class to get the first day of the week and the last day of the week to make the request for the room information over the whole week 2024-06-04 08:24:58 +02:00
SimonGschnell 39321dcde3 adds the roomInformation Calendar to the menu and uses different template for the calendar page slot 2024-05-31 12:28:06 +02:00
SimonGschnell 729509a45d WIP 2024-05-23 15:40:23 +02:00
SimonGschnell 186e9e6f08 WIP room planning in calendar 2024-05-21 15:56:18 +02:00
SimonGschnell 9db09a040a Merge branch 'master' into feature-25999/C4_ma0594_profilePage 2024-05-08 09:58:18 +02:00
SimonGschnell 04f6ee6156 Merge branch 'master' into feature-25999/C4_ma0594dev 2024-02-15 15:16:07 +01:00
SimonGschnell a21a292da6 dokument upload 2024-01-29 16:48:41 +01:00
Werner Masik 304caf9157 added time recording query 2024-01-18 12:30:35 +01:00
Werner Masik a613abea39 fix kurzbz check 2023-11-28 12:18:13 +01:00
Werner Masik cccdfa1ac8 extracted function for generation employee kurzbz 2023-11-21 17:45:20 +01:00
Simon Gschnell 16b61d0560 Daten fuer die Betriebsmittel und zutrittskarten_ausgegebenam gesammelt 2023-11-20 17:30:58 +01:00
Simon Gschnell 7c229bbcee importing the api calls in the component and creating api endpoints for the cis profile page 2023-11-15 13:49:06 +01:00
ma0048 c4377010b1 - pv21 stundensaetze hinzugefuegt 2023-08-14 14:14:37 +02:00
cgfhtw 0f60ab2a54 Stundenplan & Calendar 2023-02-06 08:43:43 +01:00
ma0048 a13c010cd5 textaenderungen und getzutrittskarte by uid 2022-08-25 10:43:26 +02:00
Andreas Österreicher 491f025364 Merge branch 'feature-15970/kartenterminal' 2022-05-03 10:18:40 +02:00
Andreas Österreicher 268bf474df Infomail bei Zeitwunschänderungen - Inaktive Abteilungsleitungen werden nicht informiert, Ermittlung der geänderten 
Zeitwünsche angepasst
 2022-04-08 16:29:47 +02:00
Cris 5c82a4d821 Added insert/update/delete methods to Zeitsperre Model 2022-02-17 12:33:01 +01:00
Cris b2bd8e071b Added getStudenplanData method to Class Studenplandev_model 2021-12-20 09:47:21 +01:00
Cris d2c87d6a98 Added Class Zeitwunsch_gueltigkeit_model 2021-12-20 09:43:37 +01:00
ma0048 cf1b34769c api & anpassungen fuer das kartenterminal 2021-11-12 12:16:35 +01:00
Harald Bamberger 44c1e65011 getBetriebsmittel add parameter to only retrieve aktive users 2021-10-20 15:48:34 +02:00
alex 080e3582cf Mitarbeiter_model getPersonal: possible to reduce result to eonly certain uids 2020-09-14 11:11:44 +02:00
alex 676b3b3039 - added sanitizeProblemChars to common helper for sanitizing chars 
- improved alias handling in benutzermodel
- added kurzbz handling to employeemodel
 2020-08-12 21:33:08 +02:00
Andreas Österreicher bc305dc86c Merge branch 'master' into feature-6656/Worker_queue 2020-08-10 18:11:31 +02:00
Cris 1d2233152c Added method getBetriebsmittel to Betriebsmittelperson Model 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-08-05 18:23:51 +02:00
alex bd388a03ad codex/Bisverwendung_model: getVerwendungen ordered by beginn by default 
resource/Mitarbeiter_model: possible to retrieve Vorgesetzte within a timespan
 2020-08-01 08:20:52 +02:00
Nikolaus Krondraf 21703cfc00 add functions to delete entries 2020-06-30 15:40:30 +02:00
alex f820fa76fb ressource/Mitarbeiter_model.php: possible to get Personal with personalnr >= 0, for excluding accounts like e.g. alumni 2020-06-26 23:17:37 +02:00
alex 5b264bb6a9 codex/Bisverwendung_model: 
- added getVerwendungen method
person/Benutzer_model
- added comment
person/Benutzerfunktion_model
- added getBenutzerFunktionByUid method
ressource/Mitarbeiter_model
- added getVorgesetzte method
- extended getPersonal method
 2020-06-22 11:20:27 +02:00
Alexei 704d39095b - ressource/Mitarbeiter_model.php - improved getPersonal method 
- person/Kontakt_model.php - added getFormaKontakttyp and get FirmenTelefon methods
 2020-05-12 19:34:17 +02:00
Alexei 554fb2586a person/Benutzer_model: 
- added methods for generating alias and checking if alias exists
ressource/Mitarbeiter_model:
- added method getPersonal
 2020-04-30 21:42:30 +02:00
hainberg 169ffbb568 Changed method isLektor() to isMitarbeiter() 
Because boolean field lektor is not necessary maintained, check is now
for overall mitarbeiter.
 2019-09-25 14:11:38 +02:00
Cris a910527109 Added method isLektor() 
This method checks if a given user is a lector (and eventually if is
fix employed)
 2019-09-24 10:13:08 +02:00