 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 |
|
|
ma0068
|
2ab01132b1
|
show List Admission Dates
|
2025-04-24 16:30:50 +02:00 |
|
|
Harald Bamberger
|
9410388a7a
|
tune order by to sort nearest active dv first
|
2025-04-24 15:40:58 +02:00 |
|
|
ma0068
|
d48a0b62fd
|
Refactoring FhcApi_Factory
|
2025-04-24 12:59:47 +02:00 |
|
|
Harald Bamberger
|
a196da03d2
|
change order by to ensure latest dv is sorted first
|
2025-04-24 10:52:47 +02:00 |
|
|
ma0068
|
ed6b9310ae
|
Refactoring FhcApi_Factory
|
2025-04-24 08:23:24 +02:00 |
|
|
ma0068
|
a4777724dc
|
Merge branch 'master' into feature-61230/FHC4_Studierendenverwaltung_LVTermine
|
2025-04-24 07:59:13 +02:00 |
|
|
ma0068
|
eaaf5de9c0
|
Refactoring FhcApi_Factory
|
2025-04-24 07:54:06 +02:00 |
|
|
Johann Hoffmann
|
e28067259b
|
WIP Abgabetool Mitarbeiter DetailComponent
|
2025-04-23 13:59:31 +02:00 |
|
|
ma0068
|
854223a2d7
|
Merge master into feature-60874/FHC4_Studierendenverwaltung_Dokumente
|
2025-04-23 13:37: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 |
|
|
ma0068
|
8442a3d758
|
Refactoring FhcApi_Factory
|
2025-04-23 12:03:21 +02:00 |
|
|
ma0068
|
d780b472a6
|
Merge master into feature-60875/FHC4_Studierendenverwaltung_Anrechnungen
|
2025-04-23 11:11:35 +02:00 |
|
|
ma0068
|
3200a94d17
|
Refactoring FhcApi_Factory
|
2025-04-23 11:06:08 +02:00 |
|
|
ma0068
|
874c91e21c
|
Merge branch 'master' into feature-61229/FHC4_Studierendenverwaltung_GemeinsameStudien
|
2025-04-23 09:41:50 +02:00 |
|
|
ma0068
|
65c398498f
|
Refactoring FhcApi_Factory View Modal
|
2025-04-23 09:32:49 +02:00 |
|
|
ma0068
|
b9bd0e53d8
|
merge master into feature-55992/FHC4_Studierendenverwaltung_Messaging
|
2025-04-22 14:58:56 +02:00 |
|
|
ma0068
|
08b27edd64
|
Refactoring FhcApi_Factory
|
2025-04-22 14:29:45 +02:00 |
|
|
ma0068
|
2b9805aeb3
|
merge master into feature-55991/FHC4_Studierendenverwaltung_Gruppen
|
2025-04-22 13:58:27 +02:00 |
|
|
ma0068
|
2d87663841
|
basic structure for Tab Admission Dates
|
2025-04-22 13:35:31 +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 |
|
|
Alexei Karpenko
|
da86575e65
|
archiv: added space in edit form
|
2025-04-18 13:25:00 +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 |
|
|
Johann Hoffmann
|
47917e42c3
|
compare datetime timestamp for n-workdays ago calculation; more eager check on change of kontrollzeiten/termine if they match a termin; added missing phrase; fetch uploaddatum in same format as von/bis for entschuldigungen so date headerfilter can work as intended; zugangscode zeitlich abgelaufen show error message;
|
2025-04-17 12:07:54 +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 |
|
|
Alexei Karpenko
|
59f83c33b0
|
Merge branch 'master' into feature-55354/Studierendenverwaltung_Karteireiter_Archiv
|
2025-04-16 15:24:59 +02:00 |
|
|
Johann Hoffmann
|
3f607ec241
|
phrasen
|
2025-04-15 18:03:51 +02:00 |
|
|
Johann Hoffmann
|
5abc48f568
|
Merge branch 'master' into feature-56330/Digi-Anw-Feedback
|
2025-04-15 17:56:31 +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 |
|
|
ma0068
|
af30a3408c
|
add switch stundenplan, excel export, phrases
|
2025-04-15 14:22:39 +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 |
|
|
ma0048
|
ad93a0a84c
|
Merge branch 'refs/heads/master' into feature-54827/internationalisierungsmassnahmen_optimierungen
|
2025-04-15 11:09:05 +02:00 |
|
|
Harald Bamberger
|
3669e0df40
|
check if entry in tbl_studentlehrverband exits and update or insert on result
|
2025-04-15 08:24:16 +02:00 |
|
|
Harald Bamberger
|
26bf1e33d4
|
close button tags
|
2025-04-14 17:32:13 +02:00 |
|
|
kindlm
|
e8a233e503
|
Merge remote-tracking branch 'origin/master'
|
2025-04-14 17:13:15 +02:00 |
|
|
kindlm
|
1cb29ce8bb
|
Task #61376 CIS Gesamtnote Berechtigung für OE
|
2025-04-14 17:13:03 +02:00 |
|
|
Johann Hoffmann
|
6b6ec311c7
|
Merge branch 'master' into feature-56330/Digi-Anw-Feedback
|
2025-04-14 15:23:31 +02:00 |
|