blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 17:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,224 Commits 216 Branches 6 Tags
df057faa8fbedae7c41f8f0b9b6d694d7da7c290
Commit Graph

490 Commits

Author SHA1 Message Date
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 ff9aa5c48a Expanded 'lector'-column width 2019-12-18 15:40:16 +01:00
Cris 83fb32bc18 Reordered columns: Now Ausbildungssemester right after STG-Typ-Kurzbezeichnung 2019-12-18 15:38:14 +01:00
Cris 4b33f6c0bd Minor code prettyfying (tabs instead whitespaces, line wraps) 2019-12-18 14:51:45 +01:00
Cris ef3eedb989 Added data query and tabulator for 'Stornierte Lehrauftraege' 
This file is triggered within the view acceptLehrauftrag.php.
It displays information about the lectors cancelled contracts:
- Vertragstyp
- Bezeichnung
- Stunden
- Betrag
- Storno Datum
- Storno von
 2019-12-18 14:37:38 +01:00
Cris 754868e7fd Added GUI for Stornierte Lehrauftraege (for the lectors) 
Added new button 'Nur stornierte anzeigen'. When the button is clicked,
a collapsed modul opens below showing details about cancelled contracts
of the requested study semester.
 2019-12-18 14:31:17 +01:00
Cris c2b9f3a3da Amended help info: HOWTO Spaltenbreite verändern 2019-12-16 14:18:57 +01:00
Cris 80f100f5fb Changed name order: first + family name -> to family + first name 
This change allows sorting by family name.
 2019-12-16 13:57:58 +01:00
hainberg cde7e82033 Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag 2019-12-11 16:13:04 +01:00
Cris 905df6912a Changed: column description from 'Auftrag' -> to 'LV- / Projektbezeichnung' 2019-12-11 15:32:29 +01:00
alex 1a3a56483c Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag 2019-12-10 15:32:31 +01:00
alex 34d736262b added Lehraufträge Lehrendeuebersicht to menu 2019-12-10 15:32:08 +01:00
Cris 8d95c3820b Added column Studienplan to table of Lehrauftrag bestellen 
Added column with most recent, valid studiyplans of the records lv.
 2019-12-09 15:47:43 +01:00
Cris ea09dfda58 Optimized text of 'Hilfe für diese Seite' 
Added information for lectors page. Some minor text enhancements to
avoid misunderstanding.
 2019-11-25 08:43:46 +01:00
Cris df555426a0 Changed: column STG-type is visible now 2019-11-25 08:39:53 +01:00
Cris 7bc8255787 Added fixed column width to all betrag- and all status-columns 2019-11-12 17:51:18 +01:00
Cris 5488bfbc28 Amended 'Hilfe zu dieser Seite' information for Lehrauftrag akzeptieren 
Added information about filter and selection.
 2019-11-12 17:42:51 +01:00
hainberg 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
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
Andreas Österreicher 609adcc431 Dashboard für Lehraufträge hinzugefügt 2019-11-12 16:02:13 +01:00
Cris 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
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 b95b7c0707 Dropped TableWidget.css from FHC_Header: Not used at the moment 2019-11-06 10:53:37 +01:00
Cris 5fa07f68c5 Minor changes: page title text; removed values not used by Tablewidget 2019-11-05 16:52:37 +01:00
Cris 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
Cris 11635e376d Changed filterwidget to tablewidget in Lehrauftrag akzeptieren 2019-11-04 17:08:44 +01:00
Paolo 3e5e65bfc4 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag 2019-11-04 16:58:19 +01:00
Cris 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
Paolo ed818c72d9 Merge branch 'master' into feature-4026/TabulatorWidget 2019-11-04 15:08:42 +01:00
Cris 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
Cris 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
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 bc05f32d5e Merge branch 'feature-4164/Markierung_weitergeleiteter_analog_zum_Parken' 2019-10-29 15:04:02 +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
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
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