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
11635e376d
Changed filterwidget to tablewidget in Lehrauftrag akzeptieren
2019-11-04 17:08:44 +01:00
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
3e5e65bfc4
Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
2019-11-04 16:58:19 +01:00
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
ed818c72d9
Merge branch 'master' into feature-4026/TabulatorWidget
2019-11-04 15:08:42 +01:00
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
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
13fa392e04
Moved often used external models to top of Vertrag_model
2019-10-30 14:51:39 +01:00
7f549299cb
Fixed: Restricted permission for display of side navigation menu LA-Erteilen
2019-10-30 10:42:02 +01:00
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
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
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
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
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
49f7f61273
Merge branch 'feature-3801/Use_different_source_CI_REST'
2019-10-29 15:17:38 +01:00
bc05f32d5e
Merge branch 'feature-4164/Markierung_weitergeleiteter_analog_zum_Parken'
2019-10-29 15:04:02 +01:00
d760df8198
Merge branch 'feature-4960/Javascript_Timestamp'
2019-10-29 14:50:19 +01:00
5be68be408
Added Anti-Cache Functionality
2019-10-29 14:49:35 +01:00
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
3897f120ee
Merge branch 'feature-4152/CIS_Funktionen_Wochenstunden'
2019-10-29 11:09:12 +01:00
31850ebfa1
Added param validation to Vertrag_model methods & minor code improvement
2019-10-29 10:43:52 +01:00
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
22a517b88d
Added LogsViewer to CI Menu
2019-10-29 06:51:36 +01:00
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
9e9612d317
Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets'
2019-10-28 16:28:57 +01:00
ab947cf5f1
Fixed: Tooltip of geaenderte LA will show up now
2019-10-28 16:26:38 +01:00
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
85b6c7556f
Merge branch 'feature-4404/Dieter_Dummy_umbenennen'
2019-10-28 15:23:05 +01:00
a18d9ccced
Merge branch 'feature-4027/Personen_zusammenlegen_Pruefling'
2019-10-28 14:59:44 +01:00
c179655124
Merge branch 'feature-4562/Extends_helper_hlp_authentication_helper'
2019-10-28 14:52:30 +01:00
2d68d2ffeb
Adapted Header and Background Style for CIS-CI Pages
2019-10-28 14:43:05 +01:00
25c2d57993
Added missing Phrases for Password Change
2019-10-28 07:42:10 +01:00
4b6e290c5b
Merge branch 'TempusLektorFilter'
2019-10-25 19:55:52 +02:00
08cdd48510
Merge branch 'master' into TempusLektorFilter
2019-10-25 19:54:11 +02:00
acf132da39
Merge branch 'feature-3778/PunkteübertragReihungstestpunkteFAS'
2019-10-25 19:52:57 +02:00
7c0e3867b6
Merge branch 'master' into feature-3778/PunkteübertragReihungstestpunkteFAS
2019-10-25 19:50:48 +02:00
f373ffb529
Merge branch 'feature-4366'
2019-10-25 19:47:59 +02:00
3760af9394
Merge branch 'master' into feature-4366
2019-10-25 19:47:32 +02:00
4e9588cf76
Alte Vorlagen Ausbildungsverträge in Core gelöscht
...
-> sind in Addon FHTW
2019-10-25 19:45:43 +02:00
c9a3886e07
Nachgereichte Dokumente in FAS löschen
...
Wenn kein Dokument im DMS vorhanden ist, aber die akte auf "wird nachgereicht" gesetzt ist, darf diese im FAS gelöscht werden.
2019-10-25 19:45:09 +02:00
9d70d4c30f
Dokumenttyp "ZgvMaPre" hinzugefügt
...
Für Download aus Bewerbungstool
2019-10-25 19:44:22 +02:00
754868da90
Usability-Verbesserungen
...
- GUI-Überarbeitung
- vorläufige Terminzusagen als ical abonnierbar
-
2019-10-25 19:42:27 +02:00
7cf812deae
Minor GUI change for better usability
...
Now first button group groups ONLY defined process steps.
(the show-changed button is moved outside)
2019-10-25 12:33:06 +02:00
ae313175c8
Fixed: 'Alle auswählen'-button filters now correctly
...
The changed contracts were still selected when using the 'Alle Auswählen'
button. This is fixed now.
2019-10-25 12:29:38 +02:00
89ad21b1ef
- Infocenter uebersicht bugfix: tablesorter filter storage is the same for homepage with and without "/index" (for keeping tablesorter filter when coming back from details page)
2019-10-25 10:26:54 +02:00
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
5b72ccdea1
Fixed: Unfolding LV-list was broken when certain config var -> fixed now
...
This error was caused when config var
FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN was set to false
due to incorrect converting of php boolean into js boolean.
Fixed now for LV and Projektbetreuung.
2019-10-25 09:52:54 +02:00
fe94cfc350
Avoided removing lector on Key-press 'Entf', when contract exists
...
The remove of the lector was avoided by disabled 'Entfernen' in the
context menu, but still possible on key press 'Entf'. Now this is
prevented and a message is displayed. For lectors in LV and for
Projektbetreuer.
2019-10-25 08:35:07 +02:00
b6bd2dd104
Changed STORNO: Now cancelling always possible (since contract exists)
...
Before cancelling a contract was only possible if vertragsstatus was
'akzeptiert'. Now contract cancellation for LV and Projektbetreuung
since the lector has a contract. (from status 'bestellt' on)
2019-10-25 08:24:43 +02:00
Cris