blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 17:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,968 Commits 213 Branches 6 Tags
85ec64876d18ff384fd35642fc2c4bb029195628
Commit Graph

606 Commits

Author SHA1 Message Date
Cris 091d921efa Redesigned and adapted GUI 
Added download, alerts, new layout and styles that fit better to new
adaptations and to other GUIs.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-14 14:16:53 +01:00
Cris 04174d35f5 Added Anrechnungsdata (student, lv and lectors of lv) 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-05 12:19:27 +01:00
Cris e7d9d8859c Created VIEW Anrechnungen for students (CIS) 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2020-12-22 15:43:44 +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
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
Nikolaus Krondraf cb8dd948f0 Ansicht um Mitarbeiter ohne bPk erweitert 2020-08-26 13:10:18 +02:00
Andreas Österreicher bc305dc86c Merge branch 'master' into feature-6656/Worker_queue 2020-08-10 18:11:31 +02:00
Andreas Österreicher 625a95c830 Merge branch 'bugfix-8664/Richtiges_Pruefungsprotokoll_fuer_Incomings_laden' 2020-07-22 14:52:03 +02:00
Andreas Österreicher 712cc635f5 Merge branch 'feature-8743/Alte_Pruefungsprotokolle_ausblenden' 2020-07-22 14:43:01 +02:00
Cris 82c8ca7f80 Adapted logic to display Pruefungsprotokolle of certain time period 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-20 16:50:29 +02:00
Cris 618644d41f Added GUI buttons to display Pruefungsprotokolle of certain time period 
Possible time periods: today / last week / all

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-20 16:48:48 +02:00
Cris 649d0e7f5d Fixed: retrieving correct Prüfungsprotokoll data for Incomings 
Study type (Bachelor/Master) and -kennzahl and -name are retrieved from
Studienordnung. Studienordnung is not assigned to Incomings, so this data
was missing.
. Now study type is always retrieved from Abschlusspruefung.
. If no Studienordnung is provided, studykennzahl and -name are retrieved
from Student.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-07-14 17:40:47 +02:00
Cris ebb6484f3d Chrome-bug: Force Chrome to autofill username in hidden input field 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-06-30 10:04:18 +02:00
Andreas Österreicher c0693b3899 Merge branch 'master' into feature-6656/Worker_queue 2020-06-17 09:03:41 +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
Andreas Österreicher 2fc0b0f0ce Prüfungsprotokoll 
- Löschen von Abschlussarbeiten mit freigegebenem Protokoll wird verhindert
- Berechtigungen für web User erteilt damit protokoll gespeichert werden kann
 2020-05-28 19:36:08 +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 <hainberg@technikum-wien.at>
 2020-05-27 11:48:05 +02:00
KarpAlex 28d0563fa5 Digital Pruefungsprotokoll is displayed for Bachelor/Master, English/German 2020-05-25 18:21:08 +02:00
Andreas Österreicher b7a9f139af Merge branch 'review/DigitaleLehrauftraege' 2020-05-05 08:03:13 +02:00
gerryraab 364d754b51 Anpassung Datumsformat, Darstellung aller RTs des laufenden 
Studienjahres
 2020-04-27 15:52:47 +02:00
Andreas Österreicher ec884fe372 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-04-21 15:59:09 +02:00
Andreas Österreicher b935d7a175 Merge branch 'feature-6814/Infocentertool_nach_dem_RT_hinzugefuegte_Bewerbungen_auf_Detailseite_markieren' 2020-04-21 15:33:11 +02:00
Andreas Österreicher 4679701bcd Merge branch 'feature-6963/Messaging_system_hide_button_to_write' 2020-04-21 15:16:38 +02:00
Andreas Österreicher ebb6e1b90f Fixed Phrasename for Back Button 2020-04-21 15:15:57 +02:00
Cris 989409f860 Created view for acceptLehrauftrag-Helptext (using phrases-system) 2020-04-21 13:31:58 +02:00
Cris 3dacba5625 Created view for approveLehrauftrag-Helptext (using phrases-system) 2020-04-21 13:31:37 +02:00
Cris af8b6ed93d Created view for orderLehrauftrag-Helptext (using phrases-system) 2020-04-21 13:31:13 +02:00
Andreas Österreicher e698485a39 Merge branch 'feature-6634/Neue_Variable_Orgform_Bezeichnung_in_vw_msg_vars' 2020-04-21 11:26:59 +02:00
Cris 67a29b2ff7 Moved Tablesettings-Helptext to server (using phrases-system) 2020-04-20 14:58:24 +02:00
Andreas Österreicher 971e239d8e Merge branch 'feature-5961/DigitalerLehrauftrag_Auszahlungsinfoblatt_externe_Lehrende' into review/DigitaleLehrauftraege 2020-04-17 11:04:37 +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
Andreas Österreicher d5c8077d80 Merge branch 'feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren' into review/DigitaleLehrauftraege 2020-04-17 08:47:16 +02:00
Cris e25bf60bf1 Added GUI and phrase for info sheet for external lecturers 
A new link was set.
. only shown to external lecturers
. links to dms document infoblatt for external lecturers
 2020-04-15 09:51:25 +02:00
Cris 2a99f37508 Added Help-Text (Guide to this page) to orderLehrauftrag & approveLehrauftrag 
Moved text to function_getHelptext, which will switch language depending
on the given user language.
 2020-04-14 13:58:40 +02:00
Cris 262fdc277e Added Help-Text (Guide to this page) to acceptLehrauftrag 
Moved text to function_getHelptext, which will switch language depending
on the given user language.
 2020-04-14 12:52:03 +02:00
Cris db78fa20f3 Added Multilingualism to all Lehrauftraege View GUI-items 
Attention: part of phrases-array is used by javascripts.
(acceptLehrauftrag.js, approveLehrauftrag.js, orderLehrauftrag.js)
 2020-04-02 17:12:36 +02:00
Cris b6f509c057 Added Multilingualism to all Lehrauftraege Tablewidgets' columns fields 2020-04-02 16:33:26 +02:00
Paolo 2a59165332 Added new date format column ReihungstestDate to system/infocenter/infocenterFreigegebenData.php 2020-04-01 18:53:13 +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 e038fa4f34 - system/messages/MessageClient->read now loads view system/messages/ajaxRead with $this->CLMessagesModel->prepareAjaxRead() as parameter 
- view system/messages/ajaxRead.php can hide the button to write new messages
- Added new public method prepareAjaxRead to model CL/Messages_model
 2020-03-31 21:28:16 +02:00
Paolo 91d78066a4 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-03-31 20:33:01 +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 2938e0bdb0 Bugfixed: Removed undefined functions 
After moving functions to Tablewidget.js, these function calls doesnt
exist anymore in the earlier corresponding javascripts. Therefore they
must be removed.
 2020-03-30 19:27:12 +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 eac386496a Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege 
# Conflicts:
#	public/js/lehre/lehrauftrag/acceptLehrauftrag.js
 2020-03-30 12:32:39 +02:00