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
cbdb90c227
Berechtigungsfunktion angepasst damit auch Berechtigungen aus den Rollen geladen werden
2019-12-12 13:39:07 +01:00
e35e4f0398
Changed: methods condition checking 'datum' instead of 'insertamum'
2019-12-10 12:06:32 +01:00
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
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
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
3e5e65bfc4
Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
2019-11-04 16:58:19 +01:00
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
13fa392e04
Moved often used external models to top of Vertrag_model
2019-10-30 14:51:39 +01:00
31850ebfa1
Added param validation to Vertrag_model methods & minor code improvement
2019-10-29 10:43:52 +01:00
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
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
745b227c1a
Merge branch 'hotfix-4790/FAS_UDF_tab_saving_is_broken'
2019-10-15 16:06:48 +02:00
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
6d14423b82
Merge branch 'feature-4210/BIS_UHSTAT2_Erweiterungen'
2019-10-15 13:56:38 +02:00
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
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
120ffb0319
Merge remote-tracking branch 'origin/master'
2019-10-07 18:59:36 +02:00
753225e39e
Studienplan-Sprache für Cronjob correctStudienplan
2019-10-07 18:52:07 +02:00
c0afb92ddc
Merge branch 'feature-4190/Cronjobs_log_in_database'
2019-10-02 14:29:53 +02:00
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
bdb0cb7772
- added codex/Bisiozweck_model.php
2019-09-26 16:17:35 +02:00
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
223f3110bd
Added method getLast()
...
This method gets latest (active) Verwendung of the user.
2019-09-24 16:06:50 +02:00
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
1a58c977fe
Added method getLastStatus()
...
This method gets the latest Vertragsstatus for the given Vertrag and
Mitarbeiter.
2019-09-24 10:15:21 +02:00
812899e885
Added method hasStatus()
...
This method checks if Vertrag has the given Vertragsstatus.
2019-09-24 10:14:22 +02:00
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
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
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
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
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
edd7f56481
Corrected query: load uids only from *active* benutzer
2019-09-12 13:57:02 +02:00
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
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
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
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
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
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
be91fc93c0
- organisation/Studiensemester_model: added getPreviousFrom method, getNextFrom(): next studiensemester with start = ende is not skipped
2019-09-06 15:36:32 +02:00
36942d586d
Direkte Gruppen werden Defaultmäßig als Mailgruppen erstellt und als
...
nicht sichtbar
2019-09-04 12:29:38 +02:00
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
a81098f884
Added method getSTGLByUID(uid) to Benutzerfunktion_model
...
The method getSTGLByUID(uid) gets information of all STG of which a given
user is in charge of as a study course manager.
2019-08-01 15:38:33 +02:00
cf5177e5e1
Added method getNext() to Studiensemester_model
...
getNext() returns the upcoming study semester.
2019-08-01 15:25:52 +02:00
8f5b32ee94
education/Lehreinheit_model: getLesForLv method: Lehreinheiten ordered by lehreinheit_id by default
2019-07-04 11:21:30 +02:00
be09e3bf5e
Refactor Reihungstest-Jobs
...
- Link to Auswertung instead of Student-Table in E-Mail (Data security)
- Params in function for degraee-program, bcc and from
2019-06-12 14:51:57 +02:00
05a049edca
Infocenter message Quereinsteiger Freigabe
...
- Orgform bezeichnung shown in german and english
Infocenter Controller changes
- constants for Interessent and Abgewiesener names added
- removed unnecessary parameters in comments
crm/Prestudent_model
- fixed typo
2019-06-03 16:30:44 +02:00
dcdfbbe0d7
- Added new constants LANG_SESSION_NAME and LANG_SESSION_INDEXES to constants.php
...
- Added new function getPhraseByLanguage to helpers/hlp_language_helper.php
2019-05-14 15:50:04 +02:00
56e5718120
Merge branch 'master' into cleanci
2019-05-10 10:36:21 +02:00
c18252a934
Merge remote-tracking branch 'origin/master'
2019-05-03 16:47:39 +02:00
alex