From d5ee700ac56d20b6965e7ade4c9a8c8c57df57d6 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 3 Dec 2024 17:24:20 +0100 Subject: [PATCH 1/9] add zuwendungsbestaetigung --- .../Migrations/20241203155342_Fundings6.php | 15 +++++++++ .../src/Controller/FundingsController.php | 13 ++++++++ plugins/Admin/templates/Fundings/edit.php | 17 ++++++++++ plugins/Admin/templates/Fundings/index.php | 1 + .../list/fundings/zuwendungsbestaetigung.php | 7 ++++ src/Model/Entity/Funding.php | 33 +++++++++++-------- src/Model/Entity/Fundingupload.php | 2 ++ src/Model/Table/FundingsTable.php | 13 ++++++-- .../status/zuwendungsbestaetigungStatus.php | 8 +++++ .../funding/zuwendungsbestaetigungInfo.php | 10 ++++-- .../zuwendungsbestaetigung_status_changed.php | 31 +++++++++++++++++ 11 files changed, 131 insertions(+), 19 deletions(-) create mode 100644 config/Migrations/20241203155342_Fundings6.php create mode 100644 plugins/Admin/templates/element/list/fundings/zuwendungsbestaetigung.php create mode 100644 templates/element/funding/status/zuwendungsbestaetigungStatus.php create mode 100644 templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php diff --git a/config/Migrations/20241203155342_Fundings6.php b/config/Migrations/20241203155342_Fundings6.php new file mode 100644 index 000000000..d6f90173c --- /dev/null +++ b/config/Migrations/20241203155342_Fundings6.php @@ -0,0 +1,15 @@ +execute($sql); + } +} diff --git a/plugins/Admin/src/Controller/FundingsController.php b/plugins/Admin/src/Controller/FundingsController.php index 915c40a81..f150d3404 100644 --- a/plugins/Admin/src/Controller/FundingsController.php +++ b/plugins/Admin/src/Controller/FundingsController.php @@ -107,6 +107,18 @@ private function sendEmails($funding) { ]); $email->addToQueue(); } + + if ($funding->isDirty('zuwendungsbestaetigung_status')) { + $email->viewBuilder()->setTemplate('fundings/zuwendungsbestaetigung_status_changed'); + $email->setSubject('Der Status deiner Zuwendungsbestätigung wurde geändert') + ->setTo($funding->owner_user->email) + ->setViewVars([ + 'funding' => $funding, + 'data' => $funding->owner_user, + ]); + $email->addToQueue(); + } + } public function index() @@ -124,6 +136,7 @@ public function index() 'Fundingsupporters', 'FundinguploadsActivityProofs', 'FundinguploadsFreistellungsbescheids', + 'FundinguploadsZuwendungsbestaetigungs', 'Fundingbudgetplans', ]); diff --git a/plugins/Admin/templates/Fundings/edit.php b/plugins/Admin/templates/Fundings/edit.php index 66c7e6025..aa546bcde 100644 --- a/plugins/Admin/templates/Fundings/edit.php +++ b/plugins/Admin/templates/Fundings/edit.php @@ -110,6 +110,23 @@ echo $this->element('funding/blocks/blockCheckboxes', ['funding' => $funding, 'disabled' => true]); + + if ($funding->is_submitted) { + echo $this->element('funding/fundingUploadsForm', [ + 'fundinguploads' => $funding->fundinguploads_zuwendungsbestaetigungs, + 'uploadType' => Fundingupload::TYPE_MAP[Fundingupload::TYPE_ZUWENDUNGSBESTAETIGUNG], + 'legend' => 'Upload Zuwendungsbestätigung', + ]); + + echo '
'; + echo 'Status Zuwendungsbestätigung'; + echo $this->element('funding/status/zuwendungsbestaetigungStatus', ['funding' => $funding, 'additionalTextBefore' => '', 'additionalTextAfter' => '']); + echo $this->Form->control('Fundings.zuwendungsbestaetigung_status', ['label' => 'Status', 'options' => Funding::STATUS_MAPPING_UPLOADS, 'disabled' => !$funding->is_submitted, 'class' => 'no-verify']); + echo $this->Form->control('Fundings.zuwendungsbestaetigung_comment', ['label' => 'Kommentar', 'disabled' => !$funding->is_submitted, 'class' => 'no-verify']); + echo '
'; + } + + echo ''; echo $this->element('cancelAndSaveButton', ['saveLabel' => 'Speichern']); diff --git a/plugins/Admin/templates/Fundings/index.php b/plugins/Admin/templates/Fundings/index.php index 603282d46..03dd5da79 100644 --- a/plugins/Admin/templates/Fundings/index.php +++ b/plugins/Admin/templates/Fundings/index.php @@ -15,6 +15,7 @@ ['name' => 'fundingsupporter.name', 'label' => 'Träger', 'sortable' => false], ['label' => 'Summe', 'template' => 'list/fundings/budgetplan', 'sortable' => false], ['label' => 'eingereicht', 'template' => 'list/fundings/submitInfo'], + ['label' => 'ZB', 'template' => 'list/fundings/zuwendungsbestaetigung'], ['name' => 'created', 'type' => 'datetime', 'label' => 'erstellt'], ['name' => 'modified', 'type' => 'datetime', 'label' => 'geändert'], ], diff --git a/plugins/Admin/templates/element/list/fundings/zuwendungsbestaetigung.php b/plugins/Admin/templates/element/list/fundings/zuwendungsbestaetigung.php new file mode 100644 index 000000000..2f1bc3661 --- /dev/null +++ b/plugins/Admin/templates/element/list/fundings/zuwendungsbestaetigung.php @@ -0,0 +1,7 @@ +is_submitted) { + return; +} +echo '
'; + echo $object->zuwendungsbestaetigungs_count . 'x'; +echo '
'; diff --git a/src/Model/Entity/Funding.php b/src/Model/Entity/Funding.php index d7c9296be..b9ae31d29 100644 --- a/src/Model/Entity/Funding.php +++ b/src/Model/Entity/Funding.php @@ -216,28 +216,25 @@ public function _getActivityProofStatusCssClass() { if (!empty($this->workshop) && !$this->workshop->funding_activity_proof_required) { return ''; } - - if ($this->activity_proof_status == self::STATUS_PENDING) { - return 'is-pending'; - } - if ($this->activity_proof_status == self::STATUS_VERIFIED_BY_ADMIN) { - return 'is-verified'; - } - if ($this->activity_proof_status == self::STATUS_REJECTED_BY_ADMIN) { - return 'is-rejected'; - } - return ''; + return $this->getAdminStatusCssClass('activity_proof_status'); } public function _getFreistellungsbescheidStatusCssClass() { + return $this->getAdminStatusCssClass('freistellungsbescheid_status'); + } + + public function _getZuwendungsbestaetigungStatusCssClass() { + return $this->getAdminStatusCssClass('zuwendungsbestaetigung_status'); + } - if ($this->freistellungsbescheid_status == self::STATUS_PENDING) { + private function getAdminStatusCssClass($statusField) { + if ($this->$statusField == self::STATUS_PENDING) { return 'is-pending'; } - if ($this->freistellungsbescheid_status == self::STATUS_VERIFIED_BY_ADMIN) { + if ($this->$statusField == self::STATUS_VERIFIED_BY_ADMIN) { return 'is-verified'; } - if ($this->freistellungsbescheid_status == self::STATUS_REJECTED_BY_ADMIN) { + if ($this->$statusField == self::STATUS_REJECTED_BY_ADMIN) { return 'is-rejected'; } return ''; @@ -273,6 +270,10 @@ public function _getFreistellungsbescheidStatusHumanReadable() { return self::STATUS_MAPPING_UPLOADS[$this->freistellungsbescheid_status]; } + public function _getZuwendungsbestaetigungStatusHumanReadable() { + return self::STATUS_MAPPING_UPLOADS[$this->zuwendungsbestaetigung_status]; + } + public static function getFieldsCount() { return count(self::FIELDS_WORKSHOP) + count(self::FIELDS_OWNER_USER) @@ -371,4 +372,8 @@ public function _getFreistellungsbescheidsCount(): int { return count($this->fundinguploads_freistellungsbescheids); } + public function _getZuwendungsbestaetigungsCount(): int { + return count($this->fundinguploads_zuwendungsbestaetigungs); + } + } \ No newline at end of file diff --git a/src/Model/Entity/Fundingupload.php b/src/Model/Entity/Fundingupload.php index 4d085c484..90dd1dab1 100644 --- a/src/Model/Entity/Fundingupload.php +++ b/src/Model/Entity/Fundingupload.php @@ -10,10 +10,12 @@ class Fundingupload extends Entity const TYPE_ACTIVITY_PROOF = 1; const TYPE_FREISTELLUNGSBESCHEID = 2; + const TYPE_ZUWENDUNGSBESTAETIGUNG = 3; const TYPE_MAP = [ self::TYPE_ACTIVITY_PROOF => 'activity_proofs', self::TYPE_FREISTELLUNGSBESCHEID => 'freistellungsbescheids', + self::TYPE_ZUWENDUNGSBESTAETIGUNG => 'zuwendungsbestaetigungs', ]; public function _getFullPath() { diff --git a/src/Model/Table/FundingsTable.php b/src/Model/Table/FundingsTable.php index 19b02a83d..89ee93725 100644 --- a/src/Model/Table/FundingsTable.php +++ b/src/Model/Table/FundingsTable.php @@ -36,7 +36,7 @@ public function initialize(array $config): void { 'className' => 'Fundinguploads', 'foreignKey' => 'funding_uid', 'conditions' => [ - 'FundinguploadsActivityProofs.type' => Fundingupload::TYPE_ACTIVITY_PROOF + 'FundinguploadsActivityProofs.type' => Fundingupload::TYPE_ACTIVITY_PROOF, ], 'dependent' => true, ]); @@ -44,7 +44,15 @@ public function initialize(array $config): void { 'className' => 'Fundinguploads', 'foreignKey' => 'funding_uid', 'conditions' => [ - 'FundinguploadsFreistellungsbescheids.type' => Fundingupload::TYPE_FREISTELLUNGSBESCHEID + 'FundinguploadsFreistellungsbescheids.type' => Fundingupload::TYPE_FREISTELLUNGSBESCHEID, + ], + 'dependent' => true, + ]); + $this->hasMany('FundinguploadsZuwendungsbestaetigungs', [ + 'className' => 'Fundinguploads', + 'foreignKey' => 'funding_uid', + 'conditions' => [ + 'FundinguploadsZuwendungsbestaetigungs.type' => Fundingupload::TYPE_ZUWENDUNGSBESTAETIGUNG, ], 'dependent' => true, ]); @@ -201,6 +209,7 @@ public function findOrCreateCustom($workshopUid) { 'Fundingsupporters', 'FundinguploadsActivityProofs', 'FundinguploadsFreistellungsbescheids', + 'FundinguploadsZuwendungsbestaetigungs', ])->first(); if (empty($funding->fundingbudgetplans)) { diff --git a/templates/element/funding/status/zuwendungsbestaetigungStatus.php b/templates/element/funding/status/zuwendungsbestaetigungStatus.php new file mode 100644 index 000000000..ae29bd00d --- /dev/null +++ b/templates/element/funding/status/zuwendungsbestaetigungStatus.php @@ -0,0 +1,8 @@ +zuwendungsbestaetigung_status_css_class . '">'; +echo '

' . $additionalTextBefore . $funding->zuwendungsbestaetigung_status_human_readable . $additionalTextAfter . '

'; + if ($funding->zuwendungsbestaetigung_comment != '') { + echo '

' . h($funding->zuwendungsbestaetigung_comment) . '

'; + } +echo ''; diff --git a/templates/element/funding/zuwendungsbestaetigungInfo.php b/templates/element/funding/zuwendungsbestaetigungInfo.php index 6f099a2d0..fdcc7447d 100644 --- a/templates/element/funding/zuwendungsbestaetigungInfo.php +++ b/templates/element/funding/zuwendungsbestaetigungInfo.php @@ -1,8 +1,12 @@ '; - echo 'Zuwendungsbestätigung: Bestätigung von Admin ausstehend (Der Upload wird in Kürze möglich sein)'; -echo ''; +echo $this->element('funding/status/zuwendungsbestaetigungStatus', [ + 'funding' => $funding, + 'additionalTextBefore' => 'Zuwendungsbestätigung: ', + 'additionalTextAfter' => ' - ' . $this->Html->link('Jetzt hochladen', [ + 'javascript:void(0)', + ]), +]); echo '
'; diff --git a/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php b/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php new file mode 100644 index 000000000..a92644aa1 --- /dev/null +++ b/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php @@ -0,0 +1,31 @@ + +element('email/tableHead'); ?> + + element('email/greeting'); ?> + + +

+ Der Status deiner Zuwendungsbestätigung wurde geändert auf:
+ zuwendungsbestaetigung_status_human_readable; ?> +

+ zuwendungsbestaetigung_comment != '') { ?> +

+ Kommentar: zuwendungsbestaetigung_comment; ?> +

+ +

+ MyHtml->link( + 'Link zu deiner Zuwendungsbestätigung', + Configure::read('AppConfig.serverName') . $this->MyHtml->urlFundingsEdit($funding->workshop->uid), + ); + */ + ?> +

+ + + +element('email/tableFoot'); ?> From 8fb79d0927b7b205684ed694a9048fba6de9ad51 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Tue, 3 Dec 2024 17:41:52 +0100 Subject: [PATCH 2/9] show button --- plugins/Admin/templates/Fundings/edit.php | 2 +- .../status/zuwendungsbestaetigungStatus.php | 2 +- .../funding/workshopWithFundingAllowed.php | 31 +++++++++---------- .../funding/zuwendungsbestaetigungInfo.php | 21 ++++++++++--- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/plugins/Admin/templates/Fundings/edit.php b/plugins/Admin/templates/Fundings/edit.php index aa546bcde..16514cfc0 100644 --- a/plugins/Admin/templates/Fundings/edit.php +++ b/plugins/Admin/templates/Fundings/edit.php @@ -120,7 +120,7 @@ echo '
'; echo 'Status Zuwendungsbestätigung'; - echo $this->element('funding/status/zuwendungsbestaetigungStatus', ['funding' => $funding, 'additionalTextBefore' => '', 'additionalTextAfter' => '']); + echo $this->element('funding/status/zuwendungsbestaetigungStatus', ['funding' => $funding, 'additionalTextBefore' => '']); echo $this->Form->control('Fundings.zuwendungsbestaetigung_status', ['label' => 'Status', 'options' => Funding::STATUS_MAPPING_UPLOADS, 'disabled' => !$funding->is_submitted, 'class' => 'no-verify']); echo $this->Form->control('Fundings.zuwendungsbestaetigung_comment', ['label' => 'Kommentar', 'disabled' => !$funding->is_submitted, 'class' => 'no-verify']); echo '
'; diff --git a/templates/element/funding/status/zuwendungsbestaetigungStatus.php b/templates/element/funding/status/zuwendungsbestaetigungStatus.php index ae29bd00d..86cb9c468 100644 --- a/templates/element/funding/status/zuwendungsbestaetigungStatus.php +++ b/templates/element/funding/status/zuwendungsbestaetigungStatus.php @@ -1,7 +1,7 @@ zuwendungsbestaetigung_status_css_class . '">'; -echo '

' . $additionalTextBefore . $funding->zuwendungsbestaetigung_status_human_readable . $additionalTextAfter . '

'; +echo '

' . $additionalTextBefore . $funding->zuwendungsbestaetigung_status_human_readable . '

'; if ($funding->zuwendungsbestaetigung_comment != '') { echo '

' . h($funding->zuwendungsbestaetigung_comment) . '

'; } diff --git a/templates/element/funding/workshopWithFundingAllowed.php b/templates/element/funding/workshopWithFundingAllowed.php index 1c4baba47..82a926117 100644 --- a/templates/element/funding/workshopWithFundingAllowed.php +++ b/templates/element/funding/workshopWithFundingAllowed.php @@ -10,25 +10,22 @@ ); echo '
'; - $classes = ['button']; - $buttonHref = $this->Html->urlFundingsEdit($workshop->uid); - if ($workshop->funding_created_by_different_owner) { - $classes[] = 'disabled'; - $buttonHref = 'javascript:void(0);'; - } $isSubmitted = $workshop->funding_exists && $workshop->workshop_funding->is_submitted; - if ($isSubmitted) { - $classes[] = 'disabled'; - $buttonHref = 'javascript:void(0);'; + if (!$workshop->funding_exists || !$isSubmitted) { + $classes = ['button']; + $buttonHref = $this->Html->urlFundingsEdit($workshop->uid); + if ($workshop->funding_created_by_different_owner) { + $classes[] = 'disabled'; + $buttonHref = 'javascript:void(0);'; + } + echo $this->Html->link( + $workshop->funding_exists ? 'Förderantrag bearbeiten' : 'Förderantrag erstellen', + $buttonHref, + [ + 'class' => implode(' ', $classes), + ], + ); } - echo $this->Html->link( - $workshop->funding_exists ? 'Förderantrag bearbeiten' : 'Förderantrag erstellen', - $buttonHref, - [ - 'class' => implode(' ', $classes), - 'disabled' => $isSubmitted, - ], - ); echo '
'; if ($workshop->funding_exists) { diff --git a/templates/element/funding/zuwendungsbestaetigungInfo.php b/templates/element/funding/zuwendungsbestaetigungInfo.php index fdcc7447d..7bba47d64 100644 --- a/templates/element/funding/zuwendungsbestaetigungInfo.php +++ b/templates/element/funding/zuwendungsbestaetigungInfo.php @@ -1,11 +1,10 @@ element('funding/status/zuwendungsbestaetigungStatus', [ 'funding' => $funding, 'additionalTextBefore' => 'Zuwendungsbestätigung: ', - 'additionalTextAfter' => ' - ' . $this->Html->link('Jetzt hochladen', [ - 'javascript:void(0)', - ]), ]); echo '
'; @@ -28,6 +27,20 @@ [ 'target' => '_blank', ], - ); + ); + +echo '
'; + +if ($funding->zuwendungsbestaetigung_status == Funding::STATUS_VERIFIED_BY_ADMIN) { + return; +} +echo '
'; + echo $this->Html->link( + 'Zuwendungsbestätigung hochladen', + 'javascript:void(0);', + [ + 'class' => 'button', + ], + ); echo '
'; \ No newline at end of file From a9d44c73d97e1a591f65544d9e23ff54ad10e8a1 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 4 Dec 2024 09:38:05 +0100 Subject: [PATCH 3/9] add upload form for zuwendungsbestaetigung --- config/app_config.php | 1 + config/routes.php | 28 ++---- .../src/Controller/FundingsController.php | 3 + plugins/Admin/templates/Fundings/edit.php | 6 +- src/Controller/FundingsController.php | 95 +++++++++++++------ src/Model/Entity/Fundingupload.php | 6 +- src/Model/Table/FundingsTable.php | 15 ++- src/Policy/FundingsPolicy.php | 14 +-- src/View/Helper/MyHtmlHelper.php | 4 + .../upload_zuwendungsbestaetigung.php | 44 +++++++++ .../funding/blocks/blockActivityProof.php | 2 +- .../blocks/blockFreistellungsbescheid.php | 2 +- .../blocks/blockZuwendungsbestaetigung.php | 24 +++++ .../funding/zuwendungsbestaetigungInfo.php | 2 +- .../zuwendungsbestaetigung_status_changed.php | 4 +- webroot/css/fundings.css | 9 +- 16 files changed, 190 insertions(+), 69 deletions(-) create mode 100644 templates/Fundings/upload_zuwendungsbestaetigung.php create mode 100644 templates/element/funding/blocks/blockZuwendungsbestaetigung.php diff --git a/config/app_config.php b/config/app_config.php index 669924433..7d9a27b20 100644 --- a/config/app_config.php +++ b/config/app_config.php @@ -34,6 +34,7 @@ define('ZIP_REGEX', '/^[0-9]{4,5}$/'); define('ZIP_REGEX_DE', '/^[0-9]{5}$/'); define('BIC_REGEX', '/^[A-Z]{4}[A-Z]{2}[A-Z0-9]{2}([A-Z0-9]{3})?$/'); +define('UUID_REGEX', '[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[0-5][a-fA-F0-9]{3}-[089aAbB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}'); // see Validate::uuid() return [ 'Email' => [ diff --git a/config/routes.php b/config/routes.php index 2c259ab02..b490a24d8 100644 --- a/config/routes.php +++ b/config/routes.php @@ -125,31 +125,19 @@ if (Configure::read('AppConfig.fundingsEnabled')) { $routes->connect('/mein-foerderantrag', ['controller'=>'fundings', 'action'=>'index']); - $routes->connect('/mein-foerderantrag/{action}/{workshopUid}', [ - 'controller'=>'fundings', - 'action'=>'{action}' - ], - )->setPatterns([ - 'action' => 'edit', - 'workshopUid' => '[0-9]+' - ]); - - $routes->connect('/mein-foerderantrag/delete/{fundingUid}', [ - 'controller'=>'fundings', - 'action'=>'delete' - ])->setPatterns(['fundingUid' => '[0-9]+']); - - $routes->connect('/mein-foerderantrag/download/{type}/{fundingUid}', [ + $routes->connect('/mein-foerderantrag/download/{type}/{uid}', [ 'controller'=>'fundings', 'action'=>'download' ])->setPatterns([ 'type' => 'foerderantrag|foerderbewilligung', - 'fundingUid' => '[0-9]+' + 'uid' => '[0-9]+' ]); - - $routes->connect('/mein-foerderantrag/uploadDetail/{fundinguploadId}', [ - 'controller'=>'fundings', - 'action'=>'uploadDetail' + $routes->connect('/mein-foerderantrag/{action}/{uid}', [ + 'controller' => 'fundings', + 'action'=> '{action}' + ])->setPatterns([ + 'action' => 'uploadDetail|uploadZuwendungsbestaetigung|edit|delete', + 'uid' => '[0-9]+|(' . UUID_REGEX . ')', ]); } diff --git a/plugins/Admin/src/Controller/FundingsController.php b/plugins/Admin/src/Controller/FundingsController.php index f150d3404..5b015a781 100644 --- a/plugins/Admin/src/Controller/FundingsController.php +++ b/plugins/Admin/src/Controller/FundingsController.php @@ -48,6 +48,9 @@ public function edit($uid) 'FundinguploadsFreistellungsbescheids' => function($q) { return $q->order(['FundinguploadsFreistellungsbescheids.created' => 'DESC']); }, + 'FundinguploadsZuwendungsbestaetigungs' => function($q) { + return $q->order(['FundinguploadsZuwendungsbestaetigungs.created' => 'DESC']); + }, ])->first(); if ($funding->owner_user) { diff --git a/plugins/Admin/templates/Fundings/edit.php b/plugins/Admin/templates/Fundings/edit.php index 16514cfc0..d6668bb2f 100644 --- a/plugins/Admin/templates/Fundings/edit.php +++ b/plugins/Admin/templates/Fundings/edit.php @@ -33,7 +33,7 @@ if ($funding->workshop->funding_activity_proof_required) { echo $this->element('funding/fundingUploadsForm', [ 'fundinguploads' => $funding->fundinguploads_activity_proofs, - 'uploadType' => Fundingupload::TYPE_MAP[Fundingupload::TYPE_ACTIVITY_PROOF], + 'uploadType' => Fundingupload::TYPE_MAP_STEP_1[Fundingupload::TYPE_ACTIVITY_PROOF], 'legend' => 'Uploads Aktivitätsnachweis', ]); @@ -49,7 +49,7 @@ echo $this->element('funding/fundingUploadsForm', [ 'fundinguploads' => $funding->fundinguploads_freistellungsbescheids, - 'uploadType' => Fundingupload::TYPE_MAP[Fundingupload::TYPE_FREISTELLUNGSBESCHEID], + 'uploadType' => Fundingupload::TYPE_MAP_STEP_1[Fundingupload::TYPE_FREISTELLUNGSBESCHEID], 'legend' => 'Upload Freistellungsbescheid', ]); @@ -114,7 +114,7 @@ if ($funding->is_submitted) { echo $this->element('funding/fundingUploadsForm', [ 'fundinguploads' => $funding->fundinguploads_zuwendungsbestaetigungs, - 'uploadType' => Fundingupload::TYPE_MAP[Fundingupload::TYPE_ZUWENDUNGSBESTAETIGUNG], + 'uploadType' => Fundingupload::TYPE_MAP_STEP_2[Fundingupload::TYPE_ZUWENDUNGSBESTAETIGUNG], 'legend' => 'Upload Zuwendungsbestätigung', ]); diff --git a/src/Controller/FundingsController.php b/src/Controller/FundingsController.php index 83a035d06..f107c4b6a 100644 --- a/src/Controller/FundingsController.php +++ b/src/Controller/FundingsController.php @@ -91,7 +91,7 @@ private function createdByOtherOwnerCheck($workshopUid) { public function edit() { - $workshopUid = (int) $this->getRequest()->getParam('workshopUid'); + $workshopUid = (int) $this->getRequest()->getParam('uid'); $createdByOtherOwnerCheckMessage = $this->createdByOtherOwnerCheck($workshopUid); if ($createdByOtherOwnerCheckMessage != '') { @@ -153,8 +153,8 @@ public function edit() { $patchedEntity = $this->patchFunding($funding, $associations); $errors = $patchedEntity->getErrors(); - $newFundinguploads = $this->handleNewFundinguploads($funding, $associations, $patchedEntity); - $this->handleDeleteFundinguploads($funding, $associations, $patchedEntity, $newFundinguploads); + $newFundinguploads = $this->handleNewFundinguploads($funding, $associations, $patchedEntity, Fundingupload::TYPE_MAP_STEP_1); + $this->handleDeleteFundinguploads($funding, $associations, $patchedEntity, $newFundinguploads, Fundingupload::TYPE_MAP_STEP_1); if (!empty($errors)) { $patchedEntity = $this->getPatchedFundingForValidFields($errors, $workshopUid, $associationsWithoutValidation); @@ -173,25 +173,7 @@ public function edit() { $fundingsTable->save($patchedEntity, ['associated' => $associationsWithoutValidation]); $this->AppFlash->setFlashMessage('Der Förderantrag wurde erfolgreich zwischengespeichert.'); - foreach(Fundingupload::TYPE_MAP as $uploadTypeId => $uploadType) { - if (!empty($this->request->getData('Fundings.fundinguploads_' . $uploadType))) { - // patch id for new fundinguploads - $fundinguploadsFromDatabase = $this->getTableLocator()->get('Fundinguploads')->find()->where([ - 'Fundinguploads.funding_uid' => $funding->uid, - ])->toArray(); - $updatedFundinguploads = []; - foreach($this->request->getData('Fundings.fundinguploads_' . $uploadType) as $fundingupload) { - foreach($fundinguploadsFromDatabase as $fundinguploadFromDatabaseEntity) { - if ($fundingupload['filename'] == $fundinguploadFromDatabaseEntity->filename) { - $fundingupload['id'] = $fundinguploadFromDatabaseEntity->id; - $updatedFundinguploads[] = $fundingupload; - } - } - } - $this->request = $this->request->withData('Fundings.fundinguploads_' . $uploadType ?? [], $updatedFundinguploads); - $patchedEntity = $this->patchFunding($funding, $associations); - } - } + $patchedEntity = $this->handleUpdateNewFundinguploadsWithIds($funding, $associations, $patchedEntity, Fundingupload::TYPE_MAP_STEP_1); if (!$patchedEntity->hasErrors() && $funding->is_submittable && !empty($this->request->getData('submit_funding'))) { $this->submitFunding($funding); @@ -278,9 +260,32 @@ public function foerderantragPdf($fundingUid) { die($pdfWriterService->writeInline()); } - private function handleDeleteFundinguploads($funding, $associations, $patchedEntity, $newFundinguploads) { + private function handleUpdateNewFundinguploadsWithIds($funding, $associations, $patchedEntity, $uploadTypes) { + foreach($uploadTypes as $uploadTypeId => $uploadType) { + if (!empty($this->request->getData('Fundings.fundinguploads_' . $uploadType))) { + // patch id for new fundinguploads + $fundinguploadsFromDatabase = $this->getTableLocator()->get('Fundinguploads')->find()->where([ + 'Fundinguploads.funding_uid' => $funding->uid, + ])->toArray(); + $updatedFundinguploads = []; + foreach($this->request->getData('Fundings.fundinguploads_' . $uploadType) as $fundingupload) { + foreach($fundinguploadsFromDatabase as $fundinguploadFromDatabaseEntity) { + if ($fundingupload['filename'] == $fundinguploadFromDatabaseEntity->filename) { + $fundingupload['id'] = $fundinguploadFromDatabaseEntity->id; + $updatedFundinguploads[] = $fundingupload; + } + } + } + $this->request = $this->request->withData('Fundings.fundinguploads_' . $uploadType ?? [], $updatedFundinguploads); + $patchedEntity = $this->patchFunding($funding, $associations); + } + } + return $patchedEntity; + } + + private function handleDeleteFundinguploads($funding, $associations, $patchedEntity, $newFundinguploads, $uploadTypes) { - foreach(Fundingupload::TYPE_MAP as $uploadTypeId => $uploadType) { + foreach($uploadTypes as $uploadTypeId => $uploadType) { $deleteFundinguploads = $this->request->getData('Fundings.delete_fundinguploads_' . $uploadType); if (!empty($deleteFundinguploads)) { $remainingFundinguploads = $this->request->getData('Fundings.fundinguploads_' . $uploadType) ?? []; @@ -316,9 +321,9 @@ private function handleDeleteFundinguploads($funding, $associations, $patchedEnt } - private function handleNewFundinguploads($funding, $associations, $patchedEntity) { + private function handleNewFundinguploads($funding, $associations, $patchedEntity, $uploadTypes) { $newFundinguploads = []; - foreach(Fundingupload::TYPE_MAP as $uploadTypeId => $uploadType) { + foreach($uploadTypes as $uploadTypeId => $uploadType) { $filesFundinguploadsErrors = $patchedEntity->getError('files_fundinguploads_' . $uploadType); if (!empty($filesFundinguploadsErrors)) { $patchedEntity->setError('files_fundinguploads_' . $uploadType . '[]', $filesFundinguploadsErrors); @@ -392,7 +397,7 @@ private function updateCoordinates($entity, $index, $addressString) { public function delete() { - $fundingUid = (int) $this->request->getParam('fundingUid'); + $fundingUid = (int) $this->request->getParam('uid'); $fundingsTable = $this->getTableLocator()->get('Fundings'); $fundingsTable->deleteCustom($fundingUid); $this->AppFlash->setFlashMessage('Der Förderantrag wurde erfolgreich gelöscht.'); @@ -442,9 +447,41 @@ private function removeValidationFromAssociations($associations) { } + public function uploadZuwendungsbestaetigung() { + + $fundingsTable = $this->getTableLocator()->get('Fundings'); + $fundingUid = $this->getRequest()->getParam('uid'); + $funding = $fundingsTable->getUnprivatizedFundingWithAllAssociations($fundingUid); + + if (!$funding->is_submitted) { + throw new NotFoundException('Förderantrag (UID: '.$fundingUid.') wurde noch nicht eingereicht.'); + } + + $this->setReferer(); + + if (!empty($this->request->getData())) { + $associations = ['FundinguploadsZuwendungsbestaetigungs']; + $patchedEntity = $this->patchFunding($funding, $associations); + $newFundinguploads = $this->handleNewFundinguploads($funding, $associations, $patchedEntity, Fundingupload::TYPE_MAP_STEP_2); + $this->handleDeleteFundinguploads($funding, $associations, $patchedEntity, $newFundinguploads, Fundingupload::TYPE_MAP_STEP_2); + + $patchedEntity->modified = DateTime::now(); + $fundingsTable->save($patchedEntity); + $this->AppFlash->setFlashMessage('Die Zuwendungsbestägigung wurde erfolgreich gespeichert.'); + $patchedEntity = $this->handleUpdateNewFundinguploadsWithIds($funding, $associations, $patchedEntity, Fundingupload::TYPE_MAP_STEP_2); + + } + + $this->set('metaTags', [ + 'title' => 'Upload Zuwendungsbestätigung zu Förderantrag UID: ' . $funding->uid . ')', + ]); + $this->set('funding', $funding); + + } + public function download() { - $fundingUid = $this->getRequest()->getParam('fundingUid'); + $fundingUid = $this->getRequest()->getParam('uid'); $type = $this->getRequest()->getParam('type'); $fundingsTable = $this->getTableLocator()->get('Fundings'); @@ -479,7 +516,7 @@ public function download() { public function uploadDetail() { - $fundinguploadUid = $this->getRequest()->getParam('fundinguploadId'); + $fundinguploadUid = $this->getRequest()->getParam('uid'); $fundinguploadsTable = $this->getTableLocator()->get('Fundinguploads'); $fundingupload = $fundinguploadsTable->find('all', conditions: [ diff --git a/src/Model/Entity/Fundingupload.php b/src/Model/Entity/Fundingupload.php index 90dd1dab1..25fa78a66 100644 --- a/src/Model/Entity/Fundingupload.php +++ b/src/Model/Entity/Fundingupload.php @@ -12,12 +12,16 @@ class Fundingupload extends Entity const TYPE_FREISTELLUNGSBESCHEID = 2; const TYPE_ZUWENDUNGSBESTAETIGUNG = 3; - const TYPE_MAP = [ + const TYPE_MAP_STEP_1 = [ self::TYPE_ACTIVITY_PROOF => 'activity_proofs', self::TYPE_FREISTELLUNGSBESCHEID => 'freistellungsbescheids', + ]; + + const TYPE_MAP_STEP_2 = [ self::TYPE_ZUWENDUNGSBESTAETIGUNG => 'zuwendungsbestaetigungs', ]; + public function _getFullPath() { return self::UPLOAD_PATH . $this->funding_uid . DS . $this->filename; } diff --git a/src/Model/Table/FundingsTable.php b/src/Model/Table/FundingsTable.php index 89ee93725..d6d9dbea3 100644 --- a/src/Model/Table/FundingsTable.php +++ b/src/Model/Table/FundingsTable.php @@ -84,12 +84,24 @@ public function validationDefault(Validator $validator): Validator }, ]); + $validator->add('fundinguploads_zuwendungsbestaetigungs', 'fileCount', [ + 'rule' => function ($value, $context) { + if (count($value) > 1) { + return 'Es ist nur eine Datei erlaubt.'; + } + return true; + }, + ]); + $validator->add('files_fundinguploads_activity_proofs', 'fileTypeAndSize', [ 'rule' => [$this, 'validateFileTypeAndSize'], ]); $validator->add('files_fundinguploads_freistellungsbescheids', 'fileTypeAndSize', [ 'rule' => [$this, 'validateFileTypeAndSize'], ]); + $validator->add('files_fundinguploads_zuwendungsbestaetigungs', 'fileTypeAndSize', [ + 'rule' => [$this, 'validateFileTypeAndSize'], + ]); return $validator; } @@ -131,7 +143,8 @@ public function getUnprivatizedFundingWithAllAssociations($fundingUid) { 'Fundingdatas', 'Fundingbudgetplans', 'FundinguploadsActivityProofs', - 'FundinguploadsFreistellungsbescheids' + 'FundinguploadsFreistellungsbescheids', + 'FundinguploadsZuwendungsbestaetigungs', ])->where([ $this->aliasField('uid') => $fundingUid, ])->first(); diff --git a/src/Policy/FundingsPolicy.php b/src/Policy/FundingsPolicy.php index 1d4c334ae..97a9ffedd 100644 --- a/src/Policy/FundingsPolicy.php +++ b/src/Policy/FundingsPolicy.php @@ -28,14 +28,15 @@ public function canAccess($identity, ServerRequest $request): bool|ResultInterfa return false; } - if (in_array($request->getParam('action'), ['uploadDetail', 'download'])) { + $fundingsTable = FactoryLocator::get('Table')->get('Fundings'); + + if (in_array($request->getParam('action'), ['uploadDetail', 'download', 'uploadZb'])) { if ($identity->isAdmin()) { return true; } - $fundingUid = (int) $request->getParam('fundingUid'); - $fundingsTable = FactoryLocator::get('Table')->get('Fundings'); + $fundingUid = (int) $request->getParam('uid'); $entity = $fundingsTable->find()->where([ $fundingsTable->aliasField('uid') => $fundingUid, $fundingsTable->aliasField('owner') => $identity->uid, @@ -50,8 +51,7 @@ public function canAccess($identity, ServerRequest $request): bool|ResultInterfa } if (in_array($request->getParam('action'), ['delete'])) { - $fundingUid = (int) $request->getParam('fundingUid'); - $fundingsTable = FactoryLocator::get('Table')->get('Fundings'); + $fundingUid = (int) $request->getParam('uid'); $entity = $fundingsTable->find()->where([ $fundingsTable->aliasField('uid') => $fundingUid, $fundingsTable->aliasField('owner') => $identity->uid, @@ -70,9 +70,9 @@ public function canAccess($identity, ServerRequest $request): bool|ResultInterfa if (in_array($request->getParam('action'), ['edit'])) { - $workshopUid = (int) $request->getParam('workshopUid'); + $workshopUid = (int) $request->getParam('uid'); - // all approved orgas are allowed to edit fundings + // only approved orgas are allowed to edit fundings $workshopsTable = FactoryLocator::get('Table')->get('Workshops'); $workshop = $workshopsTable->getWorkshopForIsUserInOrgaTeamCheck($workshopUid); if ($workshopsTable->isUserInOrgaTeam($identity, $workshop)) { diff --git a/src/View/Helper/MyHtmlHelper.php b/src/View/Helper/MyHtmlHelper.php index 3d68ff972..1f0478d44 100644 --- a/src/View/Helper/MyHtmlHelper.php +++ b/src/View/Helper/MyHtmlHelper.php @@ -232,6 +232,10 @@ function urlFundingsEdit($workshopUid) { return $this->urlFundings() . '/edit/' . $workshopUid; } + function urlFundingsUploadZuwendungsbestaetigung($fundingUid) { + return $this->urlFundings() . '/uploadZuwendungsbestaetigung/' . $fundingUid; + } + function urlFundingsAdminEdit($fundingUid) { return '/admin/fundings/edit/' . $fundingUid; } diff --git a/templates/Fundings/upload_zuwendungsbestaetigung.php b/templates/Fundings/upload_zuwendungsbestaetigung.php new file mode 100644 index 000000000..13469445c --- /dev/null +++ b/templates/Fundings/upload_zuwendungsbestaetigung.php @@ -0,0 +1,44 @@ +element('addScript', ['script' => + JS_NAMESPACE.".Helper.bindCancelButton();". + JS_NAMESPACE.".Funding.initIsMissing();" +]); +echo $this->element('jqueryTabsWithoutAjax', [ + 'links' => $this->Html->getUserBackendNaviLinks($loggedUser->uid, true, $loggedUser->isOrga()), + 'selected' => $this->Html->urlFundings(), +]); +?> + +
+
+ element('heading', ['first' => $metaTags['title']]); + echo $this->element('funding/blocks/blockColorCodes'); + + echo $this->Form->create($funding, [ + 'novalidate' => 'novalidate', + 'url' => $this->Html->urlFundingsUploadZuwendungsbestaetigung($funding->uid), + 'type' => 'file', + 'id' => 'fundingForm', + ]); + + echo $this->Form->hidden('referer', ['value' => $referer]); + $this->Form->unlockField('referer'); + + echo '
'; + echo $this->element('funding/blocks/blockZuwendungsbestaetigung', ['funding' => $funding]); + echo '
'; + + echo $this->Form->button('Zurück', [ + 'type' => 'button', + 'id' => 'cancel-button', + 'class' => 'rounded gray', + ]); + + echo $this->Form->end(); + + ?> + +
+
\ No newline at end of file diff --git a/templates/element/funding/blocks/blockActivityProof.php b/templates/element/funding/blocks/blockActivityProof.php index d85251ce6..11950a234 100644 --- a/templates/element/funding/blocks/blockActivityProof.php +++ b/templates/element/funding/blocks/blockActivityProof.php @@ -20,7 +20,7 @@ echo '
'; echo $this->element('funding/blocks/upload/listUploadsAndUploadForm', [ - 'uploadType' => Fundingupload::TYPE_MAP[Fundingupload::TYPE_ACTIVITY_PROOF], + 'uploadType' => Fundingupload::TYPE_MAP_STEP_1[Fundingupload::TYPE_ACTIVITY_PROOF], 'fundinguploads' => $funding->fundinguploads_activity_proofs, 'showUploadForm' => $funding->activity_proof_status != Funding::STATUS_VERIFIED_BY_ADMIN, 'validationMessage' => 'Nur PDF, JPG und PNG-Dateien sind erlaubt. Jede Datei muss kleiner als 5 MB sein.', diff --git a/templates/element/funding/blocks/blockFreistellungsbescheid.php b/templates/element/funding/blocks/blockFreistellungsbescheid.php index 9a76e0961..23731b926 100644 --- a/templates/element/funding/blocks/blockFreistellungsbescheid.php +++ b/templates/element/funding/blocks/blockFreistellungsbescheid.php @@ -14,7 +14,7 @@ echo '
'; echo $this->element('funding/blocks/upload/listUploadsAndUploadForm', [ - 'uploadType' => Fundingupload::TYPE_MAP[Fundingupload::TYPE_FREISTELLUNGSBESCHEID], + 'uploadType' => Fundingupload::TYPE_MAP_STEP_1[Fundingupload::TYPE_FREISTELLUNGSBESCHEID], 'fundinguploads' => $funding->fundinguploads_freistellungsbescheids, 'showUploadForm' => $funding->freistellungsbescheid_status != Funding::STATUS_VERIFIED_BY_ADMIN, 'validationMessage' => '', diff --git a/templates/element/funding/blocks/blockZuwendungsbestaetigung.php b/templates/element/funding/blocks/blockZuwendungsbestaetigung.php new file mode 100644 index 000000000..77f389385 --- /dev/null +++ b/templates/element/funding/blocks/blockZuwendungsbestaetigung.php @@ -0,0 +1,24 @@ +'; + + echo 'Zuwendungsbestätigung'; + + echo $this->element('funding/status/zuwendungsbestaetigungStatus', ['funding' => $funding, 'additionalTextBefore' => '']); + + echo '
'; + echo '

Die Zuwendungsbestätigung muss lesbar sein. Bitte lade alle Seiten als ein PDF (unter 5MB) hoch.

'; + echo '
'; + + echo $this->element('funding/blocks/upload/listUploadsAndUploadForm', [ + 'uploadType' => Fundingupload::TYPE_MAP_STEP_2[Fundingupload::TYPE_ZUWENDUNGSBESTAETIGUNG], + 'fundinguploads' => $funding->fundinguploads_zuwendungsbestaetigungs, + 'showUploadForm' => $funding->zuwendungsbestaetigung_status != Funding::STATUS_VERIFIED_BY_ADMIN, + 'validationMessage' => '', + 'multiple' => false, + ]); + +echo ''; diff --git a/templates/element/funding/zuwendungsbestaetigungInfo.php b/templates/element/funding/zuwendungsbestaetigungInfo.php index 7bba47d64..81eb7297b 100644 --- a/templates/element/funding/zuwendungsbestaetigungInfo.php +++ b/templates/element/funding/zuwendungsbestaetigungInfo.php @@ -38,7 +38,7 @@ echo '
'; echo $this->Html->link( 'Zuwendungsbestätigung hochladen', - 'javascript:void(0);', + $this->Html->urlFundingsUploadZuwendungsbestaetigung($funding->uid), [ 'class' => 'button', ], diff --git a/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php b/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php index a92644aa1..2d1cb2b0e 100644 --- a/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php +++ b/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php @@ -17,12 +17,10 @@

MyHtml->link( 'Link zu deiner Zuwendungsbestätigung', - Configure::read('AppConfig.serverName') . $this->MyHtml->urlFundingsEdit($funding->workshop->uid), + Configure::read('AppConfig.serverName') . $this->MyHtml->urlFundingsUploadZuwendungsbestaetigung($funding->uid), ); - */ ?>

diff --git a/webroot/css/fundings.css b/webroot/css/fundings.css index 78b652bfe..4f7798431 100644 --- a/webroot/css/fundings.css +++ b/webroot/css/fundings.css @@ -88,6 +88,7 @@ body.fundings .verification-wrapper p.comment { body.fundings .upload-button-wrapper { display: flex; justify-content: flex-end; + max-height: 34px; /* if upload input has error */ } body.fundings.edit div.admin.edit { padding: 20px; @@ -274,13 +275,13 @@ body.fundings.edit .ui-progressbar-value { background-color: var(--is-verified); margin: 0; } -body.fundings.edit .color-codes-wrapper { +body.fundings .color-codes-wrapper { margin-bottom: 20px; display: flex; gap: 10px; width: 70%; } -body.fundings.edit .color-codes-wrapper > div { +body.fundings .color-codes-wrapper > div { flex: 1; padding: 10px; border-radius: 3px; @@ -303,6 +304,10 @@ body.fundings div.is-rejected { body.fundings a.funding-delete-button { color: red ! important; } +body.fundings.uploadZuwendungsbestaetigung fieldset { + flex: 0 ! important; + flex-basis: calc(50% - 40px) ! important; +} @media (max-width: 767px) { #fundingForm fieldset:not(.fundingbudgetplan) div.input:not(.file) { From 2413dcc24eef6bafd464a9ad0f3cb1366114a651 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 4 Dec 2024 15:43:30 +0100 Subject: [PATCH 4/9] add test for zuwendungsbestaetigungs upload --- .../src/Controller/FundingsControllerTest.php | 55 ++++++++++++++++--- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/tests/TestCase/src/Controller/FundingsControllerTest.php b/tests/TestCase/src/Controller/FundingsControllerTest.php index 29f270ae3..0748ae389 100644 --- a/tests/TestCase/src/Controller/FundingsControllerTest.php +++ b/tests/TestCase/src/Controller/FundingsControllerTest.php @@ -115,7 +115,7 @@ private function prepareWorkshopForFunding($workshopUid) { } } - public function testEditAndSubmitAsOrgaOk() { + public function testCompleteFundingProcess() { $fundingsTable = $this->getTableLocator()->get('Fundings'); $testWorkshopUid = 2; @@ -187,10 +187,12 @@ public function testEditAndSubmitAsOrgaOk() { $uploadFileActivityProof2 = TESTS . 'files/uploadActivityProof2.txt'; $uploadFileFreistellungsbescheid1 = TESTS . 'files/uploadTFreistellungsbescheid1.jpg'; $uploadFileFreistellungsbescheid2 = TESTS . 'files/uploadFreistellungsbescheid2.jpg'; + $uploadFileZuwendungsbestaetigung1 = TESTS . 'files/uploadZuwendungsbestaetigung1.jpg'; copy($uploadTemplateJpgFile, $uploadFileActivityProof1); copy($uploadTemplateTxtFile, $uploadFileActivityProof2); copy($uploadTemplateJpgFile, $uploadFileFreistellungsbescheid1); copy($uploadTemplateJpgFile, $uploadFileFreistellungsbescheid2); + copy($uploadTemplateJpgFile, $uploadFileZuwendungsbestaetigung1); // 1) POST $this->post(Configure::read('AppConfig.htmlHelper')->urlFundingsEdit($testWorkshopUid), [ @@ -365,7 +367,6 @@ public function testEditAndSubmitAsOrgaOk() { $this->assertCount(0, $funding->fundinguploads_activity_proofs); $this->assertCount(0, $funding->fundinguploads_freistellungsbescheids); - // 4) POST create a valid funding and submit $funding->activity_proof_status = Funding::STATUS_VERIFIED_BY_ADMIN; $funding->freistellungsbescheid_status = Funding::STATUS_VERIFIED_BY_ADMIN; @@ -452,8 +453,8 @@ public function testEditAndSubmitAsOrgaOk() { $foerderbewilligungPdfWriterService = new FoerderbewilligungPdfWriterService(); $foerderbewilligungPdfFilename = $foerderbewilligungPdfWriterService->getFilenameCustom($funding, $funding->submit_date); - $this->assertFileExists($foerderantragPdfWriterService->getUploadPath($funding->uid) . $foerderantragPdfFilename); - $this->assertFileExists($foerderbewilligungPdfWriterService->getUploadPath($funding->uid) . $foerderbewilligungPdfFilename); + $this->assertFileExists($foerderantragPdfWriterService->getUploadPath($fundingUid) . $foerderantragPdfFilename); + $this->assertFileExists($foerderbewilligungPdfWriterService->getUploadPath($fundingUid) . $foerderbewilligungPdfFilename); $this->runAndAssertQueue(); $this->assertMailCount(1); @@ -463,13 +464,53 @@ public function testEditAndSubmitAsOrgaOk() { $this->assertMailContainsAttachment($foerderbewilligungPdfFilename); $this->assertMailContainsAttachment($foerderantragPdfFilename); - $this->get(Configure::read('AppConfig.htmlHelper')->urlFundingFoerderbewilligungDownload($funding->uid)); + $this->get(Configure::read('AppConfig.htmlHelper')->urlFundingFoerderbewilligungDownload($fundingUid)); $this->assertResponseOk(); $this->assertContentType('application/pdf'); - $this->get(Configure::read('AppConfig.htmlHelper')->urlFundingFoerderantragDownload($funding->uid)); + $this->get(Configure::read('AppConfig.htmlHelper')->urlFundingFoerderantragDownload($fundingUid)); $this->assertResponseOk(); $this->assertContentType('application/pdf'); + // 5) POST zuwendungsbestaetigung upload + $this->post(Configure::read('AppConfig.htmlHelper')->urlFundingsUploadZuwendungsbestaetigung($fundingUid), [ + 'referer' => '/', + 'Fundings' => [ + 'files_fundinguploads_zuwendungsbestaetigungs' => [ + new UploadedFile( + $uploadFileZuwendungsbestaetigung1, + filesize($uploadFileZuwendungsbestaetigung1), + UPLOAD_ERR_OK, + 'test.jpg', + 'image/jpeg', + ), + ], + ], + ]); + $this->assertResponseContains('Die Zuwendungsbestägigung wurde erfolgreich gespeichert.'); + $funding = $fundingsTable->getUnprivatizedFundingWithAllAssociations($fundingUid); + + $this->assertCount(1, $funding->fundinguploads_zuwendungsbestaetigungs); + foreach($funding->fundinguploads_zuwendungsbestaetigungs as $fundingupload) { + $this->assertEquals(Fundingupload::TYPE_ZUWENDUNGSBESTAETIGUNG, $fundingupload->type); + $this->assertFileExists($fundingupload->full_path); + $this->get(Configure::read('AppConfig.htmlHelper')->urlFundinguploadDetail($fundingupload->id)); + $this->assertResponseOk(); + } + + // 6) POST zuwendungsbestaetigung delete + $this->post(Configure::read('AppConfig.htmlHelper')->urlFundingsUploadZuwendungsbestaetigung($fundingUid), [ + 'referer' => '/', + 'Fundings' => [ + 'delete_fundinguploads_zuwendungsbestaetigungs' => [ + $funding->fundinguploads_zuwendungsbestaetigungs[0]->id, + ], + ] + ]); + + $funding = $fundingsTable->getUnprivatizedFundingWithAllAssociations($fundingUid); + $this->assertCount(0, $funding->fundinguploads_zuwendungsbestaetigungs); + + // cleanup everything including file uploads $fundingsTable = $this->getTableLocator()->get('Fundings'); $fundingsTable->save($funding); @@ -477,7 +518,7 @@ public function testEditAndSubmitAsOrgaOk() { $this->expectExceptionMessage('funding (UID: 14) is submitted and cannot be deleted'); $funding->submit_date = null; - $fundingsTable->deleteCustom($funding->uid); + $fundingsTable->deleteCustom($fundingUid); } From 5b7d06f36d4231f2700e4cd1b9f68db700e83ff1 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 4 Dec 2024 15:54:04 +0100 Subject: [PATCH 5/9] cleanup --- .../blocks/blockZuwendungsbestaetigung.php | 25 ++++++++++++++++++- .../funding/zuwendungsbestaetigungInfo.php | 12 +++------ .../zuwendungsbestaetigung_status_changed.php | 2 +- webroot/css/fundings.css | 3 +++ 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/templates/element/funding/blocks/blockZuwendungsbestaetigung.php b/templates/element/funding/blocks/blockZuwendungsbestaetigung.php index 77f389385..726613545 100644 --- a/templates/element/funding/blocks/blockZuwendungsbestaetigung.php +++ b/templates/element/funding/blocks/blockZuwendungsbestaetigung.php @@ -10,7 +10,30 @@ echo $this->element('funding/status/zuwendungsbestaetigungStatus', ['funding' => $funding, 'additionalTextBefore' => '']); echo '
'; - echo '

Die Zuwendungsbestätigung muss lesbar sein. Bitte lade alle Seiten als ein PDF (unter 5MB) hoch.

'; + + echo '

'; + echo 'Die Zuwendungsbestätigung muss lesbar sein. Bitte lade alle Seiten als ein PDF (unter 5MB) hoch.'; + echo '

'; + + echo '

'; + echo $this->Html->link( + 'Formular-Vorlage Zuwendungsbestätigung', + 'https://anstiftung.de/images/vorlage_zuwendungsbestaetigung_geldzuwendung.pdf', + [ + 'target' => '_blank', + ], + ); + + echo ' / '; + + echo $this->Html->link( + 'Ausfüllhilfe Zuwendungsbestätigung', + 'https://anstiftung.de/images/vorlage_zuwendungsbestaetigung_geldzuwendung_ausfuellhilfe.pdf', + [ + 'target' => '_blank', + ], + ); + echo '

'; echo '
'; echo $this->element('funding/blocks/upload/listUploadsAndUploadForm', [ diff --git a/templates/element/funding/zuwendungsbestaetigungInfo.php b/templates/element/funding/zuwendungsbestaetigungInfo.php index 81eb7297b..665708213 100644 --- a/templates/element/funding/zuwendungsbestaetigungInfo.php +++ b/templates/element/funding/zuwendungsbestaetigungInfo.php @@ -12,7 +12,7 @@ echo 'Downloads:'; echo $this->Html->link( - 'Formular-Vorlage', + 'Formular-Vorlage Zuwendungsbestätigung', 'https://anstiftung.de/images/vorlage_zuwendungsbestaetigung_geldzuwendung.pdf', [ 'target' => '_blank', @@ -22,22 +22,18 @@ echo ' / '; echo $this->Html->link( - 'Ausfüllhilfe', + 'Ausfüllhilfe Zuwendungsbestätigung', 'https://anstiftung.de/images/vorlage_zuwendungsbestaetigung_geldzuwendung_ausfuellhilfe.pdf', [ 'target' => '_blank', ], - ); + ); echo '
'; -if ($funding->zuwendungsbestaetigung_status == Funding::STATUS_VERIFIED_BY_ADMIN) { - return; -} - echo '
'; echo $this->Html->link( - 'Zuwendungsbestätigung hochladen', + 'Upload-Formular der Zuwendungsbestätigung', $this->Html->urlFundingsUploadZuwendungsbestaetigung($funding->uid), [ 'class' => 'button', diff --git a/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php b/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php index 2d1cb2b0e..50e02662e 100644 --- a/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php +++ b/templates/email/html/fundings/zuwendungsbestaetigung_status_changed.php @@ -18,7 +18,7 @@

MyHtml->link( - 'Link zu deiner Zuwendungsbestätigung', + 'Zum Upload-Formular der Zuwendungsbestätigung', Configure::read('AppConfig.serverName') . $this->MyHtml->urlFundingsUploadZuwendungsbestaetigung($funding->uid), ); ?> diff --git a/webroot/css/fundings.css b/webroot/css/fundings.css index 4f7798431..ec1fc87c9 100644 --- a/webroot/css/fundings.css +++ b/webroot/css/fundings.css @@ -308,6 +308,9 @@ body.fundings.uploadZuwendungsbestaetigung fieldset { flex: 0 ! important; flex-basis: calc(50% - 40px) ! important; } +body.fundings.uploadZuwendungsbestaetigung h1 { + margin-bottom: 20px; +} @media (max-width: 767px) { #fundingForm fieldset:not(.fundingbudgetplan) div.input:not(.file) { From ac0fa6c7bb760094074df516b9935a1be01834ef Mon Sep 17 00:00:00 2001 From: mrothauer Date: Wed, 4 Dec 2024 16:04:27 +0100 Subject: [PATCH 6/9] cleanup --- src/Policy/FundingsPolicy.php | 44 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/Policy/FundingsPolicy.php b/src/Policy/FundingsPolicy.php index 915ab8583..aee52cc8b 100644 --- a/src/Policy/FundingsPolicy.php +++ b/src/Policy/FundingsPolicy.php @@ -3,7 +3,6 @@ namespace App\Policy; -use AssetCompress\Factory; use Cake\Http\ServerRequest; use Authorization\Policy\RequestPolicyInterface; use Authorization\Policy\ResultInterface; @@ -13,6 +12,15 @@ class FundingsPolicy implements RequestPolicyInterface { + private function getOwnerEntity($fundingUid, $identity) { + $fundingsTable = FactoryLocator::get('Table')->get('Fundings'); + $entity = $fundingsTable->find()->where([ + $fundingsTable->aliasField('uid') => $fundingUid, + $fundingsTable->aliasField('owner') => $identity->uid, + ])->first(); + return $entity; + } + public function canAccess($identity, ServerRequest $request): bool|ResultInterface { @@ -28,20 +36,27 @@ public function canAccess($identity, ServerRequest $request): bool|ResultInterfa return false; } - $fundingsTable = FactoryLocator::get('Table')->get('Fundings'); - if (in_array($request->getParam('action'), ['download', 'uploadZuwendungsbestaetigung'])) { + if (in_array($request->getParam('action'), ['uploadZuwendungsbestaetigung'])) { + + $fundingUid = (int) $request->getParam('uid'); + $entity = $this->getOwnerEntity($fundingUid, $identity); + if (empty($entity)) { + return false; + } + + return true; + + } + + if (in_array($request->getParam('action'), ['download'])) { if ($identity->isAdmin()) { return true; } $fundingUid = (int) $request->getParam('uid'); - $entity = $fundingsTable->find()->where([ - $fundingsTable->aliasField('uid') => $fundingUid, - $fundingsTable->aliasField('owner') => $identity->uid, - ])->first(); - + $entity = $this->getOwnerEntity($fundingUid, $identity); if (empty($entity)) { return false; } @@ -66,11 +81,7 @@ public function canAccess($identity, ServerRequest $request): bool|ResultInterfa return false; } - $entity = $fundingsTable->find()->where([ - $fundingsTable->aliasField('uid') => $fundinguploadEntity->funding_uid, - $fundingsTable->aliasField('owner') => $identity->uid, - ])->first(); - + $entity = $this->getOwnerEntity($fundinguploadEntity->funding_uid, $identity); if (empty($entity)) { return false; } @@ -79,14 +90,9 @@ public function canAccess($identity, ServerRequest $request): bool|ResultInterfa } - if (in_array($request->getParam('action'), ['delete'])) { $fundingUid = (int) $request->getParam('uid'); - $entity = $fundingsTable->find()->where([ - $fundingsTable->aliasField('uid') => $fundingUid, - $fundingsTable->aliasField('owner') => $identity->uid, - ])->first(); - + $entity = $this->getOwnerEntity($fundingUid, $identity); if (empty($entity)) { return false; } From b01e3dc83fc18e104304989c0f5cad047fe9cac8 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 5 Dec 2024 20:35:48 +0100 Subject: [PATCH 7/9] admin order --- plugins/Admin/src/Controller/EventsController.php | 2 +- plugins/Admin/src/Controller/WorkshopsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/src/Controller/EventsController.php b/plugins/Admin/src/Controller/EventsController.php index ab650f7ff..847a8ae84 100644 --- a/plugins/Admin/src/Controller/EventsController.php +++ b/plugins/Admin/src/Controller/EventsController.php @@ -72,7 +72,7 @@ public function index() $objects = $this->paginate($query, [ 'order' => [ - 'Events.updated' => 'DESC' + 'Events.uid' => 'DESC' ] ]); foreach($objects as $object) { diff --git a/plugins/Admin/src/Controller/WorkshopsController.php b/plugins/Admin/src/Controller/WorkshopsController.php index f5729fe72..caa7a9084 100644 --- a/plugins/Admin/src/Controller/WorkshopsController.php +++ b/plugins/Admin/src/Controller/WorkshopsController.php @@ -64,7 +64,7 @@ public function index() $objects = $this->paginate($query, [ 'order' => [ - 'Workshops.name' => 'ASC' + 'Workshops.created' => 'DESC' ], ]); From dbabd0bbf96af9dac4eb559bbc5cd732b8419538 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Thu, 5 Dec 2024 21:03:09 +0100 Subject: [PATCH 8/9] add status filter --- plugins/Admin/src/Controller/AdminAppController.php | 4 ++++ plugins/Admin/src/Controller/FundingsController.php | 10 +++++++++- plugins/Admin/templates/Fundings/index.php | 5 ++++- src/Model/Entity/Funding.php | 10 ++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/plugins/Admin/src/Controller/AdminAppController.php b/plugins/Admin/src/Controller/AdminAppController.php index 05ea99dde..462507c55 100644 --- a/plugins/Admin/src/Controller/AdminAppController.php +++ b/plugins/Admin/src/Controller/AdminAppController.php @@ -144,6 +144,10 @@ protected function generateSearchConditions($searchFieldKey) ] ]; break; + case 'custom': + $this->conditions[] = $searchOption['conditions'][$queryParams['val-' . $searchFieldKey]]; + break; + } } } diff --git a/plugins/Admin/src/Controller/FundingsController.php b/plugins/Admin/src/Controller/FundingsController.php index cabb8056a..9bf2a13df 100644 --- a/plugins/Admin/src/Controller/FundingsController.php +++ b/plugins/Admin/src/Controller/FundingsController.php @@ -8,6 +8,7 @@ use Cake\I18n\DateTime; use App\Services\PdfWriter\FoerderantragPdfWriterService; use League\Csv\Writer; +use App\Model\Entity\Funding; class FundingsController extends AdminAppController { @@ -15,7 +16,7 @@ class FundingsController extends AdminAppController public $searchName = false; public $searchText = false; public $searchUid = false; - + public $searchStatus = false; public function beforeFilter(EventInterface $event) { $this->addSearchOptions([ @@ -23,7 +24,13 @@ public function beforeFilter(EventInterface $event) { 'name' => 'Workshops.name', 'searchType' => 'search' ], + 'FundingStatus' => [ + 'searchType' => 'custom', + 'conditions' => Funding::ADMIN_FILTER_CONDITIONS, + 'extraDropdown' => true + ], ]); + $this->generateSearchConditions('opt-1'); parent::beforeFilter($event); } @@ -283,6 +290,7 @@ public function index() } $this->set('objects', $objects); + $this->set('fundingStatus', Funding::ADMIN_FILTER_OPTIONS); } diff --git a/plugins/Admin/templates/Fundings/index.php b/plugins/Admin/templates/Fundings/index.php index 03dd5da79..f153a158c 100644 --- a/plugins/Admin/templates/Fundings/index.php +++ b/plugins/Admin/templates/Fundings/index.php @@ -5,7 +5,10 @@ 'heading' => 'Förderanträge', 'editMethod' => ['url' => 'urlFundingsAdminEdit'], 'deleteMethod' => '/admin/intern/ajaxDeleteFunding', - 'fields' => [ + 'optionalSearchForms' => [ + ['options' => $fundingStatus, 'value' => 'FundingStatus', 'label' => 'Status'], + ], + 'fields' => [ ['name' => 'uid', 'label' => 'UID'], ['name' => 'workshop.name', 'label' => 'Initiative', 'sortable' => false], ['label' => 'AN', 'template' => 'list/fundings/activityProof'], diff --git a/src/Model/Entity/Funding.php b/src/Model/Entity/Funding.php index b9ae31d29..748fe2092 100644 --- a/src/Model/Entity/Funding.php +++ b/src/Model/Entity/Funding.php @@ -8,6 +8,16 @@ class Funding extends Entity { + const ADMIN_FILTER_OPTIONS = [ + 'submitted' => 'eingereicht', + 'not-submitted' => 'nicht eingereicht', + ]; + + const ADMIN_FILTER_CONDITIONS = [ + 'submitted' => 'Fundings.submit_date IS NOT NULL', + 'not-submitted' => 'Fundings.submit_date IS NULL', + ]; + const STATUS_PENDING = 10; const STATUS_VERIFIED_BY_ADMIN = 20; const STATUS_REJECTED_BY_ADMIN = 30; From 2f2739c663c56e32d03435a71cfb6bc7c610caa9 Mon Sep 17 00:00:00 2001 From: mrothauer Date: Fri, 6 Dec 2024 19:31:37 +0100 Subject: [PATCH 9/9] no upload button if approved, show download link instead --- src/Model/Table/WorkshopsTable.php | 5 ++++- .../funding/zuwendungsbestaetigungInfo.php | 21 ++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Model/Table/WorkshopsTable.php b/src/Model/Table/WorkshopsTable.php index 1b67972c8..1d52641b9 100644 --- a/src/Model/Table/WorkshopsTable.php +++ b/src/Model/Table/WorkshopsTable.php @@ -200,7 +200,10 @@ public function transformForDropdown($workshops) public function getFundingContain() { return [ - 'WorkshopFundings.OwnerUsers', + 'WorkshopFundings' => [ + 'OwnerUsers', + 'FundinguploadsZuwendungsbestaetigungs', + ], 'FundingAllPastEvents' => function (Query $q) { return $q->select(['workshop_uid', 'count' => $q->func()->count('*')])->groupBy('workshop_uid'); }, diff --git a/templates/element/funding/zuwendungsbestaetigungInfo.php b/templates/element/funding/zuwendungsbestaetigungInfo.php index 665708213..10931f952 100644 --- a/templates/element/funding/zuwendungsbestaetigungInfo.php +++ b/templates/element/funding/zuwendungsbestaetigungInfo.php @@ -11,6 +11,11 @@ echo 'Downloads:'; + if ($funding->zuwendungsbestaetigung_status == Funding::STATUS_VERIFIED_BY_ADMIN) { + echo $this->Html->link('Zuwendungsbestätigung', $this->Html->urlFundinguploadDetail($funding->fundinguploads_zuwendungsbestaetigungs[0]->id), ['target' => '_blank']); + echo ' / '; + } + echo $this->Html->link( 'Formular-Vorlage Zuwendungsbestätigung', 'https://anstiftung.de/images/vorlage_zuwendungsbestaetigung_geldzuwendung.pdf', @@ -32,11 +37,13 @@ echo '

'; echo '
'; - echo $this->Html->link( - 'Upload-Formular der Zuwendungsbestätigung', - $this->Html->urlFundingsUploadZuwendungsbestaetigung($funding->uid), - [ - 'class' => 'button', - ], - ); + if ($funding->zuwendungsbestaetigung_status != Funding::STATUS_VERIFIED_BY_ADMIN) { + echo $this->Html->link( + 'Upload-Formular der Zuwendungsbestätigung', + $this->Html->urlFundingsUploadZuwendungsbestaetigung($funding->uid), + [ + 'class' => 'button', + ], + ); + } echo '
'; \ No newline at end of file