Commit Graph

1586 Commits

Author SHA1 Message Date
Paolo 16cb4a0d4c - Replace "This is a notice to notice you that you have been noticed..." with:
EN: "This message will be delivered to the Infocenter of UAS Technikum Wien"
	DE: "Diese Nachricht wird an das Infocenter der FHTW zugestellt "
- Bugfix: fixed phrases in system/messages/MessageClient/write
2020-02-11 16:49:25 +01:00
alex b41ef00b3d crm/Prestudent_model: hasBewerber can optionally check bewerber only for a Studiengangtyp. In InfoCenter, only Bachelors are checked after Freigabe (for setting Bewerber and Reihungstestbooleans) 2020-02-11 16:42:04 +01:00
Paolo c7b33fe160 Bugfix: FAS write page person id and prestudent id are swapped 2020-02-11 16:04:08 +01:00
Manfred Kindl 8f915d3c39 Initial File 2020-02-11 14:44:23 +01:00
Cris 5953b6932f Bufixed Chromes autofilling username in random input field
If no username input field is required, Chorme is autofilling a random
inputfield with username. This is a Chrome bug.
Workaround by adding a hidden username field. Also setting autocomplete=
new-password should help stopping random autofill in some browsers.
2020-02-10 15:42:34 +01:00
alex 7fdaaace50 If Prestudent is freigegeben for RT and has already a Bewerber with reihungstestangetreten = true, a new Bewerber for the prestudent is created, reihungstestangetreten and teilgenommen are set to true 2020-02-07 17:46:29 +01:00
Andreas Österreicher b0380f4b64 FilterWidget and TableWidget Pages can now also be access with Readonly Permission 2020-02-07 13:16:55 +01:00
alex 7f8415e6dc system/Variable_model: replaced concatenation of names array with ? (parameter replacement by CI) to prevent SQL injections 2020-02-06 14:52:26 +01:00
Andreas Österreicher e2f4e35a7f Lehrauftragsverwaltung zeigt per Default das aktuelle Studiensemester statt dem nächsten 2020-02-05 15:25:00 +01:00
Paolo 15b3532359 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-02-04 17:16:17 +01:00
Paolo 749e9be64d Messaging system: student writes new message: separate logic for master and bachelor 2020-02-04 17:02:25 +01:00
Paolo 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
Paolo 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
Andreas Österreicher 16f6bdbf70 Merge branch 'feature-5128/FHC-IDAM_account_activation' 2020-02-03 14:53:24 +01:00
Cris b2542b5fcc Added HELP button and collapsable help-info to TableWidget [ALPHA VERSION]
Now this is a standard behaviour of TableWidget.
Removed also table related help information from general
Hilfe-zu-dieser-Seite help.
[ALPHA VERSION]: minor issue to be fixed:
button color not toggling correctly when opening help then settings
(and way round)
2020-01-30 17:09:31 +01:00
Cris bce7f60df4 Moved layout options to TableWidget
Now this is a standard behaviour of TableWidget.
2020-01-30 13:22:49 +01:00
Cris 6897ccdd6b Moved empty table placeholder text to TableWidget
Now this is a standard behaviour of TableWidget.
2020-01-30 12:43:50 +01:00
Cris 8c36b0b67a Reduced default minimum size of columns in Stornierte Lehraufträge 2020-01-30 12:28:51 +01:00
Cris 3b2b279bf9 Changed default visibility / order of columns
Now fitted to the users primary needs. Columns can be displayed/hidden
via Columnpicker by user afterwards.
2020-01-30 12:27:13 +01:00
Cris 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
Cris 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
alex 2e30841b0d - added UDF prestudent dropdown to infocenterDetails
- crm/Prestudent_model: improved code, e.g. replaced ->retval
2020-01-28 17:21:47 +01:00
Cris b270e65d2e Extended FHC_TableWidget with column picker, header & footer
Added standard behaviour to FHC_TableWidget:
. Added column picker to new TableWidgetHeader div.
. Moved former footerElement (including Alle aus-/abwählen
buttons, CSV Downloads) from single specific files to new
TableWidgetFooter divs.
. Adapted other files to work with new FHC_TableWidget behaviour
2020-01-28 12:26:56 +01:00
Paolo 87aa482234 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-01-28 11:03:51 +01:00
Paolo 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
Paolo 15fa4a6c90 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-23 09:55:00 +01:00
alex 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
Paolo 3e72f399be Infocenter is now hardcoded in recipient messages to avoid to display an empty "message to" 2020-01-22 15:04:07 +01:00
Paolo 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
Paolo 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
Paolo 47682f37df Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-16 16:36:57 +01:00
Paolo 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
Andreas Österreicher 908d63f07e Merge branch 'feature-5698/Clean_ViewMessage_MessageToken_model' 2020-01-15 13:17:41 +01:00
Andreas Österreicher b29871be59 Merge branch 'hotfix-5697/DigitalerLehrauftrag_ErrorMessages' 2020-01-15 10:04:17 +01:00
Andreas Österreicher 3600f18cd0 Merge branch 'feature-5131/FilterWidget/TableWidget_reloadDataset_true_by_default' 2020-01-15 08:05:54 +01:00
Andreas Österreicher e537c0e00a Fixed Errorhandling for Phrases 2020-01-15 08:04:18 +01:00
Andreas Österreicher 03903ec51b Usernames are always lowered and trimmed after Login 2020-01-08 17:06:14 +01:00
Andreas Österreicher a5fae5f07f Lehrauftragsverwaltung - Berechtigungsprüfung beim Akzeptieren von Lehraufträgen angepasst wenn Lektor mehrere Accounts besitzt 2020-01-08 16:16:49 +01:00
Andreas Österreicher 3adba32420 Merge branch 'feature-3334/FilterWidget_remove_old_filters_session_cached' 2020-01-08 15:53:29 +01:00
Paolo bf9cc35dd5 TableWidget fixed a typo 2020-01-08 15:52:03 +01:00
Paolo 232379ae72 Added SESSION_TIMEOUT constant to TableWidgetLib 2020-01-08 15:49:26 +01:00
Cris 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
Andreas Österreicher 8e78382230 Merge branch 'feature-3334/FilterWidget_remove_old_filters_session_cached' 2020-01-08 15:43:05 +01:00
Paolo ac4350959b Cleaned and improved code 2019-12-20 16:25:27 +01:00
Paolo 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
Paolo 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
Paolo 1832f9a78a - Set reloadDataset = true when widget is loaded
- Remove reloadDataset = true where these widgets are called
2019-12-20 14:43:09 +01:00
Paolo 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
Andreas Österreicher 827860e9cc Fixed Navigation Menu Entry to be displayed correctly 2019-12-18 16:36:26 +01:00
Andreas Österreicher 8f3aadd3e2 Merge branch 'feature-3994/Digitaler_Lehrauftrag' 2019-12-18 16:08:11 +01:00