Commit Graph

353 Commits

Author SHA1 Message Date
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
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
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
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
Cris 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
Cris cf5177e5e1 Added method getNext() to Studiensemester_model
getNext() returns the upcoming study semester.
2019-08-01 15:25:52 +02:00
alex 8f5b32ee94 education/Lehreinheit_model: getLesForLv method: Lehreinheiten ordered by lehreinheit_id by default 2019-07-04 11:21:30 +02:00
Manfred Kindl 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
alex 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
Paolo 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
Paolo 56e5718120 Merge branch 'master' into cleanci 2019-05-10 10:36:21 +02:00
Manfred Kindl c18252a934 Merge remote-tracking branch 'origin/master' 2019-05-03 16:47:39 +02:00
Manfred Kindl 855a24968d Refactor cronjob remindApplicantsOfPlacementTest
- renamed function
- extend function with params $bcc and $from to set bcc-receivers and sender
- changed function getWorkingDays to isDateWorkingDay
- changed  function getNextPlacementtestDate to getNextPlacementtests
- extend function getNextPlacementtests with optional $days param
2019-05-03 16:46:05 +02:00
Paolo 9101537c14 Merge branch 'master' into cleanci 2019-04-30 14:42:40 +02:00
alex 4151ae5364 education/Lehreinheit_model:
- prestudent_id also retrieved when getting students of a Lehreinheit
2019-04-30 14:00:01 +02:00
Paolo d4c7f1f18d Merge branch 'master' into cleanci 2019-04-30 13:14:37 +02:00
Paolo 3b4012798f Fixed some comments typo 2019-04-30 13:13:34 +02:00
Paolo e1ed8b55f5 Fixed models 2019-04-26 12:51:02 +02:00
Paolo c84c484a2a Fixed models 2019-04-26 12:43:51 +02:00
Paolo 50f3b95c89 Deleted all not used models by this project and by extensions 2019-04-26 11:16:41 +02:00
Paolo 699aca74d1 - Changed helper and language autoload
- Changed language config
- Removed never used constants
- Changed rest_language in rest config file
- Adapted models that where extending FHC_Model
- Adapted code to load hlp_return_object
- Adapted code to use exit status codes constants
2019-04-25 12:09:31 +02:00
Manfred Kindl 0439c19cb1 Infocenter Notices "Anmerkung zur Bewerbung"
When there is an extra content after "Anmerkung zur Bewerbung" e.g. "Anmerkung zur Bewerbung (BWI)" the notice is also displayed on top
2019-04-16 16:44:55 +02:00
alex ff90e48e28 accounting/Kostenstelle_model:
- corrected typo in method getKostenstellenForGeschaeftsjahrWithOe
- added method getKostenstellenBerechtigt for all Kostenstellen for which user berechtigt
2019-04-15 18:43:52 +02:00
alex d32c764955 - Lehrveranstaltung_model: getLvsWithIncomings method takes studienplan_lehrveranstaltung export field (= studienplanrelevant) into account 2019-04-11 10:11:08 +02:00
alex ecadec9280 Changes in Models:
- education/Lehreinheit_model getLesForLv: studiengang_kz and studiengang_kuerzel of lehreinheitgruppen is also retrieved
- education/Lehrveranstaltung_model getLvsWithIncomingPlaces:
   -- Retrieving not by Studienordnung Gültigkeit, but by tbl_studienplan_semester
   -- retrieving lvs of studiengang ECI Campus International
2019-04-08 17:21:38 +02:00
Manfred Kindl 9f945b12f8 New function getNextPlacementtestDate 2019-03-28 15:51:48 +01:00
alex 8bc8679143 - added method getLvsWithIncomings to education/Lehrveranstaltung_model (from mobility online extension) 2019-03-25 16:39:47 +01:00
alex abe64c1bfe education/Lehreinheit_model:
- added info if Lehreinheit directly assigned (direktinskription) in getLesForLv method
- added getStudenten method for getting all students of a lehreinheit
2019-03-21 16:13:05 +01:00
alex c325c98728 direct group deletion, education/Lehreinheitgruppe_model:
- fixed "bug" when checking if users are in group
- added additional checks for existence of group in lehreinheitgruppe and benutzergruppe before group deletion
2019-03-08 10:32:05 +01:00
alex 68dd0f3cb8 - added method getLesForLv to education/Lehreinheit_model
- added methods direktUserAdd, direktuserDelete (for direkt User Zuordnung to le) to education/Lehreinheitgruppe_model
- added method getLvsByStudent to education/Lehrveranstaltung_model
- Added hasSequence = false to Benutzergruppe_model
- fixed typo in lehrveranstaltungDBML
2019-03-06 19:03:02 +01:00
Paolo 663c1d9f35 Merge branch 'messages' 2019-02-25 15:57:40 +01:00
Paolo acd918a547 system/MessageToken_model and system/PersonLog_model models now extend DB_Model 2019-02-25 15:57:07 +01:00
Paolo 8dd7ed0335 Merge branch 'master' into messages 2019-02-25 15:28:13 +01:00
Paolo 2d7cc09d02 - Added new model CL/Messages_model.php
- Moved logic from controllers system/Messages and ViewMessage to CL/Messages_model
- Better code
- MessageLib and PersonLogLib methods do not use anymore show_error and return success/error object
- helpers/hlp_message_helper: hasData function changed
2019-02-25 15:23:31 +01:00
Manfred Kindl e598264f30 New Cronjobs for Reihungstests
- runZentraleReihungstestAnmeldefristAssistenzJob
- runZentraleReihungstestNachtraeglichHinzugefuegtJob
- runRemindApplicantsOfPlacementTestJob
- New function getWorkingDays returns business days between two dates
- New function checkReachedRegistrationDate
- New function getApplicantsOfPlacementTestForCronjob
- New function getApplicantAssignedAfterDate
- New function getApplicantsOfPlacementTest
- New function getTestsOnDate
- New function loadStudiengaengeFromTyp
2019-02-25 10:30:34 +01:00