 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
|
5f198114f7
|
added popperjs because bootstrap5 requires it
|
2023-05-23 17:03:13 +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 |
|
|
Werner Masik
|
3940912830
|
fix attribute name valorisieren to valorisierung
|
2023-05-16 10:04:56 +02:00 |
|
|
Werner Masik
|
cd66397740
|
add current date to DV selection query
|
2023-05-16 10:03:50 +02:00 |
|
|
Andreas Österreicher
|
a64fafb6ad
|
Merge branch 'feature-28402/popper_in_bootstrap5'
|
2023-05-15 14:58:02 +02:00 |
|
|
Werner Masik
|
4786ff503a
|
added organisation to current contract info
|
2023-05-09 17:24:18 +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 |
|
|
Andreas Österreicher
|
f7ec0c4ce0
|
Merge branch 'feature-27946/infocenter_zusaetzliche_spalte_fuer_kaution'
|
2023-05-05 08:53:17 +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
|
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 |
|
|
Andreas Österreicher
|
a528018761
|
Merge branch 'master' into feature-19172/Abgabetool_digitale_signatur_pruefen
|
2023-04-27 09:57:40 +02:00 |
|
|
ma0048
|
eefffa8a0e
|
- kaution spalte
- fas abgeschickt am timestamp automatisch ausfuellen
- zgvuberpruefung zeigt abgewiesene nicht an
|
2023-04-27 09:08:26 +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 |
|
|
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 |
|