Commit Graph

12123 Commits

Author SHA1 Message Date
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
alex 551eeaa004 - infocenter: different color for onhold - applicants so they can be better distinguished in infocenter uebersicht from parked 2019-11-06 16:38:45 +01:00
Paolo ece06bc462 Notice email for all people allowed to receive messages for an organisation unit 2019-11-06 16:34:20 +01:00
Andreas Österreicher 4e50f6eea2 Assistenzfunktion wird nicht mehr automatisch als disziplinäre Zuordnung
zur jeweiligen Abteilung gewertet. Zur Ermittlung der Untergebenen wird nur
noch die oezuordnung verwendet
2019-11-06 15:55:13 +01:00
raab 5d57fd2441 automatische Pause erst ab 2019-11-06 2019-11-06 14:58:53 +01:00
alex 01d3755df2 Zeitaufzeichnung Projektlisteexport: commented out "gedruckt am" (printed on) 2019-11-06 11:52:24 +01:00
Cris b95b7c0707 Dropped TableWidget.css from FHC_Header: Not used at the moment 2019-11-06 10:53:37 +01:00
Andreas Österreicher a1eec8e551 Merge branch 'feature-4834/Zeitaufzeichnung_OhneUeberlappung' 2019-11-06 10:22:39 +01:00
Cris 5fa07f68c5 Minor changes: page title text; removed values not used by Tablewidget 2019-11-05 16:52:37 +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 557906c4dd LogsViewer always reload dataset 2019-11-05 16:27:35 +01:00
Cris 11635e376d Changed filterwidget to tablewidget in Lehrauftrag akzeptieren 2019-11-04 17:08:44 +01:00
alex 86a129a5e3 - user story 4023: when Fotoliste is generated for more than 1 Mitarbeiter (e.g. Freifächer), now different photos for each Mitarbeiter are generated (person_id is used instead of Matrikelnr) 2019-11-04 17:08:36 +01:00
hainberg 9c2ce1614b Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag 2019-11-04 17:00:38 +01:00
Paolo 3e5e65bfc4 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag 2019-11-04 16:58:19 +01:00
raab 6997791794 Überlappungen nicht mehr möglich
feature Pause automatisch stempeln
2019-11-04 16:09:11 +01:00
Cris f70fddbb27 Moved embedded js-script within view files --> to own javascript files
Moved out all js related code from views
lehrauftrag bestellen/erteilen/akzeptieren to own javascript files.
2019-11-04 15:35:34 +01:00
Paolo ed818c72d9 Merge branch 'master' into feature-4026/TabulatorWidget 2019-11-04 15:08:42 +01:00
alex 927975aa5f No PHP notice (undefined variable foto_url_arr) is shown when exporting Fotoliste 2019-11-04 13:57:51 +01:00
Unknown 3a95c4f22f Lehrverband in PreStudentstatus 2019-10-30 22:19:11 +01:00
Manfred Kindl 763c34e27d Merge branch 'master' into feature-4092/Berechtigung_aendern_der_ZGV_FAS 2019-10-30 20:17:43 +01:00
Manfred Kindl 71aba3a78c Recht in Checksystem 2019-10-30 20:17:29 +01:00
Manfred Kindl 5184ab58c8 Merge branch 'master' into feature-4822/Sonderzeichen_uid 2019-10-30 20:14:21 +01:00
Manfred Kindl 7d5dd646fa Fehlermeldung wenn Sonderzeichen in UID 2019-10-30 20:13:22 +01:00
Paolo 2a4360862a - Reply Button in Inbox/outbox Page
- Write new message Button with Layer/Popup
- Degree Programs drop down displays longer name (if prestudent bestätigt (alias interessent with bestaetigtam != null ) receiver-> dp, otherwise -> infocenter)
- SQL to get OU recipient doesn't use beginn / End of function
- Always set insertvon in tbl_msg_status
- Add Multilanguage Support for Message Page (not completed yet)
- If in sent mode do not set messages as read
- Error message when there are no Messages available shouldnt be displayed
2019-10-30 18:35:46 +01:00
Paolo 36e5009d68 Fixed problems with DialogLib 2019-10-30 18:31:21 +01:00
Paolo 6594a5288b Better CSS for messaging system pages 2019-10-30 18:30:50 +01:00
Paolo d40fd6391a Added some phrases for the messaging system, english only 2019-10-30 18:30:16 +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 47f1fe1377 Added methods getLehreinheitID() and getLehreinheitData() to Vertrag_model
. getLehreinheitID(): Gets Lehreinheit ID corresponding to the contract.
. getLehreinheitData(): Gets (table) data of lehreinheit_id
  corresponding to the contract.
2019-10-30 14:54:40 +01:00
Cris 13fa392e04 Moved often used external models to top of Vertrag_model 2019-10-30 14:51:39 +01:00
alex c0abce27d6 insertvon Person wird bei Reservierungen details (stpl_detail.php) und "Meine Reservierungen"-Liste angezeigt 2019-10-30 14:42:32 +01:00
Cris 7f549299cb Fixed: Restricted permission for display of side navigation menu LA-Erteilen 2019-10-30 10:42:02 +01:00
hainberg 65c3a83a20 Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag 2019-10-30 08:24:05 +01:00
Cris fff1025eed Adapted FAS to display status 'Geändert' when CHANGED HOURS (and NO betrag)
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 18:12:16 +01:00
Cris a02c1cd579 Added FORMATTER form_formatNullToStringNumber: formats NULL to '0.00'
Now this is used to display 0.00 in Betrag-column when the value is null.
2019-10-29 17:41:17 +01:00
Cris 998dbe7528 Added FORMATTER form_formatNullToStringNumber: formats NULL to '0.00'
Now this is used to display 0.00 in Betrag-column when the value is null.
2019-10-29 17:40:12 +01:00
Cris 3129707a10 Adapted GUI and filter 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 16:21:13 +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
Manfred Kindl e9b20283b5 Berechtigung in FAS einbauen 2019-10-29 14:53:40 +01:00
Andreas Österreicher d760df8198 Merge branch 'feature-4960/Javascript_Timestamp' 2019-10-29 14:50:19 +01:00
Andreas Österreicher 5be68be408 Added Anti-Cache Functionality 2019-10-29 14:49:35 +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
Andreas Österreicher 3897f120ee Merge branch 'feature-4152/CIS_Funktionen_Wochenstunden' 2019-10-29 11:09:12 +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
alex 4d248f3a1e - cis/private/profile/index.php: Wochenstunden on profile are only shown to own user or admin 2019-10-28 17:29:09 +01:00