Commit Graph

30 Commits

Author SHA1 Message Date
OliiverHacker 847529d5aa nachname vorname tauschen 2021-05-19 09:03:20 +02:00
Cris c1e4278e71 Changed permission denying - text in 'Lehrauftrag bestellen'
If a permission is correctly set, but the permission is restricted on
organisational units Department or Kompetenzfeld, the error-text gives now
meaningful information about the abort.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-10-13 15:45:37 +02:00
Cris 67a29b2ff7 Moved Tablesettings-Helptext to server (using phrases-system) 2020-04-20 14:58:24 +02:00
Andreas Österreicher b0380f4b64 FilterWidget and TableWidget Pages can now also be access with Readonly Permission 2020-02-07 13:16:55 +01:00
Andreas Österreicher e2f4e35a7f Lehrauftragsverwaltung zeigt per Default das aktuelle Studiensemester statt dem nächsten 2020-02-05 15:25:00 +01:00
Andreas Österreicher b29871be59 Merge branch 'hotfix-5697/DigitalerLehrauftrag_ErrorMessages' 2020-01-15 10:04:17 +01:00
Cris 26228430aa Customized error messages
Before the user got only a general error message ('Systemerror')  when
an error occured. Now the error messages are more individual for better
debugging experience.
2020-01-08 15:46:17 +01:00
Paolo 4e6fc7c607 - Create new function getError in helper hlp_return_object_helper that should just returns retval
- Replace all show_error(getData( with show_error(getError(
- Replace all error($...->retval) with error(getError($...))
- Replace all ->outputJsonError(getData( with ->outputJsonError(getError(
- Replace all show_error($...->retval with show_error(getError($...
- Replace all outputJsonError($...->retval with outputJsonError(getError$...
- Replace all return error($...->retval) with return $...
2019-12-18 18:35:19 +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
Cris 9bf1715cb4 Removed unused code from CTRL Lehrauftrag bestellen 2019-12-12 13:43:07 +01:00
alex 34d736262b added Lehraufträge Lehrendeuebersicht to menu 2019-12-10 15:32:08 +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
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
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 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
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
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
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
Cris ad5309e273 Corrected SQL: bestellt/erteilt/akzeptiert in same row; added mitarbeiter_uid
. Corrected SQL to get bestellt/erteilt/akzeptiert in same row
  Before it was creating new row for each stati, which was wrong.

. Added mitarbeiter_uid column.

. Changed column names for better maintainance and understanding.
  (e.g. row_index instead of id)
2019-09-17 15:54:41 +02:00
hainberg 6b1e225991 Added private methods to send mail when ordering Lehrauftraege
These two methods will send email to 1. authorized Kompetenzleiter or
2. Departmentleiter with data about
. study semester
. study program
. amount of Lehrauftraege
2019-09-12 13:30:04 +02:00
Cris 0703984fa6 Added Controller method orderLehrauftrag 2019-09-12 13:26:29 +02:00
hainberg aad5f7bd5e Amended Lehrauftrag Controller - GUI with Tabulator-table
Amended the Lehrauftrag Controller GUI:
. corrected DB query
. corrected processing of GET-params
. corrected filter of tabulator (LE-ID caused problems -> now LE_ID)
. now stg are retrieved by permission entitlement of user
. implemented Tabulator filter and other properties/functions
. minor GUI adaptations
. added phrase
2019-08-29 14:19:01 +02:00
Cris 157237963b Lehrauftrag Controller [PRE-ALPHA-VERSION]
Started: Building the Lehrauftrag Controller.
2019-08-01 15:45:06 +02:00