47682f37df
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-16 16:36:57 +01:00
908d63f07e
Merge branch 'feature-5698/Clean_ViewMessage_MessageToken_model'
2020-01-15 13:17:41 +01:00
b29871be59
Merge branch 'hotfix-5697/DigitalerLehrauftrag_ErrorMessages'
2020-01-15 10:04:17 +01:00
3600f18cd0
Merge branch 'feature-5131/FilterWidget/TableWidget_reloadDataset_true_by_default'
2020-01-15 08:05:54 +01:00
e537c0e00a
Fixed Errorhandling for Phrases
2020-01-15 08:04:18 +01:00
03903ec51b
Usernames are always lowered and trimmed after Login
2020-01-08 17:06:14 +01:00
a5fae5f07f
Lehrauftragsverwaltung - Berechtigungsprüfung beim Akzeptieren von Lehraufträgen angepasst wenn Lektor mehrere Accounts besitzt
2020-01-08 16:16:49 +01:00
3adba32420
Merge branch 'feature-3334/FilterWidget_remove_old_filters_session_cached'
2020-01-08 15:53:29 +01:00
bf9cc35dd5
TableWidget fixed a typo
2020-01-08 15:52:03 +01:00
232379ae72
Added SESSION_TIMEOUT constant to TableWidgetLib
2020-01-08 15:49:26 +01:00
26228430aa
Customized error messages
...
Before the user got only a general error message ('Systemerror') when
an error occured. Now the error messages are more individual for better
debugging experience.
2020-01-08 15:46:17 +01:00
8e78382230
Merge branch 'feature-3334/FilterWidget_remove_old_filters_session_cached'
2020-01-08 15:43:05 +01:00
ac4350959b
Cleaned and improved code
2019-12-20 16:25:27 +01:00
4f69152a2b
Merge branch 'feature-5663/Create_new_helper_function_getError' into feature-5698/Clean_ViewMessage_MessageToken_model
2019-12-20 16:18:58 +01:00
befb707870
Merge branch 'feature-5663/Create_new_helper_function_getError' into feature-5131/FilterWidget/TableWidget_reloadDataset_true_by_default
2019-12-20 15:08:28 +01:00
1832f9a78a
- Set reloadDataset = true when widget is loaded
...
- Remove reloadDataset = true where these widgets are called
2019-12-20 14:43:09 +01:00
4e6fc7c607
- Create new function getError in helper hlp_return_object_helper that should just returns retval
...
- Replace all show_error(getData( with show_error(getError(
- Replace all error($...->retval) with error(getError($...))
- Replace all ->outputJsonError(getData( with ->outputJsonError(getError(
- Replace all show_error($...->retval with show_error(getError($...
- Replace all outputJsonError($...->retval with outputJsonError(getError$...
- Replace all return error($...->retval) with return $...
2019-12-18 18:35:19 +01:00
827860e9cc
Fixed Navigation Menu Entry to be displayed correctly
2019-12-18 16:36:26 +01:00
8f3aadd3e2
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-12-18 16:08:11 +01:00
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
2dd540c9e6
Changed Permission for Lehrauftrag-Report from lehre/bestellen to lehre/erteilen
2019-12-18 15:50:30 +01:00
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
ff9aa5c48a
Expanded 'lector'-column width
2019-12-18 15:40:16 +01:00
83fb32bc18
Reordered columns: Now Ausbildungssemester right after STG-Typ-Kurzbezeichnung
2019-12-18 15:38:14 +01:00
4b33f6c0bd
Minor code prettyfying (tabs instead whitespaces, line wraps)
2019-12-18 14:51:45 +01:00
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
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
1a298c7e46
AuthLib->_createAuthObjByPerson now checks that the benutzer is active, and no more the person
2019-12-18 12:43:39 +01:00
a20e8da298
Fixed Error Handling in AuthLib
2019-12-18 07:49:49 +01:00
218a468587
Lecturer Menu Entry is now only viisible with the correct Permission
2019-12-17 17:51:20 +01:00
b6b3870e94
Trimmed Username after HTTP Basic Auth in Codeigniter
2019-12-17 09:04:27 +01:00
c2b9f3a3da
Amended help info: HOWTO Spaltenbreite verändern
2019-12-16 14:18:57 +01:00
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
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
7e58a0f0d2
Removed NavigationLib from acceptLehrauftrag Page because it is not used
2019-12-13 08:55:39 +01:00
478bfdb9a0
Navigationwidget can be called without initial Permission
2019-12-13 08:54:49 +01:00
5b27f29a92
Merge branch 'feature-3994/Digitaler_Lehrauftrag'
2019-12-12 13:54:20 +01:00
9bf1715cb4
Removed unused code from CTRL Lehrauftrag bestellen
2019-12-12 13:43:07 +01:00
cbdb90c227
Berechtigungsfunktion angepasst damit auch Berechtigungen aus den Rollen geladen werden
2019-12-12 13:39:07 +01:00
cde7e82033
Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag
2019-12-11 16:13:04 +01:00
905df6912a
Changed: column description from 'Auftrag' -> to 'LV- / Projektbezeichnung'
2019-12-11 15:32:29 +01:00
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
1a3a56483c
Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag
2019-12-10 15:32:31 +01:00
34d736262b
added Lehraufträge Lehrendeuebersicht to menu
2019-12-10 15:32:08 +01:00
e35e4f0398
Changed: methods condition checking 'datum' instead of 'insertamum'
2019-12-10 12:06:32 +01:00
e8942a69b6
Changed: linking URL to CIS_ROOT now
2019-12-10 12:04:03 +01:00
72ec67a605
Fixed: errormsg missing data_arr in cronjob is fixed now
2019-12-10 10:26:50 +01:00
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
fc2d26e96d
Gruppenbezeichnung bei Lehraufträge korrigiert
2019-12-06 11:32:24 +01:00
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