blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,245 Commits 217 Branches 6 Tags
bhdev_rollup
Commit Graph
657 Commits
Author SHA1 Message Date
Cris 907ecca333 Added coloured status alert in students view 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-29 11:55:27 +01:00
Cris 7d0ff4fcee Added check, when STGL tries to request recommendation for already recommended Antraege 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-26 13:56:34 +01:00
Cris aefd0842db Added tooltip for unselectable Anrechnungen 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-25 18:18:13 +01:00
Cris 1b00ae78b4 Created Anrechnungen LektorInen: GUI, Controller, Tabledata, Phrases 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-25 17:07:39 +01:00
Cris 8a03ccab5d Visibly greyed rows that are unselectable (at start and on update) 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-21 11:19:11 +01:00
Cris 99db4ec3ce Adapted empfehlung to be human readable 
ja/nein/- instead of boolean/null

Signed-off-by: cris-technikum <[email protected]>
 2021-01-21 11:08:57 +01:00
Cris 47c8432faf Added filter buttons to STGL Anrechnungen 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-21 10:51:22 +01:00
Cris 9e5b03b2dc Adapted Select-all-button to select only Anrechnungen progressed by STGL 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 19:16:17 +01:00
Cris 97d86cc702 Added logic & GUI adaptations for requesting recommendations 
. Added request recommendation-methods in Controller and Library

Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 19:07:33 +01:00
Cris 9a0ea02e0c Minor code enhancement 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 19:03:53 +01:00
Cris f0ef091c5f Added logic & GUI adaptations for rejecting Anrechnungen 
. Added rejecting-methods in Controller and Library

Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 11:48:07 +01:00
Cris 4ed786d65a Added promise check (browser compatibility) and redrawing table on resize 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 11:03:47 +01:00
cris-technikum 964bd40c14 Added logic & GUI adaptations for approving Anrechnungen 
. Added approve-methods in Controller and Library
. Added row selection checks to avoid selecting approved and rejected
Antraege

Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 11:02:15 +01:00
Cris b5dd85f2a6 Created Anrechnungen STGL: GUI, Controller, Tabledata, Phrases 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-19 14:43:32 +01:00
Andreas Österreicher 0738f28144 Merge branch 'master' into feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen 2020-11-25 14:52:22 +01:00
Andreas Österreicher ef3b86af4a Merge branch 'feature-10176/Diplomasupplement_Auslandsaufenthalt' 2020-11-09 08:27:01 +01:00
Cris 17251de9b0 Shelf TableWidget.js for new branch 
Signed-off-by: Cris <[email protected]>
 2020-10-01 11:50:56 +02:00
alex 0153364885 Prüfungsprotokoll Freigabe: passed data to controller in better way (password and freigegeben bool in a separate object) 2020-09-15 18:11:37 +02:00
Paolo 65ee03f6ae - Added new constant OPT_MINUTES to FilterWidgetLib 
- Now is it possible to use minutes and hours in the FilterWidget
- LogsViewer tool now displays milliseconds for execution time column
- Changed filters for LogsViewer tool
 2020-09-14 15:01:33 +02:00
alex c2e9d27909 - Pruefungsprotokoll can be saved even when no grade provided 
- removed console log
 2020-06-09 13:09:35 +02:00
Cris 8304b4a1ae Adapted GUI: display user fields in tinymce-editor on doubleclick 
Signed-off-by: Cris <[email protected]>
 2020-06-02 16:31:52 +02:00
KarpAlex 466264befe Prüfungsprotokoll: 
- changed phrases
- added notice  that grade cannot be set when Einverständniserklärung is not checked
 2020-05-29 13:00:31 +02:00
KarpAlex f03ed2f666 Prüfungsprotokoll: 
Verfassungscheck is not checked by default, if no grade filled out
 2020-05-29 10:48:00 +02:00
KarpAlex bc32a643f1 Prüfungsprotokoll: 
- phrases: multilingual database fields shown depending on language (e.g. beurteilung, studiengang,...
- added phrases
- added timepicker css
- if student not in condition, time can still be filled out
 2020-05-28 20:53:21 +02:00
KarpAlex f1a346c545 Prüfungsprotokoll: 
- new fields: beginnzeit, endezeit, Prüfungsantritt
- Einverständniserklärung: if not checked no save possible
- can be saved and freigegeben
- added phrases
 2020-05-28 11:08:38 +02:00
Andreas Österreicher 772c4fa308 Prüfungsprotokoll Übersichtsliste für Vorsitz hinzugefügt 2020-05-28 09:44:52 +02:00
Cris 1be1d1c8e9 Added GUI for 'Eigene Felder' + layout adaptations 
. GUI: added multidropdown 'Eigene Felder', which contains fields of
the logged in user
. Layout: Message text area has now min and max height; sending
button now aligned correctly; multidropdowns now aligned to text area

Signed-off-by: Cris <[email protected]>
 2020-05-27 11:48:05 +02:00
Cris 67a5fe82e7 Fixed: Now column-picker activates/deactivates correctly column buttons 
Before the problem was using the pseudoclass 'active'. Now, by using
a css class instead, it works.
Also, before when clicking the button twice (activate/deactivate) - it
was always on focus (and therefore always grey). Also fixed.
 2020-05-05 16:07:48 +02:00
Andreas Österreicher b7a9f139af Merge branch 'review/DigitaleLehrauftraege' 2020-05-05 08:03:13 +02:00
Andreas Österreicher ec884fe372 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-04-21 15:59:09 +02:00
Cris a0bb912f8d Fixed: typo error in accepted-tooltip 
Now phrase is retrieved correctly
 2020-04-21 13:36:32 +02:00
Cris 67a29b2ff7 Moved Tablesettings-Helptext to server (using phrases-system) 2020-04-20 14:58:24 +02:00
Cris 637dbefce0 Removed user_language property from FHC_JS_DATA_STORAGE_OBJECT 
To persist on a consistent translation system, the translation should be
performed by phrases system on serversite.
Therefore the user_language property is removed from
FHC_JS_DATA_STORAGE_OBJECT.
 2020-04-20 14:55:01 +02:00
Andreas Österreicher cee3d7bdd3 Merge branch 'feature-5883/DigitalerLehrauftrag_ColumnPicker' into review/DigitaleLehrauftraege 2020-04-17 09:33:32 +02:00
Andreas Österreicher b89ccf2595 Merge branch 'feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege' into review/DigitaleLehrauftraege 2020-04-17 08:54:21 +02:00
Cris aaaa5f52ae Added Multilingualism to all Lehrauftraege tooltips 2020-04-02 17:07:04 +02:00
Cris b960a5ec58 Added Multilingualism for Tablewidget: Help / GUI items 
Shorter phrases are realised via FHC_PhrasesLib.
Longer text (including HTML tags) are realised by
. first retrieving language of FHC_JS_Storage_Object
. then switching to corresponding language text while rendering.
 2020-04-02 15:53:06 +02:00
Paolo 299f16dd8c - View system/messages/ajaxWrite added new button backButton 
- Added new function backToInOut to public/js/messaging/write.js
- Assigned function backToInOut to backButton click event
- Added new phrase backToReadWeiteMeassage to system/phrasesupdate.php
 2020-04-01 18:27:10 +02:00
Paolo a2c9954a6d - FAS_UDF->index declared missing array data 
- public/js/UDFWidget.js changed save button caption to "Speichern"
 2020-03-31 20:40:41 +02:00
Paolo 91d78066a4 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-03-31 20:33:01 +02:00
Cris 76afc73c49 Fixed: Now Projektbetreuer are selectable again 
Before Projektbetreuer, that should be selectable in ordering process,
were excluded from selection. This is fixed now.
 2020-03-31 11:50:11 +02:00
Cris 9d4482767b Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren 
# Conflicts:
#	public/js/lehre/lehrauftrag/acceptLehrauftrag.js
#	public/js/lehre/lehrauftrag/orderLehrauftrag.js
 2020-03-31 09:57:24 +02:00
Cris e272975a17 Changed / Adapted Dropdown PDF Download for Lehrauftraege 
Changed:
GUI. Now using Dropup button instead of 2 single buttons to give
clarity and ability to add more pdf download in a single point.

Adapted:
GUI and JS now adapted to newer GUI version (after merging column picker
branch into feature branch)
 2020-03-30 19:10:59 +02:00
Cris f4747e431c Filtered out Lehrauftraege with non-employees and where stunden is 0 (or null) 
Now the initial filter and the new/changed filter will filter out
Lehrauftraege, where no mitarbeiter exist or stunden are not assigned to.

The 'show-all'-filter still displays these Lehrauftraege, but will set
them to unselectable.

A tooltip on the status-icon will show an appropriate
information-
 2020-03-24 17:48:59 +01:00
Andreas Österreicher 1f4722b7a0 - Config hinzugefügt um Lektorenzuordnungen im CIS nur anzuzeigen wenn der Vertrag erteilt wurde 
- Verträge werden erst ab Status erteilt für Lektoren angezeigt
 2020-03-12 19:24:47 +01:00
Paolo da621a2154 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-03-12 11:19:17 +01:00
Andreas Österreicher 5bd9ece44a Merge branch 'master' into feature-5883/DigitalerLehrauftrag_ColumnPicker 2020-03-10 16:59:15 +01:00
Paolo edf7800120 - Controller system/messages/Messages parameters are now retrieved via HTTP POST 
- public/js/messaging/messageWrite.js function parseMessageText now perform a HTTP POST ajax call
 2020-03-02 16:45:04 +01:00
Paolo de62bc0f3d Merge branch 'feature-3716/Messaging_inbox_outbox_user' 2020-03-02 16:13:04 +01:00
Andreas Österreicher 331c90b64b Merge branch 'feature-6079/Infocenter_Freigabe_nach_RT_Anmeldung' 2020-03-02 16:03:28 +01:00