blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-03 03:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,123 Commits 227 Branches 6 Tags
d53f14eeea259004d2ccef8aef7f5caecfececce
Commit Graph

12123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cris fd3f74807b Added font-awsome 5.9.0. USER ICONS in PNG format 150x150 
PNG icons are used in status- and filter buttons
Setting png icons is a workaround to use font-awsome 5.9.0 icons
until system can be updated to newer font awsome version.
 2019-10-22 11:59:38 +02:00
Nikolaus Krondraf b59ba3f156 erlaube Terminkollision bei Raumreservierung 2019-10-22 07:20:36 +02:00
Manfred Kindl e65fc08e31 Merge remote-tracking branch 'origin/master' 2019-10-21 18:24:28 +02:00
Manfred Kindl e22d560134 Quickfix Export Studienblatt als .doc 2019-10-21 18:21:35 +02:00
Manfred Kindl a3ba7e381f BugFix Betreuertyp BetreuerPraktik 2019-10-21 18:20:49 +02:00
Manfred Kindl 49be024ca9 Coodle 
- Umfragestart ohne Terminwahl verhindern
- Coodle FreeBusy einbinden
- Coodle Zusagen als iCal abonnieren
 2019-10-21 18:19:57 +02:00
Cris 325f7dd09a Changed order of displaying status in Lehrauftrag akzeptieren 
First erteilte
Then bestellte
Last akzeptierte
 2019-10-21 17:35:55 +02:00
Cris ce84e0bea4 Removed unused vertrag data from queries and filters 
. Removed unused:
  - vertrag_insertvon (now using insertvon of vertrag_vertragsstatus instead)
  - vertrag_insertamum
  - vertrag_updatevon
  - vertrag_updateamum
 2019-10-21 17:33:41 +02:00
Cris 06f31997f2 Added bestellt_von/erteilt_von/akzeptiert_von columns and TOOLTIPS 
. added tooltips on bestellt-, erteilt- and akzeptiert-column with
 insertvon information
. adapted tooltips on status column
. added columns to all tabulator queries and to the filters
 2019-10-21 17:29:23 +02:00
Cris af29146bb5 Fixed: now variable erteilt is initialized correctly 2019-10-21 17:19:50 +02:00
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
Paolo 790065a281 Added phrases for password change page 2019-10-18 14:42:08 +02:00
Nikolaus Krondraf fde9af3eed Anmeldebutton wird erst ab 2 Monaten vor Prüfung angezeigt 2019-10-17 12:42:22 +02:00
Nikolaus Krondraf 383558f262 new config variable 2019-10-17 07:41:28 +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
Nikolaus Krondraf 4f065c9234 revert change 2019-10-16 14:47:42 +02:00
Andreas Österreicher fbfa3badf1 Berechtigung korrigiert beim Löschen von Reservierungen direkt aus der Wochenplanansicht 2019-10-16 14:36:25 +02:00
Cris 19a88a8648 Added filter button for geaenderte Lehrauftraege to LA bestellen/erteilen 2019-10-16 12:42:13 +02:00
Manfred Kindl 58ec6f8f31 SaveSort in Dokumentezuteilung 2019-10-16 12:08:20 +02:00
Manfred Kindl 809b2b3e64 Anpassung FHTW Incomings auslesen 
An der FHTW können nur die Incomings ausgelesen werden, wenn die stg_kz 10006 übergeben wird
 2019-10-16 12:07:52 +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
Andreas Österreicher 745b227c1a Merge branch 'hotfix-4790/FAS_UDF_tab_saving_is_broken' 2019-10-15 16:06:48 +02:00
Paolo 7daac696b3 - Renamed controller system/UDF.php to system/FAS_UDF.php 
- Renamed view system/udf.php to system/fas_udf.php
- Adapted code with new names
- Added model system/FAS_UDF_model with only FAS functionalities
- Removed FAS functionalities from model system/UDF_model
- Fixed session problems in controller system/FAS_UDF
 2019-10-15 15:40:47 +02:00
Andreas Österreicher 733685b67e Merge branch 'feature-2533/ZeitaufzeichnungCSVImport' 2019-10-15 14:10:27 +02:00
Andreas Österreicher 6d14423b82 Merge branch 'feature-4210/BIS_UHSTAT2_Erweiterungen' 2019-10-15 13:56:38 +02:00
Paolo 509fdef03b - Removed tabulator local pagination for messages list 
- Removed error messages when the messages list is empty
 2019-10-15 11:54:01 +02:00
Andreas Österreicher 934f8dc3c5 Fehlende Berechtigung für Tabelle aufenthaltfoerderung hinzugefügt 2019-10-15 09:35:02 +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
alex 19d69fdb59 Personen zusammenlegen (vilesci/stammdaten/personen_wartung.php): When merging prestudent, prueflinge are transferred from deleted prestudent to remaining prestudent. 2019-10-11 15:55:16 +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
raab fa28536093 Import für projekt, phase, oe und service 
uid;aktivitaet;start;ende;beschreibung;OE;Projekt;Phase;Service

phase wird in der liste angezeigt
phase auch im export
 2019-10-11 15:02:35 +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