ma0068
50ec93f5c1
extend function getLesFromLvIds for studiensemesterkurzb and aggregation lehreinheit_id
2025-03-03 13:43:19 +01:00
ma0068
b50a4a16d1
change form parameter mobility and add param studiensemester_kurzbz to function get LVsandLesByStudent
2025-03-03 11:45:31 +01:00
ma0068
3db367b255
bugfix Uhrzeit, datumsformat for tab abschlusspruefung
2025-02-07 09:34:07 +01:00
Harald Bamberger
1a0601ebc0
Merge branch 'feature-54856/FHC4_Studierendenverwaltung_In_Out' into merge_FHC4_C4
2025-02-03 16:06:06 +01:00
ma0068
ec46dbd10d
Validation during delete for extension mobility, add field lehreinheit to dropdown and backend
2025-01-30 14:56:48 +01:00
Harald Bamberger
a89ca4e143
Merge branch 'feature-53938/StV_Tab_Noten_fertigstellen' into merge_FHC4_C4
2025-01-28 09:49:53 +01:00
Harald Bamberger
519aa2f9b2
Merge branch 'feature-25999/C4_cleanup' into merge_FHC4_C4
2025-01-27 18:34:42 +01:00
Harald Bamberger
db70a7869c
Merge branch 'feature-54564/FHC-4_Studierendenverwaltung_Abschlusspruefung' into merge_FHC4_C4
2025-01-27 18:17:50 +01:00
Harald Bamberger
a60ce78d18
Merge branch 'feature-40280/FHC4_Studierendenverwaltung_Pruefung' into merge_FHC4_C4
2025-01-27 17:39:47 +01:00
SimonGschnell
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
ma0068
c69910a338
Child component Purpose.js for tableview
2025-01-24 11:00:50 +01:00
cgfhtw
469c01c9e6
Comments
2024-12-20 14:15:28 +01:00
cgfhtw
e13e612ad9
Merge branch 'master' into feature-53938/StV_Tab_Noten_fertigstellen
2024-12-19 16:48:15 +01:00
ma0068
faa705408d
Merge master into feature-54564/FHC-4_Studierendenverwaltung_Abschlusspruefung
2024-12-18 13:12:57 +01:00
cgfhtw
b78382f1ba
Add extra fields/joins to getZeugnisnoten
2024-12-17 09:27:18 +01:00
ma0048
70b44c2202
Merge branch 'feature-40717/pep_faktor' into pep_deploy
...
# Conflicts:
# public/js/components/filter/Filter.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2024-12-13 11:50:53 +01:00
cgfhtw
446a5732d2
NotenTab: Use Points
2024-12-03 09:27:38 +01:00
ma0068
bf6b6e4563
actions insert, update, delete, link Pruefungsprotokoll
2024-11-28 16:29:13 +01:00
ma0068
f398a5699f
merge into feature-54564
2024-11-27 15:14:48 +01:00
ma0068
3318147ba0
Start tab Abschlusspruefung, Table and Form with Dropdowns and default data
2024-11-27 12:52:03 +01:00
cgfhtw
28e4454409
Move Semester Filter to top component
2024-11-25 11:20:44 +01:00
cgfhtw
fe7ca2bf69
Teacher Proposal
2024-11-20 11:06:28 +01:00
cgfhtw
da465fffb1
Points to Grade conversion
2024-11-15 09:56:58 +01:00
Harald Bamberger
1691c75a84
replace dependencies on legacy code with ci model functions
2024-11-07 19:18:08 +01:00
Harald Bamberger
e78c2e1bf7
Merge branch 'master' into feature-25999/C4_cleanup
2024-10-30 17:19:01 +01:00
SimonGschnell
ff367339ea
makes MyLv more responsive
2024-10-29 14:31:20 +01:00
Harald Bamberger
1e55b13546
force use of insertamum column from antrag table
2024-10-28 15:58:20 +01:00
Harald Bamberger
8ba2a6852b
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
2024-10-22 11:04:07 +02:00
Harald Bamberger
d4494836b1
fix file permissions erroneously commited as a21a292da6
2024-10-17 15:34:00 +02:00
Harald Bamberger
0ab1ec1fc8
Merge branch 'master' into feature-25999/C4
2024-10-17 14:49:43 +02:00
Harald Bamberger
24ce443e95
nur die letzte komm oder zusaetzlichen komm Pruefung einer LV beruecksichtigen
2024-10-15 17:40:11 +02:00
Harald Bamberger
439ae5113d
fix unterbrechung erstellen nicht möglich wenn ein abgelehnter unterbrechungsantrag existiert
2024-10-15 13:59:11 +02:00
Harald Bamberger
e2cee7ffa3
Merge branch 'master' into feature-25999/C4
2024-10-15 10:44:56 +02:00
Harald Bamberger
27e3f1d1bc
take status rejected into account when calculating available semster slots for unterbrechung
2024-10-14 15:40:25 +02:00
cgfhtw
469867e98c
Studstatus: status "EmailVersandt" is not an active status
2024-10-10 12:37:57 +02:00
Harald Bamberger
a2f70be7e4
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-10-08 09:28:56 +02:00
Andreas Österreicher
c754291c6d
Merge branch 'feature-20228/erfassung_internationalisierungsmassnahmen_beurteilung'
2024-10-03 10:42:00 +02:00
ma0048
0f708f4934
- added app pep
...
- phrases
- added error
- added model
2024-09-27 11:23:54 +02:00
Harald Bamberger
be412abebc
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
2024-09-26 16:16:24 +02:00
ma0068
a7f51205b1
Show Kürzel Ma in Dropdown, Filter current semester, adapt Berechtigungen, reload semester
2024-09-20 11:41:44 +02:00
ma0068
4d5ea1f519
adapt addNewPruefung, pruefungModal, function getLvsByStudent
2024-09-17 15:28:18 +02:00
ma0048
7c85e981f9
- absteigende sortierung endabgabe
2024-09-17 11:17:44 +02:00
Johann Hoffmann
d9f5646ad1
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
...
# Conflicts:
# application/models/crm/Prestudentstatus_model.php
# public/js/api/fhcapifactory.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2024-09-10 10:17:55 +02:00
Harald Bamberger
5f50d9f0ec
Merge branch 'feature-40311/Stundenplan_widget' into feature-25999/C4
2024-09-09 13:26:03 +02:00
Harald Bamberger
a8141e5dac
Merge branch 'master' into feature-25999/C4
2024-09-09 11:45:10 +02:00
ma0068
de0fbdb72c
Form, Table and Queries for new Tab Pruefung
2024-08-29 09:53:34 +02:00
ma0068
d254b9c10b
Start Tab Pruefung, Abfrage Pruefungen
2024-08-23 11:58:08 +02:00
Cris
0c4d1afded
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-08-21 13:46:41 +02:00
Cris
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
cgfhtw
ffabd681c8
setFirstStudent logic
2024-08-08 16:24:23 +02:00