blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,126 Commits 225 Branches 6 Tags
4ebd5a85bb49cd2ad9b8fd4150057ddecd989a62
Commit Graph

11126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cris 4ebd5a85bb Avoided click event bubbling for nested buttons 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-22 16:12:15 +01:00
cris-technikum cf5ee6afa3 Merge branch 'master' into feature/Anrechnungen_NEU 2021-02-22 16:05:50 +01:00
Andreas Österreicher 4d041023a8 Problem beim Speichern der Lektorenzuordnung behoben wenn Semesterstunden leer sind 2021-02-22 08:49:52 +01:00
Andreas Österreicher f208fbcd4b Merge branch 'feature-11869/testtool_sprache_und_sprachwahl' 2021-02-19 17:15:00 +01:00
Andreas Österreicher d69083eba2 Fixed Typo in Demo Page 2021-02-19 17:13:53 +01:00
Andreas Österreicher b44853d536 Merge branch 'master' into feature-11869/testtool_sprache_und_sprachwahl 2021-02-19 17:13:25 +01:00
Andreas Österreicher ad9de97a8c Merge branch 'feature-10816/log_download_bescheid' 2021-02-19 16:23:07 +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 2723e130f0 Fixed repeating grant privileges on tbl anrechnungstatus to web user 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-18 14:53:03 +01:00
Cris 4b3cf019c3 Fixed flickering popup massage preventing approving AFTER withdrawing a rejection 
This happened because of a conflict between HTML forms native submit behaviour
(automatically refreshing page) and our javascripts submit onclick functions.
Now fixed by setting event.preventDefault() within the js functions.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-18 13:56:15 +01:00
Cris 6d3407c309 Reset deleted filter button in STGL overview (show recommended) 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-18 09:42:16 +01:00
Cris ce2deb32e1 Deleted testuser 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-18 09:32:46 +01:00
cris-technikum b5c9567c01 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 
# Conflicts:
#	public/js/lehre/anrechnung/approveAnrechnungDetail.js
 2021-02-17 19:09:09 +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
Cris d9d71c42ce Added feature to withdraw approvals/rejections for STGL 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-17 18:54:53 +01:00
Andreas Österreicher 577d0f1eb5 Fixed Filename 2021-02-17 15:21:38 +01:00
Andreas Österreicher 0993b94507 Anrechnungen Tooltip korrigiert bei STGL Filter 2021-02-17 11:44:35 +01:00
Andreas Österreicher a02d581d0a Merge branch 'feature/Anrechnungen_NEU' 2021-02-17 08:49:24 +01:00
Cris 734db4a2a8 Granted Web User for tbl_anrechnung_status; Added Sequence Anrechnung Status 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-16 18:22:00 +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
Andreas Österreicher 6522def7a2 Merge branch 'feature/Anrechnungen_NEU' 2021-02-15 11:44:07 +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
ma0048 38220ab772 Logeintrag beim Downloaden eines Bescheides 2021-02-15 08:11:37 +01:00
Andreas Österreicher 2973c9e856 Merge branch 'feature/Anrechnungen_NEU' 2021-02-12 16:14:59 +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
ma0048 ea45ce9934 Sprache und Sprachwahl fixed, wenn kein Studienplan verfügbar ist. 
Ablauf_ID wird nun mitgeschickt
 2021-02-11 11:57:45 +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-technikum 41f8a0e3b3 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 
# Conflicts:
#	system/phrasesupdate.php
 2021-02-10 18:31:26 +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 3cbb1b5c95 Translated STGL and Lectors VIEW to English 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-10 17:26:25 +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 d1537df896 Fixed: Now Nachweisdokument- and Detail-Links clickable after table update 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-09 14:36:29 +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
Andreas Österreicher 8a3096edf1 Merge branch 'feature-11841/studiengang_dropdown' 2021-02-09 08:06:51 +01:00
Andreas Österreicher a39256d21d Merge branch 'feature-11575/anzahl_der_markierten_personen' 2021-02-09 08:03: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