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
f064a29efc
Merge branch 'master' into feature-40743/Anrechnung_Config-fuer-zusaetzliche-Felder
2024-07-17 08:02:55 +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
1139b251ef
Adapted Views to handle display of Begruendung-zur-Gleichwertigkeit fields
...
...depending on $config['explain_equivalence']
2024-07-11 10:52:51 +02:00
8c3b85066a
Adapted Controller RequestAnrechnung.php to handle Begruendung-zur-Gleichwertigkeit fields
...
...depending on $config['explain_equivalence']
2024-07-11 10:49:05 +02:00
0b48e94d3c
Added config variable $config['explain_equivalence'] (Begruendung zu Gleichwertigkeit)
...
...to display and enable 'Begründung zu Gleichwertigkeit'-fields
2024-07-11 10:44:12 +02:00
2a537df687
Merge branch 'master' into feature-40285/Studstatus_Datum_der_Abmeldung_auf_den_3_Abmeldungsdokumenten
2024-07-09 10:35:40 +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
9c53a7a75b
PDF Download Button während Einspruchsfrist verbergen
2024-06-19 14:02:20 +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
1e56707e5a
Merge branch 'feature-40415/Studstatus-UID_in_Sancho_Message_Abmeldung_StG_Ablauf_Einspruchsfrist'
2024-06-12 08:13:11 +02:00
6816a300f6
Beschriftung korrigiert
2024-06-11 16:39:20 +02:00
0b8191a435
Beschriftung zu IDs in Sancho Message hinzugefuegt
2024-06-11 16:26:52 +02:00
f8d8a44a3c
student_uid zu sancho message Abmeldung StG Ablauf Einspruchsfrist
2024-06-11 14:47:54 +02:00
884d930e71
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2024-06-04 16:05:33 +02:00
7b148b1a39
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
2024-06-03 17:21:50 +02:00
0cbb8997e2
migratecontract config und config check auch in MigrateHourlyRate verwenden
2024-06-03 17:14:55 +02:00
9454bde14a
backport Betriebsmittel Component from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
2024-05-29 15:19:23 +02:00
a924c9d2bb
backport Betriebsmittel Component from feature-30660/FHC4_StudierendenGUI_Prototyp Branch
2024-05-29 11:49:11 +02:00
d8ba92e343
Merge branch 'master' into feature-36963/BIS_check_duales_Studium
2024-05-27 19:42:48 +02:00
d5e8227918
Bugfix: api/frontend/fas controller do not inherit from FHCAPI_Controller
2024-05-27 12:45:10 +02:00
8cba0aec5a
vertragsarten dvbund, dvanderegk und dvanderebet hinzugefuegt, MigrateContract default oe und ba1code mapping in config verschoben und config check implementiert
2024-05-22 15:32:28 +02:00
aab198e355
Merge branch 'master' into feature-28575/Softwarebereitstellung_GUI_zur_Verwaltung_von_Software
2024-05-22 11:03:34 +02:00
f2a2469e6e
MigrateContract: keine ZeitaufzeichnungsVbs erstellen wenn za oder azg flag null ist. MigrateHourlyRate: kalkulatorische Stundensaetze nur migrieren wenn SAP Sync Tabelle existiert.
2024-05-15 17:25:26 +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
69b0b3601d
Merge branch 'master' into feature-39212/PV21-Grund_beim_Beenden_eines_DV
2024-05-03 13:08:12 +02:00
ef5040557d
Merge branch 'master' into feature-37246/APIs_Konsolidierung
2024-04-29 09:37:06 +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
8bac75ae52
- bug behoben, damit keine leeren "Status Abgewiesen gesetzt" Mails verschickt werden
2024-04-25 14:20:18 +02:00
c33a11e952
Merge branch 'master' into feature-37246/APIs_Konsolidierung
2024-04-24 08:30:25 +02:00
5175dcdbe4
Merge branch 'master' into feature-37246/APIs_Konsolidierung
2024-04-23 15:57:50 +02:00
e11dd21a1e
add parameter dvendegrund_kurzbz and dvendegrund_anmerkung
2024-04-09 16:35:00 +02:00
2132fe76ae
added Plausicheck: students in DUAL Studiengang should have set boolean value dual to true, plausicheck bugfixes (loading model, remove unnecessary property)
2024-04-03 17:39:00 +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
Cris