Commit Graph

11199 Commits

Author SHA1 Message Date
cris-technikum 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
Cris 5e77e252c7 Added GUI to create Anrechnungsantrag
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 15:54:16 +02:00
Cris 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
cris-technikum 8730f28d91 Merge branch 'master' into feature/Anrechnungen_NEU 2021-04-15 09:53:15 +02:00
Cris 3d574c30b7 Adapted job sendMailtoSTGL: interval '24 hours' instead of '1 day'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-14 11:07:20 +02:00
Cris ca378ef13b Added header filter to all hidden table columns
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 17:35:55 +02:00
Cris b9955c14a6 Minor code changes for better maintainance
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 16:33:53 +02:00
Cris 7317623fbf Added jobs to send mails to students once per day (info approved/rejected)
. The jobs will send mails to students, whose Anrechnungen were
approved/rejected the last day.

. Removed former sendMailToStudent functions from Controllers.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 16:09:11 +02:00
Cris b92260c1d5 Added Moodle-link to Anrechnungen-Prozessinformation
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 11:47:13 +02:00
Cris cb5037626b Minor change: Now using language phrase for 'maxZeichen'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 09:45:23 +02:00
Cris 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
Cris b8768f997c Usability: Gendered StudentIn; Changed first table column to bold text - Students VIEW
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-08 14:44:00 +02:00
Cris 1008f6b8b3 Fixed DB errormessage in STGL Overview (related to added Ausbildungssemester)
The subquery was returning multiple rows. This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-08 14:34:16 +02:00
Cris cbf4cd14e5 Added column 'Status' (last Anrechnungstatus) in FAS Anrechnung tab
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-08 13:15:11 +02:00
Cris 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
Cris 587796e374 Usability: Gendered StudentIn; Changed first table column to bold text
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 15:52:06 +02:00
Cris 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
Cris bd2727fa02 Fixed: Now trimming text when copying lectors reason to STGLs reason for rejection
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 11:59:32 +02:00
Cris 343b7a3087 Adapted Controller to use library method getLectors()
...instead of redundant private method.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 11:59:13 +02:00
Cris b5ba81b26e Added fixed column width to tables
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 11:49:42 +02:00
Andreas Österreicher 45a78b7700 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2021-04-06 16:56:53 +02:00
Andreas Österreicher f681827e5d Personalmeldung Formatierung von Dezimalwerten korrigiert 2021-04-06 16:56:19 +02:00
Cris 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
Manfred Kindl 5bc0f544f9 Neuer Tablesorter 2021-04-02 14:02:01 +02:00
Manfred Kindl 38919da730 Attribut studienplan_regelstudiendauer ergänzt 2021-04-02 13:55:41 +02:00
Manfred Kindl 642561a67d Merge remote-tracking branch 'origin/master' 2021-04-02 13:47:22 +02:00
Cris 5dafb3447b 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 14:25:15 +02:00
Cris fdf53ea3eb Modified: Now user gets back error message if upload failes
...instead of hard program exit

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-01 14:15:02 +02:00
cris-technikum 7fab658954 Merge branch 'master' into feature/Anrechnungen_NEU 2021-04-01 13:29:14 +02:00
Cris 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
Andreas Österreicher 803076d7d2 Merge branch 'feature-12337/nationenliste_sortieren' 2021-03-31 15:37:41 +02:00
Cris 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
Cris 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
Cris 9ee473d9bd Usability: Added Link to Anrechnungen in CIS LV Menu (for lectors)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-30 16:41:02 +02:00
cris-technikum 3366cf224b Merge branch 'master' into feature/Anrechnungen_NEU 2021-03-30 14:04:03 +02:00
Cris 7690a122b8 Refactored: Moved getAnrechnungstatusbezeichnung to AnrechnungLib
This method retrieves the Anrechnungstatusbezeichnung in the users language.
It is used multiple times -> moved to library.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-30 13:57:43 +02:00
Andreas Österreicher 96bdafbda8 Merge branch 'bugfix-12144/Bewerberstatistikmail_HTMLError' 2021-03-30 12:20:08 +02:00
Cris 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
Cris 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
Cris c455778731 Fixed: Added formatted download-document-link after application was done
After refactoring the code and doing the application via AJAX call, the
document-download-link must be created on ajax success. This was missing
and is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 17:50:19 +02:00
cris-technikum 2c091cd405 Fixed: Recommendation button was not enabled correctly after withdrawing approvement
Now, if approvment is withdrawn, the recommendation button is enabled again
ONLY if no recommendation was submitted until yet.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 13:05:27 +02:00
Cris 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
Cris f9cbd9caf5 Refactored code
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 16:51:11 +01:00
Cris faf253c159 Adapted to keep individual filters by opening views in new tabs
When Detail Views were opened within the same browser window, individual
filters of the overview site were lost when returning to the overview.
Fixed by opening detail views in new tab.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 16:41:41 +01:00
Cris 3ba4229eed Refactored Students View + Controller
. Now application is done via AJAX call.
. Now messages are returned to user instead of hard exits.
. Now formatting status on client side, not on serverside.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 15:06:47 +01:00
Manfred Kindl d4ef17c183 Merge remote-tracking branch 'origin/master' 2021-03-25 13:27:36 +01:00
Manfred Kindl 0c32ecac11 Umbenennung Inskriptionsbestätigung zu "Studienbestätigung" 2021-03-25 13:27:12 +01:00
Cris 4450f5a473 Removed unnessessary code
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 12:14:26 +01:00
Cris 997f6f406b Fixed: Now application can only be done for actual study semester
Before student could apply for past study semester, which should not be
possible. Fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-24 17:16:17 +01:00
Cris 683e9ffdda Modified to request recommendation (+send mails) ONLY if LV has lectors
Modifications done for STGL Overview and Detailview

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-24 16:22:56 +01:00