 Johann Hoffmann
|
38424bc875
|
serientermin anlegen mitarbeiter; deadline overview mitarbeiter;
|
2025-04-29 14:36:40 +02:00 |
|
|
Johann Hoffmann
|
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 |
|
|
Johann Hoffmann
|
97d83d3acf
|
WIP abgabetool mitarbeiter
|
2025-04-25 09:59:41 +02:00 |
|
|
Johann Hoffmann
|
e28067259b
|
WIP Abgabetool Mitarbeiter DetailComponent
|
2025-04-23 13:59:31 +02:00 |
|
|
Johann Hoffmann
|
2759bb0309
|
cis4 abgabetool student uploads/signature check/emails working; TODO: - testing with diff users, styling & mobile layout;
|
2025-03-19 15:57:08 +01:00 |
|
|
Johann Hoffmann
|
669752dd90
|
WIP cis4 abgabetool student
|
2025-03-12 13:41:01 +01:00 |
|
|
Cristina
|
83fe68c04e
|
Removed 2 methods getNonQuellkursLvs and getNonQuellkursLvsAutocompleteSuggestions from Lehrveranstaltung_model.php
|
2025-03-06 10:39:00 +01:00 |
|
|
Cristina
|
3a83d468ef
|
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
|
2025-03-06 09:50:55 +01:00 |
|
|
Cristina
|
aab0dd7fc7
|
Added / Adapted Model queries and api Controller regarding for Lehrveranstaltung- and Studienjahr Model
|
2025-03-06 09:40:40 +01:00 |
|
|
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 |
|
|
Johann Hoffmann
|
881b7fb789
|
fix loadEvents race condition; normalize route pushes; WIP getting route.replace to work;
|
2025-02-24 17:53:56 +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 |
|
|
Cristina
|
9a53880b9d
|
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
|
2025-01-28 13:58:58 +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 |
|
|
Cris
|
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 |
|
|
Cris
|
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 |
|
|
Cris
|
1159b0dad5
|
Refactored getLvs method in Lehrveranstaltung_model.php
|
2024-11-27 17:28:54 +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 |
|
|
Cris
|
8a22eab0c8
|
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
|
2024-11-20 13:59:35 +01:00 |
|
|
Cris
|
933af94344
|
Added checkIsTemplate method to Lehrveranstaltung Model
Checks if given LV is a template (Quellkurs)
|
2024-11-20 13:55:11 +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 |
|
|
Cris
|
2f448ca2bc
|
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
# Conflicts:
# system/phrasesupdate.php
|
2024-10-16 09:44:50 +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 |
|