c7b33fe160
Bugfix: FAS write page person id and prestudent id are swapped
2020-02-11 16:04:08 +01:00
15b3532359
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-02-04 17:16:17 +01:00
749e9be64d
Messaging system: student writes new message: separate logic for master and bachelor
2020-02-04 17:02:25 +01:00
53ac4d11ba
Do not retrieve the degree program name from studiengang table but directly from the organization unit table
...
in student sent messages page and student write to organisation unit page
2020-02-04 14:42:53 +01:00
d496bf5993
When the recipient is infocenter then place a * close to the drop down description and a note under the tinymce box.
2020-02-03 16:44:29 +01:00
16f6bdbf70
Merge branch 'feature-5128/FHC-IDAM_account_activation'
2020-02-03 14:53:24 +01:00
98bb9987da
Now inkludierte Lehre also checking former (past) BIS Verwendungen
...
This allows display of column 'Betrag' in Lehraufträge annehmen.
(Important for external lectors, who want to see Betrag of their new
Lehrauftraege. They usually don't have active BIS Verwendung at the
beginning of each term, therefor last (past) BIS Verwendung needs to be
checked)
2020-01-29 09:55:59 +01:00
9bdee6d0f8
Corrected SQL query: now retrieving employees UID via tbl_mitarbeiter
...
Some Lectors, who were assigned as Projektbetreuer, received an email on
their (past) student-email-account. Now this is corrected.
2020-01-28 17:33:04 +01:00
8f908887be
- Method parseMessageText of controller system/messages/Messages could accept also the prestudent_id parameter
...
- If prestudent_id parameter then CLMessagesModel->parseMessageTextPrestudent is called
- Fixed show_error(getData error in model CLMessagesModel
- Added new method parseMessageTextPrestudent to model CLMessagesModel
- Method _prepareHtmlWriteTemplate of model CLMessagesModel now checks if data are from a prestudent and then uses MessageLib->getMessageVarsPrestudent
- Added new method getMessageVarsPrestudent to MessageLib
- Function parseMessageText in js/messaging/messageWrite.js could call system/messages/Messages/parseMessageText with prestudent_id parameter
2020-01-24 18:13:03 +01:00
15fa4a6c90
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-23 09:55:00 +01:00
09323d167b
controllers/system/infocenter/InfoCenter.php: bugfix - links are not built incorrectly anymore when switch from freigegeben to uebersicht with filter_id
2020-01-23 09:39:00 +01:00
3e72f399be
Infocenter is now hardcoded in recipient messages to avoid to display an empty "message to"
2020-01-22 15:04:07 +01:00
0244caaa70
- Moved core from Redirect controller to ViewMessage controller
...
- Dropped Redirect controller
- Adapted configs and paths because of these changes
2020-01-17 15:39:34 +01:00
63f475cd27
- Moved controllers Redirect and ViewMessage to system/messages/
...
- Changed config entries in message.php
- Changed Redirect controller to improve code and logic
2020-01-17 15:02:42 +01:00
47682f37df
Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user
2020-01-16 16:36:57 +01:00
4e43d37780
- Droped not used packages from composer.json
...
- Fixed packages version in composer.json
- Renewed file composer.lock
- Checked & Fixed imports paths
- Moved /vendor/FHC-Vendor to /FHC-Vendor
2020-01-15 18:08:29 +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
Paolo