Commit Graph

629 Commits

Author SHA1 Message Date
Harald Bamberger ec000fbf83 changes for aenderung and korrektur 2023-05-30 19:13:27 +02:00
Harald Bamberger a47a746940 add require for vertragsbestandteil_karenz 2023-05-25 15:53:40 +02:00
Harald Bamberger 92672aaacf adapt overlapping DVs Check to not consider current DV if edited, but consider karenzen 2023-05-25 15:47:16 +02:00
Harald Bamberger 80d194cfc0 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter
- remove popper from composer introduced in branch feature-25562, but master included bootstrap.bundle in the meanwhile to have popper available
2023-05-25 11:04:20 +02:00
Harald Bamberger 38509d530a prepare list of vbs with gbs 2023-05-24 17:54:04 +02:00
Werner Masik 24bf2f95a2 update vertragsbestandteile 2023-05-16 17:05:49 +02:00
Werner Masik a198a740f4 fix json_serialize 2023-05-16 17:04:37 +02:00
Harald Bamberger 7045827450 bufix Urlaubsanspruch 2023-05-09 16:14:01 +02:00
Andreas Österreicher 2cb4ee9879 Merge branch 'feature-19172/Abgabetool_digitale_signatur_pruefen' 2023-05-08 15:50:59 +02:00
Harald Bamberger de4c236817 Merge branch 'master' into feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter 2023-05-05 13:11:16 +02:00
Harald Bamberger 2c0e815fe8 add validations 2023-05-05 11:43:02 +02:00
Harald Bamberger 42ff682700 add validations 2023-05-05 08:20:29 +02:00
Andreas Österreicher 6c1a47955f Merge branch 'feature-27949/infocenter_evaluieren_des_zurueckstellens_mit_einem_grund_zb_fuer_drittstaaten' 2023-05-05 07:48:53 +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
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
Andreas Österreicher a528018761 Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen 2023-04-27 09:57:40 +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 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 01ca8f6fb9 Merge branch 'master' into feature-26625/Anrechnungen-BFI-Änderungen-und-Sonstige 2023-04-24 11:18:40 +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
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
Paolo 8eb423414a Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen 2023-04-17 10:21:09 +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 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 c52cd05436 Merge branch 'feature-25562/PV21_Vertraege_Encryption_Merge' 2023-03-28 20:12:40 +02:00
Cris 1e00f2683e Corrected check 'isEmpfehlungsberechtigt'
Fachbereichsleiter are always empfehlungsberechtigt.
2023-03-27 11:05:03 +02:00
Cris 8feec18ff7 Changed query to get Leitung of Lehrveranstaltung-Organisationseinheit (instead of 'Fachbereich') 2023-03-27 10:58:59 +02:00