Commit Graph

16749 Commits

Author SHA1 Message Date
Johann Hoffmann a99cc96682 fix missing "import VueDatePicker from '../../vueDatepicker.js.php';" statements for new cis4 pages abgabetool & raumsuche 2025-05-21 16:37:00 +02:00
Harald Bamberger 4e945648d0 Merge branch 'master' into feature-25999/C4_cleanup 2025-05-19 11:00:24 +02:00
Harald Bamberger 310bd08648 Merge branch 'feature-40430/updateamum_von_im_AntragLib' 2025-05-19 10:51:05 +02:00
Harald Bamberger bc4514b2a0 Merge branch 'master' into feature-40430/updateamum_von_im_AntragLib 2025-05-19 10:29:28 +02:00
Harald Bamberger c04c08bca4 finetune datepicker and timepicker config 2025-05-16 08:22:19 +02:00
Harald Bamberger a858049e15 fix viewData prop validator, change nullish coalescing operator to logical or since optional router param is empty string and not an unset prop 2025-05-15 18:54:28 +02:00
Harald Bamberger 7b9b1a762e Merge branch 'master' into feature-25999/C4_cleanup 2025-05-14 15:17:25 +02:00
Harald Bamberger 3c08bc12cd Merge branch 'feature-61748/FHC-Alert-Plugin_EMail-Address' 2025-05-14 09:20:47 +02:00
Andreas Österreicher a72dcdf8b0 Merge branch 'bug-61306/addfaktor_entfernen' 2025-05-13 15:31:20 +02:00
Harald Bamberger 4bceddcc82 add systemerror_mailto ci config, render systemerror_mailto to FHC_JS_DATA_STORAGE_OBJECT, use FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto in FhcAlert Plugins 2025-05-09 13:58:14 +02:00
Harald Bamberger 05de9cd94a move logic processing moodle events from core to moodle addon 2025-05-06 13:24:08 +02:00
Harald Bamberger 2ee7742ada Merge branch 'master' into feature-25999/C4_cleanup 2025-05-05 16:56:00 +02:00
Harald Bamberger 6ab50654ba add activity title to moodle calender entries, render activity title as html, set overscroll behavior for all day event area 2025-05-05 16:55:06 +02:00
Harald Bamberger 0930866beb revert change introduced by merging api refactoring branch 2025-05-05 13:55:54 +02:00
Andreas Österreicher 7030d5b822 Merge branch 'feature-54827/internationalisierungsmassnahmen_optimierungen' 2025-05-05 11:32:18 +02:00
Harald Bamberger 884a5e41ac Merge branch 'master' into feature-25999/C4_cleanup 2025-05-05 11:20:13 +02:00
Andreas Österreicher 6dfa7089e7 Merge branch 'master' into feature-54827/internationalisierungsmassnahmen_optimierungen 2025-05-05 11:08:25 +02:00
SimonGschnell 9b895fbd23 feature(Studium API endpoinds): adds the api endpoints for the Studium View to get the studienplan from a studiensemester/studiengang/semester 2025-04-30 13:45:01 +02:00
Andreas Österreicher 24b19a1d8b Workaround für Bug in Firefox ab Version 137 wodruch der Weiter Button nicht immer ganz
angezeigt wird
2025-04-30 10:33:37 +02:00
Harald Bamberger 7d3ffdde7b fix api endpoint http error 500 when stundenplan_events is null or empty array 2025-04-29 17:15:32 +02:00
Johann Hoffmann d791a6d3ef phrasen & change email template name to under 32 characters long 2025-04-29 15:03:10 +02:00
Johann Hoffmann 38424bc875 serientermin anlegen mitarbeiter; deadline overview mitarbeiter; 2025-04-29 14:36:40 +02:00
Harald Bamberger c24a9997a9 add function StundenplanEvents to new api factory 2025-04-29 12:13:29 +02:00
Harald Bamberger 3b7a862dbe align composer.lock with composer.json 2025-04-29 11:42:26 +02:00
Harald Bamberger 5856f1c2ae Merge branch 'master' into feature-25999/C4_cleanup 2025-04-29 11:27:27 +02:00
Andreas Österreicher edcd2aa1df Merge branch 'feature-61464/infocenter_ausbildungssemester' 2025-04-28 13:23:38 +02:00
Johann Hoffmann a5ab2f1381 match abgabetool_detail student/mitarbeiter look&feel; WIP terminserie, zweitbetreuer logic etc 2025-04-25 14:30:12 +02:00
Johann Hoffmann 54e8a855f4 Merge branch 'master' into feature-25999/C4_cleanup
# Conflicts:
#	public/js/apps/Dashboard/Fhc.js
#	public/js/components/Cis/Cms/Content.js
#	public/js/components/Cis/Cms/News.js
#	public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
#	public/js/components/Cis/Mylv/LvUebersicht.js
#	public/js/components/Cis/Stundenplan/Stundenplan.js
#	public/js/components/DashboardWidget/Ampel.js
#	public/js/components/DashboardWidget/News.js
#	public/js/components/DashboardWidget/Stundenplan.js
#	public/js/components/DashboardWidget/Url.js
#	system/phrasesupdate.php
2025-04-25 10:58:02 +02:00
Johann Hoffmann 97d83d3acf WIP abgabetool mitarbeiter 2025-04-25 09:59:41 +02:00
Harald Bamberger 9410388a7a tune order by to sort nearest active dv first 2025-04-24 15:40:58 +02:00
Harald Bamberger a196da03d2 change order by to ensure latest dv is sorted first 2025-04-24 10:52:47 +02:00
Johann Hoffmann e28067259b WIP Abgabetool Mitarbeiter DetailComponent 2025-04-23 13:59:31 +02:00
Johann Hoffmann 91910ef538 Merge remote-tracking branch 'origin/feature-25999/C4_cleanup' into feature-25999/C4_cleanup
# Conflicts:
#	application/libraries/dashboard/DashboardLib.php
#	public/js/components/Dashboard/Dashboard.js
#	public/js/components/Dashboard/Section.js
2025-04-23 12:49:16 +02:00
SimonGschnell 0c95dbad1f update(Dashboard Section description): adds phrases for the description of general/custom/other sections 2025-04-22 11:40:58 +02:00
Harald Bamberger 34eb2ab80c check permission system_change_outputformat in final exam on degree program oe_kurzbz 2025-04-22 11:11:46 +02:00
SimonGschnell 8c00158d04 refactor(Dashboard Database data structure): changes how the data for the dashboard is structured in the database, instead of having a global widgets property, each section has its own widgets property where additional properties like description can be stored 2025-04-22 09:52:07 +02:00
Harald Bamberger ced54d76d5 Merge branch 'feature-55980/gehaltsbestandteile_export_filtern_summieren' 2025-04-17 18:43:51 +02:00
Harald Bamberger 7b30869f7c make where clause more precise 2025-04-17 18:28:26 +02:00
ma0048 d4012232ab ausbildungssemester hinzugefuegt 2025-04-17 11:01:33 +02:00
SimonGschnell c98d0a9c45 refactor(Dashboard Section description): updates the database structure for the dashboard information to add information about the description of a section 2025-04-17 08:52:21 +02:00
Harald Bamberger ac5e95e6b9 dbchanges: add columns lvexport and lvexport_sum to hr.tbl_gehalstyp, add gehaltstyp zulage_allin, set zulage_allin for gbs attached to vbs freitext allin 2025-04-17 08:20:30 +02:00
Harald Bamberger b323f91999 Merge branch 'feature-60851/FhcApi_Factory_Refactoring' 2025-04-15 16:49:17 +02:00
Harald Bamberger 99587fd064 Merge branch 'master' into feature-60851/FhcApi_Factory_Refactoring 2025-04-15 16:20:34 +02:00
Harald Bamberger b67b19bd1a handle condition when endpoint has not been set 2025-04-15 15:38:27 +02:00
ma0068 26d7d17169 delete unneeded code, fix permission issue 2025-04-15 15:21:36 +02:00
Harald Bamberger b2a7ec6e67 add component names, Modal dynamically import new phrases plugin to created app 2025-04-15 14:52:24 +02:00
Harald Bamberger 9c5ebc902d fix typos, remove duplicate attribute 2025-04-15 14:51:10 +02:00
SimonGschnell 19f169aca2 feature(Dashboard Grid): adds a red border to the widget if the user tries to resize the widget over its max width/height or under its min width/height 2025-04-15 13:55:02 +02:00
SimonGschnell fc0a09180a update(Dashboard pinned animation): also triggers the pinned animation when the target area of a drag action contains a pinned widget 2025-04-15 11:16:20 +02:00
ma0048 1888c51a48 master gemerged
phrase bugfix
2025-04-15 11:09:59 +02:00