100 Commits
Author SHA1 Message Date
Paolo b5b43eaa78 Merge branch 'master' into dbskel 2020-11-13 20:55:57 +01:00
Paolo 2b6f8d9040 Fixed alias name of loglib in JQW_Controller 2020-10-23 10:42:12 +02:00
Paolo 4654339681 Renamed library alias LogLib into LogLibJob when loaded in
JOB_Controller
2020-10-18 23:40:48 +02:00
Paolo 6fccfbb073 Changed LogsViewer job queue workers filters description 2020-09-14 15:25:17 +02:00
Paolo 65ee03f6ae - Added new constant OPT_MINUTES to FilterWidgetLib
- Now is it possible to use minutes and hours in the FilterWidget
- LogsViewer tool now displays milliseconds for execution time column
- Changed filters for LogsViewer tool
2020-09-14 15:01:33 +02:00
Paolo fbd4ded720 - Added new constants P_NAME_REQUEST_ID and
P_NAME_REQUEST_DATA_FORMATTER tp logLib
- Added new properties _requestId and _requestDataFormatter to LogLib
- Added new public method setConfigs to LogLib
- Added possibility to choose the request id when the LogLib is loaded
- Added possibility to format the request data using the
_requestDataFormatter parameter
- Now LogLib always stores the request id + log level
- Added possibility to change the execution time parameter
- Adapted application/core/JOB_Controller.php code
- Adapted application/core/JQW_Controller.php code
2020-09-11 17:43:39 +02:00
Paolo 40766e7161 Added new public method getJobsByTypeStatusInput to controller core/JQW_Controller 2020-07-22 17:10:11 +02:00
Paolo a9ba3f039f Added new public method getJobsByTypeStatusInput to library JobsQueueLib 2020-07-22 16:51:38 +02:00
Paolo 73bf1fb050 Reverted changes added by commit be7ea871be 2020-07-22 16:47:41 +02:00
Paolo 747d1d8d32 Fixed bug in application/core/JQW_Controller.php 2020-07-22 13:52:13 +02:00
Paolo 9c732a4870 Added utility methods updateJobs and generateJobs to controller core/JQW_Controller 2020-07-22 13:34:37 +02:00
Paolo ade81e5460 Merge branch 'feature-6656/Worker_queue' of https://github.com/FH-Complete/FHC-Core into feature-6656/Worker_queue 2020-07-22 01:00:04 +02:00
Paolo be7ea871be - Added new config entry job_schedulers_list to config/jqm.php
- Library JobsQueueLib:
	- Added constant JOB_SCHEDULERS_LIST
	- Constructor now loads the jqm configs
	- Added new public method schedule
2020-07-22 00:56:52 +02:00
Paolo 32490dfc2d organisation/Studiensemester_model->getLastOrAktSemester: changed query to get more data 2020-06-21 21:57:50 +02:00
Paolo 596494708d CL/Messages_model->prepareHtmlRead changed to redirect to an
authenticated controller to reply to a message in case the receiver
is the the system sender
2020-06-17 14:57:01 +02:00
Paolo 89ccb2f3a5 Renamed column bis.tbl_nation.ISO-3166-1-A-2 as iso3166_1_a2 2020-05-22 17:18:59 +02:00
Paolo 13dc57b90c Added ISO-3166-1-A-2 column to bis.tbl_nation 2020-05-22 16:17:46 +02:00
Paolo a1600c9f3a CL/Messages_model->sendImplicitTemplate now writes the person log in any case 2020-05-13 17:55:56 +02:00
Paolo fc5403d257 Merge branch 'master' into dbskel 2020-04-22 21:22:59 +02:00
Paolo 0d2e99860e Expanded DB structure 2020-04-22 21:21:55 +02:00
Paolo 2f34e13519 Added config file for DBSkel 2020-04-15 17:24:20 +02:00
Paolo d1e1957f28 Added previously deleted DBSkel files and dirs 2020-04-15 17:21:01 +02:00
Paolo 70a8e5deae Merge branch 'master' into dbskel 2020-04-15 17:11:24 +02:00
Paolo 4d35dc5ad7 Merge branch 'master' into dbskel 2020-04-15 17:00:15 +02:00
Paolo 2a59165332 Added new date format column ReihungstestDate to system/infocenter/infocenterFreigegebenData.php 2020-04-01 18:53:13 +02:00
Paolo 299f16dd8c - View system/messages/ajaxWrite added new button backButton
- Added new function backToInOut to public/js/messaging/write.js
- Assigned function backToInOut to backButton click event
- Added new phrase backToReadWeiteMeassage to system/phrasesupdate.php
2020-04-01 18:27:10 +02:00
Paolo 35970696ca CL/Messages_model->prepareHtmlRead hide reply button only if the sender
is not the system sender and are present configurations to reply
2020-03-31 21:48:55 +02:00
Paolo e038fa4f34 - system/messages/MessageClient->read now loads view system/messages/ajaxRead with $this->CLMessagesModel->prepareAjaxRead() as parameter
- view system/messages/ajaxRead.php can hide the button to write new messages
- Added new public method prepareAjaxRead to model CL/Messages_model
2020-03-31 21:28:16 +02:00
Paolo a2c9954a6d - FAS_UDF->index declared missing array data
- public/js/UDFWidget.js changed save button caption to "Speichern"
2020-03-31 20:40:41 +02:00
Paolo 91d78066a4 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-03-31 20:33:01 +02:00
Paolo 625b0f1167 - jobs/OneTimeMessages->sendMessageToApplicantsStillWaiting now accept
new message senderId to specify the sender for all the messages
- jobs/OneTimeMessages->sendMessageToApplicantsStillWaiting adapted code
to make use of the new method CLMessagesModel->sendExplicitTemplateSenderId
- jobs/OneTimeMessages->sendMessageToApplicantsStillWaiting now logs the
number of prestudents retrieved from database
- Renamed CLMessagesModel->sendExplicitTemplate as CLMessagesModel->sendExplicitTemplateSenderId
- Added new parameter sender_id to CLMessagesModel->sendExplicitTemplateSenderId to specify the sender person id
- Added new public method sendExplicitTemplate to CLMessagesModel as
wrapper method for sendExplicitTemplateSenderId
- CLMessagesModel->sendExplicitTemplate tries to retrieve the sender id
from the authentication session
2020-03-31 20:21:18 +02:00
Paolo e3257eef25 - CL/Messages_model->sendExplicitTemplate now gets the sender id from
the configuration if the user is not logged (ex. job)
- Added new job application/controllers/jobs/OneTimeMessages.php
2020-03-30 22:44:03 +02:00
Paolo 3ff527b2ad - Added check on property status in private method _checkJobStatus of JobsQueueLib
- When updating a job now it is checked if the job is present in the
database
2020-03-18 00:56:28 +01:00
Paolo 4d1dbdfae9 - Added new model system/JobTriggers_model
- Loads jqm configuration in controller system/jq/JobsQueueManager
- Added new table system.tbl_jobtriggers to system/dbupdate_3.3.php
- Added new privacy method _addNewTriggeredJobToQueue to JobsQueueLib
- JobsQueueLib is called by addNewJobsToQueue and updateJobsQueue
2020-03-12 18:51:26 +01:00
Paolo da621a2154 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-03-12 11:19:17 +01:00
Paolo 9bb4e2507a - Added two new functions to config entry ou_function_whitelist
- Fixed Vorlage_widget to retrieve univocally templates
2020-03-09 13:41:17 +01:00
Paolo 88fc901bf7 - Added new config entry ou_function_whitelist in message.php
- Added new constant CFG_OU_FUNCTION_WHITELIST in library MessageLib
- MessageLib->getOeKurzbz now filters out organization units based on config entry ou_function_whitelist
- Removed redundant templates in Vorlage_widget
2020-03-06 16:56:27 +01:00
Paolo 8363f0d26c Fixed marker in JobsQueueViewer 2020-03-06 14:30:52 +01:00
Paolo 6b0bf89592 Removed load config loads in JobsQueueLib 2020-03-06 14:25:52 +01:00
Paolo e92880b79a - Added new private methods _checkPermissions and _convertJobs to controller system/jq/JobsQueueManager
- Added new public method updateJobsQueue to controller system/jq/JobsQueueManager
- system/jq/JobsQueueManager->getLastJobs now checks permissions
- Added new public method updateJobsQueue to JQW_Controller
- Less redundant constansts in Library JobsQueueLib
- JobsQueueLib constructor now loads models JobsQueueModel, JobTypesModel and JobStatusesModel
- Added new public methods getLastJobs, addNewJobsToQueue and updateJobsQueue to JobsQueueLib
- Added new private methods _checkNewJobStructure, _checkUpdateJobStructure, _checkJobType, _checkJobStatus, _inArray, _dropNotAllowedPropertiesNewJob and _dropNotAllowedPropertiesUpdateJob to
2020-03-06 14:15:10 +01:00
Paolo d2e7336f2c Granted permission to user fhcomplete and vilesci for sequence seq_jobsqueue_jobid 2020-03-06 14:14:11 +01:00
Paolo ba566ab459 Added new models system/JobStatuses_model and system/JobTypes_model 2020-03-06 14:13:25 +01:00
Paolo 3bfe1cdeea - Fixed messages and comments in PermissionLib
- JobsQueueManager->addNewJobsToQueue now checks permission to write new jobs in the queue
- Added statuses for system.tbl_jobstatuses in system/dbupdate_3.3.php
- Added permission access type (read/write) in configuration file application/config/jqm.php
2020-03-05 18:48:26 +01:00
Paolo cd815acdbf - Added new constant BEGINNING_OF_TIME
- Added new config entry job_type_permissions_white_list in jqm.php
- Added new navigation entry jobsqueueviewer
- Added new model application/models/system/JobsQueue_model.php
- Added new option in FilterWidget for hours comparison with dates
- Added new filter core-jq-lastHour to system/filtersupdate.php
- Added new statements to system/dbupdate_3.3.php to create tables system.tbl_jobstatuses, system.tbl_jobtypes and system.tbl_jobstatuses
- Added new views application/views/system/jq/jobsQueueViewer.php and application/views/system/jq/jobsQueueViewerData.php
2020-03-05 15:57:06 +01:00
Paolo 30c6f10d80 First proposal 2020-03-04 15:54:23 +01:00
Paolo edf7800120 - Controller system/messages/Messages parameters are now retrieved via HTTP POST
- public/js/messaging/messageWrite.js function parseMessageText now perform a HTTP POST ajax call
2020-03-02 16:45:04 +01:00
Paolo de62bc0f3d Merge branch 'feature-3716/Messaging_inbox_outbox_user' 2020-03-02 16:13:04 +01:00
Paolo caf57092e4 - Page to write a new message from FAS/Infocenter has a wider and higher variables drop down
- Tabulator fix CSS
2020-02-28 17:05:11 +01:00
Paolo e3211ff73d Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-02-28 13:44:34 +01:00
Paolo cfcf8f7ba7 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-02-28 13:44:13 +01:00
Paolo 34b6581849 - Renamed BenutzerfunktionModel->getByPersonId to getActiveFunctionsByPersonId
- BenutzerfunktionModel->getActiveFunctionsByPersonId changed query to get only active functions
- Removed commented code
2020-02-26 17:22:59 +01:00
Paolo a50cc6cba8 - jobs/MailJob->sendAllMessageEmailNotices changed since parameter default value
- Moved ALT_OE from MessageLib to CL/Messages_model
- MessageLib->_setSentError renamed to _updatedRecipientNoticeEmailInfo
- MessageLib->_sendNoticeEmail changed to have more information about a not sent notice email
- Recipient_model->getNotSentMessages now does not retrieve messages with notice email send failure
2020-02-25 16:41:27 +01:00
Paolo b9d973a6e8 Merge branch 'feature-3716/Messaging_inbox_outbox_user' of https://github.com/FH-Complete/FHC-Core into feature-3716/Messaging_inbox_outbox_user 2020-02-24 11:09:00 +01:00
Paolo ae0853b048 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-02-21 17:04:43 +01:00
Paolo 304d7727f0 - CL/Messages_model-> sendReply applied workaround for Infocenter
- MailJob now extends JOB_Controller and writes logs in DB
- MailJob->sendMessages renamed to sendAllMessageEmailNotices
- sendAllMessageEmailNotices now accept new parameter since to restrict number of messages
- MessageLib->sendAllEmailNotices now accept new parameter since and adapted to use new MessageLib->_sendNoticeEmails
- Recipient_model->getMessages renamed to getNotSentMessages
- Now accepts only limit and since as parameters
- Changed query to retrieve only message ids
2020-02-21 16:59:25 +01:00
Paolo c1adc94204 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-02-20 16:41:42 +01:00
Paolo 9a9b847138 Fixed Tabulator include in FHC-Header 2020-02-20 16:21:31 +01:00
Paolo 0b3d5e19a3 CL/Messages_model->sendReply now uses as sender id the logged user person id or the previous message recipient id 2020-02-20 14:39:37 +01:00
Paolo 0db611ed27 - Added new config entry in mail config file called enable_debug
- If enable_debug is true then info about the mail are logged into the CI error logs
- Fixed queries to get sent and received messages with Recipient_model, now messages for which a notice email was not sent are retrieved and messages are sorted by insertamum
- CL/Messages_model:
	- Before setting a message as read check if a record is already present
	- If the recipient is a prestudent then in table tbl_msg_message oe_kurzbz is set with the ou of the prestudent
	- The sender id (person_id) now is get from the currently logged user also when replying
- MessageLib->_sendNoticeEmails checks that the message was sent only from FAS (NOT from infocenter)
2020-02-18 15:19:58 +01:00
Paolo b94aad14fb - Added new config entris for messaging: ou_receivers_no_notice and ou_receivers_private
- MessageLib:
	- Renamed method sendAllNotices to sendAllEmailNotices
	- Renamed method _sendOneNotice to _sendNoticeEmails
	- Renamed method _sendNotice to _sendNoticeEmail
	- If the recipient contact is empty is not anymore a blocking error
- Recipient_model->getMessageById renamed to getMessagesById, not it accepts an array of message ids, could return more results
- Fixed bug in public/js/messaging/writeReply.js to send subject value
2020-02-17 18:29:07 +01:00
Paolo 11f3fad1f7 Changed logic to send notice email to a message recipient 2020-02-14 19:17:09 +01:00
Paolo a4bfdfb4a0 Fixed merge with stashed files in system/messages/htmlWriteTemplate.php 2020-02-13 12:49:57 +01:00
Paolo c54579ef7d /system/messages/MessageClient/read sent messages: read them all 2020-02-12 16:39:00 +01:00
Paolo 937db42e11 - Allow to change the subject in all reply pages
- Remove tabs and/or blanks from subject when replying
2020-02-12 16:14:50 +01:00
Paolo 6882199d0e Bugfixes to allow to write to a person or to a prestudent from different GUIs 2020-02-12 14:43:11 +01:00
Paolo de7ecb678c Fixed phrases 2020-02-11 18:28:29 +01:00
Paolo 98918bc336 - Bugfix: fixed phrases in views/system/messages/*
- Added new phrases where missing or hard coded
- Fixed windowz new lines in /application/*
2020-02-11 18:05:26 +01:00
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
Paolo 1b9693e316 Bugfix: Infocenter write page person id and prestudent id are swapped 2020-02-11 16:10:39 +01:00
Paolo c7b33fe160 Bugfix: FAS write page person id and prestudent id are swapped 2020-02-11 16:04:08 +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
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
Paolo a396f4a4ba Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-23 09:41:57 +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 13e24230bc Fixed font awesome in composer and gitignore 2020-01-21 12:18:08 +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 50f633ce3e Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-17 15:04:47 +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
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
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
Paolo 1a298c7e46 AuthLib->_createAuthObjByPerson now checks that the benutzer is active, and no more the person 2019-12-18 12:43:39 +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
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
Paolo 6e89a917ae Added missing phrases 2019-12-04 15:12:19 +01:00
Paolo 64976c31df Added new weblogservice type: API 2019-12-04 13:56:10 +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 5c3aed92f0 Added missing phrase 2019-12-03 16:07:45 +01:00