Commit Graph

47 Commits

Author SHA1 Message Date
Andreas Österreicher cee3d7bdd3 Merge branch 'feature-5883/DigitalerLehrauftrag_ColumnPicker' into review/DigitaleLehrauftraege 2020-04-17 09:33:32 +02:00
Cris b6f509c057 Added Multilingualism to all Lehrauftraege Tablewidgets' columns fields 2020-04-02 16:33:26 +02:00
Cris 2938e0bdb0 Bugfixed: Removed undefined functions
After moving functions to Tablewidget.js, these function calls doesnt
exist anymore in the earlier corresponding javascripts. Therefore they
must be removed.
2020-03-30 19:27:12 +02:00
Cris eac386496a Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege
# Conflicts:
#	public/js/lehre/lehrauftrag/acceptLehrauftrag.js
2020-03-30 12:32:39 +02:00
Andreas Österreicher 1f4722b7a0 - Config hinzugefügt um Lektorenzuordnungen im CIS nur anzuzeigen wenn der Vertrag erteilt wurde
- Verträge werden erst ab Status erteilt für Lektoren angezeigt
2020-03-12 19:24:47 +01:00
Andreas Österreicher 5bd9ece44a Merge branch 'master' into feature-5883/DigitalerLehrauftrag_ColumnPicker 2020-03-10 16:59:15 +01:00
Cris bce7f60df4 Moved layout options to TableWidget
Now this is a standard behaviour of TableWidget.
2020-01-30 13:22:49 +01:00
Cris 6897ccdd6b Moved empty table placeholder text to TableWidget
Now this is a standard behaviour of TableWidget.
2020-01-30 12:43:50 +01:00
Cris 3b2b279bf9 Changed default visibility / order of columns
Now fitted to the users primary needs. Columns can be displayed/hidden
via Columnpicker by user afterwards.
2020-01-30 12:27:13 +01:00
Cris 9bdee6d0f8 Corrected SQL query: now retrieving employees UID via tbl_mitarbeiter
Some Lectors, who were assigned as Projektbetreuer, received an email on
their (past) student-email-account. Now this is corrected.
2020-01-28 17:33:04 +01:00
Cris b270e65d2e Extended FHC_TableWidget with column picker, header & footer
Added standard behaviour to FHC_TableWidget:
. Added column picker to new TableWidgetHeader div.
. Moved former footerElement (including Alle aus-/abwählen
buttons, CSV Downloads) from single specific files to new
TableWidgetFooter divs.
. Adapted other files to work with new FHC_TableWidget behaviour
2020-01-28 12:26:56 +01:00
Paolo 1832f9a78a - Set reloadDataset = true when widget is loaded
- Remove reloadDataset = true where these widgets are called
2019-12-20 14:43:09 +01:00
Andreas Österreicher 8f3aadd3e2 Merge branch 'feature-3994/Digitaler_Lehrauftrag' 2019-12-18 16:08:11 +01:00
Cris df057faa8f Added default text 'Keine Daten vorhanden' for empty tables
Before the tabulator sometimes looked kind of 'undone', when no data was
loaded. Now a nice message is displayed if the table is empty.
2019-12-18 15:45:34 +01:00
Cris 83fb32bc18 Reordered columns: Now Ausbildungssemester right after STG-Typ-Kurzbezeichnung 2019-12-18 15:38:14 +01:00
Andreas Österreicher 5b27f29a92 Merge branch 'feature-3994/Digitaler_Lehrauftrag' 2019-12-12 13:54:20 +01:00
Cris 905df6912a Changed: column description from 'Auftrag' -> to 'LV- / Projektbezeichnung' 2019-12-11 15:32:29 +01:00
Andreas Österreicher fc2d26e96d Gruppenbezeichnung bei Lehraufträge korrigiert 2019-12-06 11:32:24 +01:00
Cris 7bc8255787 Added fixed column width to all betrag- and all status-columns 2019-11-12 17:51:18 +01:00
Cris 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
Cris 3f1f509dfa Renamed column 'LE-ID' -> to 'LV-Teil' 2019-11-12 12:05:31 +01:00
Cris d1f99ac667 Removed initial filter from Lehrauftrag akzeptieren
Now Lehrauftrag akzeptieren is showing initially all lehrauftraege.
2019-11-12 12:04:29 +01:00
Cris 5fa07f68c5 Minor changes: page title text; removed values not used by Tablewidget 2019-11-05 16:52:37 +01:00
Paolo 3e5e65bfc4 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag 2019-11-04 16:58:19 +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 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
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
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 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
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 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 325f7dd09a Changed order of displaying status in Lehrauftrag akzeptieren
First erteilte
Then bestellte
Last akzeptierte
2019-10-21 17:35:55 +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 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
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 4375a1ad0e Added (Ausbildungs-)semester to query, tabulator columns and filter 2019-10-01 15:33:35 +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 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 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
Cris a70507a079 Adapted tabulator to display columns in correct order after query change 2019-09-25 16:58:33 +02:00
Cris 61a6bc7bfc Fixed SQL query: corrected column order in subquery for Projektbetreuung 2019-09-25 16:25:04 +02:00
Cris 6f5de6a786 Adapted SQL query: gruppen aggregated in one cell, not in seperated rows
Before same lehreinheiten of same lector were shown in different rows,
when they were taught in different groups. This caused incorrect contract
inserts.

One contract is for per lector and per lehreinheit. Gruppen are only
displayed in one cell (aggregated if more)
2019-09-25 15:39:42 +02:00
Cris 8685f5ed1b Minor fix: Corrected wrong hover color behaviour
Now the row stays green when accepted. Before it was still changing
color when hovering.
2019-09-25 12:11:28 +02:00
Cris 43452a2127 Hided column 'Betrag' if lector has inkludierte Lehre
If the lectors actual Verwendung has inkludierte Lehre, the tabulators
column betrag is hided.
2019-09-24 16:10:23 +02:00
Cris 6caec74df5 Created SQL-query and tabulator to accept Lehraufträge 2019-09-24 10:10:42 +02:00