Commit Graph

12123 Commits

Author SHA1 Message Date
Manfred Kindl 8c30666043 Testtool Login shows applicants only once (Only application of first priority) -> Only for FHTW!
New function getFirstPrioPrestudentRT in prestudent.class.php
Link to pivot-table in mail to assistants
auswertung_fhtw berücksichtigt nun orgformen (studienpläne) aus tbl_ablauf
2020-02-24 18:43:38 +01:00
alex 166a4a76e8 stammdaten/auswertung_fhtw.php:
- added column "Punkte mit offset"
- removed commented code concerning RT-punkte without Physik
2020-02-24 16:44:57 +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
Manfred Kindl 96150dd5a2 Merge branch 'master' into feature-6141/Testtool_Sprache_Fallback 2020-02-23 21:30:06 +01:00
Manfred Kindl 8507f63936 GUI-changes in writeTemplate
- Show only "bezeichnung" of template in select for regular users
- New styled "Preview"-Button.
- Click on "Preview" automatically scrolls to Preview-Div
2020-02-23 20:51:16 +01:00
Manfred Kindl d07b0684c3 Orgform nur dazu schreiben, wenn es mehr als Eine gibt 2020-02-23 20:47:54 +01:00
Manfred Kindl b8b36e975e Orgform_kurzbz in bankverbindung.class und zahlungen_details.php 2020-02-23 18:18:14 +01:00
alex 0addc4ffb5 gebiet.class.php: improved offset calculation, LIMIT maxfragen instead multiplication 2020-02-21 17:22:50 +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
Manfred Kindl 8a8ed725c4 Merge branch 'master' into feature-5490/Cronjobs_Priorisierung 2020-02-20 20:48:40 +01:00
Manfred Kindl f146afb77f Merge branch 'Historie_PreStudent_Tab' 2020-02-20 20:47:33 +01:00
Manfred Kindl 45599ec2ec Merge branch 'master' into Historie_PreStudent_Tab 2020-02-20 20:43:52 +01:00
Manfred Kindl ff7f150cb6 prioritizationJob created 2020-02-20 20:42:37 +01:00
Andreas Österreicher a42cf10140 Merge branch 'feature-5489/Kontonummern_der_Studiengaenge_in_DB' 2020-02-20 18:51:26 +01:00
Andreas Österreicher f1cf82c107 Spalte Alias hinzugefügt, Spalte Prio umbenannt 2020-02-20 18:48:15 +01:00
Andreas Österreicher 7043422fe9 Zahlenformat bei Lehrauftragsexport korrigiert 2020-02-20 18:11:37 +01:00
alex fc9ae760b5 public.vw_msg_vars: added variables semester, Studiengangsassistenz, relative Prio 2020-02-20 17:07:57 +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
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
Andreas Österreicher cc5bfdc292 Merge branch 'feature-5153/Reihungstest_Gewichtung_der_Gebiete' 2020-02-18 17:43:30 +01:00
alex d74a516202 - testtool edit_gebiet.php: hinweis for suggestion offsetpunkteanzahl is always shown 2020-02-18 17:33:44 +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
alex a063a73c41 reihungst admin edit_gebiet.php: checking that there are same negativpoints for one gebiet and one level before showing offsetpunkte suggestion for RT gebiete 2020-02-17 19:26:55 +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
Manfred Kindl 4d3024e3f7 Placeholder Geburtsdatum 2020-02-17 16:43:28 +01:00
hainberg 23828023ee Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2020-02-17 10:55:58 +01:00
Paolo 11f3fad1f7 Changed logic to send notice email to a message recipient 2020-02-14 19:17:09 +01:00
alex ed332717ce Infocenter Details:
- added notice for entering the placement test points when Freigabe after RT participation
2020-02-14 18:23:14 +01:00
Manfred Kindl c81a25988e Historie-Feld nebeneinander 2020-02-14 15:31:20 +01:00
Andreas Österreicher 119a2b200a Neuen Modus für Lehreinheitenvorrückung hinzugefügt bei dem die Stundensätze abhängig von der Beschaeftigungsart aktualisiert werden 2020-02-14 14:46:54 +01:00
Andreas Österreicher 99dc36b501 Stundensatz wird bei Fixangestellten mit voller inkludierter Lehre (-1) immer auf NULL gesetzt. (abhängig von Config) 2020-02-14 13:54:06 +01:00
Nikolaus Krondraf 1ac14fca24 Prüfungstermine werden nicht mehr doppelt angezeigt 2020-02-14 07:33:28 +01:00
Manfred Kindl b3d80a8e3b Merge remote-tracking branch 'origin/master' 2020-02-13 19:08:43 +01:00
Manfred Kindl b60e7ed439 Option zur Ausgabe der Fragen ohne Lösungen 2020-02-13 19:08:37 +01:00
alex 21da8dfb51 - Added offsetpunkte Berechnung for Suggestions on admin/edit_gebiet page
- offsetpunkte are validated before saving
2020-02-13 18:49:01 +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
Andreas Oesterreicher 58a458dc73 Maximalbreite bei Projektarbeiten-Lehreinheiten hinterlegt da sonst der
rechte Teil des Karteireiters nicht mehr lesbar ist
2020-02-12 14:06:33 +01:00
Manfred Kindl 98b2abeb51 BugFix show PreStudent Variables instead of Person Variables in Msg 2020-02-12 09:40:19 +01:00
Manfred Kindl 4b3f6f109d Bugfix Load Phrases in ViewMessage 2020-02-12 09:08:32 +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
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