blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-06 21:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,908 Commits 230 Branches 6 Tags
b3748fb9107643bcd74372a020add50f992b5dde
Commit Graph

1204 Commits

Author SHA1 Message Date
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
Cris 19a88a8648 Added filter button for geaenderte Lehrauftraege to LA bestellen/erteilen 2019-10-16 12:42:13 +02:00
hainberg aa6946bfff Adapted tabulator QUERY for DUMMY lectors in Lehrauftrag erteilen 2019-10-16 11:59:09 +02:00
Cris 9f8921e186 Adapted tabulator QUERY for DUMMY lectors in Lehrauftrag bestellen 2019-10-16 11:58:44 +02:00
Cris ed2a029139 Added GUI for DUMMY lectors in Lehrauftrag erteilen 
. dummy status icon/tooltip/formats
. dummy filter button
 2019-10-16 11:57:39 +02:00
Cris 5ccd23f68d Added GUI for DUMMY lectors in Lehrauftrag bestellen 
. dummy status icon/tooltip/formats
. dummy filter button
 2019-10-16 11:56:26 +02:00
Cris 70605a83e1 Removed uncommented doc text! 2019-10-16 09:00:08 +02:00
Cris 9fc3d165db Added status icons/tooltip/formats for GEAENDERTE in Lehrauftrag erteilen 2019-10-16 08:58:11 +02:00
Cris 5030f0b1ed Major addition of tabulator functionality methods III / Enhanced code 
III: Same as for orderLehrauftrag is here adapted to acceptLehrauftrag:

. 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
. Rows formatting enhanced and bootstrapped
. day of date now with 2 digits
 2019-10-16 08:53:37 +02:00
Cris 5ac6e4f01d Added Ausbildungssemester to CONTROLLER 2019-10-15 08:46:00 +02:00
Cris 049820b468 Created Ausbildungssemster DropdownWidget 
. returning 10 semester by default
. returning given numer of semester
 2019-10-15 08:43:19 +02:00
Cris 36c8a4dbbe Added Ausbildungssemester to tabulator QUERY 2019-10-15 08:41:16 +02:00
Cris 4c85c88725 Added Ausbildungssemester-Dropdown to GUI 2019-10-15 08:38:43 +02:00
Cris 0514ec87ba Renamed main title to Lehrauftraege bestellen/erteilen/annehmen 2019-10-14 16:56:50 +02:00
Cris a793a2f88c Added hidden column with vertragdata 
. Added hidden columns with vertragsdata to erteilt- and akzeptiert-
tabulator tables. This is to be able to detect where contract were
changed and mark/disable that lehrauftrag.
. Adapted filter
 2019-10-14 16:44:03 +02:00
Cris c370a27c18 Added table columns orgform_kurzbz and ausbildungssemester 
. Columns lehrveranstaltung-orgform_kurzbz and -semester are now visible
in all tabulator-tables in bestellen - erteilen - akzeptieren.
. Renamed names of auftraege (no need to display semester text anymore)
. Adapted filter
 2019-10-14 16:39:31 +02:00
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
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
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
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