996e9147bc
views/system/infocenter/infocenterFreigegebenData.php: Interessenten with reihungstestangetreten = TRUE from prestudent table are removed from resultset
2019-11-18 18:47:54 +01:00
084056a1a0
Merge branch 'feature-4825/Infocenter_zurückstellen_Farbe_intensiver'
2019-11-15 11:44:45 +01:00
617f435a7c
Merge branch 'feature-4825/Studiensemester_Studienjahr_anlegen_bessere_Fehlermeldung_wenn_existiert'
2019-11-15 11:08:53 +01:00
a093d470e4
Fixed merge mistakes in FilterWidget
2019-11-14 15:40:35 +01:00
2a73f440ee
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-11-14 14:41:47 +01:00
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
7aea534778
Added formatter to column Stunden: null values -> format to '0.0'
...
Before the field was left empty. Now 0.0 will be displayed, even if
FAS Stunden are left empty.
2019-11-12 16:11:40 +01:00
e092a6c33e
Minor change: removed unused field
2019-11-12 16:08:10 +01:00
609adcc431
Dashboard für Lehraufträge hinzugefügt
2019-11-12 16:02:13 +01:00
26cd749f01
Added 'Hilfe zu dieser Seite' link & collapsable module
...
Now a 'how to use this site' - help information is provided to the user
for Lehrauftrag bestellen / erteilen / annehmen.
2019-11-12 12:08:54 +01:00
3f1f509dfa
Renamed column 'LE-ID' -> to 'LV-Teil'
2019-11-12 12:05:31 +01:00
d1f99ac667
Removed initial filter from Lehrauftrag akzeptieren
...
Now Lehrauftrag akzeptieren is showing initially all lehrauftraege.
2019-11-12 12:04:29 +01:00
bd723e234e
Changed order of Studiensemester_widget
...
Now it is ordered chronologically (WS2020-SS2020-WS201-SS2019...), which
fits better to daily usage.
Before it was ordered alphabetically.
2019-11-12 11:56:11 +01:00
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
3b697df851
Changed side menu window target from _blank -> to _self
...
Now side menu links Lehrauftrag bestellen and Lehrauftrag erteilen
are opening within tab itself.
2019-11-12 11:46:01 +01:00
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
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
b95b7c0707
Dropped TableWidget.css from FHC_Header: Not used at the moment
2019-11-06 10:53:37 +01:00
5fa07f68c5
Minor changes: page title text; removed values not used by Tablewidget
2019-11-05 16:52:37 +01:00
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
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
557906c4dd
LogsViewer always reload dataset
2019-11-05 16:27:35 +01:00
11635e376d
Changed filterwidget to tablewidget in Lehrauftrag akzeptieren
2019-11-04 17:08:44 +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
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
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
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
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
c179655124
Merge branch 'feature-4562/Extends_helper_hlp_authentication_helper'
2019-10-28 14:52:30 +01: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
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
172421f4a9
Fixed: Size of password field now visible also when resizing
2019-10-24 16:05:22 +02:00
f3006d4760
Minor doc changes
2019-10-24 15:59:30 +02:00
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
9d0944b717
Reduced posting data (client-side)
...
This is to achieve better performance when sending loads
of Lehrauftraege.
2019-10-24 15:48:08 +02:00
alex