 Harald Bamberger
|
f265e20dce
|
Merge branch 'feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp' into feature-25999/C4_cleanup
|
2024-11-12 11:21:16 +01:00 |
|
|
Johann Hoffmann
|
96335a7979
|
moved email template to fhtw addon; einheiten column visibility default false since pausen are not represented; backend code cleanup; phrase fix;
|
2024-11-11 09:56:43 +01:00 |
|
|
Harald Bamberger
|
1691c75a84
|
replace dependencies on legacy code with ci model functions
|
2024-11-07 19:18:08 +01:00 |
|
|
Harald Bamberger
|
39cedfe6a0
|
remove controllers, views and libraries for CisHmvc since not used
|
2024-11-05 16:48:30 +01:00 |
|
|
Harald Bamberger
|
93ac45308f
|
Merge branch 'feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5' into feature-25999/C4_cleanup
|
2024-10-31 16:00:12 +01:00 |
|
|
Harald Bamberger
|
e78c2e1bf7
|
Merge branch 'master' into feature-25999/C4_cleanup
|
2024-10-30 17:19:01 +01:00 |
|
|
Harald Bamberger
|
d4f3fbfc79
|
Merge branch 'master' into feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5
|
2024-10-30 16:45:07 +01:00 |
|
|
Harald Bamberger
|
ae80c3415d
|
betraege im Gehaltsbestandteil als string mit . als komma konvertieren, um zu verhindern, dass locale spezifische Betraege in der verschluesselten DB Spalte gespeichert werden
|
2024-10-29 10:37:00 +01:00 |
|
|
Johann Hoffmann
|
e387671e09
|
added set language feature; phrasen plugin with optional reload if non responsive phrasen are used; stundenplan header mode & buttons reworked
|
2024-10-24 17:46:42 +02:00 |
|
|
cgfhtw
|
9eb91574c3
|
semester
|
2024-10-24 11:08:22 +02:00 |
|
|
cgfhtw
|
2edfd1febc
|
Unterbrecher in serie problematik
|
2024-10-24 11:03:28 +02:00 |
|
|
Harald Bamberger
|
8ba2a6852b
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
|
2024-10-22 11:04:07 +02:00 |
|
|
Johann Hoffmann
|
d8c4c6506a
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
|
2024-10-21 10:21:42 +02:00 |
|
|
Harald Bamberger
|
d4494836b1
|
fix file permissions erroneously commited as a21a292da6
|
2024-10-17 15:34:00 +02:00 |
|
|
Harald Bamberger
|
14aa98c223
|
Merge branch 'master' into feature-25999/C4
|
2024-10-15 10:46:17 +02:00 |
|
|
Harald Bamberger
|
e2cee7ffa3
|
Merge branch 'master' into feature-25999/C4
|
2024-10-15 10:44:56 +02:00 |
|
|
Andreas Österreicher
|
5774cb78c9
|
Merge branch 'feature-40816/Plausicheck_Anpassungen'
|
2024-10-15 10:28:38 +02:00 |
|
|
Harald Bamberger
|
27e3f1d1bc
|
take status rejected into account when calculating available semster slots for unterbrechung
|
2024-10-14 15:40:25 +02:00 |
|
|
SimonGschnell
|
ed1d4b1a50
|
regex replaces old content links with new CIS4 controller links and adopts the Menu Entry links to not refresh the page when closing the Menu point
|
2024-10-14 10:17:20 +02:00 |
|
|
Johann Hoffmann
|
ef0e3f3a66
|
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
|
2024-10-03 11:24:48 +02:00 |
|
|
Harald Bamberger
|
be412abebc
|
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
|
2024-09-26 16:16:24 +02:00 |
|
|
Harald Bamberger
|
2fc0827d49
|
revert erroneously merged pull request
|
2024-09-25 11:22:59 +02:00 |
|
|
Christian Paminger
|
f66c3466ed
|
Extend HTTP-Basic-Auth for Demo-Mode and easier testing
|
2024-09-25 05:40:04 +02:00 |
|
|
Alexei Karpenko
|
3b20f5e45c
|
Plausichecks: removed check BewerberNichtZumRtAngetreten
|
2024-09-20 16:12:14 +02:00 |
|
|
Harald Bamberger
|
d6966b24fe
|
Merge branch 'master' into feature-39161/PV21_Valorisierung
|
2024-09-13 12:39:05 +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
|
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 |
|
|
Harald Bamberger
|
996a49105b
|
Merge branch 'feature-40309/Cis_News_widget' into feature-25999/C4
|
2024-09-09 13:03:47 +02:00 |
|
|
Harald Bamberger
|
1f4628720a
|
Merge branch 'feature-39911/Suche_um_raeume_erweitern' into feature-25999/C4
|
2024-09-09 11:50:27 +02:00 |
|
|
Harald Bamberger
|
a8141e5dac
|
Merge branch 'master' into feature-25999/C4
|
2024-09-09 11:45:10 +02:00 |
|
|
cgfhtw
|
054e59a891
|
Bugfixes PrestudentLib
|
2024-08-12 12:22:43 +02:00 |
|
|
cgfhtw
|
02c12c6a54
|
Bugfixes in PrestudentstatusCheckLib
|
2024-08-09 13:25:21 +02:00 |
|
|
cgfhtw
|
ffabd681c8
|
setFirstStudent logic
|
2024-08-08 16:24:23 +02:00 |
|
|
ma0068
|
b54449012b
|
implement version without processLehrverband for setAbbrecher and setUnterbrecher
|
2024-08-08 11:30:56 +02:00 |
|
|
cgfhtw
|
ac29247783
|
checkIfLastBewerberAndAufgenommenerShareSemesters
|
2024-08-07 16:19:15 +02:00 |
|
|
cgfhtw
|
59314ae0aa
|
correct rolle exists check
|
2024-08-07 15:56:07 +02:00 |
|
|
cgfhtw
|
24d74dd332
|
correct student check
|
2024-08-07 15:51:19 +02:00 |
|
|
cgfhtw
|
0621073f8d
|
correct checkIfExistingAufgenommenerstatus
|
2024-08-07 15:40:11 +02:00 |
|
|
cgfhtw
|
1fc7f9d3e8
|
correct checkIfExistingBewerberstatus
|
2024-08-07 15:37:43 +02:00 |
|
|
cgfhtw
|
9af8117749
|
add statusgrund_id
|
2024-08-06 16:53:48 +02:00 |
|
|
cgfhtw
|
baa7417c22
|
Status: Wartender
|
2024-08-06 16:49:11 +02:00 |
|
|
cgfhtw
|
6dd779b421
|
Status Abgewiesener
|
2024-08-06 16:47:12 +02:00 |
|
|
cgfhtw
|
b3e105908b
|
Fix Status Absolvent & Bewerber
|
2024-08-06 16:41:38 +02:00 |
|
|
cgfhtw
|
f87277e1f2
|
Status: Aufgenommener & code reuse
|
2024-08-06 16:35:59 +02:00 |
|
|
cgfhtw
|
749b29a239
|
Status: Bewerber
|
2024-08-06 16:30:50 +02:00 |
|
|
cgfhtw
|
942e8a9229
|
Status: Absolvent
|
2024-08-06 16:27:45 +02:00 |
|
|
cgfhtw
|
09a0536921
|
Status Diplomand
|
2024-08-06 16:24:38 +02:00 |
|
|
cgfhtw
|
21e69c6d94
|
Status: Unterbrecher & Student
|
2024-08-06 16:19:35 +02:00 |
|
|
cgfhtw
|
07400e7551
|
change all setAbbrecher to setAbbrecherNeu and rename
|
2024-08-06 14:49:20 +02:00 |
|
|
cgfhtw
|
e6676e8868
|
setAbbrecherNeu
|
2024-08-06 14:26:52 +02:00 |
|