13a040737a
Fehler behoben wodurch die LV-Leitung von Lehrveranstaltungen nicht
...
immer korrekt ermittelt wurde
2021-09-21 17:17:28 +02:00
52127ade60
fixed datumanzeige
2021-09-17 10:27:55 +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
4b94dfbda7
Merge branch 'master' into feature/Anrechnungen_NEU
2021-09-03 11:08:29 +02:00
6034da43d8
Fixed loading of current Geschaeftsjahr if it is the last day of the
...
year
2021-08-31 07:56:59 +02:00
484151bab2
Merge branch 'master' into feature/Anrechnungen_NEU
2021-08-26 11:32:47 +02:00
73ce635188
Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung
2021-08-20 10:34:55 +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
e4aa42ad58
models/CL/Messages_model->getVorlage now filters out the _not_ active
...
templates
2021-07-21 10:39:52 +02:00
cee6156646
- added Bisioaufenthaltfoerderung_model.php
...
- dbupdate_3.3.php: added Buchungstyp "ZuschussIO"
2021-07-07 20:22:53 +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
7314352e79
absagen nun möglich auch bei studenten die den reihungstest absolviert haben
2021-06-22 16:54:45 +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
ccffdf9b7f
statusgruende sortiert
2021-06-10 12:00:09 +02:00
5330e2b250
beim abweisen das studiensemester hinzugefuegt
2021-06-01 11:13:23 +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
2c6d8937f6
funktion hinzugefuegt um mehrere bewerber abzuweisen und status wird nur angezeigt wenn aktiv
2021-05-12 12:48:29 +02:00
6f885fb924
fixed typo and put the insert on a other position
2021-05-07 22:23:48 +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
5fff866363
Merge branch 'feature-4836/studiengang_der_anmerkung_ergaenzen' into feature-11001/zgv_ueberpruefung
2021-04-29 10:55:51 +02:00
7c02e0247d
Merge branch 'feature-12010/filter_for_bachelor_master' into feature-11001/zgv_ueberpruefung
2021-04-29 10:55:35 +02:00
21ce118f0b
Merged master into branch
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-28 15:54:54 +02:00
bb0776a808
Added method createAnrechnungsantrag to Anrechnungsmodel + Refactored code
...
Moved code from Controller to Anrechnungmodel.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 16:41:25 +02:00
b7a6cefa36
Added Controller to create Anrechnungsantrag + Model Anrechnungbegruendung_model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 16:00:14 +02:00
bc7e3c5cc5
zgv ueberpruefung hinzugefuegt
2021-04-20 13:51:41 +02:00
170b2485d3
Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen
2021-04-06 18:06:30 +02:00
7c875d5f80
Usability: Added 'ZGV' to STGL and lectors Detail site
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-06 14:48:08 +02:00
42d2f45561
bei den anmerkungen studiengang hinzugefuegt
2021-04-06 13:51:27 +02:00
287cddf926
added zgv ueberpruefung
2021-03-23 09:25:24 +01:00
41e8b4094e
Merge branch 'feature-11970/AnrechnungJob_MailToSTGL' into feature/Anrechnungen_NEU
2021-03-18 10:58:57 +01:00
7340564d1e
Added job to send mail to STGL with yesterdays new Anrechnungen
...
. added AnrechnungJob sendMailToSTGL()
. removed functions to send mail from CTRL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-16 17:42:46 +01:00
9677a5a4fd
- BenutzerModel: added comment for getFromPersonId method
...
- UPDATE permission for web for tbl_projektbetreuer added
- added phrase for Zweitbegutachter - link
2021-03-01 09:33:14 +01:00
abcf41f7a3
Added feature to withdraw approvals/rejections for STGL
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-17 19:07:13 +01:00
935b370166
added filter for bachelor and master
2021-02-17 15:07:09 +01:00
3366f091dd
Anrechnungen - Fixed Details Page for People with multiple Accounts
2021-02-15 21:12:14 +01:00
bff6307a62
Anrechnungen
...
- Neuer Job zum Setzen der Anrechnungsnote hinzugefügt
- Direktes setzen der Zeugnisnote bei Anrechnung entfernt
2021-02-12 15:52:26 +01:00
00799f2f64
Adapted: Ordered Notizen to retrieve last inserted first
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-08 17:35:34 +01:00
1f88bfae40
- Projektbetreuer Model: added getBetreuerByToken method
...
- phrasesupdate: added new Projektarbeitsbeurtielung phrases
2021-02-04 11:21:40 +01:00
52450561fd
Added method getApprovedOrRejected() to Anrechnung Model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-04 10:20:10 +01:00
5235915d6a
Changed method getNotizByAnrechnung() -> added param titel
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 10:57:27 +01:00
297c96c3e5
Changed method getLastAnrechnungstatus() -> added param status_kurzbz
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-03 10:53:51 +01:00
8fc338ccb4
Added GUI/functionality to add begruendung for 'NICHT EMPFEHLEN' in lectors overview
...
. Begruendung is added as Notiz
. GUI to attach begruendung will slide down the moment 'Nicht Empfehlen'
is clicked
. added phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-02 14:06:49 +01:00
a218b36323
Added getUID() by prestudentID - method to Prestudent Model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-01 10:03:18 +01:00
3fb2c3d387
Added Sanchomail sent when Anrechnung is applied by student
...
Mail goes to STGL. If not present, it will be sent to STGL assistance.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-27 10:33:19 +01:00
8a75bc9fdd
Added method getFullName() to Person_model
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 18:54:42 +01:00
db10f78505
Added method getLeitung() to Studiengang_model to retrieve STGL by studiengang_kz
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-01-26 18:52:28 +01:00
Andreas Österreicher