blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-16 00:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,488 Commits 222 Branches 8 Tags
feature-78218/optimize-memory-usage
Commit Graph
179 Commits
Author SHA1 Message Date
ma0048 61ef27e5eb Merge branch 'feature-77949/tempus_synchronisation' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	application/libraries/KalenderLib.php
#	system/dbupdate_3.4.php
 2026-09-01 12:20:12 +02:00
ma0048 51886960bb Merge branch 'master' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	application/controllers/api/frontend/v1/lv/StgTree.php
#	public/js/components/Stv/Studentenverwaltung/Verband.js
#	system/dbupdate_3.4.php
#	tests/cypress/.gitignore
 2026-08-31 12:49:28 +02:00
Harald Bamberger 9bf5bc2ad9 more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz 2026-08-24 07:26:12 +02:00
Harald Bamberger 75d2cabdbe bugfix lv-plan 2026-08-20 15:10:26 +02:00
Ivymaster a912fcf019 Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id 2026-08-06 13:20:51 +02:00
ma0048 8636364c08 Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-77949/tempus_synchronisation 
# Conflicts:
#	system/dbupdate_3.4.php
 2026-08-03 12:31:07 +02:00
Ivymaster 02a81fd52e BUG: fix for available tempus event resource suggestions 2026-07-22 08:58:58 +02:00
ma0048 9983a48102 gui fuer kalender sync hinzugefuegt und syncjob angepasst 2026-07-21 13:50:17 +02:00
Ivymaster e09fea72a4 add resources assignment to tempus kalender entries 2026-07-17 09:09:49 +02:00
ma0048 9abaf30ed3 Merge branch 'master' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	public/js/components/Calendar/Base/DragAndDrop.js
#	public/js/components/Calendar/Base/Grid/Line.js
#	public/js/composables/EventLoader.js
 2026-07-15 15:48:44 +02:00
ma0048 a2d10ae09d Merge remote-tracking branch 'origin/feature-69454/lvverwaltung_karteireiter_lv_termine' into feature-77372/lv_verwaltung_release_fine_tuning 
# Conflicts:
#	application/controllers/api/frontend/v1/LvPlan.php
#	public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
 2026-07-15 09:32:03 +02:00
ma0048 c233902fe2 Merge remote-tracking branch 'origin/feature-70746/lvverwaltung_lektorentausch' into feature-77372/lv_verwaltung_release_fine_tuning 
# Conflicts:
#	application/libraries/LektorLib.php
 2026-07-15 09:20:57 +02:00
ma0048 57597dac29 - added reservierungen 
- added updatemails
- added reservierungssync
- updated status kurzbz
- reservierung renderer for tempus
 2026-04-28 20:17:50 +02:00
adisposkofh f1c3c8296f implemented 'OtherLvPlan' to view other users' timetables 2026-04-13 10:41:41 +02:00
chfhtw f06e59b362 Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe 2026-04-08 14:13:02 +02:00
ma0048 8dd42361a0 Merge branch 'master' into feature-68298/Tempus_Grundstruktur 
# Conflicts:
#	public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
#	system/dbupdate_3.4.php
 2026-03-30 09:18:31 +02:00
ma0048 e990bb3d81 tempus pre-alpha version 2026-03-25 14:41:13 +01:00
Harald Bamberger 00fae2fa15 Merge branch 'master' into vv_und_studvw_2026_02_rc4 2026-02-23 09:28:54 +01:00
Harald Bamberger d98b7fd67a fix duplicates in lvplan for special groups 2026-02-19 18:34:27 +01:00
Harald Bamberger 69749da331 Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader 2026-02-03 11:46:19 +01:00
ma0048 43a1d163a3 Merge branch 'master' into feature-68298/Tempus_Grundstruktur 2026-01-20 09:21:47 +01:00
ma0048 e26387a75a lektoren tausch auch bei verplanten lektoren hinzugefuegt 2026-01-19 15:08:59 +01:00
Cristina 6512ad0f1c Merge branch 'master' into epic-56039/LV-Evaluierung 2026-01-13 13:38:04 +01:00
Alexei Karpenko 77a1067ea5 Studierendenverwaltung Projektbetreuer: default Stunden coming from global config, Stundensatz is requested each time BetreuerIn is selected 2025-12-03 15:32:21 +01:00
ma0048 8f974e8902 sql angepasst 2025-12-03 08:37:38 +01:00
ma0048 0de033e428 termine tab hinzugefuegt 2025-12-01 10:55:04 +01:00
ma0068 a8c4fc7607 CIS4 #69146 Lvplan for View StG/Semester/Verband/Gruppe 
- new API Endpoint lvPlan/eventsStgOrg
        - new view Cis/LvPlan/StgOrg
        - new component LvPlan/StgOrg.js
        - new overview Cis/OverviewLvPlan with Dropdown
	- phrases
 2025-11-20 14:06:12 +01:00
Cristina 4ab0c0a44e Merge branch 'master' into epic-56039/LV-Evaluierung 
# Conflicts:
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
 2025-11-13 10:44:39 +01:00
Andreas Österreicher 93388ff06c Merge branch 'master' into feature-68298/Tempus_Grundstruktur 2025-11-12 13:55:44 +01:00
Harald Bamberger 00eac334c0 Merge branch 'feature-63443/Studierendenverwaltung_Tab_Abschlusspruefung_Finetuning' into studvw_2025-11_rc 2025-11-10 12:48:01 +01:00
Harald Bamberger 0417afeea8 Merge branch 'feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren' into studvw_2025-11_rc 2025-11-04 14:56:54 +01:00
Andreas Österreicher 352fc53e74 Erster Prototyp für Tempus Neu DB und GUI 2025-10-20 11:01:50 +02:00
ma0068 e9c039dad2 Refactor detailHeader component for PV21 
- own css.file for fotouplad
- domain as prop
- refactor link to Leitung
- slots for issuetracking and tags
 2025-10-13 16:07:51 +02:00
Cristina 0d51df95f9 Merge branch 'master' into epic-56039/LV-Evaluierung 
# Conflicts:
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
 2025-10-02 11:30:55 +02:00
Harald Bamberger d148eaed11 ReservierungModel getRerservierungenMitarbeiter remove unused paramter ort_kurzbz, StundenplanLib only query reservations for logged in user if request is for the personal lv plan aka if ort_kurbz is empty 2025-10-01 16:19:15 +02:00
Cristina cb77f3148a Added method to get Stundenplantermine for Lehreinheit/Lehrveranstaltung 2025-10-01 13:50:57 +02:00
Alexei Karpenko 8e7a1a2ddd Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren 2025-09-22 13:39:36 +02:00
Alexei Karpenko d062e8903f Mitarbeiter model searchMitarbeiter method: removed redundant person id 2025-09-19 11:29:08 +02:00
Alexei Karpenko 566938d4f0 Studierendenverwaltung Abschlusspruefung: moved Vorsitz and Pruefer search to backend, searched by vorname or nachname or combinations of vorname and nachname 2025-09-18 17:25:00 +02:00
ma0048 6a31eade8b Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into deploy_22_09_25_lvverwaltung 
# Conflicts:
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
 2025-09-18 15:04:01 +02:00
Alexei Karpenko ce9a4e2e09 Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren 2025-08-23 16:16:41 +02:00
Andreas Österreicher 703872adc9 Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader 2025-08-20 11:14:40 +02:00
Harald Bamberger e7f58ca1ba Merge branch 'master' into feature-62779/xul_abloese_haustechnik_schluesselverwaltung 2025-08-13 07:33:13 +02:00
ma0048 2b7f56622c Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung 
# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
#	application/models/organisation/Studienplan_model.php
#	application/models/person/Notiz_model.php
#	application/models/ressource/Mitarbeiter_model.php
#	public/js/components/Stv/Studentenverwaltung.js
#	public/js/components/Stv/Studentenverwaltung/Verband.js
#	system/dbupdate_3.4.php
#	system/phrasesupdate.php
 2025-08-07 11:03:05 +02:00
Harald Bamberger 66caf47d98 Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4 2025-08-01 15:54:22 +02:00
ma0048 1d63b8de44 schluesselverwaltung & kontaktdatenverwaltung gui hinzugefuegt 
betriebsmittel einschraenkung ueber prop moeglich (nur anzeige)
 2025-07-24 11:18:58 +02:00
ma0048 96cb546b68 permission check bug fixed 2025-07-23 14:14:03 +02:00
Alexei Karpenko caa70715ad Merge branch 'merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren 2025-07-15 15:24:30 +02:00
ma0068 9d341cc045 getFunction for Student: restrict select attributes for person, update mitarbeiter model 2025-07-14 10:23:05 +02:00
ma0068 3ca49c5574 refactor function getHeader, get mitarbeiter_uid as prop instead of using function getMitarbeiterUid 2025-07-08 15:01:54 +02:00