c57eb1b8de
Adapted method getLvLeitung: filter Dummy and allow only active Benutzer/Person
2026-03-02 11:00:05 +01:00
4ab0c0a44e
Merge branch 'master' into epic-56039/LV-Evaluierung
...
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-11-13 10:44:39 +01:00
0d51df95f9
Merge branch 'master' into epic-56039/LV-Evaluierung
...
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-10-02 11:30:55 +02:00
cb64c83b50
Added method to get LV-Leitung from given LV
2025-10-01 13:48:10 +02:00
10d58d1a42
Added column prestudent_id to getStudentsByLv method query in Lehrveranstaltung_model.php
2025-09-03 15:24:44 +02:00
fc845ebf4e
Studierendenverwaltung Projektarbeit: separate saving of Projektarbeit and Betreuer, added action for editing Betreuer
2025-09-02 15:04:45 +02:00
2b7f56622c
Merge branch 'master' into feature-60973/komponente_fuer_lehrfaecherverteilung
...
# Conflicts:
# application/models/education/Lehrveranstaltung_model.php
# application/models/organisation/Studienplan_model.php
# application/models/person/Notiz_model.php
# application/models/ressource/Mitarbeiter_model.php
# public/js/components/Stv/Studentenverwaltung.js
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2025-08-07 11:03:05 +02:00
66caf47d98
Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4
2025-08-01 15:54:22 +02:00
5d07879ebd
org form hinzugefuegt im stree
...
gruppe autocomplete auch auf die bezeichnung
getalloe sql angepasst
2025-08-01 11:44:23 +02:00
f9f0748b89
studiensemester_kurzbz aus dem fronted beruecksichtigen
...
extendedHeaderFilter suche in mehreren spalten moeglich
getAllOe sql abfrage richtig gestellt
2025-07-31 09:10:11 +02:00
5b2b715a16
userstory 61241: bugs behoben
2025-07-07 08:59:36 +02:00
f96bfbe000
lehrfächerverteilung v1
2025-05-28 07:51:10 +02:00
54e8a855f4
Merge branch 'master' into feature-25999/C4_cleanup
...
# Conflicts:
# public/js/apps/Dashboard/Fhc.js
# public/js/components/Cis/Cms/Content.js
# public/js/components/Cis/Cms/News.js
# public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
# public/js/components/Cis/Mylv/LvUebersicht.js
# public/js/components/Cis/Stundenplan/Stundenplan.js
# public/js/components/DashboardWidget/Ampel.js
# public/js/components/DashboardWidget/News.js
# public/js/components/DashboardWidget/Stundenplan.js
# public/js/components/DashboardWidget/Url.js
# system/phrasesupdate.php
2025-04-25 10:58:02 +02:00
d780b472a6
Merge master into feature-60875/FHC4_Studierendenverwaltung_Anrechnungen
2025-04-23 11:11:35 +02:00
b75c9cc524
portation of tab Anrechnungen
...
- switch version edit / non edit in config
2025-03-20 11:16:05 +01:00
83fe68c04e
Removed 2 methods getNonQuellkursLvs and getNonQuellkursLvsAutocompleteSuggestions from Lehrveranstaltung_model.php
2025-03-06 10:39:00 +01:00
3a83d468ef
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2025-03-06 09:50:55 +01:00
aab0dd7fc7
Added / Adapted Model queries and api Controller regarding for Lehrveranstaltung- and Studienjahr Model
2025-03-06 09:40:40 +01:00
50ec93f5c1
extend function getLesFromLvIds for studiensemesterkurzb and aggregation lehreinheit_id
2025-03-03 13:43:19 +01:00
b50a4a16d1
change form parameter mobility and add param studiensemester_kurzbz to function get LVsandLesByStudent
2025-03-03 11:45:31 +01:00
881b7fb789
fix loadEvents race condition; normalize route pushes; WIP getting route.replace to work;
2025-02-24 17:53:56 +01:00
1a0601ebc0
Merge branch 'feature-54856/FHC4_Studierendenverwaltung_In_Out' into merge_FHC4_C4
2025-02-03 16:06:06 +01:00
a89ca4e143
Merge branch 'feature-53938/StV_Tab_Noten_fertigstellen' into merge_FHC4_C4
2025-01-28 09:49:53 +01:00
519aa2f9b2
Merge branch 'feature-25999/C4_cleanup' into merge_FHC4_C4
2025-01-27 18:34:42 +01:00
a60ce78d18
Merge branch 'feature-40280/FHC4_Studierendenverwaltung_Pruefung' into merge_FHC4_C4
2025-01-27 17:39:47 +01:00
38a083742d
update(MyLv Noten farbe): uses db positiv column to determine the color of the grade in the MyLv component
2025-01-24 11:18:46 +01:00
c69910a338
Child component Purpose.js for tableview
2025-01-24 11:00:50 +01:00
469c01c9e6
Comments
2024-12-20 14:15:28 +01:00
e13e612ad9
Merge branch 'master' into feature-53938/StV_Tab_Noten_fertigstellen
2024-12-19 16:48:15 +01:00
b549622f50
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# application/models/organisation/Studiensemester_model.php
# system/phrasesupdate.php
2024-11-27 17:44:45 +01:00
c94a2d2d0c
Added param lehrveranstaltung_id to getTemplateLvTree method in Lehrveranstaltung_model.php and enhanced order
...
Now ordering extra templates to appear first and directly after the assigned lvs
2024-11-27 17:31:02 +01:00
1159b0dad5
Refactored getLvs method in Lehrveranstaltung_model.php
2024-11-27 17:28:54 +01:00
933af94344
Added checkIsTemplate method to Lehrveranstaltung Model
...
Checks if given LV is a template (Quellkurs)
2024-11-20 13:55:11 +01:00
fe7ca2bf69
Teacher Proposal
2024-11-20 11:06:28 +01:00
1691c75a84
replace dependencies on legacy code with ci model functions
2024-11-07 19:18:08 +01:00
ff367339ea
makes MyLv more responsive
2024-10-29 14:31:20 +01:00
d4494836b1
fix file permissions erroneously commited as a21a292da6
2024-10-17 15:34:00 +02:00
e2cee7ffa3
Merge branch 'master' into feature-25999/C4
2024-10-15 10:44: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
4d5ea1f519
adapt addNewPruefung, pruefungModal, function getLvsByStudent
2024-09-17 15:28:18 +02:00
a8141e5dac
Merge branch 'master' into feature-25999/C4
2024-09-09 11:45:10 +02:00
0c4d1afded
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-08-21 13:46:41 +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
7abe95ba5f
Adapted LvsByStudienplan query to retrieve also Lehreinheitgruppen
2024-08-06 10:48:20 +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
Cristina