Commit Graph
3467 Commits
Author SHA1 Message Date
adisposkofh 4d2a6589b4 reworked range view presets and localized label 2026-09-23 15:39:41 +02:00
adisposkofh 191a81058c lv plan mode phrases fix 2026-09-23 15:32:07 +02:00
adisposkofh dd25c7af75 lv plan mode phrases fix 2026-09-23 15:31:58 +02:00
adisposkofh adce19e651 changed lv plan range view icon, added tooltips on lv plan view buttons 2026-09-23 14:40:52 +02:00
adisposkofh 43b849e787 merged master into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-22 13:44:49 +02:00
Harald Bamberger be7527e994 increase length of column taglib in table public.tbl_notiz_typ 2026-09-22 09:52: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
adisposkofh aaf8dd16ef merged feature-78456/MeineReservierungenUebersichtCis4 into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 15:08:23 +02:00
adisposkofh 7ea80395a8 merged feature-78497/Cis4StudiumStgInfoBlock into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 14:43:10 +02:00
Harald Bamberger 75c341d983 Merge branch 'master' into cis40_2026-05_ma_rc 2026-09-16 10:55:13 +02:00
Harald Bamberger 9c43374267 Merge branch 'master' into feature-75469/LeOptional4Projektarbeit 2026-09-15 07:53:10 +02:00
adisposkofh 80e17e264a merged cis40_2026-05_ma_rc into 2026-09-14 17:08:15 +02:00
Paolo ea7c0cccde Added base seeders for testing/staging/demoing 2026-09-14 16:36:12 +02:00
Johann Hoffmann 9a3532265f information schema guard check for the data migration & table alter statements aswell, so they dont run on every checksystem.php invocation 2026-09-10 11:50:51 +02:00
Manuela Thamer 4ac108174b rename title delete button 2026-09-08 08:29:08 +02:00
Johann Hoffmann fe65dc60c4 finalized optional Studiengang Ansprechpartner Infoblock in Cis4 Studium page; 2026-09-02 18:13:41 +02:00
Johann Hoffmann f15349029f WIP stg info sidebar in cis4 studium 2026-09-02 09:30:57 +02:00
Ivymaster 349a0641cd BUG: Fix for non active news display 2026-08-31 13:54:35 +02:00
Ivymaster de627171d5 WIP 2026-08-26 14:46:49 +02:00
Andreas Österreicher e32691994c Merge branch 'master' into feature-75469/LeOptional4Projektarbeit 2026-08-26 08:21:30 +02:00
Ivymaster 6f3c0fb174 WIP 2026-08-25 17:22:44 +02:00
Ivymaster 76130bbf2c Added translations for cms newsAdmin section 2026-08-24 13:08:28 +02:00
Ivymaster 708ffac47e WIP 2026-08-20 17:05:38 +02:00
Harald Bamberger 4e3ddad8c1 Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc 2026-08-20 15:22:04 +02:00
Harald Bamberger c2cb3f5b7a move message to inner if 2026-08-20 15:21:47 +02:00
Harald Bamberger c24b6e6b32 fix variable name 2026-08-20 09:49:07 +02:00
Harald Bamberger cabda4cc35 Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc 2026-08-20 08:13:30 +02:00
Harald Bamberger 16166db31a Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc 2026-08-20 07:46:02 +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
Harald Bamberger 411d2192cb Merge branch 'master' into features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster 2026-08-19 18:44:20 +02:00
Harald Bamberger 391bf296d7 Merge branch 'master' into cis40_2026-05_ma_rc 2026-08-19 18:41:29 +02:00
Harald Bamberger 7ce81ad4bd Merge branch 'feature-78292/dv_gehaltsbestandteil_ersteinstufung' 2026-08-19 07:57:07 +02:00
Harald Bamberger ea56ec8daa change wording 2026-08-19 07:50:50 +02:00
Harald Bamberger 84c99d23cd Merge branch 'master' into cis40_2026-05_ma_rc 2026-08-18 18:11:15 +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 9a592047a0 merge feature-70747/Zeitsperren_auf_VueJs_Portieren into feature-77941/CIS_MA_Zeitsperren_Portieren 2026-08-18 13:54:02 +02:00
ma0068 e6947a3246 merge master into feature-77941/CIS_MA_Zeitsperren_Portieren 2026-08-18 12:04:28 +02:00
Harald Bamberger 7910cf3055 Merge branch 'master' into cis40_2026-05_ma_rc 2026-08-13 17:36:38 +02:00
Johann Hoffmann 67bbe9c105 new cis4 page "MyReservations" as new adaptation of cis/private/lvplan/stpl_reserve_list.php; 2026-08-13 16:37:03 +02:00
Werner Masik d8355ba3f5 added Funktionsänderung to gehaltsanpassungtyp 2026-08-13 14:56:04 +02:00
Johann Hoffmann 46f8d0d07d remove all remaining projektarbeit-lehreinheit joins across the codebase;
master merge reverted the LE removal in Projektarbeit_model -> re-applied that fix and went through every file that touches tbl_projektarbeit to find remaining issues.

Projektarbeit_model, stv Projektarbeit controller, Vertrag_model, vertrag.class, lehrauftragsliste_gst.xls.php, zeitaufzeichnung.class.php, sammelzeugnis.rdf.php, zeugnis.rdf.php, projektarbeit.rdf.php,
lehrauftrag.xml.php, personal_lektorenohnelehrauftrag.php, personal_generateverwendung.php

tbl_lehreinheit joins remain in tbl_lehreinheitmitarbeiter contexts where lehreinheit_id is always set.
2026-08-12 18:05:45 +02:00
Werner Masik d85a3cb08f extract DB migration for gehaltsanpassungtyp into separate file 2026-08-12 15:18:35 +02:00
Harald Bamberger c81b5338de Merge branch 'master' into feature-78292/dv_gehaltsbestandteil_ersteinstufung 2026-08-12 11:39:49 +02:00
Johann Hoffmann 9274743df3 Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
# Conflicts:
#	application/controllers/api/frontend/v1/Abgabe.php
#	application/controllers/api/frontend/v1/stv/Projektarbeit.php
#	application/models/education/Projektarbeit_model.php
#	public/css/Studentenverwaltung.css
#	public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
#	public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
#	public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
#	public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
2026-08-12 11:26:51 +02:00
Johann Hoffmann 97be497fda refactored the core pruefungslogic to revolve around PruefungsverlaufLib.php instead of tbl_pruefungstyp which was highly inflexible for any adjustments. could be reused in Stv/Pruefungen aswell since there invalid inserts are very much possible; typen are still being used but are irrelevant for sequencing the attempts correctly; incorporated kommissionelle Pruefung into Gesamtnoteneingabe as the last possible antritt a student makes; updated cypress suites accordingly and added some ui tests aswell; documented usage in a readme_benotungstool.txt for the suite; 2026-08-11 17:35:06 +02:00
adisposkofh a397460e0e Merge branch 'master' into feature/78128-quick-copy-full-name-and-title 2026-08-11 09:43:27 +02:00
Harald Bamberger 046a552f34 Merge branch 'master' into feature-76995/StudStatusModal_Hinweis_Beratungsgespraech_bei_Abmeldung 2026-08-11 08:11:55 +02:00
adisposkofh 108f91ea1a quick copy option on full name and title in profile and other lv plan 2026-08-10 17:09:31 +02:00
Harald Bamberger 8bfd90e159 Merge branch 'master' into feature-69378/Studienverlauf_verlinken_im_neuen_FAS 2026-08-10 14:48:41 +02:00
Werner Masik bd99f3f927 add db schema for gehaltsanpassungtyp 2026-08-10 12:20:30 +02:00