blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 00:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,657 Commits 217 Branches 6 Tags
feature-61509/AutomaticTesting
Commit Graph
4045 Commits
Author SHA1 Message Date
Cris d87e47c3ab Major addition of tabulator functionality methods II / Enhanced code 
II: Same as for orderLehrauftrag is here adapted to approveLehrauftrag:

. 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
. GroupBy Lehrveranstaltung: rows are grouped by LV, formatted
. Added calculation per group AND total
. Rows formatting enhanced and bootstrapped
. Fixed selection of data
. day of date now with 2 digits
 2019-10-11 15:14:53 +02:00
Cris dcaf4b26cb Major addition of tabulator functionality methods / Enhanced code 
. 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
. GroupBy Lehrveranstaltung: rows are grouped by LV, formatted
. Added calculation per group AND total
. Rows formatting enhanced and bootstrapped
. Fixed selection of data
. day of date now with 2 digits
 2019-10-11 14:32:17 +02:00
Cris 7605daed01 Added vertrag-columns and lv bezeichnung to tabulator query and filter 
Mainly usage is to update contract.
 2019-10-11 13:55:36 +02:00
Cris 8a246a9f94 Added methods deleteStatus(), updateStatus() to Vertragvertragsstatus_model 
. Updates the date of the given vertragsstatus.
. Deletes the given vertragsstatus of the contract.
 2019-10-11 13:44:21 +02:00
Cris 0d5906e7bc Added method updateVertrag() to Vertrag_model 
Updates Vertrag and, if resets vertragsstatus as follows:
- if vertragsstatus 'erteilt': delete status 'erteilt' and
  update date of status 'bestellt'
- if vertragsstatus 'bestellt': update date of status 'bestellt'
 2019-10-11 13:42:39 +02:00
Cris 1af0ed466b Added UPDATE contract logic to Controller orderLehrauftrag() 
If a contract already exist and there is a difference between the
origin contract betrag and the lehrauftrag/projektbetreuer-betrag (after
FAS changes), the contract is updated.
 2019-10-11 13:38:58 +02:00
Manfred Kindl 120ffb0319 Merge remote-tracking branch 'origin/master' 2019-10-07 18:59:36 +02:00
Manfred Kindl 753225e39e Studienplan-Sprache für Cronjob correctStudienplan 2019-10-07 18:52:07 +02:00
alex 72a3c2845f tablesorter filters saved in local storage in infocenter Übersicht are not deleted when using zurück button or freigegeben on infocenter details page. 2019-10-07 18:30:06 +02:00
alex 5ef7fa2112 - PersonLogLib: rename _saveLog function to _savePsLog (processtate log) 2019-10-03 17:16:27 +02:00
alex 854dcb7cea - Infocenter: dataset in Übersicht is reloaded when clicking on back button from details page. 2019-10-03 16:23:19 +02:00
alex fce3659573 - Infocenter Übersicht: zurückgestellte BewerberInnen werden grün markiert 2019-10-03 15:22:54 +02:00
alex 73e248534b - infocenterDetails: added phrases rueckstelldatumUeberschritten and parkenZurueckstellenInfo 2019-10-03 10:15:10 +02:00
alex 38ae98cc36 - Infocenter Details: possible to set persons on hold, i.e. person is out of workflow temporalily (e.g. when waiting for info), but this can only be undone manually 2019-10-02 17:19:31 +02:00
Paolo bc9a5b4b06 Added new functions getAuthFirstname and getAuthSurname to helper hlp_authentication_helper 2019-10-02 16:33:44 +02:00
alex b5c1285fb4 - Infocenter filter dataset is reloaded anytime Infocenter menu is clicked for Übersicht, Frreigegeben or Reihungstestabsolviert 2019-10-02 15:48:42 +02:00
Andreas Österreicher c0afb92ddc Merge branch 'feature-4190/Cronjobs_log_in_database' 2019-10-02 14:29:53 +02:00
Andreas Österreicher 0dd82d42b3 Merge branch 'feature-3854/Refactor_sqls_for_filterwidgets' 2019-10-02 10:57:58 +02:00
Cris 4375a1ad0e Added (Ausbildungs-)semester to query, tabulator columns and filter 2019-10-01 15:33:35 +02:00
Cris dfe4e3d82c Embedded into FH-Complete Navigation 
. Added navigation items to top and left side menu for
Lehrauftraege bestellen and Lehrauftraege erteilen.
. Added NavigationWidget to views.
 2019-10-01 14:28:15 +02:00
Paolo ac1f31f31f Added possibility to have same TableWidget in more pages 2019-10-01 12:46:19 +02:00
Cris 15370267c6 Minor code and GUI changes 
. changed file name lehrauftrag to orderLehrauftrag
. changed order of buttons
Both for consistecy
 2019-10-01 08:14:36 +02:00
Cris 4ad2fe7dfb Changed permission check: now using lehrauftrag_akzeptieren 2019-09-30 15:27:12 +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 df12a9aa5d Changed button show-accepted to show-approved 
It makes more sense for lectures to show only approved lehraufträge by
one click to be then able to accept them.
 2019-09-30 14:25:24 +02:00
Cris 04ac4f55fd Removed groupBy option of tabulator 
This was decided for better usability.
 2019-09-30 14:22:04 +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 6b29461e06 Added empty password field 2019-09-30 14:16:48 +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 3938000cfc Changed Kürzel for Studiengang-Dropdown-Widget to upper(typ||kurzbz) 2019-09-30 14:05:22 +02:00
alex 10e1539b22 infocenterData.php, infocenterFreigegebenData.php, infocenterReihungstestAbsolviertData.php: column data is retrieved from selected Studiensemester variable, and not from future Semesters 2019-09-27 14:36:18 +02:00
Paolo 1273c32419 - Renamed controller system/JobsViewer.php to system/LogsViewer.php 
- Renamed directory views/system/jobs to views/system/logs
- Changed FilterWidget query in view system/logs/logsViewerData.php to load all logs
- Added more filters in database to load different log types
 2019-09-26 17:40:51 +02:00
alex bdb0cb7772 - added codex/Bisiozweck_model.php 2019-09-26 16:17:35 +02:00
Paolo 0c82d4fffc Added new views for TableWidget 2019-09-25 17:19:08 +02:00
Paolo 8210c3fdc7 Derived TableWidget from FilterWidget, added: 
- libraries/TableWidgetLib
- widgets/TableWidget
- controllers/widgets/Tables
- public/js/TableWidget.js
 2019-09-25 17:15:46 +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
hainberg 83dd828be7 Minor adaptation to changed method isMitarbeiter() 2019-09-25 14:13:16 +02:00
hainberg 169ffbb568 Changed method isLektor() to isMitarbeiter() 
Because boolean field lektor is not necessary maintained, check is now
for overall mitarbeiter.
 2019-09-25 14:11:38 +02:00
Cris d7cbc89d8b Added password validation to accept Lehraufträge in view & controller 
. added password input field in view
. added password check in controller
. adapted ajax data object and logic to handle password check
 2019-09-25 12:15:19 +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 30c60881a7 Changed check for inkludierte Lehre 
Now inkludierte Lehre returns false when value is null (= freelancer
lector), else true (= fix employed lector)
This impacts the visibility of the column 'Betrag': hidden for fix
employed lectors, shown for freelancer lectors.
 2019-09-25 09:53:52 +02:00
Cris dc64cadc4a Changed: now rows are marked green only for accepted Lehraufträge 
This is to achieve same behaviour for whole process Lehraufträge
bestellen/erteilen/akzeptieren.
 2019-09-25 08:50:21 +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 223f3110bd Added method getLast() 
This method gets latest (active) Verwendung of the user.
 2019-09-24 16:06:50 +02:00
Cris 3340922a35 Extended/Adapted method setStatus() 
Extended check: if new status is 'akzeptiert', the latest status has
to be 'erteilt'.

Adapted code as check for having certain status was outsourced to method
hasStatus.
 2019-09-24 10:21:05 +02:00
Cris 1a58c977fe Added method getLastStatus() 
This method gets the latest Vertragsstatus for the given Vertrag and
Mitarbeiter.
 2019-09-24 10:15:21 +02:00
Cris 812899e885 Added method hasStatus() 
This method checks if Vertrag has the given Vertragsstatus.
 2019-09-24 10:14:22 +02:00
Cris a910527109 Added method isLektor() 
This method checks if a given user is a lector (and eventually if is
fix employed)
 2019-09-24 10:13:08 +02:00