04261e11e4
Wording für Anrechnungen angepasst
2021-09-03 17:38:52 +02:00
484151bab2
Merge branch 'master' into feature/Anrechnungen_NEU
2021-08-26 11:32:47 +02:00
fb00baae00
Merge branch 'master' into feature-12333/Change_legacy_jobs_database_log
2021-08-22 20:58:09 +02:00
73ce635188
Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung
2021-08-20 10:34:55 +02:00
d8804730ba
Merge branch 'master' into feature-13218/BewerbungstoolMasterDokumente
2021-08-18 11:18:33 +02:00
6ff8df6ac3
merged master into anpassung_infocenter
2021-08-18 08:45:28 +02:00
9eae959b15
Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig
2021-07-28 12:10:28 +02:00
8822a589c9
Merge branch 'master' into feature-12075/zeitwuensche_lesezugriff
2021-07-23 14:22:36 +02:00
68a469bce6
Changed text for Anrechnungen Antragsfrist 15.09. -> to 22.09.
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-07-19 14:50:12 +02:00
50a7bfe927
Minor text changes in Infobox/Nachweisdokumente
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-07-19 12:03:55 +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
07cb19ccd1
Merge branch 'feature-13604/Pruefungsprotokolle_Filter_fuer_zukuenftige_Termine'
2021-07-01 14:44:33 +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
f4ddbd3084
Added DB-Index for lehre.tbl_pruefung to speed up queries
2021-06-25 11:15:12 +02:00
1eb3f96200
Added STGL-Notizfeld to Lectors Detail View
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-22 12:46:03 +02:00
bf3c8a344b
Merge branch 'master' into feature/Anrechnungen_NEU
2021-06-21 17:18:07 +02:00
e5a6af7eb3
first guess adding filter for upcoming exams
2021-06-18 09:16:02 +02:00
934248aa0e
Merge branch 'feature-12178/message_bei_master_freigabe' into feature-13277/anpassung_infocenter
2021-06-16 09:26:30 +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
6d0613e5c8
Merge branch 'master' into feature-12340/StudienblattAnpassungFureAbbrecher
2021-06-14 15:36:56 +02:00
c9ec4cb674
ist infocentermitarbeiter spalte nachgezogen
2021-06-10 12:19:42 +02:00
3ba88b43dd
zgvmaster spalte hinzugefuegt
2021-06-10 11:49:48 +02:00
6550fb6301
wording angepasst
2021-05-31 13:29:13 +02:00
0285e3fc92
Adaptierungen Bewerbungstool Übersichtsseite
2021-05-20 08:54:14 +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
6f885fb924
fixed typo and put the insert on a other position
2021-05-07 22:23:48 +02:00
debd6724b3
Merge branch 'master' into feature/Anrechnungen_NEU
2021-05-05 17:21:56 +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
062ff74b03
Mails bei freigabe zum RT und Freigabe an Studiengang fuer Master hinzugefuegt
2021-05-04 22:09:47 +02:00
69b33a7f92
Bugfix: Now Ampelmail is sending HTML content correctly
...
...so that the eMail client can parse and display HTML content correctly.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-04 16:23:24 +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
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
b5be5be59d
Merge branch 'master' into feature-11250/zeitaufzeichnung_stammkostenstelle
2021-04-28 17:17:02 +02:00
21ce118f0b
Merged master into branch
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-28 15:54:54 +02:00
dca828650a
Adapted Bestaetigung Moodle link to open in new tab
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 16:51:18 +02:00
5e77e252c7
Added GUI to create Anrechnungsantrag
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 15:54:16 +02:00
f6f31f7efb
Added Berechtigung 'lehre/anrechnung_anlegen' to create Anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-20 15:49:08 +02:00
bc7e3c5cc5
zgv ueberpruefung hinzugefuegt
2021-04-20 13:51:41 +02:00
b92260c1d5
Added Moodle-link to Anrechnungen-Prozessinformation
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-13 11:47:13 +02:00
a70082f0e5
Usability: Added Pflichtfeld "Lesebestaetigung" to students VIEW
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-12 17:00:03 +02:00
b29621354f
- abgabetool: added zweitbetreuer mailto Link incl. icons
...
- Bewertunglink is not sent in Parbeit Enduploadmail if older Semester
- phrasesupdate Projektarbeitsbeurteilung: added female form
2021-04-10 03:55:05 +02:00
094b502862
Usability: Limited chars-length for 'Herkunft der Kenntnisse' / Added chars counter
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-07 17:17:53 +02:00
fe4b70ba19
Usability: Added 'Empfehlungsanforderung an/am' to STGL + lectors Detail view
...
. Now more "Empfehlungs"-data shown in a table.
. Better separation of PHP / JS.
. Adapted Controller, View, JS and library to provide data about WHEN and
TO WHOME the requests for recommendation had been sent.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-07 15:50:05 +02:00
170b2485d3
Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen
2021-04-06 18:06:30 +02:00
48105425fc
Edit Studienblatt in Englisch für AbbrecherInnen
2021-04-02 15:35:36 +02:00
3644cc690c
Put Checks from xml to xsl for Abbrecher
2021-04-01 21:28:27 +02:00
Andreas Österreicher