Commit Graph

395 Commits

Author SHA1 Message Date
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 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
Cris edd7f56481 Corrected query: load uids only from *active* benutzer 2019-09-12 13:57:02 +02:00
hainberg b8ed622f96 Added method getParent()
This method gets only one parent of given organisational unit.
This ist to easily retrieve department of a studiengang or
fakultät of department etc.
2019-09-12 13:53:39 +02:00
hainberg 3c98988c1c Added new method hasVertrag()
This method checks if a Projektbetreuer has a corresponding contract.
If vertrag_id is null => is still a new Projektauftrag
If vertrag_id is present => Projektauftrag has been ordered and a
contract has been created.
2019-09-12 13:51:54 +02:00
hainberg 237a906ecf Added new method hasVertrag()
This method checks if a Lehrauftrag has a corresponding contract.
If vertrag_id is null => is still a new Lehrauftrag
If vertrag_id is presendt => Lehrauftrag has been ordered and a contract
has been created.
2019-09-12 13:50:31 +02:00
hainberg 10b476c27e Added methods save() and setStatus()
. save method inserts a new Vertrag, sets Vertragsstatus to 'bestellt'
  and assigns vertrags_id to either corresponding Lehreinheitmitarbeiter
  or corresponding Projektbetreuuer
. setStatus inserts a new Status to a given Vertrag
2019-09-12 13:45:50 +02:00
alex 67415a4707 - possible to read and write user Variables in Codeigniter
- added Variablenname_model, VariableLib, Variables controller
- Infocenter Übersicht - infocenterData, infocenterFreigegebenData, infocenterReihungstestAbsolviertData: added possibility of toggle of infocenter_studiensemester variable, only prestudents of selected Studiensemester are shown
2019-09-06 17:33:56 +02:00
alex 5255e6166d crm/Prestudent_model, education/Lehrveransaltung_mode, person/Person_model: models are loaded in constructor to avoid multiple load 2019-09-06 15:49:47 +02:00
alex be91fc93c0 - organisation/Studiensemester_model: added getPreviousFrom method, getNextFrom(): next studiensemester with start = ende is not skipped 2019-09-06 15:36:32 +02:00
Andreas Oesterreicher 36942d586d Direkte Gruppen werden Defaultmäßig als Mailgruppen erstellt und als
nicht sichtbar
2019-09-04 12:29:38 +02:00
Paolo ff858a495d - Added new core controller JOB_Controller
- Added new webservicetyp_kurzbz "job" to table system.tbl_webservicetyp in system/dbupdate_3.3.php
- Added new filter "All jobs viewer"
- Added new __construct to LogLib to set properties
- Added new public methods logInfoDB, logDebugDB, logWarningDB and logErrorDB to LogLib
- Added new private method _logDB to LogLib
- Renamed LogLib private method _format to _getPrefix
- Added new private method _getDatabaseDescription to LogLib
- Changed method _getCaller to use different levels of debug_backtrace
- Added new properties and constants to LogLib to log to the database
2019-08-28 17:26:41 +02:00