blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-09 08:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,836 Commits 225 Branches 6 Tags
fbd4ded720b339cc29d3900a6741bc21d87cd721
Commit Graph

1586 Commits

Author SHA1 Message Date
hainberg 3be1c627b2 Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag 2019-12-18 15:53:27 +01:00
Andreas Österreicher 2dd540c9e6 Changed Permission for Lehrauftrag-Report from lehre/bestellen to lehre/erteilen 2019-12-18 15:50:30 +01:00
Cris df057faa8f Added default text 'Keine Daten vorhanden' for empty tables 
Before the tabulator sometimes looked kind of 'undone', when no data was
loaded. Now a nice message is displayed if the table is empty.
 2019-12-18 15:45:34 +01:00
Cris ff9aa5c48a Expanded 'lector'-column width 2019-12-18 15:40:16 +01:00
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 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
Paolo 1a298c7e46 AuthLib->_createAuthObjByPerson now checks that the benutzer is active, and no more the person 2019-12-18 12:43:39 +01:00
Andreas Österreicher a20e8da298 Fixed Error Handling in AuthLib 2019-12-18 07:49:49 +01:00
Andreas Österreicher 218a468587 Lecturer Menu Entry is now only viisible with the correct Permission 2019-12-17 17:51:20 +01:00
Paolo e509f7acd1 Added comments and cleaned code 2019-12-17 16:57:02 +01:00
Paolo 719f2d7314 - Changed controller system/FAS_UDF, less busy now 
- Method execReadOnlyQuery of DB_Model less strict check against SQL statements
- Added new public method setup to DB_Model to setup the model after initialization
- Added new constants to UDFLib
- Added new private method _printEndUDFBlock and _printEndUDFBlock to UDFLib
- Added new public methods setUDFUniqueId, getSession, getSessionElement, setSession, setSessionElement, saveUDFs and isAllowed to UDFLib
- Removed model system/FAS_UDF_model
- View views/system/fas_udf now uses the view templates/FHC-Header
- Added new parameter udfs to view templates/FHC-Header
- Added new properties to UDFWidget
- Added new private methods _initUDFWidget, _checkParameters and _startUDFWidget to UDFWidget
 2019-12-17 13:35:41 +01:00
Andreas Österreicher b6b3870e94 Trimmed Username after HTTP Basic Auth in Codeigniter 2019-12-17 09:04:27 +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
alex e2b75bcca9 - system/Variablenname_model getDefaults: replaced string concatenation of variable names in query by ci parameter replacement to prevent SQL injections 2019-12-13 16:37:33 +01:00
Andreas Österreicher 7e58a0f0d2 Removed NavigationLib from acceptLehrauftrag Page because it is not used 2019-12-13 08:55:39 +01:00
Andreas Österreicher 478bfdb9a0 Navigationwidget can be called without initial Permission 2019-12-13 08:54:49 +01:00
Andreas Österreicher 5b27f29a92 Merge branch 'feature-3994/Digitaler_Lehrauftrag' 2019-12-12 13:54:20 +01:00
Cris 9bf1715cb4 Removed unused code from CTRL Lehrauftrag bestellen 2019-12-12 13:43:07 +01:00
Andreas Österreicher cbdb90c227 Berechtigungsfunktion angepasst damit auch Berechtigungen aus den Rollen geladen werden 2019-12-12 13:39:07 +01:00
Paolo 14e54ea48c Merge branch 'feature-4998/FHC-IDAM_REST_Schnittstelle_zum_Setzen_des_Aktivierungscodes' into feature-5128/FHC-IDAM_account_activation 2019-12-11 18:55:10 +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
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
Andreas Österreicher fc2d26e96d Gruppenbezeichnung bei Lehraufträge korrigiert 2019-12-06 11:32:24 +01:00
Paolo 4cf6ed9e0c Added new CryptLib as a collection of different encryption/hashing algorithms based on phpseclib 2019-12-04 13:27:49 +01:00
Paolo c2bc48d320 - Placed a timestamp in the filter/table widget session 
- Added a constant as fallback timeout for filter/table widget
- Added a parameter to specify the filter/table widget life time
- Filter/table widget on load removes expired filter/table widgets from session
 2019-11-28 16:51:38 +01:00
Paolo 0319d0cc2a - Added new constants in config/constants.php: 
- LANG_SESSION_ACTIVE_LANGUAGES
        - LANG_SESSION_CURRENT_LANGUAGE
- Added new functions in helper hlp_language_helper:
        - setUserLanguage
        - getDBActiveLanguages
        - getActiveLanguages
- Adapted code to make use of them
- Added new controller controllers/widgets/Language
 2019-11-26 15:24:26 +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
Paolo 0f9b29c52e - Added private method _checkHTTPS to core/FHC_Controller 
- Method _checkHTTPS is called in core/FHC_Controller constructor immediately after the parent constructor call
- Method _checkHTTPS checks if the HTTPS protocol is enabled and used, if NOT then an error is raised and the execution is terminated
 2019-11-25 16:25:10 +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
Paolo ceb3f212c9 - Added support for language in session in function getUserLanguage from helper hlp_language_helper 
- If the language is loaded from database then it is checked that the language is enabled
 2019-11-22 12:05:07 +01:00
alex 996e9147bc views/system/infocenter/infocenterFreigegebenData.php: Interessenten with reihungstestangetreten = TRUE from prestudent table are removed from resultset 2019-11-18 18:47:54 +01:00
Paolo 6bf7d46ace - Added securimage via composer 
- Added securimage in application/views/templates/FHC-Header.php
 2019-11-18 15:04:52 +01:00
Andreas Österreicher 084056a1a0 Merge branch 'feature-4825/Infocenter_zurückstellen_Farbe_intensiver' 2019-11-15 11:44:45 +01:00
Andreas Österreicher 617f435a7c Merge branch 'feature-4825/Studiensemester_Studienjahr_anlegen_bessere_Fehlermeldung_wenn_existiert' 2019-11-15 11:08:53 +01:00