From e4a99b4c849b45ba04fa22d4dda7179511d88160 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 7 Nov 2023 11:04:39 +0100 Subject: [PATCH] upgrade datepicker to version 7.2.0, change Dienstverhaeltnis class to honor checkoverlap flag --- .../vertragsbestandteil/Dienstverhaeltnis.php | 13 ++++++++++--- composer.json | 12 ++++++------ composer.lock | 12 ++++++------ 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php b/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php index 4267432ae..037c00a03 100644 --- a/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php +++ b/application/libraries/vertragsbestandteil/Dienstverhaeltnis.php @@ -20,7 +20,8 @@ class Dienstverhaeltnis extends AbstractBestandteil { protected $dienstverhaeltnis_id; protected $mitarbeiter_uid; protected $vertragsart_kurzbz; - protected $oe_kurzbz; + protected $oe_kurzbz; + protected $checkoverlap; protected $von; protected $bis; protected $insertamum; @@ -31,6 +32,7 @@ class Dienstverhaeltnis extends AbstractBestandteil { public function __construct() { parent::__construct(); + $this->checkoverlap = true; } public function hydrateByStdClass($data, $fromdb=false) @@ -39,6 +41,7 @@ class Dienstverhaeltnis extends AbstractBestandteil { isset($data->dienstverhaeltnis_id) && $this->setDienstverhaeltnis_id($data->dienstverhaeltnis_id); isset($data->mitarbeiter_uid) && $this->setMitarbeiter_uid($data->mitarbeiter_uid); isset($data->vertragsart_kurzbz) && $this->setVertragsart_kurzbz($data->vertragsart_kurzbz); + isset($data->checkoverlap) && $this->setCeckoverlap($data->checkoverlap); isset($data->oe_kurzbz) && $this->setOe_kurzbz($data->oe_kurzbz); isset($data->von) && $this->setVon($data->von); isset($data->bis) && $this->setBis($data->bis); @@ -157,6 +160,11 @@ EOTXT; return $this; } + public function setCheckoverlap(bool $checkoverlap) + { + $this->checkoverlap = $checkoverlap; + } + public function setOe_kurzbz($oe_kurzbz) { $this->markDirty('oe_kurzbz', $this->oe_kurzbz, $oe_kurzbz); @@ -239,8 +247,7 @@ EOTXT; $this->validationerrors[] = 'Das Beginndatum muss vor dem Endedatum liegen.'; } - // TODO check for overlapping DVs - if( $ci->VertragsbestandteilLib->isOverlappingExistingDV($this) ) + if( $this->checkoverlap && $ci->VertragsbestandteilLib->isOverlappingExistingDV($this) ) { $this->validationerrors[] = 'Es existiert bereits ein überlappendes Dienstverhältnis'; } diff --git a/composer.json b/composer.json index 12e01af4e..e223998ac 100644 --- a/composer.json +++ b/composer.json @@ -374,9 +374,9 @@ "type": "package", "package": { "name": "vuejs/vuedatepicker_js", - "version": "5.4.0", + "version": "7.2.0", "dist": { - "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/vue-datepicker.iife.js", + "url": "https://unpkg.com/@vuepic/vue-datepicker@7.2.0/dist/vue-datepicker.iife.js", "type": "file" } } @@ -385,9 +385,9 @@ "type": "package", "package": { "name": "vuejs/vuedatepicker_css", - "version": "5.4.0", + "version": "7.2.0", "dist": { - "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/main.css", + "url": "https://unpkg.com/@vuepic/vue-datepicker@7.2.0/dist/main.css", "type": "file" } } @@ -465,8 +465,8 @@ "vuejs/vuejs3": "3.2.33", "vuejs/vuerouter4": "4.1.3", - "vuejs/vuedatepicker_js": "5.4.0", - "vuejs/vuedatepicker_css": "5.4.0" + "vuejs/vuedatepicker_js": "7.2.0", + "vuejs/vuedatepicker_css": "7.2.0" }, "config": { "bin-dir": "vendor/bin" diff --git a/composer.lock b/composer.lock index 092ee608d..cc7529f8c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "67e5823946d817dac0c89156a2f0fcf0", + "content-hash": "3ac7bea74aadb85ee412b61e393f8188", "packages": [ { "name": "afarkas/html5shiv", @@ -1850,19 +1850,19 @@ }, { "name": "vuejs/vuedatepicker_css", - "version": "5.4.0", + "version": "7.2.0", "dist": { "type": "file", - "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/main.css" + "url": "https://unpkg.com/@vuepic/vue-datepicker@7.2.0/dist/main.css" }, "type": "library" }, { "name": "vuejs/vuedatepicker_js", - "version": "5.4.0", + "version": "7.2.0", "dist": { "type": "file", - "url": "https://unpkg.com/@vuepic/vue-datepicker@5.4.0/dist/vue-datepicker.iife.js" + "url": "https://unpkg.com/@vuepic/vue-datepicker@7.2.0/dist/vue-datepicker.iife.js" }, "type": "library" }, @@ -4739,5 +4739,5 @@ "php": ">=5.6.40" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.1.0" }