Commit Graph

2653 Commits

Author SHA1 Message Date
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
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
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
Andreas Österreicher 9e9612d317 Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets' 2019-10-28 16:28:57 +01:00
Cris ab947cf5f1 Fixed: Tooltip of geaenderte LA will show up now 2019-10-28 16:26:38 +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
Andreas Österreicher c179655124 Merge branch 'feature-4562/Extends_helper_hlp_authentication_helper' 2019-10-28 14:52:30 +01:00
Cris 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
Cris 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
alex 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
Cris 172421f4a9 Fixed: Size of password field now visible also when resizing 2019-10-24 16:05:22 +02:00
Cris f3006d4760 Minor doc changes 2019-10-24 15:59:30 +02: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 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
Cris 89fc2ecd0a Fixed: Corrected number of rows in CSV download
The new line in concatinated groups was causing extra lines in
excel file and messing the structure.
Also adapted download status title to enable correct data import of
csv text file.
2019-10-24 15:44:38 +02:00
Cris 5936476dd5 Minor GUI optimizations
. Changed status icon on header row
. No mousepointer on unselectable geanderte LA in LA akzeptieren
2019-10-24 14:19:05 +02:00
Cris 746f082121 Fixed: Excluded dummy lectors from all selections/filters
Some selections/filters were not selecting/filtering correctly out the
dummy lectors OR filtering out Betreuung.
It needs: personalnummer >= 0
  . > to ensure no dummies
  . = to retrieve also Betreuungen
     (where personalnummer is provided with NULL)
2019-10-24 14:14:48 +02:00
Cris bceb11b420 Added INITIAL FILTER to LA akzeptieren
Initial filter is: erteilte LA.
Now these rows are presented to the user when loading the page.
2019-10-24 14:08:23 +02:00
hainberg e68337c685 Added INITIAL FILTER to LA erteilen
Initial filter is: no dummies, neu or geändert.
Now these rows are presented to the user when loading the page.
2019-10-24 14:04:57 +02:00
Cris 7cf02c3566 Added INITIAL FILTER to LA bestellen
Initial filter is: no dummies, neu or geändert.
Now these rows are presented to the user when loading the page.
2019-10-24 14:03:08 +02:00
Cris 9a71c29ca2 Added FOOTER to tabulator with CSV download and adapted GUI to LA akzeptieren
New:
. tabulator footer with
  - buttons Alle auswählen/abwählen
  - display number of selected rows
  - CSV download

. filter buttons
  - accept-button now initially activated and focused, toggle on click
  - now as buttongroup in extra row
2019-10-24 13:51:43 +02:00
Cris a5e915066a Added FOOTER to tabulator with CSV download and adapted GUI to LA erteilen
New:
. tabulator footer with
  - buttons Alle auswählen/abwählen
  - display number of selected rows
  - CSV download

. filter buttons
  - approve-button now initially activated and focused, toggle on click
  - now as buttongroup in extra row

. Lehrauftrag erteilen - button disabled when filter on dummies
2019-10-24 13:47:30 +02:00
Cris 83eb4bd5f3 Added FOOTER to tabulator with CSV download and adapted GUI to LA bestellen
New:
. tabulator footer with
  - buttons Alle auswählen/abwählen
  - display number of selected rows
  - CSV download

. filter buttons
  - order-button now initially activated and focused, toggle on click
  - now as buttongroup in extra row

. Lehrauftrag bestellen - button disabled when filter on dummies
2019-10-24 13:44:05 +02:00
Cris 92cfa521f7 Fixed DB-error when vertragsbetrag IS NULL
Now if betrag is null will be converted to 0.
2019-10-24 13:28:18 +02:00
Cris d3e22185e3 Changed wording: akzeptiert -> angenommen
Changed wording according to customer request.
Only if visible on GUI, not on all technical usages.
2019-10-22 16:41:16 +02:00
Cris 0dcf1980ca Optimized HEADER FILTER in tabulator to use COMPARISON OPERATORS
Now header filter parses the given filterstring.
If it starts with a comparison operator it will be used for comparison.
Otherwise just compare the stringnumbers to be equal.
2019-10-22 16:27:27 +02:00
Cris 836c61e3b8 Changed user icons in filter- and status buttons (PNG icons)
Setting png icons is a workaround to use font-awsome 5.9.0 icons
until system can be updated to newer font awsome version.
Changed for filter/status buttons:
. ordered
. approved
. changed
2019-10-22 12:06:32 +02:00
Cris 325f7dd09a Changed order of displaying status in Lehrauftrag akzeptieren
First erteilte
Then bestellte
Last akzeptierte
2019-10-21 17:35:55 +02:00
Cris ce84e0bea4 Removed unused vertrag data from queries and filters
. Removed unused:
  - vertrag_insertvon (now using insertvon of vertrag_vertragsstatus instead)
  - vertrag_insertamum
  - vertrag_updatevon
  - vertrag_updateamum
2019-10-21 17:33:41 +02:00
Cris 06f31997f2 Added bestellt_von/erteilt_von/akzeptiert_von columns and TOOLTIPS
. added tooltips on bestellt-, erteilt- and akzeptiert-column with
 insertvon information
. adapted tooltips on status column
. added columns to all tabulator queries and to the filters
2019-10-21 17:29:23 +02:00
Cris af29146bb5 Fixed: now variable erteilt is initialized correctly 2019-10-21 17:19: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 b3748fb910 Added focus on clicked filter button 2019-10-16 17:23:42 +02:00
Cris 49f7ac1c72 Minor changes: Changed tooltip text / Enhanced code
. standardized tooltip text
. geaenderte Lehrauftraege: bold in bestellen (selectable),
  marked orange and not selectable in erteilen and akzeptieren
. removed parseFloat (not needed, now better perfomance)
. better var names for readability reasons
2019-10-16 15:13:46 +02:00
Cris 8881f799c3 Adapted filter select-all to select also geaenderte Lehrauftraege 2019-10-16 14:53:49 +02:00
Cris 19a88a8648 Added filter button for geaenderte Lehrauftraege to LA bestellen/erteilen 2019-10-16 12:42:13 +02:00
hainberg aa6946bfff Adapted tabulator QUERY for DUMMY lectors in Lehrauftrag erteilen 2019-10-16 11:59:09 +02:00
Cris 9f8921e186 Adapted tabulator QUERY for DUMMY lectors in Lehrauftrag bestellen 2019-10-16 11:58:44 +02:00
Cris ed2a029139 Added GUI for DUMMY lectors in Lehrauftrag erteilen
. dummy status icon/tooltip/formats
. dummy filter button
2019-10-16 11:57:39 +02:00
Cris 5ccd23f68d Added GUI for DUMMY lectors in Lehrauftrag bestellen
. dummy status icon/tooltip/formats
. dummy filter button
2019-10-16 11:56:26 +02:00
Cris 70605a83e1 Removed uncommented doc text! 2019-10-16 09:00:08 +02:00
Cris 9fc3d165db Added status icons/tooltip/formats for GEAENDERTE in Lehrauftrag erteilen 2019-10-16 08:58:11 +02:00
Cris 5030f0b1ed Major addition of tabulator functionality methods III / Enhanced code
III: Same as for orderLehrauftrag is here adapted to acceptLehrauftrag:

. MOVED out function from datasetRepFieldDefs to javascript for better
  maintainance
. Added status column and status icons with tooltips
. Added status buttons to filter status rapidly
. Rows formatting enhanced and bootstrapped
. day of date now with 2 digits
2019-10-16 08:53:37 +02:00
Andreas Österreicher 745b227c1a Merge branch 'hotfix-4790/FAS_UDF_tab_saving_is_broken' 2019-10-15 16:06:48 +02:00
Paolo 7daac696b3 - Renamed controller system/UDF.php to system/FAS_UDF.php
- Renamed view system/udf.php to system/fas_udf.php
- Adapted code with new names
- Added model system/FAS_UDF_model with only FAS functionalities
- Removed FAS functionalities from model system/UDF_model
- Fixed session problems in controller system/FAS_UDF
2019-10-15 15:40:47 +02:00