blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,909 Commits 225 Branches 6 Tags
cc28a9220514c2ae8e4e610e08a4abdddb9d9109
Commit Graph

9909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Cris 280c4ca19f Adapted filters for DUMMY lectors 2019-10-16 12:00:40 +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 2729b17d00 Adapted projektbetreuer rdf to return also vertrag_id 2019-10-08 13:44:26 +02:00
Cris f1174f155e Adapted DB-connection via $_POST type 'cancelVertrag' to cancel contracts 
Adapted to cancel projektauftraege.
 2019-10-08 13:43:39 +02:00
Cris daa181a021 Added JS methods to perform Vertragsdetail-GUI & Vertragsstorno 2019-10-08 13:41:59 +02:00
Cris 4fb6ce3840 Added config var FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN 
Boolean var to show/hide Vertragdetails in FAS Projektarbeit tab.
 2019-10-08 13:38:37 +02:00
Cris 2af7909f66 Created GUI for Vertragdetails in FAS Projektarbeit 2019-10-08 13:37:17 +02:00
Cris 4e0264e2d4 Added method cancel() to vertrag.class to cancel contracts 2019-10-07 08:57:52 +02:00
Cris 3e3a238dd9 Added DB-connetction via $_POST type 'cancelVertrag' to cancel contracts 2019-10-07 08:55:55 +02:00
Cris e4969de9f3 Adapted FAS GUI to cancel contracts 2019-10-07 08:50:23 +02:00
Cris 0dddf57577 Added functionality & method VertragStornieren() to cancel contracts 2019-10-07 08:49:37 +02:00
Cris e60839af27 Minor addings for correct GUI behaviour when Vertragsstorno is enabled 
. disabled all fields of LektorInnendaten to prevent changings when
vertrag is already accepted
. added disabling the storno button by default
 2019-10-02 18:10:52 +02:00
Cris d9df0196a4 Adapted getLehreinheitmitarbeiter() to return also vertrag_id 2019-10-02 17:26:30 +02:00
Cris 4adf1c6db9 Adapted lehreinheitmitarbeiter rdf to return also vertrag_id 2019-10-02 17:25:21 +02:00
Cris eabbf701b3 Added post type 'getLastVertragsstatus' 
This will return the most recent vertragsstatus_kurzbz of passed
vertrag_id.
 2019-10-02 17:24:11 +02:00
Cris f939535444 Adapted JS method LeMitarbeiterAuswahl() to perform Vertragsdetails-GUI 2019-10-02 17:21:10 +02:00
Cris 544fd4d976 Added config var FAS_LV_LEKTORINNENZUTEILUNG_VERTRAGSDETAILS_ANZEIGEN 
If set to true the Vertragdetails will be displayed in FAS
LektorInnenzuteilung.
 2019-10-02 17:13:16 +02:00
Cris 4472868fcd Created GUI for Vertragdetails in FAS LektorInnenzuteilung 
Added groupbox with the contract details:
. status
. stunden (of original version of contract)
. studiensemester (of original version of contract)

The display is determined by global config value.
 2019-10-02 17:11:32 +02:00
Cris f1497df019 Adapted vertrag rdfs to new attributes vertragstunden, -studiensemester 
Adapted rdf vertrag, vertragdetails to new attributes vertragsstunden
and vertragsstunden_studiensemester_kurbz.
 2019-10-02 09:42:31 +02:00
Cris 605b88e8d7 Adapted queries to new vertragstunden, -studiensemester in vertrag.class 
Adapted methods:
load, loadVertrag, loadZugeordnet, loadNichtZugeordnet
 2019-10-02 09:39:38 +02:00
Cris 10963fd5c7 Added Stunden/Studiensemester of original contract to FAS Vertragsreiter 2019-10-02 09:30:41 +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 1c3a5c395d Added permission lehrauftrag_akzeptieren 
This permission is for lectors to accept their lehraufträge.
 2019-09-30 15:26:47 +02:00