Commit Graph

12123 Commits

Author SHA1 Message Date
Andreas Österreicher e6a761abd7 Darstellungsfehler in OE-Widget behoben 2020-10-15 13:38:01 +02:00
Cris 7fe2f3ef39 Adapted span-width of date in each tablerow
Allows nice align of error messages.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-10-15 11:03:16 +02:00
OliiverHacker 14fa1b24ad Display Full Name instead of Email Adress of Supervisor 2020-10-14 13:23:19 +02:00
OliiverHacker df667b1eec merge 2020-10-14 12:44:32 +02:00
alex a6e77b73c8 Merge remote-tracking branch 'origin/master' 2020-10-13 18:32:27 +02:00
alex 15877dd914 Lehrveranstaltung_model getStudents: possible to get only active students 2020-10-13 18:32:09 +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
OliiverHacker 4ced199e88 Freigegebenen Urlaub löschen auch in Zeitsperren 2020-10-13 12:26:06 +02:00
OliiverHacker 5802ca8ea2 versende Email an Vorgesetzten wenn freigegebener Urlaub gelöscht wird 2020-10-13 09:26:06 +02:00
OliiverHacker 6128a7ae6e add X to delete approved vacation 2020-10-12 15:31:37 +02:00
Andreas Österreicher 2a09e1af8a Verhindert dass Matrikelnummern angefordert werden für Studiengänge mit Kennzahl > 10000 2020-10-07 08:57:12 +02:00
Unknown cd3557ed98 Zeitsperretyp kurzbz in DropDown entfernt 2020-10-05 17:34:28 +02:00
Andreas Österreicher 5e4107fa4f Added Permission to edit Payments that are already transfered to external System 2020-10-02 15:00:57 +02:00
Cris 17251de9b0 Shelf TableWidget.js for new branch
Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-10-01 11:50:56 +02:00
Cris c8bd604fe2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2020-10-01 11:17:41 +02:00
Cris 388a266822 Modified Dropdown-Widget Organisationseinheit
Modified to enable empty default-value and default text.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-10-01 11:17:14 +02:00
OliiverHacker c485400142 user is able to delete approved vacation if in the future 2020-09-29 14:56:15 +02:00
Nikolaus Krondraf 51c4e1f92b zeige keine Prüfungstermine wo positive Note vorhanden ist 2020-09-25 13:00:41 +02:00
OliiverHacker 08536d63df display Full Name of Supervisors for vacation reqeust 2020-09-25 12:19:18 +02:00
OliiverHacker f672cd2d53 user can enter project with projectphase even if not assigend to project 2020-09-24 11:14:32 +02:00
OliiverHacker 3d274645ac correct user 2020-09-24 08:52:33 +02:00
OliiverHacker 14fbfc7860 diplay date in error message 2020-09-24 08:48:59 +02:00
Nikolaus Krondraf 52fe60090e zeige keine Prüfungstermine wo Note vorhanden ist 2020-09-24 08:25:28 +02:00
Andreas Österreicher b62a2007af Schlagwortdienst auf HTTPS geaendert 2020-09-23 16:33:14 +02:00
OliiverHacker 16fb610b3f impliment checks for ProjektPhase 2020-09-23 14:24:17 +02:00
OliiverHacker 4183e7f4f7 changed errormessage for projects that are already complited 2020-09-23 13:44:46 +02:00
OliiverHacker 49fb4d8afa sort csvExport 2020-09-23 13:16:07 +02:00
OliiverHacker 85c6aa08fc fix bug for empty projekt and projektphasen 2020-09-23 12:45:00 +02:00
Andreas Österreicher 0a63d40e72 Merge branch 'bug-9862/inventarStauts' 2020-09-23 10:24:26 +02:00
OliiverHacker b79ab2a043 add dropdown again when writing permissions 2020-09-23 10:16:57 +02:00
OliiverHacker 4fa86ce173 display latest status in status bar in inventory search 2020-09-22 11:20:01 +02:00
Andreas Österreicher ecfe6762a7 Zahlungsreferenz im CIS kann nun ausgeblendet werden 2020-09-18 16:01:23 +02:00
Andreas Österreicher e2fb60a327 Merge branch 'feature-9718/Zahlungsbestaetigungen_nur_fuer_FH_und_Log' 2020-09-18 15:44:27 +02:00
Andreas Österreicher 3b33b6bcdb Formatierung des Betrags bei automatisierten Gegenbuchungen korrigiert 2020-09-18 11:55:52 +02:00
Manfred Kindl 48a9395d93 Merge remote-tracking branch 'origin/master' 2020-09-16 22:15:12 +02:00
Manfred Kindl d37dbb5d11 Optional farbliche Hervorhebung der Studienpläne 2020-09-16 22:15:05 +02:00
Oliiver ad98fed84b additionally export projectphasen without project 2020-09-16 12:34:26 +02:00
Oliiver 82d7f4edd2 fix brackets; remove error_reporting 2020-09-16 09:37:31 +02:00
alex 0153364885 Prüfungsprotokoll Freigabe: passed data to controller in better way (password and freigegeben bool in a separate object) 2020-09-15 18:11:37 +02:00
Andreas Österreicher e717a3b65c Merge branch 'logging' 2020-09-15 13:43:57 +02:00
Paolo 6fccfbb073 Changed LogsViewer job queue workers filters description 2020-09-14 15:25:17 +02: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
alex 3309157a99 Merge remote-tracking branch 'origin/master' 2020-09-14 11:11:58 +02:00
alex 080e3582cf Mitarbeiter_model getPersonal: possible to reduce result to eonly certain uids 2020-09-14 11:11:44 +02:00
Paolo fbd4ded720 - Added new constants P_NAME_REQUEST_ID and
P_NAME_REQUEST_DATA_FORMATTER tp logLib
- Added new properties _requestId and _requestDataFormatter to LogLib
- Added new public method setConfigs to LogLib
- Added possibility to choose the request id when the LogLib is loaded
- Added possibility to format the request data using the
_requestDataFormatter parameter
- Now LogLib always stores the request id + log level
- Added possibility to change the execution time parameter
- Adapted application/core/JOB_Controller.php code
- Adapted application/core/JQW_Controller.php code
2020-09-11 17:43:39 +02:00
Andreas Österreicher 01a8ec69de Merge branch 'feature-9472/betriebsmitteltyp' 2020-09-11 15:43:46 +02:00
OliiverHacker a565b66751 display only projektphasen of the user 2020-09-10 13:07:51 +02:00
OliiverHacker 612c339305 only get project phases that user is assigned to in CSV Export 2020-09-10 10:39:33 +02:00
OliiverHacker e933cce0e8 add project ID to csv export 2020-09-10 09:29:39 +02:00
OliiverHacker 2e8ed786f4 impliment export 2020-09-09 13:05:28 +02:00