 Andreas Österreicher
|
f499110bbf
|
Merge branch 'feature-41046/wartende_anschreiben_onetimemessages_abgewiesene_werden_nicht_ausgefiltert'
|
2024-09-18 12:28:50 +02:00 |
|
|
Andreas Österreicher
|
d0281bb3b4
|
Merge branch 'feature-47888/projektarbeit_endabgabe'
|
2024-09-18 12:24:37 +02:00 |
|
|
SimonGschnell
|
910a467fcc
|
changes the stundenplan widget to use the new api endpoints that query the stundenplan events
|
2024-09-18 11:44:47 +02:00 |
|
|
ma0048
|
91174ca974
|
- schickt message, nur wenn wartender der letzte status ist
|
2024-09-17 15:35:00 +02:00 |
|
|
ma0068
|
4d5ea1f519
|
adapt addNewPruefung, pruefungModal, function getLvsByStudent
|
2024-09-17 15:28:18 +02:00 |
|
|
Johann Hoffmann
|
79ea8c4521
|
renamed unrulyPerson api to checkPerson; built in logic into infoCenterDetails to trigger a number of checks about any changed data in the info center (in this case unruly) and update the page accordingly; Also fixed a bug when saving stammdaten without kontakt entries;
|
2024-09-17 14:09:49 +02:00 |
|
|
SimonGschnell
|
6edc411a95
|
adds the LvMenu as dropdown options to the MyLV
|
2024-09-17 12:34:47 +02:00 |
|
|
SimonGschnell
|
5ca639101c
|
fixes Month display of LVs
|
2024-09-17 11:39:39 +02:00 |
|
|
ma0048
|
7c85e981f9
|
- absteigende sortierung endabgabe
|
2024-09-17 11:17:44 +02:00 |
|
|
SimonGschnell
|
d931aad11c
|
solves reactive data problem in CalendarModal
|
2024-09-17 09:41:17 +02:00 |
|
|
SimonGschnell
|
61e6ad063a
|
solves Telefon displaying as null for some benutzer
|
2024-09-17 09:28:11 +02:00 |
|
|
Cris
|
d6d6d0ac48
|
Added phrases for softwarebereitstellung app
|
2024-09-16 18:22:28 +02:00 |
|
|
Cris
|
585cec31e2
|
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
|
2024-09-16 16:20:51 +02:00 |
|
|
Cris
|
2f0514092a
|
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
|
2024-09-16 16:20:12 +02:00 |
|
|
SimonGschnell
|
e1c395146b
|
refactors the LvMenu into its own component and removes debugging prints
|
2024-09-16 14:55:26 +02:00 |
|
|
Harald Bamberger
|
363a014298
|
Merge branch 'feature-39161/PV21_Valorisierung'
|
2024-09-16 09:17:51 +02:00 |
|
|
SimonGschnell
|
4836ed8de0
|
adds LvMenu to the CalendarModel WIP
|
2024-09-13 13:44:53 +02:00 |
|
|
SimonGschnell
|
b30156a65f
|
catches errors better in Profil
|
2024-09-13 12:42:57 +02:00 |
|
|
Harald Bamberger
|
d6966b24fe
|
Merge branch 'master' into feature-39161/PV21_Valorisierung
|
2024-09-13 12:39:05 +02:00 |
|
|
SimonGschnell
|
88c38c9228
|
fixes ProfilUpdate bugs
|
2024-09-13 12:37:13 +02:00 |
|
|
SimonGschnell
|
cf1cb44afa
|
refactors old ProfilUpdate controller functions
|
2024-09-13 12:27:07 +02:00 |
|
|
SimonGschnell
|
2b9406b172
|
resolves zustellnungs value bug and removes debugging prints
|
2024-09-13 11:15:46 +02:00 |
|
|
Johann Hoffmann
|
27c312d7d3
|
filterPerson unrulyPerson api & person model
|
2024-09-12 15:42:21 +02:00 |
|
|
SimonGschnell
|
29fac520f3
|
component was setting the topic false when trying to delete a kontakt or an adresse
|
2024-09-12 12:04:42 +02:00 |
|
|
SimonGschnell
|
1208c6829c
|
when an error happenes to editProfil Modal will also be closed then
|
2024-09-12 11:53:13 +02:00 |
|
|
SimonGschnell
|
1de8c00990
|
fixes an error where the payload i treated like an object but is an associative array in the controller
|
2024-09-12 11:45:54 +02:00 |
|
|
SimonGschnell
|
e247621f95
|
fixes the profilBearbeiten phrase and does update the topic correctly when adding a new kontakt/addresse in the profil
|
2024-09-12 10:47:31 +02:00 |
|
|
SimonGschnell
|
cfea7e10f2
|
adds the reservierungen overview action for the search result with a room object and removes debugging prints
|
2024-09-11 14:51:52 +02:00 |
|
|
SimonGschnell
|
6cf3896d49
|
fixes Calendar.js
|
2024-09-11 14:38:00 +02:00 |
|
|
Andreas Österreicher
|
b2dbe65739
|
Berechtigungen korrigiert beim Setzen von Unruly People
|
2024-09-11 14:32:47 +02:00 |
|
|
SimonGschnell
|
cf4105dcb3
|
Merge branch 'feature-25999/C4_copy' into feature-25999/C4
|
2024-09-11 14:07:25 +02:00 |
|
|
SimonGschnell
|
b79a3bd5e9
|
Merge branch 'master' into feature-25999/C4
|
2024-09-11 14:06:49 +02:00 |
|
|
SimonGschnell
|
04aaefd5d8
|
refetches the Stundenplan events also for the Stundenplan and not only for the roomplan
|
2024-09-11 14:00:53 +02:00 |
|
|
SimonGschnell
|
aef267186f
|
removes typo and debugging print from Calendar.js
|
2024-09-11 13:56:39 +02:00 |
|
|
SimonGschnell
|
d80761d952
|
Merge branch 'feature-39912/Room_planning_calendar' into feature-25999/C4_copy
|
2024-09-11 13:54:45 +02:00 |
|
|
SimonGschnell
|
8860d9a598
|
adds quick fix for the query builder error that comes up when fetching content
|
2024-09-11 11:26:04 +02:00 |
|
|
SimonGschnell
|
f2a57f85a8
|
fixes the errors with the stundenplan/reservierungen data query
|
2024-09-11 10:19:46 +02:00 |
|
|
SimonGschnell
|
ac35ba3e27
|
puts the logic that adds the object informtion to the json reponse in the controllers instead of the models
|
2024-09-11 09:50:04 +02:00 |
|
|
SimonGschnell
|
1de658ace6
|
fixes the query for the reservierungen in the stundenplan and in the raum informations
|
2024-09-11 09:32:28 +02:00 |
|
|
SimonGschnell
|
715b8075b8
|
reworks the query for the reservierungen stundenplan/room
|
2024-09-10 12:30:40 +02:00 |
|
|
Andreas Österreicher
|
555e74b8cd
|
Projektexport ist jetzt auch möglich wenn aktuell keine Projekte
zugeordnet sind
|
2024-09-10 11:48:43 +02:00 |
|
|
Johann Hoffmann
|
79d23a4557
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
# Conflicts:
# public/js/components/Form/Upload/Dms.js
|
2024-09-10 11:25:19 +02:00 |
|
|
Johann Hoffmann
|
6bc58c00b7
|
unruly controller benutzerrechte; studstatus unruly api fix;
|
2024-09-10 10:50:02 +02:00 |
|
|
Johann Hoffmann
|
d9f5646ad1
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
# Conflicts:
# application/models/crm/Prestudentstatus_model.php
# public/js/api/fhcapifactory.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2024-09-10 10:17:55 +02:00 |
|
|
Johann Hoffmann
|
888e3878bd
|
studstatus unruly als grund
|
2024-09-09 17:16:05 +02:00 |
|
|
SimonGschnell
|
7b110aaf50
|
adds the needed phrase to the api/frontend/v1/Cms Controller
|
2024-09-09 14:16:37 +02:00 |
|
|
SimonGschnell
|
7a63301f08
|
puts profil settings ul outside of the sticky container
|
2024-09-09 13:49:38 +02:00 |
|
|
Harald Bamberger
|
5f50d9f0ec
|
Merge branch 'feature-40311/Stundenplan_widget' into feature-25999/C4
|
2024-09-09 13:26:03 +02:00 |
|
|
SimonGschnell
|
26a0521379
|
fixes fhcapi
|
2024-09-09 13:12:11 +02:00 |
|
|
Harald Bamberger
|
996a49105b
|
Merge branch 'feature-40309/Cis_News_widget' into feature-25999/C4
|
2024-09-09 13:03:47 +02:00 |
|