e4fc0660f8
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-14 11:14:20 +02:00
7abe95ba5f
Adapted LvsByStudienplan query to retrieve also Lehreinheitgruppen
2024-08-06 10:48:20 +02:00
b0821be465
Added methods getLastOrAktStudienjahr / getAktOrNextStudienjahr to retrieve the last or next Studienjahr during the summer term
2024-08-05 10:52:15 +02:00
9bec0c61de
Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung
...
# Conflicts:
# system/phrasesupdate.php
2024-08-01 13:55:51 +02:00
3213c051b3
Adapted getLvsByStudienplan query to get by given Lehrveranstaltungen
2024-08-01 13:48:06 +02:00
085ca2a16d
Adapted getLvsByStudienplan query to get all LVs, not only VZ
2024-07-31 11:44:42 +02:00
49bd14496a
Adapted db query to get Lehrveranstaltungen via Studienplan instead of Lehreinheit
2024-07-30 15:38:02 +02:00
0df9385f33
Adapted DB query to filter only Lehrveranstaltungen with lehrtyp_kurzbz 'lv'
2024-07-22 12:02:08 +02:00
16ab9998b0
Merge branch 'master' into feature-39592/vereinfachte_Sicht_fuer_Assistenz
2024-07-11 14:44:44 +02:00
ce7b368a8e
Adapted lv.orgform_kurzbz to selects in Lehrveranstaltung_model.php
2024-07-11 14:33:38 +02:00
115151473a
backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
2024-07-11 11:57:45 +02:00
4d48dfe018
Added method getLvsByStudiensemesterAndOes to Lehrveranstaltung_model.php
...
getLvsByStudiensemesterAndOes: Gets Lehrveranstaltungen with its Stg, OE and OE-type and filters by Studiensemester and Organisationseinheiten if necessary.
2024-07-08 12:26:41 +02:00
dd0bdddbc6
backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
2024-07-01 14:12:48 +02:00
7f32cca476
Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung
2024-06-26 11:54:51 +02:00
3a16c4ebf3
Added method getAutocompleteSuggestions to Lehrveranstaltung_model.php
...
Get Lehrveranstaltungen by eventQuery string. Use with autocomplete event queries.
2024-06-26 10:45:56 +02:00
93d0f88b0d
function getDVByPersonUID: add dvendegrund_kurzbz and dvendegrund_anmerkung to select
2024-06-14 10:48:43 +02:00
fd2474cc38
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
2024-06-13 11:51:10 +02:00
9454bde14a
backport Betriebsmittel Component from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
2024-05-29 15:19:23 +02:00
6d728ae0e7
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
...
# Conflicts:
# public/js/components/Tabs.js
# public/js/components/filter/Filter.js
2024-05-13 12:07:37 +02:00
2ea3597a10
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
2024-04-25 15:11:41 +02:00
08dd6a7783
add dvendegrund_kurzbz and dvendegrund_anmerkung when reading dvs from db
2024-04-25 15:11:16 +02:00
d34ce78c94
s&d
2024-03-29 13:00:54 +01:00
ba1fa6add4
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2024-03-28 13:20:51 +01:00
058ed94c2b
Merge branch 'feature-36196/DVUH_Meldestatus_beruecksichtigen'
2024-03-26 11:34:26 +01:00
d4bc5148a7
fix disappearing searchbar when session expires, add functions to fetch dvs at a certain duedate for valorisation
2024-03-25 16:53:03 +01:00
9f2dd82009
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-03-25 13:08:10 +01:00
2cce61ca6a
Korrekturen für Gehaltsimport
2024-03-15 13:37:07 +01:00
77221e507f
set tabulator to fixed height, fix missing grund when editing unterbrechung
2024-03-14 11:42:39 +01:00
bc5d42b310
Studstatus: ausbildungssemester in getAllPrestudentsWhereCommitteeExamFailed
2024-03-14 08:52:55 +01:00
673fd889fe
Studstatus: get details without whitelist
2024-03-13 10:39:51 +01:00
ab7a5bac68
Unterbrechung studienjahr und semester anzeige
2024-03-13 08:37:40 +01:00
7bdf5b832b
Merge branch 'master' into feature-36016/Studstatus_QMB
2024-03-12 11:32:25 +01:00
03e166dc89
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
...
# Conflicts:
# public/js/components/filter/Filter.js
# public/js/plugin/FhcAlert.js
# system/filtersupdate.php
2024-03-06 14:07:19 +01:00
6500708f90
Code Quality
2024-02-29 09:02:20 +01:00
2d2098984a
Pause feature
2024-02-29 08:34:58 +01:00
c034efb8b0
Unterbrechung bei laufender Unterbrechung
2024-02-21 09:19:56 +01:00
01c3a67762
Merge branch 'master' into feature-21620/Neues_Feld_zum_Erfassen_des_ESI
2024-02-16 14:11:02 +01:00
658212a6eb
Show Antrag to Student when finished
2024-02-16 13:28:26 +01:00
acb29c5c69
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
...
# Conflicts:
# application/views/templates/FHC-Footer.php
# composer.json
# public/js/components/Bootstrap/Modal.js
# public/js/components/filter/Filter.js
# public/js/plugin/FhcAlert.js
2024-02-13 11:54:55 +01:00
7dfb0429ae
Merge branch 'master' into feature-35768/Studstatus_Status_Abgebrochen_fuer_Wiederholerdeadline_verwenden
2024-02-08 08:25:11 +01:00
1c2c12f0a5
Bismeldestichtag Model: added getByStudiensemester method
2024-02-02 18:41:18 +01:00
e90f0c75fa
fix missing entries due to missing prestudentstatus for target semester
2024-01-22 13:47:35 +01:00
1b27dbcb5f
Bugfix: WH Antrag Prüfungstest kleiner vs kleiner gleich
2024-01-19 13:17:41 +01:00
304caf9157
added time recording query
2024-01-18 12:30:35 +01:00
7b9bfd70c8
make name of enc key more specific
2024-01-15 10:39:54 +01:00
13b5b017b8
Expose Antrag Id
2024-01-11 08:34:00 +01:00
49d24d74b0
Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
2024-01-10 13:54:06 +01:00
fde1623dc0
Merge branch 'feature-35545/Studstatus_Status_Abgemeldet'
2024-01-08 18:23:10 +01:00
5b62271711
s&d
2024-01-02 09:36:28 +01:00
43813b3ef0
getActiveStgs
2023-12-27 10:51:57 +01:00
Cris