9cd59a1250
add header version switch depending on CIS4 defined
2024-10-18 17:16:12 +02:00
cf77a60b35
remove application/controllers/components/Antrag/* since not present in master any more
2024-10-18 16:57:03 +02:00
0775fae67d
remove unnecessary comment
2024-10-18 16:49:52 +02:00
d4494836b1
fix file permissions erroneously commited as a21a292da6
2024-10-17 15:34:00 +02:00
0ab1ec1fc8
Merge branch 'master' into feature-25999/C4
2024-10-17 14:49:43 +02:00
e475fe568e
adds the dashboard menu punkt and adds greeting to the dashboard view
2024-10-17 09:58:28 +02:00
2f448ca2bc
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-10-16 09:44:50 +02:00
24ce443e95
nur die letzte komm oder zusaetzlichen komm Pruefung einer LV beruecksichtigen
2024-10-15 17:40:11 +02:00
439ae5113d
fix unterbrechung erstellen nicht möglich wenn ein abgelehnter unterbrechungsantrag existiert
2024-10-15 13:59:11 +02:00
14aa98c223
Merge branch 'master' into feature-25999/C4
2024-10-15 10:46:17 +02:00
e2cee7ffa3
Merge branch 'master' into feature-25999/C4
2024-10-15 10:44:56 +02:00
5774cb78c9
Merge branch 'feature-40816/Plausicheck_Anpassungen'
2024-10-15 10:28:38 +02:00
27e3f1d1bc
take status rejected into account when calculating available semster slots for unterbrechung
2024-10-14 15:40:25 +02:00
301466f944
Merge branch 'master' into feature-40816/Plausicheck_Anpassungen
2024-10-14 15:20:16 +02:00
0528f3b262
checks the size of the arrays before using the current method and does not allow mitarbeiter to access the student stundenplan
2024-10-14 11:32:23 +02:00
123f29a750
CMS Search
2024-10-14 11:22:20 +02:00
322544c7fb
dynamic image url for searchresults
2024-10-14 11:20:46 +02:00
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
f9e72832c9
adds time inidication on stundenplan on mouse position
2024-10-11 12:33:06 +02:00
5359539a09
makes Stundenplan query BLAZINGLY fast
2024-10-10 20:59:55 +02:00
469867e98c
Studstatus: status "EmailVersandt" is not an active status
2024-10-10 12:37:57 +02:00
3c4b4b6a58
recht lehre/lehrveranstaltung auch am api endpunkt
2024-10-08 16:38:16 +02:00
455d154b63
recht lehre/lehrveranstaltung statt basis/vilesci, schriftgröße verkleinern, menuepunkt in vilesci, headerfilter angepasst
2024-10-08 16:19:57 +02:00
a2f70be7e4
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-10-08 09:28:56 +02:00
b08e01f72f
Added columns to and moved where-clauses from _getQryLvsByStudienplan to calling methods in Lehrveranstaltung_model.php
...
.added cols lehrtyp_kurzbz and lehrveranstaltung_template_id
2024-10-07 16:37:07 +02:00
8744a00ce7
Added filter lehrtyp_kurzbz and $oe_column to getLvsByStudienplan in Lehrveranstaltung_model.php
...
.lehrtyp_kurzbz filters by Lehrtyp 'lv' or 'modul' (default no filter)
.oe_column is used when filtering $oes: Filter by lv.oe_kurzbz or stg.oe_kurzbz (the stg joined to lv)
2024-10-07 16:34:41 +02:00
11b0e770a2
Added filter lehrtyp_kurzbz to getAutocompleteSuggestions in Lehrveranstaltung_model.php
2024-10-07 16:29:53 +02:00
772fe616ff
remove unused unruly code nr2;
2024-10-03 13:27:05 +02:00
a9d0f177da
remove unused unruly code;
2024-10-03 13:25:02 +02:00
ef0e3f3a66
Merge branch 'master' into feature-33683/digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp
2024-10-03 11:24:48 +02:00
9dbb5291f4
- added limit
2024-10-03 11:17:09 +02:00
c754291c6d
Merge branch 'feature-20228/erfassung_internationalisierungsmassnahmen_beurteilung'
2024-10-03 10:42:00 +02:00
7f9352b820
prototyp fuer die Stundenplan query fuer Studierende
2024-10-02 13:25:39 +02:00
c461480d1d
stundenplanQuery optimization
2024-10-02 10:35:58 +02:00
00cf7b8112
tabs Status and Gesamthistorie: use factories
2024-10-01 15:27:36 +02:00
f38b0cf78f
changes all the Headers from the CISHTML-Header to the CISVUE-Header
2024-09-30 11:58:20 +02:00
4a5a019841
loads the menu for the CISVUE-Header in the server side and not in the client side
2024-09-30 11:33:55 +02:00
8c6f9d1bc4
loads the menu for the CISVUE-Header in the server side instead of the client side
2024-09-30 11:14:34 +02:00
bbed90c814
moves the searchbar from the mobile view to the top of the header
2024-09-30 10:26:23 +02:00
c0596c08c5
changes the header for the Dashboard to the CISVUE-Header and passes the selectedTypes props to fix the CISVUE Header search
2024-09-30 09:43:26 +02:00
0f708f4934
- added app pep
...
- phrases
- added error
- added model
2024-09-27 11:23:54 +02:00
0127982f50
use factories in Address.js, Bankaccount.js, Contact.js
2024-09-27 10:54:54 +02:00
be412abebc
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
2024-09-26 16:16:24 +02:00
bc6bc930fe
moves the news titel to the component and adds css classes for darker dropdown buttons for the different menu levels
2024-09-26 12:05:44 +02:00
9d5a0585b0
Phrases alerts, templates, tabulator
2024-09-26 07:56:15 +02:00
2fc0827d49
revert erroneously merged pull request
2024-09-25 11:22:59 +02:00
427a301d1a
Merge branch 'FH-Complete:master' into master
2024-09-25 05:51:11 +02:00
f66c3466ed
Extend HTTP-Basic-Auth for Demo-Mode and easier testing
2024-09-25 05:40:04 +02:00
1df91303f0
update Permissions, update validations, insert Termin1 with Termin2, finish phrases
2024-09-24 15:10:31 +02:00
7ed7ce1bb9
active Menu Entry logic for CISVUE
2024-09-24 14:57:41 +02:00
Harald Bamberger