 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
|
d774335bcf
|
assistenz view query now also checks for betreuerart_kurzbz ("Erstbegutachter", "Begutachter", "Betreuer", "Erstbetreuer", "Senatsvorsitz") instead of only ("Erstbegutachter", "Begutachter")
|
2026-02-03 12:35:06 +01:00 |
|
|
Johann Hoffmann
|
054663ee00
|
WIP punkte
|
2026-02-03 11:34:59 +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
|
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 |
|
|
Cristina
|
9b90e0edde
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-20 10:53:36 +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 |
|
|
Johann Hoffmann
|
c3f7f7223a
|
add student name info to betreuer sammelemail jobs table; WIP adapting same logic for assistenz;
|
2026-01-16 11:59:46 +01:00 |
|
|
Harald Bamberger
|
c720c46125
|
education/Projektarbeit_model: fix missing from-clause entry for table tbl_projektarbeit error - ticket#6059687
|
2026-01-15 16:28:38 +01:00 |
|
|
Cristina
|
6512ad0f1c
|
Merge branch 'master' into epic-56039/LV-Evaluierung
|
2026-01-13 13:38:04 +01:00 |
|
|
Johann Hoffmann
|
954c55ba3e
|
finetuning
|
2026-01-12 17:06:35 +01:00 |
|
|
Harald Bamberger
|
c113c80862
|
fix calculation of next student matrikelnr aka personenkennzeichen and student uid
|
2025-12-22 21:11:05 +01:00 |
|
|
Johann Hoffmann
|
957da460a6
|
shorter passwort freigabe text; loadCisConfig for Benotungstool via api; anw% in notentable via event; WIP incorporating CIS config into actual noten logic;
|
2025-12-18 15:24:08 +01:00 |
|
|
Andreas Österreicher
|
47e3c83909
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2025-12-18 12:25:05 +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 |
|
|
Harald Bamberger
|
39d708aa61
|
Merge branch 'master' into feature-68763/CIS4_Profilupdate_Additional_Changes
|
2025-12-17 12:56:07 +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 |
|
|
Johann Hoffmann
|
735a6654b9
|
projektbeurteilung_check_available event when loading studentprojektarbeiten handled in extension
|
2025-12-12 13:45:01 +01:00 |
|
|
Johann Hoffmann
|
635da9f8d9
|
checksystem paabgabetyp default values for upload_allowed, benotbar & aktiv only on first checksystem run by checking availability of qgate2 typ; english phrasen for betreuerart, paabgabetyp & projekttyp; disable new termin for zweitbetreuer (WIP disabling serientermin); QGate1/2 Status column -> text only for now;
|
2025-12-12 12:51:07 +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 |
|
|
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
|
50439ee6cc
|
Merge branch 'master' into feature-63468/Studierendenverwaltung_Neuanlage_von_Interessenten_ueberarbeiten
|
2025-12-09 11:37:57 +01:00 |
|
|
Alexei Karpenko
|
112e30ab39
|
Studierendenverwaltung Projektarbeit: added concatenated Betreuer, sorted autocomplete suggestions, added Gesamtnote, freigegeben check removed when lock date set, added phrases
|
2025-12-05 22:01:35 +01:00 |
|
|
Johann Hoffmann
|
ca152dc1ea
|
add projektarbeit_id & student_uid to projektbeurteilung_formular_link event in projektarbeitsbeurteilungsextension
|
2025-12-04 17:28:16 +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
|
095d5acbc5
|
load all studiensemester for assistenz; load paabgabetyp benotbar for all paabgaben; datediff calc luxon; new dateclass 'beurteilungrequired'; 2nd quality gate validation logic option; filter notenoptions as per config; filter abgabetypoptions as per config; upload_allowed checkbox for serientermine; serientermin modal layout rearranged; abgabetoolJob fixes; 23:59 in the descriptive col, not datepicker; zusatzdaten are required; activeIndex for accordion calulated on demand by method instead of reading a computed value;
|
2025-11-27 16:53:50 +01:00 |
|
|
Johann Hoffmann
|
43925e3088
|
custom sticky css; offcanvas mobility legende; mobiltiy zusatz in seperate column; added getMobilityZusatzForUids & formatZusatz similar to digital anw mobility zusaetze;
|
2025-11-25 17:23:49 +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 |
|
|
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 |
|
|
Cristina
|
92030ca697
|
Merge branch 'feature-69379/Tooltip-Direktive' into epic-56039/LV-Evaluierung
|
2025-11-18 11:02:57 +01:00 |
|
|
Johann Hoffmann
|
f89a53b156
|
fix getProjektbetreuerAnrede function since betreuer are not necessarily mitarbeiter with such an uid; notify students config from milliseconds to pgsql interval '1 day'; ported notifyBetreuerMail & notifyStudentMail to AbgabetoolJob.php;
|
2025-11-17 11:47:00 +01:00 |
|
|
ma0048
|
284633012f
|
Merge remote-tracking branch 'origin/master' into feature-67484/lvverwaltung_finetunning
|
2025-11-14 08:09:25 +01:00 |
|
|
ma0048
|
63eda8b934
|
addgroup/addperson immer anzeigen
gruppen sortierung angepasst
fehlende les anzeigen
|
2025-11-14 08:07:39 +01:00 |
|
|
Johann Hoffmann
|
cff71ec829
|
AbgabetoolJob notifyStudentMail function to send Emails to students about their changed abgabetermine inside the configurable threshold;
|
2025-11-13 17:16:51 +01:00 |
|
|
Cristina
|
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 |
|
|
Harald Bamberger
|
00eac334c0
|
Merge branch 'feature-63443/Studierendenverwaltung_Tab_Abschlusspruefung_Finetuning' into studvw_2025-11_rc
|
2025-11-10 12:48:01 +01:00 |
|
|
Johann Hoffmann
|
a61d5b1d62
|
orgform/studstatus cols;
|
2025-11-07 11:17:59 +01:00 |
|
|
Johann Hoffmann
|
b1a1cdf235
|
studiensemester dropdown filter, default all, options are current/next and op to 10 back; benotet/unbenotet/alle fetch parameter; WIP orgform/studstatus cols;
|
2025-11-06 16:29:24 +01:00 |
|
|
Johann Hoffmann
|
3878fce625
|
wip abgabetool;
|
2025-11-05 15:34:10 +01:00 |
|
|
Harald Bamberger
|
c56fd038b8
|
Merge branch 'feature-63445/Studierendenverwaltung_Filter' into studvw_2025-11_rc
|
2025-11-04 17:10:24 +01:00 |
|
|
Harald Bamberger
|
0417afeea8
|
Merge branch 'feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren' into studvw_2025-11_rc
|
2025-11-04 14:56:54 +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 |
|
|
Johann Hoffmann
|
ac1e0a8aa3
|
Merge remote-tracking branch 'origin/master' into feature-61164/AbgabetoolQualityGates
# Conflicts:
# system/phrasesupdate.php
|
2025-10-27 14:51:52 +01:00 |
|
|
Johann Hoffmann
|
259c2aec14
|
load projektarbeiten for studiengänge -> assistenz page; speed dial position rework; automagicmodal logic fix; activeTabIndex by date in detail views; tooltips on icons; $capitalize phrasen to ensure capitalization; phrasenpromise & resolve similar to anw; modal component emits fullscreen event now;
|
2025-10-27 14:40:56 +01:00 |
|
|
ma0068
|
6e9969d9e4
|
use shorter table names for columns stg and orgform , add column ausbildungssemester
|
2025-10-20 16:08:12 +02:00 |
|