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
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
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
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
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
b184cee975
Offset für das Laden von Geschaeftsjahren hinzugefügt
2024-09-24 12:40:12 +02:00
5057b2d761
bugfix unbekannte Eltern: unknown can always be chosen, and it is valid. Only if Land des Abschlusses in austria, austrian max Bildung options can be chosen
2024-09-23 18:27:19 +02:00
3b20f5e45c
Plausichecks: removed check BewerberNichtZumRtAngetreten
2024-09-20 16:12:14 +02:00
2d3643d1f0
Bismeldestichtag: added method for getting next Meldestichtag, loading data only after tabulator is ready
2024-09-20 16:04:27 +02:00
e6eea06900
Merge branch 'feature-40348/UHSTAT1_unbekannte_Eltern'
2024-09-18 12:41:05 +02:00
f499110bbf
Merge branch 'feature-41046/wartende_anschreiben_onetimemessages_abgewiesene_werden_nicht_ausgefiltert'
2024-09-18 12:28:50 +02:00
91174ca974
- schickt message, nur wenn wartender der letzte status ist
2024-09-17 15:35:00 +02:00
7c85e981f9
- absteigende sortierung endabgabe
2024-09-17 11:17:44 +02:00
585cec31e2
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-09-16 16:20:51 +02:00
d6966b24fe
Merge branch 'master' into feature-39161/PV21_Valorisierung
2024-09-13 12:39:05 +02:00
0c4d1afded
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-08-21 13:46:41 +02:00
fc8c748bc4
Added View LvTemplateUebersicht.php
2024-08-21 13:32:14 +02:00
6168a6b806
Added Controller LvTemplateUebersicht.php
2024-08-21 13:26:20 +02:00
d07f19d893
Added api Controller Studiensemester.php + methods getAll and getAktNext
2024-08-21 13:23:26 +02:00
bff5d4ffbe
Added api Controller Lehrveranstaltung.php + method getTemplateLvTree
2024-08-21 13:22:15 +02:00
4dc698a6be
Added navigation menu item 'Lehrveranstaltungen' > 'LV Template Uebersicht'
2024-08-21 13:17:54 +02:00
3963358d95
Added getTemplateLvTree method to Lehrveranstaltung_model.php
...
This method gets all Templates and unions with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
a template. This data structure can be used for nested tabulator data tree.
2024-08-21 13:16:22 +02:00
a2f9fba896
Bugfix: Favorites: Correct loading procedure for Prestudent-Subverbände
2024-08-21 12:50:58 +02:00
a594ddeb75
AntragJob: Abmeldungen durch Stg config mismatch
2024-08-19 13:08:12 +02:00
f771b54f10
StV: Favorites use now correct API return functions
2024-08-14 09:16:11 +02:00
2c6212f75f
fix reuse of for multiple purposes overwriting each other
2024-08-14 07:36:14 +02:00
30396b3f0e
Merge remote-tracking branch 'origin/feature-40728/Issues_logik_auslagern_in_eigene_library' into feature-39161/PV21_Valorisierung
2024-08-13 18:32:15 +02:00
8a9e040554
added Gehaltstyp model
2024-08-13 16:57:05 +02:00
2bd578edb3
remove unused Abstract_Searchbar_Controller
2024-08-13 16:42:09 +02:00
e24c610bf1
Studiensemester now: change getAkt to getNearest
2024-08-13 14:59:54 +02:00
2e3576b06e
Bugfix: Advance Status: object in array
2024-08-13 14:34:53 +02:00
50a96b3e4f
Prestudent History: Wrong Function for Permissioncheck
2024-08-13 14:20:40 +02:00
5d169e188a
move permissions from abstract to concrete Notiz Controller
2024-08-13 14:12:55 +02:00
4fc61c342c
Prestudent Permissions
2024-08-13 13:52:04 +02:00
f8f352fe65
Students Permissions
2024-08-13 13:41:35 +02:00
a988ff20c8
Notiz Permissions
2024-08-13 13:38:09 +02:00
6fb050fa58
Tab Config Permissions
2024-08-13 13:32:29 +02:00
Cris