6d0613e5c8
Merge branch 'master' into feature-12340/StudienblattAnpassungFureAbbrecher
2021-06-14 15:36:56 +02:00
5765be1ab8
Added Note 'nicht zugelassen'
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-14 14:57:42 +02:00
fd4740e7e0
Added Note 'intern angerechnet'
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-06-14 14:46:14 +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
3dddc97575
dbupdate_3.3.php: removed "bzeichnung_mehrsprachig" feld from bis.tbl_oehbeitrag table check
2021-05-27 16:29:27 +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
301c836255
add spalte homeoffice to zeitaufzeichnung
2021-05-19 11:48:29 +02:00
8fe1129910
Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer
2021-05-18 23:40:39 +02:00
d476b8cbd6
created bis.tbl_oehbeitrag for storing oehbeitrag and Versicherung amounts
2021-05-18 22:44:31 +02:00
f5298ae351
Ergänzung lehrmodus für Gegenprüfung, Entfernen von addon.tbl_lvevaluierung_frage
2021-05-10 15:10:30 +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
e91f3f692e
Merge branch 'feature-12808/LVNeuesAttributLehrmodus' of https://github.com/FH-Complete/FHC-Core into feature-12808/LVNeuesAttributLehrmodus
2021-04-30 14:16:48 +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
20e6573d68
Spalte lehrmodus_kurzbz zu addon.tbl_lvevaluierung_frage hinzugefügt
2021-04-28 09:34:58 +02:00
398418515f
neue Tabelle lehre.tbl_lehrmodus, neue Spalte lehrmodus_kurzbz in lehre.tbl_lehrveranstaltung
2021-04-22 09:58:53 +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
131ec0e33c
change buchbar to zeitaufzeichnung
2021-04-01 18:29:19 +02:00
3e7f75b43f
fix merge conflic at dbupdate_3.3
2021-04-01 14:48:56 +02:00
68a0e45472
Usability: Added column 'Empfehlungsanfrage_am', 'Empfehlungsanfrage_an'
...
...to STGL and lectors Overview site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-04-01 09:18:55 +02:00
09a5072a4a
db update
2021-03-31 18:21:12 +02:00
132b5097ee
Usability: Added column 'ZGV' to STGL and lectors Overview site
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-31 13:56:52 +02:00
d53d91d7d1
Usability: Added filterbutton 'Alle anzeigen, die auf Empfehlung von LektorIn warten'
...
The filterbutton was added to the STGLs Overview site.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-30 17:02:15 +02:00
d183dda815
Fixed: Anrechnunglib returning values, Adapted error messages
...
Fixed: method getData in Controller was producing wrong returning message.
Fixed by removing, as library is returning boolean value now.
Adapted few error functions to be more generic and bilingual.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-29 18:48:26 +02:00
287b961697
Fixed: Added serversite check on required form fields
...
After refactoring code to apply via AJAX call, required fields
have to be direclty validated in JS or on serversite. Now fixed by
checking on serversite.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-29 17:55:50 +02:00
b7cb8b27ce
merge
2021-03-29 10:08:35 +02:00
d2c4dd79d5
merge
2021-03-26 19:08:45 +01:00
279157b920
Added button to copy Empfehlungstext into reason textarea when rejecting
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-25 17:12:38 +01:00
Andreas Österreicher