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
10,222 Commits 225 Branches 6 Tags
83fb32bc185b100c813e83a0a2dd03841f797a3c
Commit Graph

10222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cris 83fb32bc18 Reordered columns: Now Ausbildungssemester right after STG-Typ-Kurzbezeichnung 2019-12-18 15:38:14 +01:00
Cris 4b33f6c0bd Minor code prettyfying (tabs instead whitespaces, line wraps) 2019-12-18 14:51:45 +01:00
Cris 627ad0e499 Added phrase 'Stornierte Lehrauftraege' to phrasesupdate 2019-12-18 14:49:52 +01:00
Cris 34a55e2332 Added/Adapted JS functions for 'Stornierte Lehrauftraege' 
- redrawed tabulator when opening the collapsed module. Must be done
  to display stornierte lehrauftraege.
- generated storniert-tooltip
- generated storniert-status icon
- adapted selectableCheck to leave stornierte unselectable
 2019-12-18 14:48:53 +01:00
Cris ef3eedb989 Added data query and tabulator for 'Stornierte Lehrauftraege' 
This file is triggered within the view acceptLehrauftrag.php.
It displays information about the lectors cancelled contracts:
- Vertragstyp
- Bezeichnung
- Stunden
- Betrag
- Storno Datum
- Storno von
 2019-12-18 14:37:38 +01:00
Cris 754868e7fd Added GUI for Stornierte Lehrauftraege (for the lectors) 
Added new button 'Nur stornierte anzeigen'. When the button is clicked,
a collapsed modul opens below showing details about cancelled contracts
of the requested study semester.
 2019-12-18 14:31:17 +01:00
Cris c2b9f3a3da Amended help info: HOWTO Spaltenbreite verändern 2019-12-16 14:18:57 +01:00
Cris 80f100f5fb Changed name order: first + family name -> to family + first name 
This change allows sorting by family name.
 2019-12-16 13:57:58 +01:00
Cris 9bf1715cb4 Removed unused code from CTRL Lehrauftrag bestellen 2019-12-12 13:43:07 +01:00
hainberg cde7e82033 Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag 2019-12-11 16:13:04 +01:00
Cris 905df6912a Changed: column description from 'Auftrag' -> to 'LV- / Projektbezeichnung' 2019-12-11 15:32:29 +01:00
Cris 9911d792e4 Changed: Inkludierte Lehre when not is null AND not 0 
Now the return value is also checking against 0.
 2019-12-11 15:31:36 +01:00
Cris d5df8d8584 Fixed: delete/change restrictions in FAS now ONLY when config var is true 
Before deleting/changing of lectors was disabled, no matter if the
regarding config entry was set to true or false. This is fixed now.
 2019-12-11 11:52:16 +01:00
alex 1a3a56483c Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag 2019-12-10 15:32:31 +01:00
alex 34d736262b added Lehraufträge Lehrendeuebersicht to menu 2019-12-10 15:32:08 +01:00
Cris e35e4f0398 Changed: methods condition checking 'datum' instead of 'insertamum' 2019-12-10 12:06:32 +01:00
Cris e8942a69b6 Changed: linking URL to CIS_ROOT now 2019-12-10 12:04:03 +01:00
Cris 72ec67a605 Fixed: errormsg missing data_arr in cronjob is fixed now 2019-12-10 10:26:50 +01:00
Cris 8d95c3820b Added column Studienplan to table of Lehrauftrag bestellen 
Added column with most recent, valid studiyplans of the records lv.
 2019-12-09 15:47:43 +01:00
Cris bc4bebb39f Minor changes in job MailLehrauftragToApprove 
Optimized code, added logInfo.
 2019-11-26 14:46:28 +01:00
Cris a93ddfbe3d Added cronjob mailLehrauftraegeToAccept() 
This daily job sends information about all lehr-/projektauftraege
approved (and not accepted/cancelled) the day bofore.
Receivers: lectors
 2019-11-26 14:44:24 +01:00
hainberg 45e381e043 Added function getApproved_fromDate() to Vertragvertragsstatus_model 
This method returns all contracts, where the status had been set to
'erteilt' on given date.
 2019-11-26 14:41:27 +01:00
Cris 94bafe4d6d Fixed cancel-error-msg & wrong status 'geändert' by adding permission 
Before the assistance was receiving error msg when cancelling a contract.
Also study program leader and assistance got wrong status displayed.
This was due to missing permission check in vertrag.rdf.php and is
fixed now.
 2019-11-25 17:11:41 +01:00
Cris 586c626ff0 Fixed: Corrected incorrect SQL query in Benutzerfunktion_model 
Incorrect bracket was causing error message. This is fixed now.
 2019-11-25 09:35:42 +01:00
Cris 24db32f658 Added function getOrdered_fromDate() to Vertragvertragsstatus_model 
This method returns all contracts, where the status had been set to
'bestellt' on given date.
 2019-11-25 08:55:30 +01:00
Cris 0a335b7627 Added cronjob mailLehrauftraegeToApprove() 
This daily job sends information about all lehr-/projektauftraege
ordered (and not approved) the day bofore.
Receivers: Department-/Kompetenzfeldleiter
 2019-11-25 08:46:31 +01:00
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