blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-10 08:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,196 Commits 224 Branches 6 Tags
ea09dfda58f7efbb4c77a12d900123e65eefd559
Commit Graph

10196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 4da3062c00 Added LV-ID to group-header title 2019-11-25 08:38:01 +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 b0d9010aec Fixed: now status 'geändert' renders correctly when Stunden are NULL 
When FAS Stunden were left empty, the vertrag_stunden were compared with
null stunden. So: comparing 0 with null was setting status to 'geaendert',
although practically there was no change to the contract.
This is fixed now.
 2019-11-12 16:17:45 +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 e092a6c33e Minor change: removed unused field 2019-11-12 16:08:10 +01:00
Andreas Österreicher 609adcc431 Dashboard für Lehraufträge hinzugefügt 2019-11-12 16:02:13 +01:00
Andreas Österreicher 80ed75a6ad Im Statistik SQL wird die Variable $user automatisch durch den eingeloggten User ersetzt. 2019-11-12 15:59:19 +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 321da96728 Fixed: Vertragsstatus in Projektbetreuung now showing correct status 
Before it was showing incorrectly status 'Geändert', it means even if
contract and lehrauftrag had same stunden or betrag.
Now this is fixed.
 2019-11-12 11:59:51 +01:00
Cris bd723e234e Changed order of Studiensemester_widget 
Now it is ordered chronologically (WS2020-SS2020-WS201-SS2019...), which
fits better to daily usage.
Before it was ordered alphabetically.
 2019-11-12 11:56:11 +01:00
Cris 9f3c9d5481 Unified default text displayed in Dropdown-Widgets 
Now the dropdown widgets used in lehrauftrags-process have all same
look & feel when nothing is (pre-)selected. It will display
'Ausbildungssemester' or 'Studiengang'.
 2019-11-12 11:53:57 +01:00
Cris 3b697df851 Changed side menu window target from _blank -> to _self 
Now side menu links Lehrauftrag bestellen and Lehrauftrag erteilen
are opening within tab itself.
 2019-11-12 11:46:01 +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 94506d8a14 Fixed: Corrected icon bestellt instead of icon changed when updating rows 
Because of recently commited extra check of stunden/vertragstunden to
determine geaenderte Lehrauftraege correctly, the row update callback
function needed also extra information to format status icon correctly.
This is fixed now.
 2019-11-05 16:32:00 +01:00
Cris 11635e376d Changed filterwidget to tablewidget in Lehrauftrag akzeptieren 2019-11-04 17:08:44 +01:00
hainberg 9c2ce1614b Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag 2019-11-04 17:00:38 +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 47f1fe1377 Added methods getLehreinheitID() and getLehreinheitData() to Vertrag_model 
. getLehreinheitID(): Gets Lehreinheit ID corresponding to the contract.
. getLehreinheitData(): Gets (table) data of lehreinheit_id
  corresponding to the contract.
 2019-10-30 14:54:40 +01:00
Cris 13fa392e04 Moved often used external models to top of Vertrag_model 2019-10-30 14:51:39 +01:00
Cris 7f549299cb Fixed: Restricted permission for display of side navigation menu LA-Erteilen 2019-10-30 10:42:02 +01:00
hainberg 65c3a83a20 Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag 2019-10-30 08:24:05 +01:00
Cris fff1025eed Adapted FAS to display status 'Geändert' when CHANGED HOURS (and NO betrag) 
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 18:12:16 +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 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 49f7f61273 Merge branch 'feature-3801/Use_different_source_CI_REST' 2019-10-29 15:17:38 +01:00
Andreas Österreicher bc05f32d5e Merge branch 'feature-4164/Markierung_weitergeleiteter_analog_zum_Parken' 2019-10-29 15:04:02 +01:00
Andreas Österreicher d760df8198 Merge branch 'feature-4960/Javascript_Timestamp' 2019-10-29 14:50:19 +01:00
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
Andreas Österreicher 85b6c7556f Merge branch 'feature-4404/Dieter_Dummy_umbenennen' 2019-10-28 15:23:05 +01:00