Commit Graph
69 Commits
Author SHA1 Message Date
adisposkofh 1a81f4a541 implemented missing MyReservation controller 2026-09-17 18:09:09 +02:00
adisposkofh fc89a25d3a merged feature-78293/news into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 16:31:56 +02:00
Ivymaster a0ea54d0c0 Fixed bugs found during testing 2026-08-26 17:08:53 +02:00
Ivymaster 708ffac47e WIP 2026-08-20 17:05:38 +02:00
Harald Bamberger 37d9ef66ed Merge branch 'features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster' into cis40_2026-05_ma_rc 2026-08-20 07:38:16 +02:00
ma0068 36a302f20f bugfixes Zeitsperren feature-70747
- correction of phrase error_existingZeitsperre
- capitalize Formlabels and Tableheaders
- correct path for MyLvPlan
- refactor logic for update Table Tranlations
2026-08-18 16:10:15 +02:00
ma0068 e6947a3246 merge master into feature-77941/CIS_MA_Zeitsperren_Portieren 2026-08-18 12:04:28 +02:00
ma0068 5cd0897348 Rename route and Path from Zeitsperren to Zeitsperrenma 2026-08-17 16:16:08 +02:00
Harald Bamberger 7910cf3055 Merge branch 'master' into cis40_2026-05_ma_rc 2026-08-13 17:36:38 +02:00
chfhtw dd410a74ba Add missing routes for StudVw 2026-08-12 10:14:02 +02:00
ma0068 0a46bf52dd - neue funktion loadZeitsperrenforUid
– route für maUid
- Zeitsperren als Cis-App
– link für Zeitsperren maUid in Mitarbeiterprofil
- component ZeitsperrenMitarbeiterUid
- Dropdown oes:show only active Oes
2026-08-04 08:00:40 +02:00
chfhtw f46a3c1f68 LvVerwaltung: add routes for orgform and adapt endpoint to accept lower case orgform_kurzbz 2026-07-22 10:36:38 +02:00
chfhtw e01b816ee8 Add treemenudata routes to lvverwaltung 2026-07-15 11:05:36 +02:00
chfhtw d134509c90 Remove unused routes 2026-07-13 13:13:06 +02:00
chfhtw 5bed848aae Merge branch 'master' into feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen 2026-07-08 09:43:58 +02:00
chfhtw c59b24ab4a App urls for studierendenverwaltung (neu: /studvw) 2026-07-03 12:16:30 +02:00
chfhtw 190d797d31 adapt routes and endpoints for getPrestudent, getStudent & getPerson 2026-07-02 14:36:30 +02:00
chfhtw 483d8f733f adapt routes and endpoints 2026-06-30 14:21:32 +02:00
Harald Bamberger e373e797f4 Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc 2026-05-04 17:01:44 +02:00
adisposkofh 7edddd0566 removed redundant OverviewLvPlan page (same as StgOrgLvPlan) 2026-04-14 14:19:38 +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
Johann Hoffmann 17f11fa871 Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
#	application/controllers/api/frontend/v1/Lehre.php
#	application/models/education/Lehrveranstaltung_model.php
#	application/models/education/Note_model.php
#	application/views/CisRouterView/CisRouterView.php
#	public/js/api/factory/studiensemester.js
#	public/js/components/Bootstrap/Offcanvas.js
#	public/js/components/Overlay/FhcOverlay.js
2026-02-04 15:40:34 +01:00
Johann Hoffmann 1c236cce02 Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
#	application/config/routes.php
#	application/models/crm/Prestudent_model.php
#	application/models/education/Lehreinheit_model.php
#	application/models/education/Lehrveranstaltung_model.php
#	public/js/apps/Dashboard/Fhc.js
#	system/phrasesupdate.php
2025-11-25 10:50:26 +01:00
Johann Hoffmann 8888b6991f Merge branch 'master' into feature-61164/AbgabetoolQualityGates
# Conflicts:
#	application/models/education/Projektarbeit_model.php
#	public/js/helpers/StringHelpers.js
2025-11-24 14:25:43 +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
Johann Hoffmann 6cd0e3a574 email tbl_vorlage inserts dbupdate script; index.ci.php/Abgabetool/Assistenz/stg_kz? optional param route in old cis & cis4; no data placeholder phrase fix; 2025-11-17 15:57:53 +01:00
Harald Bamberger fe1433a19c Merge branch 'feature-63374/Studierendenverwaltung_International_Baum_Filter' into studvw_2025-11_rc 2025-11-04 16:56:51 +01:00
Johann Hoffmann 259c2aec14 load projektarbeiten for studiengänge -> assistenz page; speed dial position rework; automagicmodal logic fix; activeTabIndex by date in detail views; tooltips on icons; $capitalize phrasen to ensure capitalization; phrasenpromise & resolve similar to anw; modal component emits fullscreen event now; 2025-10-27 14:40:56 +01:00
Johann Hoffmann f03411c668 legacy cis abgabetool routes; abgabetool.css for legacy cis; endupload & fixtermin logic enabled; paabgabe template rearranged; legacy view, controller has cis4 switch; viewData & router props workaround with CI3 router logic; wrapper app legacy cis; fix enduplaod validation; 2025-10-08 17:41:00 +02:00
Harald Bamberger 2c60dcb0a9 Merge branch 'master' into feature-62450/MyLv_VueRouter_Semester 2025-09-15 07:20:28 +02:00
Andreas Österreicher 8bba492ec1 Check for existing Folder before loading possible routes 2025-09-04 13:36:14 +02:00
nscbrandb d17f87be09 also take environment config into account 2025-08-29 10:35:27 +02:00
chfhtw 9b8ac595c6 Code Quality 2025-08-21 12:59:24 +02:00
chfhtw b73eac62b5 add studiensemester param to incoming/outgoing/gs backend 2025-08-20 11:54:01 +02:00
Johann Hoffmann d6c7f16ceb Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4 2025-08-19 13:43:23 +02:00
Harald Bamberger ef80a19a24 allow negative studiengang_kz in prestudent and orgform urls 2025-08-19 13:22:59 +02:00
Harald Bamberger a51f587da7 match negative studiengang_kz explicitly 2025-08-14 10:29:16 +02:00
Harald Bamberger e11ff91b53 use (:any) for studiengang_kz since it can be negative 2025-08-13 18:45:58 +02:00
SimonGschnell 3c3038362a update(MyLv VueRouter Studiensemester): adds the Studiensemester to the url of the vue router in the mylv view 2025-08-11 10:38:26 +02:00
Johann Hoffmann 3c9db86df2 Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
#	application/config/routes.php
#	application/controllers/api/frontend/v1/Lehre.php
#	application/models/education/Lehrveranstaltung_model.php
#	application/views/CisRouterView/CisRouterView.php
#	public/js/apps/Dashboard/Fhc.js
#	system/phrasesupdate.php
2025-08-07 15:17:10 +02:00
Harald Bamberger 8a1cbd754d Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4 2025-08-05 16:32:50 +02:00
chfhtw 043c9fd5f3 split LvPlan into MyLvPlan (personal calendar) and LvPlan (lv calendar) 2025-08-05 09:33:11 +02:00
Harald Bamberger a429b20823 Merge branch 'feature-63192/FHC4-Studierendenverwaltung_Semsterauswahl_fuer_mehrere_Tabs_anpassen' into rc1_FHC4_C4 2025-08-01 16:26:01 +02:00
Harald Bamberger 38fe68362d use correct function in routing 2025-07-31 16:40:33 +02:00
Harald Bamberger 2f10a3a3e9 adapt single person routes, old and new js api files and frontend usage 2025-07-31 07:50:17 +02:00
Harald Bamberger c876179762 adapt Students api endpoints, use ci routing, adapt frontend 2025-07-30 18:15:09 +02:00
SimonGschnell c080d1abb2 refactor(Rename Stundenplan to LvPlan):renames all methods and files from Stundenplan to LvPlan 2025-06-10 11:46:19 +02:00
Johann Hoffmann 5bbf05ac8a WIP Gesamtnoteneingabe Notenberechnung endpoint 2025-05-12 12:50:56 +02:00
Johann Hoffmann 1d9ea5d091 router click intercepter does not resolve internally when only matched route was the Fallback matchAll route; cleanup routes.php & Stundenplan controller from viewData and verbose reroutes; overflow setting on years page; 2025-02-20 11:22:30 +01:00