Commit Graph

600 Commits

Author SHA1 Message Date
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 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
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
Cris 36c8a4dbbe Added Ausbildungssemester to tabulator QUERY 2019-10-15 08:41:16 +02:00
Cris 4c85c88725 Added Ausbildungssemester-Dropdown to GUI 2019-10-15 08:38:43 +02:00
Cris 0514ec87ba Renamed main title to Lehrauftraege bestellen/erteilen/annehmen 2019-10-14 16:56:50 +02:00
Cris a793a2f88c Added hidden column with vertragdata
. Added hidden columns with vertragsdata to erteilt- and akzeptiert-
tabulator tables. This is to be able to detect where contract were
changed and mark/disable that lehrauftrag.
. Adapted filter
2019-10-14 16:44:03 +02:00
Cris c370a27c18 Added table columns orgform_kurzbz and ausbildungssemester
. Columns lehrveranstaltung-orgform_kurzbz and -semester are now visible
in all tabulator-tables in bestellen - erteilen - akzeptieren.
. Renamed names of auftraege (no need to display semester text anymore)
. Adapted filter
2019-10-14 16:39:31 +02:00
Cris d87e47c3ab Major addition of tabulator functionality methods II / Enhanced code
II: Same as for orderLehrauftrag is here adapted to approveLehrauftrag:

. 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
. GroupBy Lehrveranstaltung: rows are grouped by LV, formatted
. Added calculation per group AND total
. Rows formatting enhanced and bootstrapped
. Fixed selection of data
. day of date now with 2 digits
2019-10-11 15:14:53 +02:00
Cris dcaf4b26cb Major addition of tabulator functionality methods / Enhanced code
. 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
. GroupBy Lehrveranstaltung: rows are grouped by LV, formatted
. Added calculation per group AND total
. Rows formatting enhanced and bootstrapped
. Fixed selection of data
. day of date now with 2 digits
2019-10-11 14:32:17 +02:00
Cris 7605daed01 Added vertrag-columns and lv bezeichnung to tabulator query and filter
Mainly usage is to update contract.
2019-10-11 13:55:36 +02:00
alex fce3659573 - Infocenter Übersicht: zurückgestellte BewerberInnen werden grün markiert 2019-10-03 15:22:54 +02:00
alex 73e248534b - infocenterDetails: added phrases rueckstelldatumUeberschritten and parkenZurueckstellenInfo 2019-10-03 10:15:10 +02:00
alex 38ae98cc36 - Infocenter Details: possible to set persons on hold, i.e. person is out of workflow temporalily (e.g. when waiting for info), but this can only be undone manually 2019-10-02 17:19:31 +02:00
alex b5c1285fb4 - Infocenter filter dataset is reloaded anytime Infocenter menu is clicked for Übersicht, Frreigegeben or Reihungstestabsolviert 2019-10-02 15:48:42 +02:00
Andreas Österreicher c0afb92ddc Merge branch 'feature-4190/Cronjobs_log_in_database' 2019-10-02 14:29:53 +02:00
Cris 4375a1ad0e Added (Ausbildungs-)semester to query, tabulator columns and filter 2019-10-01 15:33:35 +02:00
Cris dfe4e3d82c Embedded into FH-Complete Navigation
. Added navigation items to top and left side menu for
Lehrauftraege bestellen and Lehrauftraege erteilen.
. Added NavigationWidget to views.
2019-10-01 14:28:15 +02:00
Cris 15370267c6 Minor code and GUI changes
. changed file name lehrauftrag to orderLehrauftrag
. changed order of buttons
Both for consistecy
2019-10-01 08:14:36 +02:00
Cris 6ff2f19c56 Changed the STG-Kürzel to 'typ + kurzbz' in Lehraufträge + Vertragsmodel
Before the organisational unit was set, but it should be a combination
of typ + kurzbz of the stg. This is changed now in
. all Lehraufträge
. Vertragsmodel
. filtersupdate
2019-09-30 15:09:45 +02:00
Cris df12a9aa5d Changed button show-accepted to show-approved
It makes more sense for lectures to show only approved lehraufträge by
one click to be then able to accept them.
2019-09-30 14:25:24 +02:00
Cris 04ac4f55fd Removed groupBy option of tabulator
This was decided for better usability.
2019-09-30 14:22:04 +02:00
Cris 998e906ad3 Fixed: made row unselectable after updating the row
Changed command to work with our actual jquery version.
2019-09-30 14:20:05 +02:00
Cris 6b29461e06 Added empty password field 2019-09-30 14:16:48 +02:00
Cris fd0eaaa366 Fixed: SQL subquery to only return one row
The subquery was sometimes returning more rows causing error message.
This is fixed now.
2019-09-30 14:11:04 +02:00
alex 10e1539b22 infocenterData.php, infocenterFreigegebenData.php, infocenterReihungstestAbsolviertData.php: column data is retrieved from selected Studiensemester variable, and not from future Semesters 2019-09-27 14:36:18 +02:00
Paolo 1273c32419 - Renamed controller system/JobsViewer.php to system/LogsViewer.php
- Renamed directory views/system/jobs to views/system/logs
- Changed FilterWidget query in view system/logs/logsViewerData.php to load all logs
- Added more filters in database to load different log types
2019-09-26 17:40:51 +02:00
Paolo 0c82d4fffc Added new views for TableWidget 2019-09-25 17:19:08 +02:00
Paolo 8210c3fdc7 Derived TableWidget from FilterWidget, added:
- libraries/TableWidgetLib
- widgets/TableWidget
- controllers/widgets/Tables
- public/js/TableWidget.js
2019-09-25 17:15:46 +02:00
Cris a70507a079 Adapted tabulator to display columns in correct order after query change 2019-09-25 16:58:33 +02:00