Commit Graph

466 Commits

Author SHA1 Message Date
alex 676b3b3039 - added sanitizeProblemChars to common helper for sanitizing chars
- improved alias handling in benutzermodel
- added kurzbz handling to employeemodel
2020-08-12 21:33:08 +02:00
Andreas Österreicher bc305dc86c Merge branch 'master' into feature-6656/Worker_queue 2020-08-10 18:11:31 +02:00
Cris 93ecc89ebe Added method getPhones_byPerson to Kontakt model.
Gets all latest phones of person where zustellung is true. Ordered by
telefon > mobil > firmenhandy > else.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-08-06 10:32:45 +02:00
Cris 188319a1fc Adapted method getZustellAdresse of Adresse Model
Added param select.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-08-05 18:38:27 +02:00
Cris 1d2233152c Added method getBetriebsmittel to Betriebsmittelperson Model
Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-08-05 18:23:51 +02:00
Cris 2b0ff28c41 Added getAll_byPersonID in Kontakt Model
Get all latest contact data of person, where Zustellung is true.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-08-05 18:20:11 +02:00
alex bd388a03ad codex/Bisverwendung_model: getVerwendungen ordered by beginn by default
resource/Mitarbeiter_model: possible to retrieve Vorgesetzte within a timespan
2020-08-01 08:20:52 +02:00
Andreas Österreicher 625a95c830 Merge branch 'bugfix-8664/Richtiges_Pruefungsprotokoll_fuer_Incomings_laden' 2020-07-22 14:52:03 +02:00
alex 88e25524b3 person/Benutzerfunktion_model.php getBenutzerFunktionByUid method: added organisationseinheit_bezeichnung to Benutzerfunktionen, added sorting order (datumbis, datumvon) 2020-07-22 00:48:45 +02:00
Cris 649d0e7f5d Fixed: retrieving correct Prüfungsprotokoll data for Incomings
Study type (Bachelor/Master) and -kennzahl and -name are retrieved from
Studienordnung. Studienordnung is not assigned to Incomings, so this data
was missing.
. Now study type is always retrieved from Abschlusspruefung.
. If no Studienordnung is provided, studykennzahl and -name are retrieved
from Student.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-07-14 17:40:47 +02:00
Nikolaus Krondraf 21703cfc00 add functions to delete entries 2020-06-30 15:40:30 +02:00
alex f820fa76fb ressource/Mitarbeiter_model.php: possible to get Personal with personalnr >= 0, for excluding accounts like e.g. alumni 2020-06-26 23:17:37 +02:00
alex 1ef8b95c49 codex/Bisverwendung_model:
- getVerwendungen method: Verwendungen sorted by ende
2020-06-22 20:46:37 +02:00
alex 5b264bb6a9 codex/Bisverwendung_model:
- added getVerwendungen method
person/Benutzer_model
- added comment
person/Benutzerfunktion_model
- added getBenutzerFunktionByUid method
ressource/Mitarbeiter_model
- added getVorgesetzte method
- extended getPersonal method
2020-06-22 11:20:27 +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
Andreas Österreicher 5bd62e9ac8 Merge branch 'feature-7274/SAPSF_neuer_User_wird_aus_SF_geholt_und_im_FHC_angelegt' into feature-6656/Worker_queue 2020-06-17 12:25:01 +02:00
Andreas Österreicher c0693b3899 Merge branch 'master' into feature-6656/Worker_queue 2020-06-17 09:03:41 +02:00
alex 7ce489e847 - added iso3166_1_a3 field to bis.tbl_nation
- person/kontakt_model: renamed getFirmenTelefon to getFirmentelefon, separated vorwahl from telefonklappe
2020-06-10 10:11:19 +02:00
Andreas Österreicher 1a1ef262c6 Merge branch 'feature-7384/Message_reply_from_FAS_does_not_change_aktionstyp_in_Infocenter' 2020-06-03 16:13:00 +02:00
KarpAlex f1a346c545 Prüfungsprotokoll:
- new fields: beginnzeit, endezeit, Prüfungsantritt
- Einverständniserklärung: if not checked no save possible
- can be saved and freigegeben
- added phrases
2020-05-28 11:08:38 +02:00
Andreas Österreicher 3199d5e25f Added Function for Loading Last Student Status of all Prestudents of a Person 2020-05-25 21:43:32 +02:00
KarpAlex 28d0563fa5 Digital Pruefungsprotokoll is displayed for Bachelor/Master, English/German 2020-05-25 18:21:08 +02:00
alex 784afe0044 crm/Prestudent_model getPrestudentWithZgv: added order for Bewerbungstermine 2020-05-14 13:40:34 +02:00
Paolo a1600c9f3a CL/Messages_model->sendImplicitTemplate now writes the person log in any case 2020-05-13 17:55:56 +02:00
KarpAlex 7e1f1acb22 Prestudent_model getPrestudentWithZgv: Bewerbungsfrist shown corretly evne if Prestudent from Drittland 2020-05-13 16:18:05 +02:00
Alexei 704d39095b - ressource/Mitarbeiter_model.php - improved getPersonal method
- person/Kontakt_model.php - added getFormaKontakttyp and get FirmenTelefon methods
2020-05-12 19:34:17 +02:00
Alexei e8648e52ec person/Benutzer_model.php: generated alias string is sanitized (special characters, spaces,...) 2020-05-04 20:21:57 +02:00
Alexei 554fb2586a person/Benutzer_model:
- added methods for generating alias and checking if alias exists
ressource/Mitarbeiter_model:
- added method getPersonal
2020-04-30 21:42:30 +02:00
Andreas Österreicher ec884fe372 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-04-21 15:59:09 +02:00
Andreas Österreicher 4679701bcd Merge branch 'feature-6963/Messaging_system_hide_button_to_write' 2020-04-21 15:16:38 +02:00
Andreas Österreicher 900d93fb4d Merge branch 'feature-6789/Messaging_answer-Button_for_assistants' 2020-04-21 14:48:49 +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 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 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 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 ba566ab459 Added new models system/JobStatuses_model and system/JobTypes_model 2020-03-06 14:13:25 +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
Andreas Österreicher 331c90b64b Merge branch 'feature-6079/Infocenter_Freigabe_nach_RT_Anmeldung' 2020-03-02 16:03:28 +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 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
Andreas Österreicher 1ac1c118d5 Fixed Message Reply 2020-02-20 15:53:43 +01:00
Andreas Österreicher 4477afc5ed Merge branch 'feature-3716/Messaging_inbox_outbox_user' 2020-02-20 14:59:49 +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