blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 01:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,871 Commits 216 Branches 6 Tags
c8ebcdf5a12702c6949c19ea5040093bd3feb02e
Commit Graph

1967 Commits

Author SHA1 Message Date
ma0048 287cddf926 added zgv ueberpruefung 2021-03-23 09:25:24 +01:00
Cris 3a0720e4de Changed: If LV has no lectors, show empty field instead of error message 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-22 17:28:29 +01:00
Cris 00656efaef Changed filename on download to 'Anrechnungsantrag_OrgForm_LVID_VornameNachname' 
Adapted STGL and lectors views to change the filename on download event.
All download functions moved from view to library.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-22 12:12:04 +01:00
Cris 050eef120c Adapted download function in DMSLib to accept params filename and disposition 
. Filename: uses given string as filename. Otherwise upload filename is used.
. Disposition: inline (open in new tab), attached (download dialog box)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-22 12:08:57 +01:00
cris-technikum 41e8b4094e Merge branch 'feature-11970/AnrechnungJob_MailToSTGL' into feature/Anrechnungen_NEU 2021-03-18 10:58:57 +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 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
KarpAlex ee7d51d2b3 Pruefung_model.php: method for retrieving Prüfung by person and studiensemester 2021-03-15 23:27:28 +01:00
KarpAlex 5f187b5293 Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-03-07 21:44:56 +01:00
KarpAlex 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
cris-technikum 616cfaaf41 Merge branch 'master' into feature/Anrechnungen_NEU 2021-02-23 14:21:47 +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
Andreas Österreicher 581a4c33a4 Merge branch 'feature-11690/SAPByD_User_Update_Request_Limit' 2021-02-23 08:48:30 +01:00
Andreas Österreicher cb4f22141d Merge branch 'feature-11142/Reihungstest_aufgenommene_bei_Neupriorisierung' 2021-02-23 08:36:53 +01:00
Cris 9a3addd79d Removed comments on 'if (! defined('BASEPATH')) exit('No direct script access allowed');' 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-18 14:59:11 +01:00
Cris ce2deb32e1 Deleted testuser 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-18 09:32:46 +01:00
KarpAlex eb95421ff9 ReihungstestJob.php: formatted sql 2021-02-18 04:26:54 +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
Andreas Österreicher 577d0f1eb5 Fixed Filename 2021-02-17 15:21:38 +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
Paolo 94d335600c - Added new protected method getOldestJob to JQW_Controller 
- Added new public method getOldestJob to JobsQueueLib
 2021-02-16 21:21:11 +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
Cris 86a065d0d6 Fixed: Now checking user by prestudent_id to entitle to read DMS document 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-16 16:31:42 +01:00
Andreas Österreicher fec8fbb6d4 Anrechnungen - Mail Empfänger korrigiert bei Personen mit mehreren Accounts 2021-02-16 09:46:50 +01:00
Andreas Österreicher 3366f091dd Anrechnungen - Fixed Details Page for People with multiple Accounts 2021-02-15 21:12:14 +01:00
Andreas Österreicher 4d81f91840 Problem behoben wodurch falsche Anrechnungen geladen wurden 2021-02-15 16:44:34 +01:00
Cris acec92fa2b Adapted mail message for students (different text for approved/rejected) 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-15 11:26:59 +01:00
KarpAlex da4e913a38 ReihungstestJob.php: 
- studiensemester is passed as parameter
- info mail is sent to lower priority when higher priority is cancelled (abgewiesen)
- info mail is sent to master studiengänge as well if higher prio is cancelled/aufgenommen and there are other bachelor prestudenten in same semester
 2021-02-13 00:37:33 +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
Cris 81151025da Fixed non-existing phrases 
. anrechnungNichtEmpfehlenAsk
. empfehlungNegativ

The phrases did not exist anymore, they got new name. Now fixed.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-09 14:54:32 +01:00
cris-technikum 3eecd74b1f Merge branch 'master' into feature/Anrechnungen_NEU 2021-02-09 10:54:28 +01:00
cris-technikum 6e689ce657 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-02-09 10:53:41 +01:00
Cris c69188dffe Corrected typos in name that caused button not being disabled 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 18:25:27 +01:00
Cris 17ae1b144c Corrected: Now correct text for confirmed positive recommendation 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 18:13:50 +01:00
Cris 2a59d2464b Uncommented tooltips for genehmigung/empfehlung 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 18:07:40 +01:00
Cris 77774e8cec Corrected STGL permission check to check against UID 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 18:01:06 +01:00
Cris 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
Cris 25400d8b5f Removed updateamum/updatevon when updating Anrechnungmodel 
They are not needed. Just confusing.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 17:25:34 +01:00
Cris 494cf1f688 Changed style & flow of approve/reject/recommend/dont recommend 
This was done for better clarity in workflow.
Now, when clicking on approve/reject/recommend/dont recommend - button,
this will always lead to second panel. In that one the user may leave
a reason, but in any case the user need to CONFIRM (or break) the action.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 17:19:58 +01:00
ma0048 8c666ceef2 Studiengang Dropdown angepasst 2021-02-08 17:09:34 +01:00