Commit Graph
272 Commits
Author SHA1 Message Date
Ivymaster 2eef6fb620 Made "range mode" useable in tempus view 2026-10-19 16:19:21 +02:00
Ivymaster 0468e8a227 Conflicts resolved 2026-10-19 11:21:22 +02:00
ma0048 855ec94445 Merge branch 'master' into feature-68298/Tempus_Grundstruktur
# Conflicts:
#	public/css/Cis4/CoreCalendarEvents.css
#	public/js/components/Calendar/Base.js
#	public/js/components/Calendar/Base/Grid.js
#	public/js/components/Calendar/Base/Header.js
#	public/js/components/Calendar/Base/Header/Datepicker.js
#	public/js/components/Calendar/Mode/Week.js
#	system/phrasesupdate.php
#	system/seeders/015_kalender.sql
#	tests/cypress/.env.example
2026-10-15 15:07:52 +02:00
Harald Bamberger 2d5446bfc7 Merge branch 'feature-83700/RaumsucheStandort' into cis40_2026-09_ma_rc 2026-10-12 08:12:01 +02:00
Johann Hoffmann 221d810f3f raumsuche basic filter by reservieren & aktiv = true; added erweiterte filter and columns for m², stockwerk and gebäudeteil; added the standort category "Ohne Standort" for virtual ones; 2026-10-08 18:01:39 +02:00
adisposkofh 0279813ba9 sticky first column in zeitsperrenma table 2026-09-24 16:33:42 +02:00
Ivymaster c9bbd4e84e WIP: Multiple weeks range view 2026-09-24 13:54:34 +02:00
adisposkofh a4f8154662 merged feature-78496_lv-plan-range-view into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-22 13:43:25 +02:00
adisposkofh 72e7b215ef reworked fhc calendar range view to flip axes 2026-09-21 14:30:20 +02:00
adisposkofh 1357ed5d3d fixed absences header styling 2026-09-17 15:13:02 +02:00
adisposkofh fba5953b59 merged features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 14:57:23 +02:00
adisposkofh 9a45efd558 merged feature-78496_lv-plan-range-view into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09 2026-09-16 13:42:03 +02:00
Ivymaster ccb33cde60 WIP 2026-09-09 16:53:23 +02:00
Ivymaster 5dc314febd Included cherrypicked commits from lv plan range branch 2026-09-09 15:13:16 +02:00
Ivymaster 02ff8d0e3c Conflicts resolved 2026-09-02 15:01:56 +02:00
ma0048 8a448fde3c Merge remote-tracking branch 'origin/feature-78288/tempus_usability' into feature-68298/Tempus_Grundstruktur
# Conflicts:
#	public/css/components/horizontalsplit.css
#	public/js/components/Tempus/Filters/searchbarOptions.js
2026-09-01 12:48:07 +02:00
Ivymaster 61d7268f90 Conflicts resolved 2026-09-01 11:52:25 +02:00
adisposkofh dde95c8e01 lv plan range view styling 2026-08-31 14:03: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
adisposkofh 5cfa398ea6 implemented lv plan range view 2026-08-29 15:46:03 +02:00
ma0048 623e8007b0 - sichtbarkeitsstatus hinzugefuegt
- tage ausblendbar
- lektor zur lvverwaltung verlinkt
- vertical splitter hinzugefuegt
- anzahl der einheiten hinzugefuegt
2026-08-26 09:01:47 +02:00
Manuela Thamer 90bce8d3d5 refactor templates: scroll table, only table header is sticky, rename css.file 2026-08-21 14:39:45 +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
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
ma0068 83b06b6c50 - Redesign Tags
- use Slot in Filter Component
- use Phrase  for relaoding Tag in Detail Header
2026-08-10 14:04:45 +02:00
Harald Bamberger 0419286557 Merge branch 'master' into studvw_lvvw_2026_08_rc 2026-08-04 15:41:05 +02:00
Harald Bamberger cfa4dd8b8a add padding to filtercomponent tabulator-tableholder to prevent scrollbar covering a row in tables with few rows 2026-08-04 15:33:36 +02:00
ma0068 96b4210d21 refactor backend
css file for showing inactive items in dropdown
fix missing view for vertretung zeitsperren
sticky top for header
2026-07-30 15:29:15 +02:00
Ivymaster 817afa545b add tempus kalender tags 2026-07-22 15:52:31 +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
Harald Bamberger b5e65cf072 Merge branch 'master' into studvw_2026_05_rc 2026-07-08 16:42:04 +02:00
Harald Bamberger 38447e2217 Merge branch 'master' into cis40_2026-05_ma_rc 2026-07-08 15:36:34 +02:00
Harald Bamberger 90b8788c93 Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning 2026-06-18 14:46:05 +02:00
Johann Hoffmann 263b04e67f reworked assistenz timeline feature; now shows all projektarbeiten of associated student in a more compact form; 2026-06-15 14:37:47 +02:00
Harald Bamberger 9ec876fc27 Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning 2026-05-29 13:32:15 +02:00
Johann Hoffmann 2eb2c36d5b replace + in email helpers with spaces; configs for title edit, multi edit table & confetti on endupload; empty student projektarbeiten check; only show dropdown labels on large displays; new phrasen & phrasen fixes; 2026-05-26 17:06:39 +02:00
Harald Bamberger 178c854941 Merge branch 'feature-76657/AbgabetoolFinetuning' into cis40_2026-02_rc_abgabetool_finetuning 2026-05-26 07:59:17 +02:00
Harald Bamberger dcd6cfd74b increase width of horizontal split 2026-05-19 17:26:46 +02:00
Johann Hoffmann 9b823dbaa1 scope the zoom media query to abgabetool document selector to avoid spillover to CIS4 pages unintentionally; added noten headerfilter & persistence in flat table; 2026-05-08 12:44:07 +02:00
Johann HoffmannandHarald Bamberger c16cf342cb horizontalsplit component analog to verticalsplit; also built it into Studentenverwaltung.js menu; added defaultRatio prop to both components which defaults to 50/50 seperation 2026-05-06 15:54:49 +02:00
Johann Hoffmann d0adf2dfc3 improved assistenz subqueries for zweitbetreuer infos by using common table expression instead of 8 subqueries; adapted splitMailsHelper function to take in body parameter to set default email text by parameter; dateStyles adapted so "in 12 days" also applies to termine without uploads; titleEdit modal in student & studentDetail component; send email to relevant assistenzen & projektarbeit betreuer about change from old to new title; 2nd flat table in AbgabetoolAssistenz that provides a list of all projektarbeittermine so it can be filtered & multiselected; multi delete & multi edit on these selected termine; tried to introduce a media query for zoomed in desktop users that shrinks fontsize and tabulator rows/cells; standard assistenz table column definitions have sensible minWidths & most columns are default invisible; fancy multiselect headerfilter on qualitygate 1/2 status column; actually figured out a vue watcher race codnition triggering loadProjektarbeiten twice unnecessarily; added a reload Button in case one observes a faulty reactivity somewhere in the table; fancy multiselect headerfilter on termin status column for flat table; Preselect current Semester & autoapply Filter for it; WIP refine new table & hunt for bugz; WIP working on the exact custom select handler Handling with filtered datasets; fixed root element style on legacy php view for abgabetool in old cis; WIP define more accurate allowed to delete & allowed to Edit conditions for abgabetermine -> currently benotet quality gates can be edited/deleted!!!!! 2026-05-06 13:46:26 +02:00
Harald Bamberger c3ef487a6f Merge branch 'feature-76148/MyLvaMA' into cis40_2026-05_ma_rc 2026-05-04 17:59:51 +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
Johann Hoffmann f51d0f72c6 setSelectedFields() method in filter cmpt to keep custom persistence with visible fields; distinct titles assistenz/betreuer page; fix select logic to respect the possibility of dataset being filtered; beurteilungsnotiz required if note of that termin is negative; multiselect filter on qgate status columns + persistence of those; WIP switching mode to flat table showing all abgabetermine of all projektarbeiten to multi edit/delete/whatever with them selected 2026-04-28 17:27:19 +02:00
Johann Hoffmann df369c7149 Merge branch 'feature-75996/AbgabetoolFeedbackSprint247' into feature-76657/AbgabetoolFinetuning 2026-04-27 16:11:11 +02:00
Johann Hoffmann e86e7f0bd8 manage default myLv layout mode via localStorage; actions row takes remaining space via fitDataStretch and wraps around into new row if action buttons take up too much space; added tabulator persistence on TableBuilt event; slight watcher adjustments to combat race conditions; loading spinner while tabulatorUuid has not been defined yet -> maybe worth improving but seems to work fine; 2026-04-23 15:59:38 +02:00
chfhtw 416451eb0b remove marginForExtraRow and add the required space via CSS 2026-04-22 10:23:51 +02:00