blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-03 05:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,245 Commits 225 Branches 6 Tags
bhdev_rollup
Commit Graph

30 Commits

Author SHA1 Message Date
Cris 90c5ec53bf Lehrauftragsmail an KF-Leitung: Bei Berechtigungsabfrage wird nun auch Lese-/Schreibrecht berücksichtigt 2022-05-10 10:33:00 +02: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 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
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 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
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
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
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 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 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 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 37c4ad85b8 changed Name "getActiveKostenstellenForGeschaeftsjahr" to "getKostenstellenForGeschaeftsjahr" in Kostenstelle_model to avoid confusion (kostenstelle has active field in db, but meant is active as "valid in a Geschaeftsjahr") 2019-02-14 17:20:50 +01:00
alex 89e724de0e added Kostenstellen retrievers by geschaeftsjahr 2018-04-30 17:57:48 +02:00
alex 0acf6b84d7 moved permission checks for budget to extension 2018-04-19 13:23:33 +02:00
alex 17bacc48c6 kostenstellen are retrieved only for permitted users, easier SQL statement, Geschaeftsjahr nex and current retrievement 2018-04-18 14:49:28 +02:00
alex fa795feee4 Kostenstellen can be retrieved by geschaeftsjahr (valid Kostenstellen), last Geschaeftsjahr can be retrieved 2018-04-12 16:03:28 +02:00
alex 0da929dd4f Konten can be retrieved by Kostenstelle 2018-04-11 10:54:17 +02:00
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00