 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
Johann Hoffmann
|
dab34eff35
|
klickibunti farben in accordion headers je nach datum/abgabedatum combo; more color definitions cis4 default.css; nomore legacy classes in Abgabe.php, CI3 models only; confirm delete Termin prompt; endupload validation stub, not sure about the technical min requirements here; mitarbeiter table format fix; show noten in projektarbeit view for students so there is some distinction; fhc isMobile computed revamp; order projektarbeiten by insertamum DESC to get most recent ones at the top of lists;
|
2025-10-02 16:53:41 +02:00 |
|
|
Cristina
|
0d51df95f9
|
Merge branch 'master' into epic-56039/LV-Evaluierung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-10-02 11:30:55 +02:00 |
|
|
Cristina
|
cb64c83b50
|
Added method to get LV-Leitung from given LV
|
2025-10-01 13:48:10 +02:00 |
|
|
Johann Hoffmann
|
c796536417
|
notiz -> beurteilungsnotiz; some missing phrasen; more color definitions (WIP); finalize automagic modal logic; added validation stub for endupload; loading spinner on every upload; added custom header classes to code unexpanded paabgabe accordion tabs by their abgabedatum or lack thereof (WIP);
|
2025-09-30 16:47:05 +02:00 |
|
|
ma0048
|
0f43e8eb7a
|
autocomplete auf backend umgestellt
textarea formattedAnmerkung rausgenommen
ui angepasst
|
2025-09-24 14:27:01 +02:00 |
|
|
Alexei Karpenko
|
8e7a1a2ddd
|
Merge branch 'master' into feature-61232/Studierendenverwaltung_Karteireiter_Projektarbeit_portieren
|
2025-09-22 13:39:36 +02:00 |
|
|
Johann Hoffmann
|
14f5a651a4
|
abgabetool rechte; WIP magic modal for next QG Termin logic handling;
|
2025-09-22 10:47:12 +02:00 |
|
|
ma0048
|
6a31eade8b
|
Merge branch 'feature-60973/komponente_fuer_lehrfaecherverteilung' into deploy_22_09_25_lvverwaltung
# Conflicts:
# system/dbupdate_3.4.php
# system/phrasesupdate.php
|
2025-09-18 15:04:01 +02:00 |
|
|
Johann Hoffmann
|
ce9f0536d6
|
Merge branch 'master' into feature-61164/AbgabetoolQualityGates
|
2025-09-17 16:40:53 +02:00 |
|
|
Alexei Karpenko
|
06a41e24d6
|
Lehreinheit model getLesForLv method: only getting necessary fields to save memory
|
2025-09-10 17:39:32 +02:00 |
|
|
Johann Hoffmann
|
49ca538381
|
student page redesign; wip mitarbeiter page + add new modal
|
2025-09-04 17:38:32 +02:00 |
|
|
Cristina
|
10d58d1a42
|
Added column prestudent_id to getStudentsByLv method query in Lehrveranstaltung_model.php
|
2025-09-03 15:24:44 +02:00 |
|
|
Alexei Karpenko
|
fc845ebf4e
|
Studierendenverwaltung Projektarbeit: separate saving of Projektarbeit and Betreuer, added action for editing Betreuer
|
2025-09-02 15:04:45 +02:00 |
|
|
ma0048
|
396251b061
|
lvverwaltung einschraenkung bei den tags
erledigte tags werden in der header suche nicht beruecksichtigt
|
2025-09-02 13:35:15 +02:00 |
|