blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 16:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,836 Commits 211 Branches 6 Tags
2a1a068ee2d495fe5060653b6daf3c22d588ee3e
Commit Graph

333 Commits

Author SHA1 Message Date
ma0048 2a1a068ee2 datum fuers parken nun auf semesterende + 3 monate 2021-11-03 10:51:40 +01:00
ma0048 b74247a7f2 Merge remote-tracking branch 'origin/feature-15314/infocenter_abgewiesen_von_nicht_abgeschickten' into feature/infocenter_anpassungen 2021-10-22 07:13:22 +02:00
KarpAlex 901f9ba7fa Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
 2021-10-13 09:05:05 +02:00
Harald Bamberger 4c74176d64 Merge remote-tracking branch 'origin/feature-14635/UDF_move_permissions_to_JSON_definition' 2021-10-11 12:55:24 +02:00
Paolo 1ebae59292 - Adapted controllers/widgets/UDF->saveUDFs to call UDFLib->saveUDFs without the udfUniqueId parameter 
- UDFLib->saveUDFs changed, the udfUniqueId parameter is retrieved from the session
- UDFLib->saveUDFs changed, the check of the permission is performed by
  the method prepare prepareUDFsWrite called by the DB_Model
- Changed UDFLib->_validateUDFs and public/js/UDFWidget.js to have a
  better error handling and better message errors
 2021-10-11 10:08:58 +02:00
ma0048 4a4c95aa08 auswahl fuer bewerbung abgeschickt ja/nein hinzugefuegt 2021-10-04 12:37:50 +02:00
KarpAlex cb3f3723ae issues table dataset: 
- made more readable for assistance (added vorname, nachname, removed some fields)
- added default filters (all new, last 7 days...)
- issues displayed for children oes of permitted arrays as well
- query: more exact check for prestudents future status by using studiensemester start date
- typo fixes
 2021-09-28 15:57:27 +02:00
KarpAlex 45e4d5576c Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-21 00:59:26 +02:00
KarpAlex 4c21d5364c - added issue management functionality - adding, and displaying issues with filter widget. 2021-09-21 00:58:29 +02:00
ma0048 b6ae992c3c getrennte msg bei freigabe qualikurs und einstieg anderes semester 2021-09-08 11:41:45 +02:00
KarpAlex 493bf0edda Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 2021-09-06 22:35:40 +02:00
Andreas Österreicher 89209a0c27 Problem behoben wodurch Messages im FAS nicht korrekt geladen werden 
konnten
 2021-09-06 09:25:38 +02:00
cris-technikum 58ce5a9132 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-09-01 13:58:48 +02:00
cris-technikum 64eb9eacf4 Added: Automatic Scrolling when Approving/Rejecting multiple Anrechnungen 
Also added Scrolling for Recommending/Not Recommending multiple Anrechnungen

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-08-30 15:36:50 +02:00
Andreas Österreicher 484151bab2 Merge branch 'master' into feature/Anrechnungen_NEU 2021-08-26 11:32:47 +02:00
KarpAlex b9ac73955a Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer 
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
 2021-08-24 01:19:26 +02:00
ma0048 6ff8df6ac3 merged master into anpassung_infocenter 2021-08-18 08:45:28 +02:00
KarpAlex 18bd6f7aa7 Öhbeitrags GUI: 
- possible to edit whole Öhbeitragsrow at once
- added comments
 2021-07-19 19:26:53 +02:00
ma0048 f16ea874db fragt bei den mails auch nun den studiengangtyp ab 2021-07-08 15:47:31 +02:00
cris-technikum 635974fa22 Merge branch 'master' into feature/Anrechnungen_NEU 
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
 2021-07-07 15:05:31 +02:00
ma0048 6246312ce5 bei ergaenzungspruefungen immer eine mail rausschicken und unterscheiden zw englisch und deutsch 2021-06-30 15:24:25 +02:00
ma0048 745ecf4711 zgv pruefung unterscheiden zwischen bachelor und master 2021-06-30 13:29:09 +02:00
ma0048 36507959ac dokumentenpruefung im infocenter in eigenes js ausgelagert, reloaden der anzeige beim nachreichen eines doks 2021-06-30 13:09:56 +02:00
ma0048 67aa887981 anzeige des errors 2021-06-29 14:47:57 +02:00
ma0048 d4d84a93ba Nachreichdatum kann nun auch ueber das Infocenter gesetzt werden 2021-06-29 14:43:19 +02:00
ma0048 8b3df55719 response bei doktyp änderung 2021-06-17 14:08:49 +02:00
ma0048 584a8cf100 abfrage auf null beim objekt hinzugefuegt 2021-06-16 12:48:32 +02:00
ma0048 934248aa0e Merge branch 'feature-12178/message_bei_master_freigabe' into feature-13277/anpassung_infocenter 2021-06-16 09:26:30 +02:00
ma0048 8fa40a843b Merge branch 'feature-11001/zgv_ueberpruefung' into feature-13277/anpassung_infocenter 
# Conflicts:
#	application/controllers/system/infocenter/InfoCenter.php
#	application/views/system/infocenter/dokpruefung.php
#	application/views/system/infocenter/infocenterData.php
#	application/views/system/infocenter/infocenterFreigegebenData.php
#	application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
 2021-06-16 09:26:03 +02:00
cris-technikum 179299443b Bugfixed: Genehmigungsbuttons now working directly after withdrawing 
Before buttons were not working, if genehmigungsbuttons were immidiately
used twice. (e.g. approving - withdrawing - rejecting). This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-06-10 10:39:18 +02:00
cris-technikum 5cc98562e3 Added focus on filterbutton, if table starts with stored filter 
Because tabulators persistentFilter = true, the table is initialized with
the stored filter. Therfore probably less data was shown, but was not
clear, because the corresponding filterbutton was not focused.
Now the button is focused depending on the filter detected.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-06-10 09:37:16 +02:00
KarpAlex b206c019df Oehbeitrag GUI: correct decimal format conversion before after update 2021-06-09 01:34:47 +02:00
ma0048 8a870fb4c8 reihungstest msg unterscheiden zwischen deutsch, englisch & bachelor & master 2021-06-07 12:07:34 +02:00
KarpAlex 5944938052 Oehbeitraege GUI: correct table sorting and refreshing of tablesorter 2021-06-01 15:18:54 +02:00
KarpAlex df8c946bb2 enabled updating of oehbeitrag values 2021-05-31 23:20:56 +02:00
ma0048 6550fb6301 wording angepasst 2021-05-31 13:29:13 +02:00
ma0048 36f52cf3cc dokumententyp kann nun im Infocenter geaendert werden und zgv master wird angezeigt 2021-05-31 13:20:45 +02:00
KarpAlex 4b237cbc7f oehbeitrag versicherung: possible to display and add Oehbeitraege and Versicherungsbeiträge per semester 2021-05-28 02:12:55 +02:00
cris-technikum b7939f645e Fixed width exceeding table columns, when containing large text 
In some cases table columns were exceeding the table width. Fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-05-26 19:57:23 +02:00
ma0048 f05493d3f3 modal und check hinzugefuegt 2021-05-20 09:33:08 +02:00
cris-technikum 8f93ab5927 Bugfixed TabelWidget: Ausgewählte Zeilen now displaying amount correctly 
Added 'typeof' to correctly check against 'undefined'. Before it was
checking against string.

Also corrected all other occurences.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-05-19 17:08:26 +02:00
ma0048 0d4bf432e2 deleted console.log 2021-05-12 14:00:45 +02:00
ma0048 ffa7abdf5a standardtitel hinzugefuegt 2021-05-12 13:52:19 +02:00
ma0048 2c6d8937f6 funktion hinzugefuegt um mehrere bewerber abzuweisen und status wird nur angezeigt wenn aktiv 2021-05-12 12:48:29 +02:00
Cris 842651e676 Added button 'Antrag jetzt bearbeiten' to 'Antrag anlegen' 
The button 'Antrag jetzt bearbeiten' will appear right after creating
a new application, so that the user can directly open the new application
in a new tab.
The button disappears when selecting a new student again.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-05-05 17:03:42 +02:00
ma0048 062ff74b03 Mails bei freigabe zum RT und Freigabe an Studiengang fuer Master hinzugefuegt 2021-05-04 22:09:47 +02:00
Cris a50a666d11 Added Antragssperre for Noten, that are defined in config array 
. Added new config file
. Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.
. Adapted GUI to process data via JS only

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-05-03 16:17:23 +02:00
Cris d23faa6e96 Usability: Avoided manually scrolling when recommending/approving on Detailsite 
...for STGL and lectors Detailview.
Before the downsliding panel was sliding above the window screen, so that
user was forced to scroll down the page. Now it scrolls up by itself.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-05-03 10:50:52 +02:00
ma0048 7c02e0247d Merge branch 'feature-12010/filter_for_bachelor_master' into feature-11001/zgv_ueberpruefung 2021-04-29 10:55:35 +02:00
ma0048 0b5ae2df9c Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung 2021-04-29 10:53:00 +02:00