Commit Graph

405 Commits

Author SHA1 Message Date
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
Andreas Österreicher 16f6bdbf70 Merge branch 'feature-5128/FHC-IDAM_account_activation' 2020-02-03 14:53:24 +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
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 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 47682f37df Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-16 16:36:57 +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
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
Paolo ac4350959b Cleaned and improved code 2019-12-20 16:25:27 +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
alex 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
Andreas Österreicher cbdb90c227 Berechtigungsfunktion angepasst damit auch Berechtigungen aus den Rollen geladen werden 2019-12-12 13:39:07 +01:00
Cris e35e4f0398 Changed: methods condition checking 'datum' instead of 'insertamum' 2019-12-10 12:06:32 +01:00
hainberg 45e381e043 Added function getApproved_fromDate() to Vertragvertragsstatus_model
This method returns all contracts, where the status had been set to
'erteilt' on given date.
2019-11-26 14:41:27 +01:00
Cris 586c626ff0 Fixed: Corrected incorrect SQL query in Benutzerfunktion_model
Incorrect bracket was causing error message. This is fixed now.
2019-11-25 09:35:42 +01:00
Cris 24db32f658 Added function getOrdered_fromDate() to Vertragvertragsstatus_model
This method returns all contracts, where the status had been set to
'bestellt' on given date.
2019-11-25 08:55:30 +01:00
Paolo ceb3f212c9 - Added support for language in session in function getUserLanguage from helper hlp_language_helper
- If the language is loaded from database then it is checked that the language is enabled
2019-11-22 12:05:07 +01:00
Paolo ece06bc462 Notice email for all people allowed to receive messages for an organisation unit 2019-11-06 16:34:20 +01:00
Paolo 3e5e65bfc4 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag 2019-11-04 16:58:19 +01:00
Paolo 2a4360862a - Reply Button in Inbox/outbox Page
- Write new message Button with Layer/Popup
- Degree Programs drop down displays longer name (if prestudent bestätigt (alias interessent with bestaetigtam != null ) receiver-> dp, otherwise -> infocenter)
- SQL to get OU recipient doesn't use beginn / End of function
- Always set insertvon in tbl_msg_status
- Add Multilanguage Support for Message Page (not completed yet)
- If in sent mode do not set messages as read
- Error message when there are no Messages available shouldnt be displayed
2019-10-30 18:35:46 +01:00
Cris 47f1fe1377 Added methods getLehreinheitID() and getLehreinheitData() to Vertrag_model
. getLehreinheitID(): Gets Lehreinheit ID corresponding to the contract.
. getLehreinheitData(): Gets (table) data of lehreinheit_id
  corresponding to the contract.
2019-10-30 14:54:40 +01:00
Cris 13fa392e04 Moved often used external models to top of Vertrag_model 2019-10-30 14:51:39 +01:00
Cris 31850ebfa1 Added param validation to Vertrag_model methods & minor code improvement 2019-10-29 10:43:52 +01:00
Cris 438b7b5b9e Moved methods from Vertrag_model to Vertragvertragsstatus_model
Moved out and adapted methods which correspond to Vertragsstatus
from Vertrag_model to Vertragvertragsstatus_model.
2019-10-29 10:41:40 +01:00
Cris 92cfa521f7 Fixed DB-error when vertragsbetrag IS NULL
Now if betrag is null will be converted to 0.
2019-10-24 13:28:18 +02:00
Andreas Österreicher 745b227c1a Merge branch 'hotfix-4790/FAS_UDF_tab_saving_is_broken' 2019-10-15 16:06:48 +02:00
Paolo 7daac696b3 - Renamed controller system/UDF.php to system/FAS_UDF.php
- Renamed view system/udf.php to system/fas_udf.php
- Adapted code with new names
- Added model system/FAS_UDF_model with only FAS functionalities
- Removed FAS functionalities from model system/UDF_model
- Fixed session problems in controller system/FAS_UDF
2019-10-15 15:40:47 +02:00
Andreas Österreicher 6d14423b82 Merge branch 'feature-4210/BIS_UHSTAT2_Erweiterungen' 2019-10-15 13:56:38 +02:00
Cris 8a246a9f94 Added methods deleteStatus(), updateStatus() to Vertragvertragsstatus_model
. Updates the date of the given vertragsstatus.
. Deletes the given vertragsstatus of the contract.
2019-10-11 13:44:21 +02:00
Cris 0d5906e7bc Added method updateVertrag() to Vertrag_model
Updates Vertrag and, if resets vertragsstatus as follows:
- if vertragsstatus 'erteilt': delete status 'erteilt' and
  update date of status 'bestellt'
- if vertragsstatus 'bestellt': update date of status 'bestellt'
2019-10-11 13:42:39 +02:00
Manfred Kindl 120ffb0319 Merge remote-tracking branch 'origin/master' 2019-10-07 18:59:36 +02:00
Manfred Kindl 753225e39e Studienplan-Sprache für Cronjob correctStudienplan 2019-10-07 18:52:07 +02:00
Andreas Österreicher c0afb92ddc Merge branch 'feature-4190/Cronjobs_log_in_database' 2019-10-02 14:29:53 +02:00
Cris 6ff2f19c56 Changed the STG-Kürzel to 'typ + kurzbz' in Lehraufträge + Vertragsmodel
Before the organisational unit was set, but it should be a combination
of typ + kurzbz of the stg. This is changed now in
. all Lehraufträge
. Vertragsmodel
. filtersupdate
2019-09-30 15:09:45 +02:00
alex bdb0cb7772 - added codex/Bisiozweck_model.php 2019-09-26 16:17:35 +02:00
hainberg 169ffbb568 Changed method isLektor() to isMitarbeiter()
Because boolean field lektor is not necessary maintained, check is now
for overall mitarbeiter.
2019-09-25 14:11:38 +02:00
Cris 223f3110bd Added method getLast()
This method gets latest (active) Verwendung of the user.
2019-09-24 16:06:50 +02:00
Cris 3340922a35 Extended/Adapted method setStatus()
Extended check: if new status is 'akzeptiert', the latest status has
to be 'erteilt'.

Adapted code as check for having certain status was outsourced to method
hasStatus.
2019-09-24 10:21:05 +02:00
Cris 1a58c977fe Added method getLastStatus()
This method gets the latest Vertragsstatus for the given Vertrag and
Mitarbeiter.
2019-09-24 10:15:21 +02:00
Cris 812899e885 Added method hasStatus()
This method checks if Vertrag has the given Vertragsstatus.
2019-09-24 10:14:22 +02:00
Cris a910527109 Added method isLektor()
This method checks if a given user is a lector (and eventually if is
fix employed)
2019-09-24 10:13:08 +02:00
Cris 73904dd007 Added contract description when saving new contract
Description was missing, now generated when inserting new contract.
2019-09-19 15:56:30 +02:00
Cris 8566039cc4 Fixed: Added check before DB insert
A check was missing if the contract already had that status. Error
was given. This is fixed now.
2019-09-19 13:23:12 +02:00
Cris e39a4252eb Added param mitarbeiter_uid to method save()
For performance reasons.
(Before the uid was retrieved by loading BenutzerModel each time when
saving lots of contracts)
2019-09-17 15:58:40 +02:00
hainberg 94d13fd77a Added method getBenutzerByBerechtigung
This method returns user who are authorized with berechtigung and,
if given, authorized for the specific organisational unit.
2019-09-12 14:04:48 +02:00