blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-01 10:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,123 Commits 229 Branches 6 Tags
d53f14eeea259004d2ccef8aef7f5caecfececce
Commit Graph

12123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KarpAlex 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
manu 07f483f3bf Ergänzung tablesorter 2021-04-08 19:13:19 +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
ma0048 88dbd77a95 bug gefixed, akzeptieren von mehreren sonstigen dokumenten nun ohne fehlermeldung moeglich 2021-04-08 09:43:36 +02:00
KarpAlex e254dfba54 Merge branch 'feature-10963/Beurteilungsformular_datenbankanpassungen' of https://github.com/FH-Complete/FHC-Core into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-07 18:01:30 +02:00
KarpAlex c2f74b1bba - mail to Zweitbegutachter after student upload is only sent when it is the endupload 
- removed comments
 2021-04-07 18:00:10 +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
manu 96ba02bd69 bst_zeit ins Downloaddokumentenarray übernommen 2021-04-07 09:55:55 +02:00
Andreas Österreicher 170b2485d3 Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-06 18:06:30 +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
ma0048 42d2f45561 bei den anmerkungen studiengang hinzugefuegt 2021-04-06 13:51:27 +02:00
ma0048 acdfdc028b zgv beim master nur updaten wenn es sich um einen master handelt 2021-04-06 12:31:46 +02:00
ma0048 84e7d95e34 changed from select to links 2021-04-06 11:47:14 +02:00
OliiverHacker 48105425fc Edit Studienblatt in Englisch für AbbrecherInnen 2021-04-02 15:35:36 +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
OliiverHacker 3644cc690c Put Checks from xml to xsl for Abbrecher 2021-04-01 21:28:27 +02:00
OliiverHacker 131ec0e33c change buchbar to zeitaufzeichnung 2021-04-01 18:29:19 +02:00
OliiverHacker 8a672780b2 Fix Typo in Anzahl MA 2021-04-01 18:13:58 +02:00
OliiverHacker 5cdc7f9542 Revert "impiment different text" 
This reverts commit 9bf8d58a
 2021-04-01 18:09:46 +02:00
OliiverHacker 3e7f75b43f fix merge conflic at dbupdate_3.3 2021-04-01 14:48:56 +02:00
OliiverHacker a6989fff11 Revert "impiment different text" 
This reverts commit 9bf8d58a
 2021-04-01 14:44:28 +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
OliiverHacker c54e934db9 Revert "impiment different text" 
This reverts commit 9bf8d58a
 2021-04-01 13:49:01 +02:00
OliiverHacker d66fc6e493 Merge branch 'master' into 9503/csvExportProjektÜbersicht 2021-04-01 13:43:40 +02:00
OliiverHacker eb1dabfc03 Merge branch '9503/csvExportProjektÜbersicht' of https://github.com/FH-Complete/FHC-Core into 9503/csvExportProjektÜbersicht 2021-04-01 13:38:42 +02:00
OliiverHacker 1a75666f01 rollback before merge and keep Überlappend fix in Zeitaufzeichnung 2021-04-01 13:36:02 +02:00
cris-technikum 7fab658954 Merge branch 'master' into feature/Anrechnungen_NEU 2021-04-01 13:29:14 +02:00
KarpAlex 2493cc57d4 abgabetool lektorview: decreased header table height 2021-04-01 09:48:49 +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
KarpAlex 9120268290 moved down icon with quickinfo for Tokensend 2021-04-01 02:34:13 +02:00
KarpAlex 2850d0e5d8 "beautified" abgabetool page (lektorenansicht) 
- moved Zweitbetreuer Text
- added icon with quickinfo for Tokensend instead of button with text
- disabled grading button and quickinfo instead of text for older Projektarbeiten
 2021-03-31 23:45:17 +02:00
OliiverHacker c37fb8836d implement functionallity for phase 2021-03-31 19:14:01 +02:00
OliiverHacker 1b38b1adca add functionality of buchbar to project overview 2021-03-31 18:22:56 +02:00
OliiverHacker 09a5072a4a db update 2021-03-31 18:21:12 +02:00
ma0048 7f713670b5 fixed recht 2021-03-31 17:57:35 +02:00
ma0048 6c6a4f6cc2 fixed for student 2021-03-31 17:52:15 +02:00
Andreas Österreicher 803076d7d2 Merge branch 'feature-12337/nationenliste_sortieren' 2021-03-31 15:37:41 +02:00
FHBGLD 047129de67 Update CHANGELOG.md 2021-03-31 15:16:22 +02:00