blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 09:04:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,262 Commits 217 Branches 6 Tags
128ca90a0fc3d632ffc2eb2757ea629d9d2ef3b9
Commit Graph
10262 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andreas Österreicher 3897f120ee Merge branch 'feature-4152/CIS_Funktionen_Wochenstunden' 2019-10-29 11:09:12 +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
alex 4d248f3a1e - cis/private/profile/index.php: Wochenstunden on profile are only shown to own user or admin 2019-10-28 17:29:09 +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
alex c55f790d4a - Only zeugnisrelevante Noten are shown in Notenspiegel (for excluding e.g. ECI LVs) 2019-10-28 16:24:10 +01:00
Andreas Österreicher 85b6c7556f Merge branch 'feature-4404/Dieter_Dummy_umbenennen' 2019-10-28 15:23:05 +01:00
Andreas Österreicher a18d9ccced Merge branch 'feature-4027/Personen_zusammenlegen_Pruefling' 2019-10-28 14:59:44 +01:00
Andreas Österreicher c179655124 Merge branch 'feature-4562/Extends_helper_hlp_authentication_helper' 2019-10-28 14:52:30 +01:00
Andreas Österreicher 2d68d2ffeb Adapted Header and Background Style for CIS-CI Pages 2019-10-28 14:43:05 +01:00
alex ff856315d1 - uid for Projektliste Zeitaufzeichnung Export is passed already when calling the Zeitaufzeichnung with uid parameter 2019-10-28 11:38:46 +01:00
Andreas Österreicher 25c2d57993 Added missing Phrases for Password Change 2019-10-28 07:42:10 +01:00
Manfred Kindl 4b6e290c5b Merge branch 'TempusLektorFilter' 2019-10-25 19:55:52 +02:00
Manfred Kindl 08cdd48510 Merge branch 'master' into TempusLektorFilter 2019-10-25 19:54:11 +02:00
Manfred Kindl acf132da39 Merge branch 'feature-3778/PunkteübertragReihungstestpunkteFAS' 2019-10-25 19:52:57 +02:00
Manfred Kindl 7c0e3867b6 Merge branch 'master' into feature-3778/PunkteübertragReihungstestpunkteFAS 2019-10-25 19:50:48 +02:00
Manfred Kindl f373ffb529 Merge branch 'feature-4366' 2019-10-25 19:47:59 +02:00
Manfred Kindl 3760af9394 Merge branch 'master' into feature-4366 2019-10-25 19:47:32 +02:00
Manfred Kindl 4e9588cf76 Alte Vorlagen Ausbildungsverträge in Core gelöscht 
-> sind in Addon FHTW
 2019-10-25 19:45:43 +02:00
Manfred Kindl c9a3886e07 Nachgereichte Dokumente in FAS löschen 
Wenn kein Dokument im DMS vorhanden ist, aber die akte auf "wird nachgereicht" gesetzt ist, darf diese im FAS gelöscht werden.
 2019-10-25 19:45:09 +02:00
Manfred Kindl 9d70d4c30f Dokumenttyp "ZgvMaPre" hinzugefügt 
Für Download aus Bewerbungstool
 2019-10-25 19:44:22 +02:00
Manfred Kindl 754868da90 Usability-Verbesserungen 
- GUI-Überarbeitung
- vorläufige Terminzusagen als ical abonnierbar
-
 2019-10-25 19:42:27 +02:00
alex 3c13dafa47 - zeitaufzeichnung_projektliste.php: uid wird übergeben sodass Admin Zeitaufzeichnungen aller Nutzer sehen kann 2019-10-25 17:14:20 +02: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 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