Harald Bamberger
b97dec7343
Merge branch 'master' into cis40_2026-09_ma_rc
2026-10-05 13:11:02 +02:00
Harald Bamberger
4ba2869632
Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters
2026-10-05 11:22:59 +02:00
adisposkofh
43b849e787
merged master into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-22 13:44:49 +02:00
adisposkofh
fc89a25d3a
merged feature-78293/news into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 16:31:56 +02:00
adisposkofh
7ea80395a8
merged feature-78497/Cis4StudiumStgInfoBlock into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 14:43:10 +02:00
adisposkofh
67f30c7765
fixed issue with wrong semester displayed and wrong ical dates used in my lv plan
2026-09-09 11:30:43 +02:00
Johann Hoffmann
f15349029f
WIP stg info sidebar in cis4 studium
2026-09-02 09:30:57 +02:00
Andreas Österreicher
e32691994c
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-08-26 08:21:30 +02:00
Ivymaster
708ffac47e
WIP
2026-08-20 17:05:38 +02:00
Harald Bamberger
391bf296d7
Merge branch 'master' into cis40_2026-05_ma_rc
2026-08-19 18:41:29 +02:00
Cristina
0f843db33d
Merge branch 'master' into epic/LVEvaluierung-Neu
2026-08-19 13:34:53 +02:00
Cristina
5e15d4b219
Add Distinct to getLeitung in Studiengang_model.php
...
Avoid multiple records for same active STGL.
e.g. double entries
2026-08-18 16:51:39 +02:00
Harald Bamberger
7910cf3055
Merge branch 'master' into cis40_2026-05_ma_rc
2026-08-13 17:36:38 +02:00
Johann Hoffmann
9274743df3
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
...
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
# application/controllers/api/frontend/v1/stv/Projektarbeit.php
# application/models/education/Projektarbeit_model.php
# public/css/Studentenverwaltung.css
# public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
# public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
2026-08-12 11:26:51 +02:00
Harald Bamberger
69048f8f48
bugfix semester calculation between semesters
2026-07-31 09:51:04 +02:00
Harald Bamberger
cad23ef1ad
Merge branch 'master' into cis40_2026-05_ma_rc
2026-07-14 10:50:25 +02:00
Cristina
8548b93ddc
Added method getPreviousSameSemesterFrom in Studiensemester_model.php
...
Method returns the current study semester and the previous semesters of the same type (SS/WS).
2026-07-08 18:57:31 +02:00
Johann Hoffmann
870c36e76b
Merge remote-tracking branch 'origin/master' into feature-75469/LeOptional4Projektarbeit
...
# Conflicts:
# system/dbupdate_3.4.php
2026-05-20 16:22:31 +02:00
Harald Bamberger
c3ef487a6f
Merge branch 'feature-76148/MyLvaMA' into cis40_2026-05_ma_rc
2026-05-04 17:59:51 +02:00
Harald Bamberger
f6747713a1
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
2026-04-20 11:13:14 +02:00
Harald Bamberger
98a10a2f55
Merge branch 'feature-69389/AbmeldungSTGL_Anzeige_mit_Studiengangskuerzel'
2026-04-17 12:37:49 +02:00
Harald Bamberger
e48b94b858
studiengangskuerzel statt kurzbzlang
2026-04-17 12:35:55 +02:00
Johann Hoffmann
ac44b36b59
cis4 myLv employee functionality implemented; wrote new query fetching studiensemester an employee in which he had assigned lehraufträge; afterwards fetch all lva by employee uid and sem_kurzbz so they fit in the existing component structure; MyLv/Lvs/SS2026 etc now also returns a 'student' | 'employee' string based on path taken inside the controller to aid vue components in rendering useful information and avoiding senseless fetch requests -> e.g. employees cant have grades on lva they are teaching; added component names for sanity when using vuedevtools;
2026-04-07 16:07:10 +02:00
Johann Hoffmann
2fde630971
adjust abgabetool queries Studentenverwaltung Projektarbeit Tab: lehreinheit required -> lehreinheit optional, lehrveranstaltung & studiensemester_kurbz required; changed occurences of the typo "Studiensemster" rigorously;
2026-03-09 15:25:44 +01:00
Johann Hoffmann
17f11fa871
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
...
# Conflicts:
# application/controllers/api/frontend/v1/Lehre.php
# application/models/education/Lehrveranstaltung_model.php
# application/models/education/Note_model.php
# application/views/CisRouterView/CisRouterView.php
# public/js/api/factory/studiensemester.js
# public/js/components/Bootstrap/Offcanvas.js
# public/js/components/Overlay/FhcOverlay.js
2026-02-04 15:40:34 +01:00
Johann Hoffmann
709aba5783
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
...
# Conflicts:
# application/models/organisation/Studiengang_model.php
2026-01-26 15:06:22 +01:00
Johann Hoffmann
9a07e7c804
wrote Studiengang_model.php -> getAssistenzForStudiengangKZ() that does just that but is not used currently since we retrieve assistenz in AbgabetoolJob.php via oe_kurzbz; added new getAssistenzForOE() method in Organisationseinheit_model; added new job "notifyAssistenzAboutChangedAbgaben" that does just that to AbgabetoolJob.php; removed console.log/debugger statements in cis4 code;
2026-01-19 16:12:54 +01:00
Cristina
4dd4d8aaa5
Removed filtering aktiv studienganege from method to get Studiengaenge by Stgs
...
otherwise when switching to former semester (which will have inactive studiengaenge) it will not appear
2025-12-17 14:35:24 +01:00
Cristina
db048e876c
Renamed getEntitledStgs to getByStgs
...
Permissions check happens in application controller.
2025-12-15 16:48:07 +01:00
Cristina
e6ef234c8b
Added method getOrgformsByStg to Studiengang_model.php
...
Get OrgForms of given Studiengang and Studiensemester
2025-12-15 16:27:47 +01:00
Cristina
8280ec42b0
Added method getEntitledStgs to Studiengang_model.php
...
Get active Studiengänge with Kuerzel by given Studiengang-Kennzahlen. Helpful to easily get Studiengänge the user is entitled for.
2025-12-11 16:07:07 +01:00
Johann Hoffmann
1c236cce02
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
...
# Conflicts:
# application/config/routes.php
# application/models/crm/Prestudent_model.php
# application/models/education/Lehreinheit_model.php
# application/models/education/Lehrveranstaltung_model.php
# public/js/apps/Dashboard/Fhc.js
# system/phrasesupdate.php
2025-11-25 10:50:26 +01:00
ma0068
38e8f91fdf
add kurzbzlang to studentDropdown suggestion
2025-11-25 10:48:57 +01:00
Johann Hoffmann
8888b6991f
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
...
# Conflicts:
# application/models/education/Projektarbeit_model.php
# public/js/helpers/StringHelpers.js
2025-11-24 14:25:43 +01:00
Johann Hoffmann
3d51753419
new bootstrap offcanvas component; projektarbeit abgabetermine timeline & status legende in offcanvas; fixtermin toggle & allowed to edit all termine for assistenz; studiengang selection + filter for getSTG_isEntitledFor('basis/abgabe_assistenz:rw'); moved filedownload from Cis/Abgabetool Auth Controller to Abgabe.php Api Controller; status symbol in table columns prevTermin/nextTermin; get_betreuer_details pgsql function to avoid rewriting the same subquery for every betreuer anrede;
2025-10-31 11:14:39 +01:00
Alexei Karpenko
ce9a4e2e09
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
2025-08-23 16:16:41 +02:00
Johann Hoffmann
332efd4106
selection fixes; phrases; preserve scroll after redraw when pressing action buttons on far right; take nav offset into account for width calculation;
2025-08-20 16:25:21 +02:00
ma0048
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
Harald Bamberger
a429b20823
Merge branch 'feature-63192/FHC4-Studierendenverwaltung_Semsterauswahl_fuer_mehrere_Tabs_anpassen' into rc1_FHC4_C4
2025-08-01 16:26:01 +02:00
Harald Bamberger
66caf47d98
Merge branch 'merge_C4_25999_61235_61730' into rc1_FHC4_C4
2025-08-01 15:54:22 +02:00
ma0048
5d07879ebd
org form hinzugefuegt im stree
...
gruppe autocomplete auch auf die bezeichnung
getalloe sql angepasst
2025-08-01 11:44:23 +02:00
Harald Bamberger
fa97116ec4
replace backend var semester_aktuell with api parameter in grades, student and status endpoints, adapt old and new js api definitions, adapt frontend, add validation method to studiensemester_model
2025-07-30 18:09:56 +02:00
Alexei Karpenko
caa70715ad
Merge branch 'merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
2025-07-15 15:24:30 +02:00
SimonGschnell
f7c03b29db
refactor(Studiengang Widget Data): filters only active persons of studiengang information
2025-06-24 10:35:20 +02:00
Harald Bamberger
cac58a0fc2
Merge branch 'feature-60876/FHC4_Studierendenverwaltung_Funktionen_als_Corecomponent' into merge_FHC4_55354_55991_55992_60874_60876_60875_61229_61230_61231
2025-06-20 11:48:11 +02:00
SimonGschnell
565925abb2
fix(typo)
2025-06-12 14:03:32 +02:00
SimonGschnell
06c822fd84
fix(foto for Studiengang information widget): adds foto property for studiengangs personen that are displayed with a foto
2025-06-12 14:01:27 +02:00
ma0048
f96bfbe000
lehrfächerverteilung v1
2025-05-28 07:51:10 +02:00
ma0068
fa0b534471
Refactoring PrimeVue Autocomplete Dropdown Functions
...
Refactoring PrimeVue Autocomplete Dropdown OrganisationUnits
Change Search from Backend to Frontend Filtering
minor changes Table Functions
2025-05-23 13:27:18 +02:00
ma0068
c26bb98960
new Core Component Function
...
- autocomplete and dropdown field for search oes and search functions with active and non active entries
- possibility to dynamic styling of display switch, newButton in Tabulator, different editLabels
- possibility to show/hide column company
- possibility to show/hide to save function as copy
2025-05-21 15:34:43 +02:00
Harald Bamberger