Commit Graph

2471 Commits

Author SHA1 Message Date
Harald Bamberger f84a75af4e Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-04 15:41:44 +02:00
Paolo defe4e2f93 Added new interface application/core/IEncryption.php 2023-05-04 15:33:08 +02:00
Paolo 1c0129466a Bugfix: added a check to DB_Model->_addEncrypt method on the parameter encryptedColumns 2023-05-04 15:23:51 +02:00
Harald Bamberger e713cdac64 Merge branch 'feature-25563/PV21_Verschlüsselung_Gehaltsdaten' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-04 15:03:13 +02:00
Harald Bamberger 2f07590461 Merge branch 'master' into feature-25563/PV21_Verschlüsselung_Gehaltsdaten 2023-05-04 14:59:12 +02:00
Harald Bamberger 7fb0c14555 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-04 14:58:29 +02:00
ma0048 4f03b61c6e - stunden bestandteil bei karenz mit 0 stunden verlaengern 2023-05-04 13:43:54 +02:00
Harald Bamberger eb7b73fee9 cleanup according to current vertragsbestandteil db tables 2023-05-02 16:00:13 +02:00
Harald Bamberger e3ec4cd5aa fix method names, handle insertamum updateamum insertvon updatevon in libs 2023-05-01 20:50:07 +02:00
Harald Bamberger b4e4f91b22 more validation 2023-04-25 20:20:02 +02:00
Harald Bamberger 10fb68a532 Dienstverhaeltnis Class updated, VertragsbestandteilLib can save Dienstverhaeltnis 2023-04-25 17:23:57 +02:00
Paolo 08de013c23 Fixes: code quality checks 2023-04-25 16:07:42 +02:00
Harald Bamberger 7a4f55bb0c require interface IValidation 2023-04-25 09:27:40 +02:00
Harald Bamberger 2163ddcdf5 add Interface IValidation, implement validate stub in all Vertragsbestandteile and Gehaltsbestandteil and DV 2023-04-25 09:22:03 +02:00
Harald Bamberger d16a670726 Merge branch 'sonstiges-28665/Tabulator-PersistenceID-einbauen' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 14:42:21 +02:00
Harald Bamberger 54864da770 Merge branch 'bugfix-28557/Alte-Anrechnungen-lassen-sich-nicht-oeffnen' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 12:12:05 +02:00
Harald Bamberger 64aa3c1250 Merge branch 'feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 11:31:39 +02:00
Harald Bamberger a663fa9436 Merge branch 'feature-27388/Anrechnungen_Zeitfenster-pflegen' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 11:30:32 +02:00
Harald Bamberger 48798e8309 Merge branch 'master' into feature-27388/Anrechnungen_Zeitfenster-pflegen 2023-04-24 11:20:53 +02:00
Harald Bamberger 01ca8f6fb9 Merge branch 'master' into feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige 2023-04-24 11:18:40 +02:00
Harald Bamberger 80eb64e418 Merge branch 'master' into feature-28278/Anrechnung_Neue-Begruendung-bei-Ablehnung 2023-04-24 10:36:32 +02:00
Harald Bamberger ea79b92beb Merge branch 'master' into bugfix-28557/Alte-Anrechnungen-lassen-sich-nicht-oeffnen 2023-04-24 10:35:22 +02:00
Andreas Österreicher b726f2ca5e Vertragsstunden mit 0.00 werden wie NULL behandelt 2023-04-24 07:14:42 +02:00
ma0048 f54351c7a3 - added missing model 2023-04-20 16:38:56 +02:00
Werner Masik 138cfd662d added return 2023-04-18 13:50:07 +02:00
Harald Bamberger 535578c399 validation 2023-04-18 13:30:56 +02:00
Harald Bamberger c90da4b50e start to implement validation 2023-04-18 13:26:08 +02:00
Harald Bamberger e462a71b6d call parent constructor 2023-04-12 16:50:00 +02:00
Harald Bamberger 9e6d78dd1d set Dienstverhaeltnis_id and Vertragsbestandteil_id on child Gehaltsbestandteile when added or changed 2023-04-12 16:26:55 +02:00
Harald Bamberger c2e956f7f3 use GehaltsbestandteilLib in VertragsbestandteilLib 2023-04-12 15:32:22 +02:00
Harald Bamberger 0061cf255c add GehaltsbestandteilLib 2023-04-12 15:22:10 +02:00
Werner Masik 2b03fcc930 removed GUI handling and renamed Gehaltsbestandteil to make it independend from Vertragsbestandteil 2023-04-12 09:41:07 +02:00
Werner Masik fe6a8d5625 fixed wrong JSON-Mapping for GUIOptions 2023-04-11 17:07:20 +02:00
Harald Bamberger e7f23643d4 fix data property name 2023-04-11 17:05:20 +02:00
Harald Bamberger c929fa8702 add freitext require, adapt freitext to current db 2023-04-11 16:59:21 +02:00
Harald Bamberger 92e23ea585 add requires for vbs zeitaufzeichnung and kuendigungsfrist 2023-04-11 16:47:44 +02:00
Harald Bamberger 3ff024fc69 fix date format 2023-04-11 15:51:23 +02:00
Harald Bamberger 234820490c variable names 2023-04-11 15:44:34 +02:00
Harald Bamberger 12c712c1b4 changed property names to match gui input 2023-04-11 15:22:40 +02:00
Harald Bamberger b50ca57907 extend VertragsbestandteilFunktion to be able to create a Benutzerfunktion entry before being persited 2023-04-11 15:10:24 +02:00
Harald Bamberger 025b58dee3 throw Exception when storeVertragsbestandteil is rolled back to handle rollback in possible outer transaction 2023-04-11 11:05:15 +02:00
Andreas Österreicher fca341ccf4 Migration von Verträgen speichert nun die Eintäge auch in der DB
Tippfehler in Models behoben
Berechtigungen für DV und VBS Sequence hinzugefügt
2023-04-06 07:34:26 +02:00
Andreas Österreicher 1a3d651759 Merge branch 'feature-27403/DVUH_Plausicheck_fuer_Personen_ohne_Konto_Buchungen' 2023-04-05 15:33:36 +02:00
Werner Masik 783cb289cd added Unit-Tests; changed IDs of organisationseinheit in VertragsGUI 2023-04-04 18:51:06 +02:00
Werner Masik c613c6dc43 small fix to prevent error when $encryptedColumns is null 2023-04-03 13:37:12 +02:00
Cris 9e4489093c Adapted & updated Tabulator default options (PersistenceID now changeable / Updates for options in Tabulator 4.9)
. Adapted
.. PersistenceID now changeable
.. check: only set default option if not set in tabulator

. Updates in version 4.9:
.. persistentLayout => persistence
.. getVisibility() => isVisible()
2023-03-29 10:29:06 +02:00
Werner Masik c52cd05436 Merge branch 'feature-25562/PV21_Vertraege_Encryption_Merge' 2023-03-28 20:12:40 +02:00
Cris bbd5962fd4 Deleted deprecated FBL-files 2023-03-27 11:19:34 +02:00
Cris 47fba23a5e Enhanced queries 2023-03-27 11:11:03 +02:00
Cris 75aff023d3 Corrected Mehrsprachigkeits-variable 2023-03-27 11:08:07 +02:00