45e4d5576c
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-21 00:59:26 +02:00
4c21d5364c
- added issue management functionality - adding, and displaying issues with filter widget.
2021-09-21 00:58:29 +02:00
ddfe41de2a
fixed rechte, damit die assistenz zugriff drauf hat
2021-09-20 09:12:47 +02:00
a77756a0d6
Merge branch 'hotfix-15106/Logs_Viewer_shows_Filters_from_other_People'
2021-09-15 11:20:32 +02:00
e412125dd0
Merge branch 'feature/Wiederholer_features_12995_12997_12998_13864'
2021-09-15 10:34:06 +02:00
848cc52cfa
- Renamed public method system/Filters_model->getFiltersByAppDatasetName to getFiltersByAppDatasetNamePersonId
...
- Added new parameter person_id to method getFiltersByAppDatasetNamePersonId
- Changed query inside getFiltersByAppDatasetNamePersonId to get global
and personal filters
- Adapted FilterWidgetLib to use the new method getFiltersByAppDatasetNamePersonId
2021-09-14 12:44:33 +02:00
2159e81888
Bugfix Anrechnung Rejected Mails
2021-09-09 08:34:36 +02:00
493bf0edda
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-09-06 22:35:40 +02:00
484151bab2
Merge branch 'master' into feature/Anrechnungen_NEU
2021-08-26 11:32:47 +02:00
b9ac73955a
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-08-24 01:19:26 +02:00
68b5e49f91
Merge branch 'master' into feature-6189/SAP_basic_structure_for_data_synchronization
2021-08-22 21:04:53 +02:00
d091374622
create merged branch with all features on topic Wiederholer - feature 13864
2021-08-19 15:26:20 +02:00
6ff8df6ac3
merged master into anpassung_infocenter
2021-08-18 08:45:28 +02:00
36d0981331
neuer Branch + Korrektur Fehlermeldung bei Änderung Status
2021-07-23 12:57:28 +02:00
18bd6f7aa7
Öhbeitrags GUI:
...
- possible to edit whole Öhbeitragsrow at once
- added comments
2021-07-19 19:26:53 +02:00
1c0de3ec45
Fixed: Doppelte Tabellenanzeige in SanchoMail korrigiert
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-07-08 15:05:19 +02:00
635974fa22
Merge branch 'master' into feature/Anrechnungen_NEU
...
# Conflicts:
# application/models/crm/Prestudent_model.php
# system/dbupdate_3.3.php
2021-07-07 15:05:31 +02:00
a9c5533959
Merge branch 'master' into feature-8210/status_abgewiesen_fuer_mehrere_personen
2021-07-01 14:00:47 +02:00
745ecf4711
zgv pruefung unterscheiden zwischen bachelor und master
2021-06-30 13:29:09 +02:00
36507959ac
dokumentenpruefung im infocenter in eigenes js ausgelagert, reloaden der anzeige beim nachreichen eines doks
2021-06-30 13:09:56 +02:00
d4d84a93ba
Nachreichdatum kann nun auch ueber das Infocenter gesetzt werden
2021-06-29 14:43:19 +02:00
7314352e79
absagen nun möglich auch bei studenten die den reihungstest absolviert haben
2021-06-22 16:54:45 +02:00
ca80d72734
added Öhbeitragsverwaltung to main menu
2021-06-21 17:42:08 +02:00
bf3c8a344b
Merge branch 'master' into feature/Anrechnungen_NEU
2021-06-21 17:18:07 +02:00
46edad620a
Fixed: to NOT send Ablehnungsmail to students multiple times
...
If STGL was rejecting - withdrawing multiple times and entering different
reasons (notizen), the Ablehnungsmail was sent for each of that reasons.
Now the mail is sent only once for most recent reason.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-21 15:50:27 +02:00
ab799cb54f
abweisen auch wenn bereits freigegeben
2021-06-17 13:47:21 +02:00
8fa40a843b
Merge branch 'feature-11001/zgv_ueberpruefung' into feature-13277/anpassung_infocenter
...
# Conflicts:
# application/controllers/system/infocenter/InfoCenter.php
# application/views/system/infocenter/dokpruefung.php
# application/views/system/infocenter/infocenterData.php
# application/views/system/infocenter/infocenterFreigegebenData.php
# application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
2021-06-16 09:26:03 +02:00
6a3fb14ea6
zgv ueberpruefung zwischen master und bachelor unterscheiden
2021-06-16 09:16:15 +02:00
3171ec2c42
dokumententypen nach bezeichnung sortiert
2021-06-10 12:01:01 +02:00
cdfaf5b90b
dokumententypen nach bezeichnung sortiert
2021-06-10 11:56:07 +02:00
b206c019df
Oehbeitrag GUI: correct decimal format conversion before after update
2021-06-09 01:34:47 +02:00
4a2c90ac60
doktypen in zgv uebersicht nur readonly
2021-06-07 12:28:32 +02:00
5330e2b250
beim abweisen das studiensemester hinzugefuegt
2021-06-01 11:13:23 +02:00
df8c946bb2
enabled updating of oehbeitrag values
2021-05-31 23:20:56 +02:00
36f52cf3cc
dokumententyp kann nun im Infocenter geaendert werden und zgv master wird angezeigt
2021-05-31 13:20:45 +02:00
4b237cbc7f
oehbeitrag versicherung: possible to display and add Oehbeitraege and Versicherungsbeiträge per semester
2021-05-28 02:12:55 +02:00
12e531532b
Changed checking Application Deadline by checking start-/enddate
...
Now checking start-/enddate in the config entries.
If not provided, start-/endedate of Studiensemester will be used.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-25 13:19:40 +02:00
758b9991d5
Added Antragssperre for Noten, when STGL wants to create Anrechnung
...
Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-19 16:18:04 +02:00
847529d5aa
nachname vorname tauschen
2021-05-19 09:03:20 +02:00
7bbd94bb89
Adapted & Enhanced Withdrawing of Approvement
...
. Added 'genehmigt von'
. Moved out to Model and added db rollback
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-17 12:35:14 +02:00
d016e26e70
Added new AnrechnungJob deleteAnrechnungGrades
...
This job deletes Zeugnisnoten 'angerechnet', when Anrechnung is rejected
afterwards. E.g., when STGL first accepts, then withdraws and finally
rejects the approvement.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-17 12:30:56 +02:00
2c6d8937f6
funktion hinzugefuegt um mehrere bewerber abzuweisen und status wird nur angezeigt wenn aktiv
2021-05-12 12:48:29 +02:00
842651e676
Added button 'Antrag jetzt bearbeiten' to 'Antrag anlegen'
...
The button 'Antrag jetzt bearbeiten' will appear right after creating
a new application, so that the user can directly open the new application
in a new tab.
The button disappears when selecting a new student again.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-05 17:03:42 +02:00
563c0cea58
Fixed wrong column grid / Small GUI adaptations
...
GUI adaptations:
. Changed 'Antrag anlegen': button instead of link
. Changed success text to: Antrag wurde angelegt
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-05 15:52:25 +02:00
7a29d27a79
Adapted Deadline check to use config parameter
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 16:18:32 +02:00
a50a666d11
Added Antragssperre for Noten, that are defined in config array
...
. Added new config file
. Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.
. Adapted GUI to process data via JS only
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 16:17:23 +02:00
7c02e0247d
Merge branch 'feature-12010/filter_for_bachelor_master' into feature-11001/zgv_ueberpruefung
2021-04-29 10:55:35 +02:00
0b5ae2df9c
Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung
2021-04-29 10:53:00 +02:00
81bd719e39
Added Empfehlungsnotiz in STGL Detailview + minor GUI change
...
Now STGL can save and update notes regarding recommendation.
Therefore minor GUI change by displaying tables within panels instead of
appending directly to panel - in STGL and lectors Detail view. This is
for clearer view and gives space for the notes.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-29 09:54:57 +02:00
21ce118f0b
Merged master into branch
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-28 15:54:54 +02:00
KarpAlex