blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 10:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,618 Commits 216 Branches 6 Tags
8a417e5cb8fb0c5b37cfb136dd6deea6d53befd7
Commit Graph

744 Commits

Author SHA1 Message Date
ma0048 d490eb4323 freigabe nur fuer den bachelor 2021-04-29 11:12:48 +02:00
ma0048 5fff866363 Merge branch 'feature-4836/studiengang_der_anmerkung_ergaenzen' into feature-11001/zgv_ueberpruefung 2021-04-29 10:55:51 +02:00
ma0048 7c02e0247d Merge branch 'feature-12010/filter_for_bachelor_master' into feature-11001/zgv_ueberpruefung 2021-04-29 10:55:35 +02:00
ma0048 0b5ae2df9c Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung 2021-04-29 10:53:00 +02:00
Cris 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
ma0048 c9bd10c3d0 zgv ueberpruefung bug fixes 2021-04-28 16:53:43 +02:00
Cris cafd72e51d Removed accaptance of FormData object within AjaxLib controllerParameter check 
Also adapted JS files to this change.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-28 15:53:17 +02:00
Cris 5f7672d9df Adapted Anrechnungen-files to use AjaxLib for uploading files 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-27 17:39:45 +02:00
Cris 731c5b9461 Added link 'Neuen Antrag anlegen' in STGL Overview Site 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-21 13:37:43 +02:00
Cris 6dca00e4e5 Corrected query to retrieve only prestudentstatus 'students' 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-20 18:45:43 +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
ma0048 bc7e3c5cc5 zgv ueberpruefung hinzugefuegt 2021-04-20 13:51:41 +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 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 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 b5ba81b26e Added fixed column width to tables 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-07 11:49:42 +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
ma0048 42d2f45561 bei den anmerkungen studiengang hinzugefuegt 2021-04-06 13:51:27 +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
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
ma0048 9b57248007 zgv auch bei master uebernehmen 2021-03-31 13:12:20 +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 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-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 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
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
ma0048 287cddf926 added zgv ueberpruefung 2021-03-23 09:25:24 +01:00
Cris 9b396eea4e Added columns Organisationsform and Ausbildungssemester to STGL Overview table 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-18 10:57:49 +01:00
Cris d345cbb43b Added 'Zurücknehmen'-button for recommendation in STGL Detail View 
Requested recommendations can now be withdrawn.
Now a button 'Zurücknehmen' is displayed as long as the Anrechnung
is processed by the lector and only as long the lector has not provided
a recommendation.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-18 10:55:58 +01:00
Cris 83b1286e08 Added column Antragsdatum to STGL/Lector Overview 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-23 14:21:21 +01:00
Cris 6446e424a9 Fixed: Now all buttons have a type (button / reset) 
+ belonging adaptations in JS:
. removed e.preventDefault as no longer needed with button type=button
. removed empty text value settings with button type=reset

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-23 11:27:03 +01:00
Cris 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
ma0048 935b370166 added filter for bachelor and master 2021-02-17 15:07:09 +01:00
Andreas Österreicher 0993b94507 Anrechnungen Tooltip korrigiert bei STGL Filter 2021-02-17 11:44:35 +01:00
Cris 241fb34b23 Added filter button to STGL Overview (filter: show all progressed by STGL) 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-16 18:04:27 +01:00
Cris 1ca22970a9 Adapted: Show only applications that were requested for recommendation 
Change in lectors overview.
Now lectors only get Anrechnungsanträge, where the STGL had requested
a recommendation.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-16 17:37:14 +01:00
Andreas Österreicher 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
Cris d44c526ba4 Minor changes 
. phrases
. GUI

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-11 16:37:44 +01:00
Cris 6dea79180c Adapted tables' boolean headerfilter to be used with strings 
i.e. entering 'yes' will filter all truish entries

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-11 16:06:20 +01:00
Cris c23a3bdac9 Fixed button breaking line in smaller devices; now all buttons inline 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-11 11:52:57 +01:00
Cris eaf902c528 Adapted tooltips for Students VIEW, minor change of phrase text 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-11 11:36:38 +01:00
Cris c0843e9506 Translated STGL and Lectors VIEW to English 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-10 18:25:48 +01:00
Cris c82ebaf678 Translated Students VIEW to English 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-09 16:31:32 +01:00