Commit Graph

616 Commits

Author SHA1 Message Date
Andreas Österreicher a5fae5f07f Lehrauftragsverwaltung - Berechtigungsprüfung beim Akzeptieren von Lehraufträgen angepasst wenn Lektor mehrere Accounts besitzt 2020-01-08 16:16:49 +01:00
Andreas Österreicher 8f3aadd3e2 Merge branch 'feature-3994/Digitaler_Lehrauftrag' 2019-12-18 16:08:11 +01:00
Andreas Österreicher 2dd540c9e6 Changed Permission for Lehrauftrag-Report from lehre/bestellen to lehre/erteilen 2019-12-18 15:50:30 +01:00
Andreas Österreicher 478bfdb9a0 Navigationwidget can be called without initial Permission 2019-12-13 08:54:49 +01:00
Andreas Österreicher 5b27f29a92 Merge branch 'feature-3994/Digitaler_Lehrauftrag' 2019-12-12 13:54:20 +01:00
Cris 9bf1715cb4 Removed unused code from CTRL Lehrauftrag bestellen 2019-12-12 13:43:07 +01:00
hainberg cde7e82033 Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag 2019-12-11 16:13:04 +01:00
Cris 9911d792e4 Changed: Inkludierte Lehre when not is null AND not 0
Now the return value is also checking against 0.
2019-12-11 15:31:36 +01:00
alex 1a3a56483c Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag 2019-12-10 15:32:31 +01:00
alex 34d736262b added Lehraufträge Lehrendeuebersicht to menu 2019-12-10 15:32:08 +01:00
Cris e8942a69b6 Changed: linking URL to CIS_ROOT now 2019-12-10 12:04:03 +01:00
Cris 72ec67a605 Fixed: errormsg missing data_arr in cronjob is fixed now 2019-12-10 10:26:50 +01:00
Cris bc4bebb39f Minor changes in job MailLehrauftragToApprove
Optimized code, added logInfo.
2019-11-26 14:46:28 +01:00
Cris a93ddfbe3d Added cronjob mailLehrauftraegeToAccept()
This daily job sends information about all lehr-/projektauftraege
approved (and not accepted/cancelled) the day bofore.
Receivers: lectors
2019-11-26 14:44:24 +01:00
Cris 0a335b7627 Added cronjob mailLehrauftraegeToApprove()
This daily job sends information about all lehr-/projektauftraege
ordered (and not approved) the day bofore.
Receivers: Department-/Kompetenzfeldleiter
2019-11-25 08:46:31 +01:00
Andreas Österreicher 617f435a7c Merge branch 'feature-4825/Studiensemester_Studienjahr_anlegen_bessere_Fehlermeldung_wenn_existiert' 2019-11-15 11:08:53 +01:00
Paolo a093d470e4 Fixed merge mistakes in FilterWidget 2019-11-14 15:40:35 +01:00
hainberg cc4baa9dfb Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag 2019-11-12 16:21:38 +01:00
Cris e092a6c33e Minor change: removed unused field 2019-11-12 16:08:10 +01:00
Andreas Österreicher 609adcc431 Dashboard für Lehraufträge hinzugefügt 2019-11-12 16:02:13 +01:00
Cris 9f3c9d5481 Unified default text displayed in Dropdown-Widgets
Now the dropdown widgets used in lehrauftrags-process have all same
look & feel when nothing is (pre-)selected. It will display
'Ausbildungssemester' or 'Studiengang'.
2019-11-12 11:53:57 +01:00
alex 5c21e29a0a - Studiensemester + Studienjahr anlegen: if Studiensemester/Studienjahr to add already exist, more beautiful error message displayed instead of page crash with database error
- renamed methods "saveStudienjahr" and "saveStudiensemester" und Studienjahr and Studiensemester controller to clearer "updateStudienjahr" and "updateStudiensemester"
2019-11-06 16:57:58 +01:00
Cris 9571e1ed7d Changed: Check if HAS INKLUDIERTE LEHRE now done by AJAX within js file
After moving javascript code from the view to an external js file, the
usage of global variable has_inkludierteLehre was causing css issues.

Now the check if lector has inkludierte lehre is an extra method in the
controller which is called by AJAX in the tabulators render-callback
function.
2019-11-05 16:47:36 +01:00
Cris 94506d8a14 Fixed: Corrected icon bestellt instead of icon changed when updating rows
Because of recently commited extra check of stunden/vertragstunden to
determine geaenderte Lehrauftraege correctly, the row update callback
function needed also extra information to format status icon correctly.
This is fixed now.
2019-11-05 16:32:00 +01:00
Paolo 3e5e65bfc4 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag 2019-11-04 16:58:19 +01:00
Paolo ed818c72d9 Merge branch 'master' into feature-4026/TabulatorWidget 2019-11-04 15:08:42 +01:00
Cris 0fc2de2155 Fixed & Secured: Approving LA not causing permission error anymore
Before the organisational unit of the lv was sent via AJAX to the server
and used for checking the permissions on that organisational unit.
This was insecure (post data manipulation) and organisational units were
wrong (prepared string instead of oe_kurzbz).

This is fixed now by serverside check of organisational unit.
(based on given vertrag_id)
2019-10-30 15:05:31 +01:00
Andreas Österreicher 49f7f61273 Merge branch 'feature-3801/Use_different_source_CI_REST' 2019-10-29 15:17:38 +01:00
Andreas Österreicher bc05f32d5e Merge branch 'feature-4164/Markierung_weitergeleiteter_analog_zum_Parken' 2019-10-29 15:04:02 +01:00
Cris 8d2c85734e Adapted Controller to UPDATE also CHANGED HOURS
Up to now changes were identified only by comparing betrag with
vertrag_betrag.
Problem is: when a new Lehrauftrag betrag is set with 0 or NULL and only
hours are set, a later change of hours cannot be identified (as the betrag
and vertrag_betrag do not change). This is fixed now.
2019-10-29 13:16:38 +01:00
Cris 31850ebfa1 Added param validation to Vertrag_model methods & minor code improvement 2019-10-29 10:43:52 +01:00
Cris 438b7b5b9e Moved methods from Vertrag_model to Vertragvertragsstatus_model
Moved out and adapted methods which correspond to Vertragsstatus
from Vertrag_model to Vertragvertragsstatus_model.
2019-10-29 10:41:40 +01:00
Andreas Österreicher 22a517b88d Added LogsViewer to CI Menu 2019-10-29 06:51:36 +01:00
Andreas Österreicher 9e9612d317 Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets' 2019-10-28 16:28:57 +01:00
Cris 720f117312 Added/Extended PERMISSION-checks to Lehrauftraege
Added permission-checks to
. navigation
. controller methods
. tabulator data query
. cancel contract
2019-10-28 16:25:56 +01:00
alex 1971ec8ed1 - Infocenter.php bugfix: GET parameter list is separated by "&" and not by ? (params filter_id, reloadDataset) 2019-10-25 10:20:56 +02:00
Cris 30ef50fa4c Fixed: BIG AMOUNT of Lehrauftrage not causing POST param limit issue anymore
Before the number of params was overflowing POST param limitation of 1000.
Now data is json stringified on clientside to pack all data in only one
string. Adaptations were done also on serverside.
2019-10-24 15:57:50 +02:00
Cris cc28a92205 Added update of status icon directly after bestellen/erteilen/akzeptieren
Now the status icon and row formats are refreshed directly after the
bestell-/erteil-/akzeptieren-button was clicked.

Returning and updating vertrag_betrag in tabulator rows is needed to
detect when geaenderte have been updated and enable correct formatting.
2019-10-21 10:07:23 +02:00
Paolo 7daac696b3 - Renamed controller system/UDF.php to system/FAS_UDF.php
- Renamed view system/udf.php to system/fas_udf.php
- Adapted code with new names
- Added model system/FAS_UDF_model with only FAS functionalities
- Removed FAS functionalities from model system/UDF_model
- Fixed session problems in controller system/FAS_UDF
2019-10-15 15:40:47 +02:00
Cris 5ac6e4f01d Added Ausbildungssemester to CONTROLLER 2019-10-15 08:46:00 +02:00
Cris 1af0ed466b Added UPDATE contract logic to Controller orderLehrauftrag()
If a contract already exist and there is a difference between the
origin contract betrag and the lehrauftrag/projektbetreuer-betrag (after
FAS changes), the contract is updated.
2019-10-11 13:38:58 +02:00
Manfred Kindl 120ffb0319 Merge remote-tracking branch 'origin/master' 2019-10-07 18:59:36 +02:00
Manfred Kindl 753225e39e Studienplan-Sprache für Cronjob correctStudienplan 2019-10-07 18:52:07 +02:00
alex 72a3c2845f tablesorter filters saved in local storage in infocenter Übersicht are not deleted when using zurück button or freigegeben on infocenter details page. 2019-10-07 18:30:06 +02:00
alex 854dcb7cea - Infocenter: dataset in Übersicht is reloaded when clicking on back button from details page. 2019-10-03 16:23:19 +02:00
alex 38ae98cc36 - Infocenter Details: possible to set persons on hold, i.e. person is out of workflow temporalily (e.g. when waiting for info), but this can only be undone manually 2019-10-02 17:19:31 +02:00
alex b5c1285fb4 - Infocenter filter dataset is reloaded anytime Infocenter menu is clicked for Übersicht, Frreigegeben or Reihungstestabsolviert 2019-10-02 15:48:42 +02:00
Andreas Österreicher c0afb92ddc Merge branch 'feature-4190/Cronjobs_log_in_database' 2019-10-02 14:29:53 +02:00
Andreas Österreicher 0dd82d42b3 Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets' 2019-10-02 10:57:58 +02:00
Cris 15370267c6 Minor code and GUI changes
. changed file name lehrauftrag to orderLehrauftrag
. changed order of buttons
Both for consistecy
2019-10-01 08:14:36 +02:00