 Harald Bamberger
|
150d54eeda
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-07 14:02:19 +02:00 |
|
|
Harald Bamberger
|
3690babf62
|
Merge branch 'cis40_2026-02_rc' into cis40_2026-05_ma_rc
|
2026-05-07 14:01:50 +02:00 |
|
|
Harald Bamberger
|
d42157c5f8
|
Merge branch 'cis40_2026-05_ma_rc' into demo-cis40
|
2026-05-06 18:19:53 +02:00 |
|
|
Harald Bamberger
|
b5b69878b8
|
Merge branch 'feature-75901/StudVW_AppMenue_neueVerlinkungen' into studvw_2026_05_rc
|
2026-05-06 14:40:17 +02:00 |
|
|
adisposkofh
|
d38641e312
|
displaying student personal identity number and matriculation number
|
2026-05-06 13:22:38 +02:00 |
|
|
Harald Bamberger
|
cffa493984
|
Merge branch 'feature-68301/cis4_ma_raumreservierung' into cis40_2026-05_ma_rc
|
2026-05-04 18:17:53 +02:00 |
|
|
Harald Bamberger
|
e373e797f4
|
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
|
2026-05-04 17:01:44 +02:00 |
|
|
Harald Bamberger
|
c53d451000
|
Merge branch 'master' into feature-68301/cis4_ma_raumreservierung
|
2026-04-20 16:34:30 +02:00 |
|
|
Harald Bamberger
|
f6747713a1
|
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
|
2026-04-20 11:13:14 +02:00 |
|
|
adisposkofh
|
7edddd0566
|
removed redundant OverviewLvPlan page (same as StgOrgLvPlan)
|
2026-04-14 14:19:38 +02:00 |
|
|
adisposkofh
|
f1c3c8296f
|
implemented 'OtherLvPlan' to view other users' timetables
|
2026-04-13 10:41:41 +02:00 |
|
|
chfhtw
|
f06e59b362
|
Merge branch 'master' into feature-69146/CIS4_Anzeige_LVPLan_Studiengang_Semester_Verband_Gruppe
|
2026-04-08 14:13:02 +02:00 |
|
|
Harald Bamberger
|
8c75608eaf
|
add menu entry for Dashboard Admin
|
2026-03-24 13:21:50 +01:00 |
|
|
ma0068
|
87dd858358
|
add entry StudVw to navigation CI Menue
|
2026-03-17 14:58:39 +01:00 |
|
|
Harald Bamberger
|
47b5eecb9b
|
Merge branch 'master' into vv_und_studvw_2026_02_rc4_ma0080
|
2026-03-04 18:57:13 +01:00 |
|
|
Johann Hoffmann
|
ce5da22180
|
import error msg phrase; config for noten which dount count towards prüfungsantritt & load & use that;
|
2026-03-03 16:47:17 +01:00 |
|
|
Johann Hoffmann
|
2dd732b924
|
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
# Conflicts:
# application/views/CisRouterView/CisRouterView.php
|
2026-02-27 10:38:24 +01:00 |
|
|
Johann Hoffmann
|
abeb411742
|
betreuer email button config
|
2026-02-26 18:00:14 +01:00 |
|
|
Harald Bamberger
|
a9b343646e
|
Merge branch 'master' into vv_und_studvw_2026_02_rc4
|
2026-02-13 10:49:09 +01:00 |
|
|
Andreas Österreicher
|
0a97e5781e
|
Nicht beurteilt aus Default Config entfernt
|
2026-02-12 11:02:16 +01:00 |
|
|
Johann Hoffmann
|
67838eb630
|
load projektarbeit.note correctly for mitarbeiter; evaluate projektarbeit termin editability correctly and define a notenarray which does NOT count (currently "Nicht beurteilt" & "Noch nicht eingetragen"). such rules apply for betreuer, assistenz is allowed to do whatever they want since we never defined an actual business process anywhere and people do whatever they want anyways
|
2026-02-11 13:39:23 +01:00 |
|
|
Johann Hoffmann
|
6da19585ff
|
optional sammelmail buttons assistenz abgabetool
|
2026-02-09 13:45:01 +01:00 |
|
|
ma0068
|
464f04b254
|
merge studvw_2026_02_rc4 in vv_und_studvw_2026_02_rc4
|
2026-02-05 11:57:03 +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 |
|
|
Andreas Österreicher
|
023c2a10be
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2026-02-04 10:21:17 +01:00 |
|
|
Harald Bamberger
|
f6b13c0bdf
|
Merge branch 'master' into studvw_2026-02_rc4
|
2026-02-03 17:16:42 +01:00 |
|
|
Harald Bamberger
|
d192489c6f
|
use correct filename in comment
|
2026-02-03 13:52:04 +01:00 |
|
|
Harald Bamberger
|
69749da331
|
Merge branch 'master' into feature-52533_62055/Vertragsverwaltung_mit_CoreComponent_DetailHeader
|
2026-02-03 11:46:19 +01:00 |
|
|
Andreas Österreicher
|
b4f28d5426
|
Abstract zum Default Config für Betreuer hinzugefügt
|
2026-02-03 11:12:50 +01:00 |
|
|
ma0068
|
b9eaac18b0
|
merge Master into feature-39571/Studierendenverwaltung_CoreNotizcontroller
|
2026-02-02 16:21:47 +01:00 |
|
|
Harald Bamberger
|
63f198098d
|
use absoluteJsImportUrl Helper for calendar Event renderers
|
2026-01-30 18:55:25 +01:00 |
|
|
Harald Bamberger
|
f7478ff05c
|
add config to insertr fhc-build-version into path or add it as query string
|
2026-01-30 18:53:31 +01:00 |
|
|
Johann Hoffmann
|
fc468ca34a
|
URL_ASSISTENZ for links in email jobs
|
2026-01-27 10:52:15 +01:00 |
|
|
Johann Hoffmann
|
4d97127539
|
remove Abgabedatum column from Assistenz/Betreuer update sammelmail. Keep it for UPLOADS sammelmail since it is relevant there; defined relevant_types in abgabetool config to filter for in the sammelmail for each role student/assistenz/betreuer; block saving/deleting/uploading ui components when projektarbeit has a note, since this indicates that the project is over;
|
2026-01-21 14:05:31 +01:00 |
|
|
Johann Hoffmann
|
eb15d6b841
|
getStudentConfig Api Method; moodle link config entry; write abgabetool termin noten into header; uniform getDateStyleClass logic in all 3 views; WIP refining AbgabetoolJob;
|
2026-01-14 16:57:57 +01:00 |
|
|
Johann Hoffmann
|
7c1f239dcb
|
configurable paabgabe types for signature check; finetuned signature response message; phrasen & code cleanup;
|
2026-01-13 12:32:41 +01:00 |
|
|
Andreas Österreicher
|
47e3c83909
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2025-12-18 12:25:05 +01:00 |
|
|
ma0048
|
8f9f447acf
|
cis4 raumreservierung beta version
|
2025-12-18 11:08:40 +01:00 |
|
|
Harald Bamberger
|
d8766e8f7a
|
Merge branch 'feature-69065/Projektarbeiten_Firmen_verwalten' into studvw_2025-12_rc3
|
2025-12-11 16:06:28 +01:00 |
|
|
Harald Bamberger
|
95027937bd
|
remove debug code
|
2025-12-11 12:52:05 +01:00 |
|
|
Harald Bamberger
|
a86d35f731
|
Merge branch 'master' into feature-69065/Projektarbeiten_Firmen_verwalten
|
2025-12-11 12:12:05 +01:00 |
|
|
Johann Hoffmann
|
bb689a6d48
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
# Conflicts:
# public/css/Cis4/Cis.css
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-12-09 17:03:18 +01:00 |
|
|
Johann Hoffmann
|
ec7ebc8286
|
allowedNoten config integer instead of string so javascript array.includes() doesnt miss the noten options
|
2025-12-04 16:57:24 +01:00 |
|
|
Johann Hoffmann
|
e7a737b7aa
|
write stg_kz & semester_kurzbz into sammelmail about each projektarbeit; move method from abgabe.php api controller to abgabejob.php
|
2025-12-04 15:36:24 +01:00 |
|
|
Johann Hoffmann
|
e3c1287664
|
WIP
|
2025-12-04 14:49:05 +01:00 |
|
|
Johann Hoffmann
|
0c5af137db
|
WIP notifyBetreuerAboutNewOrChangedAbgabenForBetreuedProjektarbeiten Email Job; allowed abgabetypen & allowed noten as per config now via db primary key; new ProjektbetreuerModel method "getAllBetreuerOfProjektarbeit" to do just that;
|
2025-12-03 16:49:49 +01:00 |
|
|
Alexei Karpenko
|
77a1067ea5
|
Studierendenverwaltung Projektbetreuer: default Stunden coming from global config, Stundensatz is requested each time BetreuerIn is selected
|
2025-12-03 15:32:21 +01:00 |
|
|
Johann Hoffmann
|
541d6d78cc
|
projektbeurteilung_formular_link event for benotung link AbgabetoolMitarbeiterDetail.js; projektarbeit_is_current event for abstracted logic in Abgabetool; show endupload missing message on benoten if neither old nor new link are eligable;
|
2025-12-03 11:35:49 +01:00 |
|
|
Johann Hoffmann
|
7747857583
|
AbgabetoolStudent beurteilung erstbetreuer/zweitbetreuer switch + get the actual link from the projektarbeitsbeurteilung extension via event 'projektbeurteilung_download_link' + fallback from config in case that fails; WIP implementing the switch for lektor beurteilungstemplate based on isCurrent/Semester etc in an Event in the pabu extension;
|
2025-12-02 16:07:26 +01:00 |
|
|
Harald Bamberger
|
4dabc642ed
|
Merge branch 'master' into feature-69438/FHC4_Studierendenverwaltung/FeedbackPunkte
|
2025-12-02 07:54:40 +01:00 |
|