blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 16:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,233 Commits 217 Branches 6 Tags
7f752bf66653dc38cdeb02ec8f32beb5a30fe6cd
Commit Graph
10233 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 89ad21b1ef - Infocenter uebersicht bugfix: tablesorter filter storage is the same for homepage with and without "/index" (for keeping tablesorter filter when coming back from details page) 2019-10-25 10:26:54 +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 5b72ccdea1 Fixed: Unfolding LV-list was broken when certain config var -> fixed now 
This error was caused when config var
FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN was set to false
due to incorrect converting of php boolean into js boolean.
Fixed now for LV and Projektbetreuung.
 2019-10-25 09:52:54 +02:00
Cris fe94cfc350 Avoided removing lector on Key-press 'Entf', when contract exists 
The remove of the lector was avoided by disabled 'Entfernen' in the
context menu, but still possible on key press 'Entf'. Now this is
prevented and a message is displayed. For lectors in LV and for
Projektbetreuer.
 2019-10-25 08:35:07 +02:00
Cris b6bd2dd104 Changed STORNO: Now cancelling always possible (since contract exists) 
Before cancelling a contract was only possible if vertragsstatus was
'akzeptiert'. Now contract cancellation for LV and Projektbetreuung
since the lector has a contract. (from status 'bestellt' on)
 2019-10-25 08:24:43 +02:00
raab 2b18be33af Button zur Bestätigung nur mehr unterhalb des Textes 2019-10-24 17:31:25 +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
alex fbec49a663 - bugfix: parking & zurückstellen datepicker: current day cannot be selected, because default time is 00:00, and it would be immediately exceeded 2019-10-24 11:43:10 +02:00
alex 4de5f1533f - parking and zurückstellen date and buttons: adapted layout for correct line breaking 2019-10-24 11:29:38 +02:00
Manfred Kindl 771fb6f823 Phrase 2019-10-23 13:48:17 +02:00
alex 7ccffc24ee - Added database column statistik_kurzbz in system.tbl_filters 
- Added row 'report' for app in system.tbl_app
 2019-10-23 13:16:24 +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 fd3f74807b Added font-awsome 5.9.0. USER ICONS in PNG format 150x150 
PNG icons are used in status- and filter buttons
Setting png icons is a workaround to use font-awsome 5.9.0 icons
until system can be updated to newer font awsome version.
 2019-10-22 11:59:38 +02:00
Nikolaus Krondraf b59ba3f156 erlaube Terminkollision bei Raumreservierung 2019-10-22 07:20:36 +02:00
Manfred Kindl e65fc08e31 Merge remote-tracking branch 'origin/master' 2019-10-21 18:24:28 +02:00
Manfred Kindl e22d560134 Quickfix Export Studienblatt als .doc 2019-10-21 18:21:35 +02:00
Manfred Kindl a3ba7e381f BugFix Betreuertyp BetreuerPraktik 2019-10-21 18:20:49 +02:00
Manfred Kindl 49be024ca9 Coodle 
- Umfragestart ohne Terminwahl verhindern
- Coodle FreeBusy einbinden
- Coodle Zusagen als iCal abonnieren
 2019-10-21 18:19:57 +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
Paolo 790065a281 Added phrases for password change page 2019-10-18 14:42:08 +02:00
Nikolaus Krondraf fde9af3eed Anmeldebutton wird erst ab 2 Monaten vor Prüfung angezeigt 2019-10-17 12:42:22 +02:00
Nikolaus Krondraf 383558f262 new config variable 2019-10-17 07:41:28 +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
Nikolaus Krondraf 4f065c9234 revert change 2019-10-16 14:47:42 +02:00
Andreas Österreicher fbfa3badf1 Berechtigung korrigiert beim Löschen von Reservierungen direkt aus der Wochenplanansicht 2019-10-16 14:36:25 +02:00
Cris 19a88a8648 Added filter button for geaenderte Lehrauftraege to LA bestellen/erteilen 2019-10-16 12:42:13 +02:00
Manfred Kindl 58ec6f8f31 SaveSort in Dokumentezuteilung 2019-10-16 12:08:20 +02:00
Manfred Kindl 809b2b3e64 Anpassung FHTW Incomings auslesen 
An der FHTW können nur die Incomings ausgelesen werden, wenn die stg_kz 10006 übergeben wird
 2019-10-16 12:07:52 +02:00