Commit Graph

52 Commits

Author SHA1 Message Date
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
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
KarpAlex 28d0563fa5 Digital Pruefungsprotokoll is displayed for Bachelor/Master, English/German 2020-05-25 18:21:08 +02:00
Cris f45f4f6987 Fixed check for external lector to display / hide infosheet correctly 2020-05-13 17:13:42 +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
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 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
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
Cris 98bb9987da Now inkludierte Lehre also checking former (past) BIS Verwendungen
This allows display of column 'Betrag' in Lehraufträge annehmen.
(Important for external lectors, who want to see Betrag of their new
Lehrauftraege. They usually don't have active BIS Verwendung at the
beginning of each term, therefor last (past) BIS Verwendung needs to be
checked)
2020-01-29 09:55:59 +01:00
Andreas Österreicher b29871be59 Merge branch 'hotfix-5697/DigitalerLehrauftrag_ErrorMessages' 2020-01-15 10:04:17 +01:00
Andreas Österreicher 3600f18cd0 Merge branch 'feature-5131/FilterWidget/TableWidget_reloadDataset_true_by_default' 2020-01-15 08:05:54 +01:00
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
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
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 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 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
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
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
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 4ad2fe7dfb Changed permission check: now using lehrauftrag_akzeptieren 2019-09-30 15:27:12 +02:00
hainberg 83dd828be7 Minor adaptation to changed method isMitarbeiter() 2019-09-25 14:13:16 +02:00
Cris d7cbc89d8b Added password validation to accept Lehraufträge in view & controller
. added password input field in view
. added password check in controller
. adapted ajax data object and logic to handle password check
2019-09-25 12:15:19 +02:00
Cris 30c60881a7 Changed check for inkludierte Lehre
Now inkludierte Lehre returns false when value is null (= freelancer
lector), else true (= fix employed lector)
This impacts the visibility of the column 'Betrag': hidden for fix
employed lectors, shown for freelancer lectors.
2019-09-25 09:53:52 +02:00
Cris 43452a2127 Hided column 'Betrag' if lector has inkludierte Lehre
If the lectors actual Verwendung has inkludierte Lehre, the tabulators
column betrag is hided.
2019-09-24 16:10:23 +02:00
Cris 9325edd326 Created Controller to accept Lehraufträge
Created index- and acceptLehrauftrag methods.
2019-09-24 10:06:03 +02:00
Cris efd5ae6411 Created Controller to approve Lehraufträge 2019-09-19 13:13:03 +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