mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-10-17 02:32:50 +00:00
Compare commits
24 Commits
v4.4.2
...
#361-impro
Author | SHA1 | Date | |
---|---|---|---|
caaed3e759
|
|||
6380fdd9a4
|
|||
fcd5080e6f
|
|||
086d418aa3
|
|||
4e61821e5b
|
|||
e3aeab315f
|
|||
8ec1063ef8
|
|||
aad9c984b1
|
|||
34b3e290e1
|
|||
0987b575ab
|
|||
d960578c5f
|
|||
176048bce6
|
|||
be210a6dd6
|
|||
4323773595
|
|||
6d432ca2cb
|
|||
c2d9c73fd4
|
|||
0d6d15fcf7 | |||
f9ad96c78b
|
|||
fcc9529a20
|
|||
955cb817c4
|
|||
823f9546b9 | |||
be39fa16e7 | |||
c8bb7575e7 | |||
|
80a3734171 |
13
.changes/v4.5.0.md
Normal file
13
.changes/v4.5.0.md
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
## v4.5.0 - 2025-10-03
|
||||||
|
### Feature
|
||||||
|
* Only allow delete of attachment on workflows that are not final
|
||||||
|
* Move up signature buttons on index workflow page for easier access
|
||||||
|
* Filter out document from attachment list if it is the same as the workflow document
|
||||||
|
* Block edition on attached document on workflow, if the workflow is finalized or sent external
|
||||||
|
* Convert workflow's attached document to pdf while sending them external
|
||||||
|
* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
|
||||||
|
### Fixed
|
||||||
|
* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
|
||||||
|
* Fix permissions on storedObject which are subject by a workflow
|
||||||
|
### DX
|
||||||
|
* Introduce a WaitingScreen component to display a waiting screen
|
4
.changes/v4.5.1.md
Normal file
4
.changes/v4.5.1.md
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
## v4.5.1 - 2025-10-03
|
||||||
|
### Fixed
|
||||||
|
* Add missing javascript dependency
|
||||||
|
* Add exception handling for conversion of attachment on sending external, when documens are already in pdf
|
19
CHANGELOG.md
19
CHANGELOG.md
@@ -6,6 +6,25 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
|
|||||||
and is generated by [Changie](https://github.com/miniscruff/changie).
|
and is generated by [Changie](https://github.com/miniscruff/changie).
|
||||||
|
|
||||||
|
|
||||||
|
## v4.5.1 - 2025-10-03
|
||||||
|
### Fixed
|
||||||
|
* Add missing javascript dependency
|
||||||
|
* Add exception handling for conversion of attachment on sending external, when documens are already in pdf
|
||||||
|
|
||||||
|
## v4.5.0 - 2025-10-03
|
||||||
|
### Feature
|
||||||
|
* Only allow delete of attachment on workflows that are not final
|
||||||
|
* Move up signature buttons on index workflow page for easier access
|
||||||
|
* Filter out document from attachment list if it is the same as the workflow document
|
||||||
|
* Block edition on attached document on workflow, if the workflow is finalized or sent external
|
||||||
|
* Convert workflow's attached document to pdf while sending them external
|
||||||
|
* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
|
||||||
|
### Fixed
|
||||||
|
* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
|
||||||
|
* Fix permissions on storedObject which are subject by a workflow
|
||||||
|
### DX
|
||||||
|
* Introduce a WaitingScreen component to display a waiting screen
|
||||||
|
|
||||||
## v4.4.2 - 2025-09-12
|
## v4.4.2 - 2025-09-12
|
||||||
### Fixed
|
### Fixed
|
||||||
* Fix document generation and workflow generation do not work on accompanying period work documents
|
* Fix document generation and workflow generation do not work on accompanying period work documents
|
||||||
|
@@ -17,3 +17,9 @@ when@dev:
|
|||||||
defaults:
|
defaults:
|
||||||
template: '@ChillMain/Dev/dev.assets.test2.html.twig'
|
template: '@ChillMain/Dev/dev.assets.test2.html.twig'
|
||||||
|
|
||||||
|
|
||||||
|
sass_address_picker:
|
||||||
|
path: /_dev/address-picker
|
||||||
|
controller: Symfony\Bundle\FrameworkBundle\Controller\TemplateController
|
||||||
|
defaults:
|
||||||
|
template: '@ChillMain/Dev/dev.address-picker.html.twig'
|
||||||
|
@@ -45,6 +45,7 @@
|
|||||||
"webpack-cli": "^5.0.1"
|
"webpack-cli": "^5.0.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@fragaria/address-formatter": "^6.6.1",
|
||||||
"@fullcalendar/core": "^6.1.4",
|
"@fullcalendar/core": "^6.1.4",
|
||||||
"@fullcalendar/daygrid": "^6.1.4",
|
"@fullcalendar/daygrid": "^6.1.4",
|
||||||
"@fullcalendar/interaction": "^6.1.4",
|
"@fullcalendar/interaction": "^6.1.4",
|
||||||
@@ -55,6 +56,7 @@
|
|||||||
"@tsconfig/node20": "^20.1.4",
|
"@tsconfig/node20": "^20.1.4",
|
||||||
"@types/dompurify": "^3.0.5",
|
"@types/dompurify": "^3.0.5",
|
||||||
"@types/leaflet": "^1.9.3",
|
"@types/leaflet": "^1.9.3",
|
||||||
|
"@vueuse/core": "^13.9.0",
|
||||||
"bootstrap-icons": "^1.11.3",
|
"bootstrap-icons": "^1.11.3",
|
||||||
"dropzone": "^5.7.6",
|
"dropzone": "^5.7.6",
|
||||||
"es6-promise": "^4.2.8",
|
"es6-promise": "^4.2.8",
|
||||||
@@ -65,10 +67,12 @@
|
|||||||
"mime": "^4.0.0",
|
"mime": "^4.0.0",
|
||||||
"pdfjs-dist": "^4.3.136",
|
"pdfjs-dist": "^4.3.136",
|
||||||
"vis-network": "^9.1.0",
|
"vis-network": "^9.1.0",
|
||||||
"vue": "^3.5.6",
|
"vue": "^3.5.x",
|
||||||
"vue-i18n": "^9.1.6",
|
"vue-i18n": "^9.1.6",
|
||||||
"vue-multiselect": "3.0.0-alpha.2",
|
"vue-multiselect": "3.0.0-alpha.2",
|
||||||
"vue-toast-notification": "^3.1.2",
|
"vue-toast-notification": "^3.1.2",
|
||||||
|
"vue-tsc": "^3.1.0",
|
||||||
|
"vue-use-leaflet": "^0.1.7",
|
||||||
"vuex": "^4.0.0"
|
"vuex": "^4.0.0"
|
||||||
},
|
},
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
|
@@ -0,0 +1,20 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\DocStoreBundle\Exception;
|
||||||
|
|
||||||
|
class ConversionWithSameMimeTypeException extends \RuntimeException
|
||||||
|
{
|
||||||
|
public function __construct(string $mimeType, ?\Throwable $previous = null)
|
||||||
|
{
|
||||||
|
parent::__construct("Conversion to same MIME type '{$mimeType}' is not allowed: already at the same MIME type", 0, $previous);
|
||||||
|
}
|
||||||
|
}
|
@@ -25,7 +25,7 @@ export interface GenericDoc {
|
|||||||
type: "doc_store_generic_doc";
|
type: "doc_store_generic_doc";
|
||||||
uniqueKey: string;
|
uniqueKey: string;
|
||||||
key: string;
|
key: string;
|
||||||
identifiers: object;
|
identifiers: { id: number };
|
||||||
context: "person" | "accompanying-period";
|
context: "person" | "accompanying-period";
|
||||||
doc_date: DateTime;
|
doc_date: DateTime;
|
||||||
metadata: GenericDocMetadata;
|
metadata: GenericDocMetadata;
|
||||||
|
@@ -46,6 +46,16 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
|
|||||||
|
|
||||||
public function voteOnAttribute(StoredObjectRoleEnum $attribute, StoredObject $subject, TokenInterface $token): bool
|
public function voteOnAttribute(StoredObjectRoleEnum $attribute, StoredObject $subject, TokenInterface $token): bool
|
||||||
{
|
{
|
||||||
|
// we first try to get the permission from the workflow, as attachement (this is the less intensive query)
|
||||||
|
$workflowPermissionAsAttachment = match ($attribute) {
|
||||||
|
StoredObjectRoleEnum::SEE => $this->workflowDocumentService->isAllowedByWorkflowForReadOperation($subject),
|
||||||
|
StoredObjectRoleEnum::EDIT => $this->workflowDocumentService->isAllowedByWorkflowForWriteOperation($subject),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (WorkflowRelatedEntityPermissionHelper::FORCE_DENIED === $workflowPermissionAsAttachment) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Retrieve the related entity
|
// Retrieve the related entity
|
||||||
$entity = $this->getRepository()->findAssociatedEntityToStoredObject($subject);
|
$entity = $this->getRepository()->findAssociatedEntityToStoredObject($subject);
|
||||||
|
|
||||||
@@ -66,7 +76,7 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
|
|||||||
return match ($workflowPermission) {
|
return match ($workflowPermission) {
|
||||||
WorkflowRelatedEntityPermissionHelper::FORCE_GRANT => true,
|
WorkflowRelatedEntityPermissionHelper::FORCE_GRANT => true,
|
||||||
WorkflowRelatedEntityPermissionHelper::FORCE_DENIED => false,
|
WorkflowRelatedEntityPermissionHelper::FORCE_DENIED => false,
|
||||||
WorkflowRelatedEntityPermissionHelper::ABSTAIN => $regularPermission,
|
WorkflowRelatedEntityPermissionHelper::ABSTAIN => WorkflowRelatedEntityPermissionHelper::FORCE_GRANT === $workflowPermissionAsAttachment || $regularPermission,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -14,6 +14,12 @@ namespace Chill\DocStoreBundle\Security\Authorization;
|
|||||||
use Chill\DocStoreBundle\Entity\StoredObject;
|
use Chill\DocStoreBundle\Entity\StoredObject;
|
||||||
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
|
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interface for voting on stored object permissions.
|
||||||
|
*
|
||||||
|
* Each time a stored object is attached to a document, the voter is responsible for determining
|
||||||
|
* whether the user has the necessary permissions to access or modify the stored object.
|
||||||
|
*/
|
||||||
interface StoredObjectVoterInterface
|
interface StoredObjectVoterInterface
|
||||||
{
|
{
|
||||||
public function supports(StoredObjectRoleEnum $attribute, StoredObject $subject): bool;
|
public function supports(StoredObjectRoleEnum $attribute, StoredObject $subject): bool;
|
||||||
|
@@ -15,6 +15,7 @@ use Chill\DocStoreBundle\Entity\StoredObject;
|
|||||||
use Chill\DocStoreBundle\Entity\StoredObjectPointInTime;
|
use Chill\DocStoreBundle\Entity\StoredObjectPointInTime;
|
||||||
use Chill\DocStoreBundle\Entity\StoredObjectPointInTimeReasonEnum;
|
use Chill\DocStoreBundle\Entity\StoredObjectPointInTimeReasonEnum;
|
||||||
use Chill\DocStoreBundle\Entity\StoredObjectVersion;
|
use Chill\DocStoreBundle\Entity\StoredObjectVersion;
|
||||||
|
use Chill\DocStoreBundle\Exception\ConversionWithSameMimeTypeException;
|
||||||
use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
|
use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
|
||||||
use Chill\WopiBundle\Service\WopiConverter;
|
use Chill\WopiBundle\Service\WopiConverter;
|
||||||
use Symfony\Component\Mime\MimeTypesInterface;
|
use Symfony\Component\Mime\MimeTypesInterface;
|
||||||
@@ -41,9 +42,10 @@ class StoredObjectToPdfConverter
|
|||||||
*
|
*
|
||||||
* @return array{0: StoredObjectPointInTime, 1: StoredObjectVersion, 2?: string} contains the point in time before conversion and the new version of the stored object. The converted content is included in the response if $includeConvertedContent is true
|
* @return array{0: StoredObjectPointInTime, 1: StoredObjectVersion, 2?: string} contains the point in time before conversion and the new version of the stored object. The converted content is included in the response if $includeConvertedContent is true
|
||||||
*
|
*
|
||||||
* @throws \UnexpectedValueException if the preferred mime type for the conversion is not found
|
* @throws \UnexpectedValueException if the preferred mime type for the conversion is not found
|
||||||
* @throws \RuntimeException if the conversion or storage of the new version fails
|
* @throws \RuntimeException if the conversion or storage of the new version fails
|
||||||
* @throws StoredObjectManagerException
|
* @throws StoredObjectManagerException
|
||||||
|
* @throws ConversionWithSameMimeTypeException if the document has already the same mime type79*
|
||||||
*/
|
*/
|
||||||
public function addConvertedVersion(StoredObject $storedObject, string $lang, $convertTo = 'pdf', bool $includeConvertedContent = false): array
|
public function addConvertedVersion(StoredObject $storedObject, string $lang, $convertTo = 'pdf', bool $includeConvertedContent = false): array
|
||||||
{
|
{
|
||||||
@@ -56,7 +58,7 @@ class StoredObjectToPdfConverter
|
|||||||
$currentVersion = $storedObject->getCurrentVersion();
|
$currentVersion = $storedObject->getCurrentVersion();
|
||||||
|
|
||||||
if ($currentVersion->getType() === $newMimeType) {
|
if ($currentVersion->getType() === $newMimeType) {
|
||||||
throw new \UnexpectedValueException('Already at the same mime type');
|
throw new ConversionWithSameMimeTypeException($newMimeType);
|
||||||
}
|
}
|
||||||
|
|
||||||
$content = $this->storedObjectManager->read($currentVersion);
|
$content = $this->storedObjectManager->read($currentVersion);
|
||||||
|
@@ -86,9 +86,165 @@ class AbstractStoredObjectVoterTest extends TestCase
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @dataProvider dataProviderVoteOnAttribute
|
* @dataProvider dataProviderVoteOnAttributeWithStoredObjectPermission
|
||||||
*/
|
*/
|
||||||
public function testVoteOnAttribute(
|
public function testVoteOnAttributeWithStoredObjectPermission(
|
||||||
|
StoredObjectRoleEnum $attribute,
|
||||||
|
bool $expected,
|
||||||
|
bool $isGrantedRegularPermission,
|
||||||
|
string $isGrantedWorkflowPermission,
|
||||||
|
string $isGrantedStoredObjectAttachment,
|
||||||
|
): void {
|
||||||
|
$storedObject = new StoredObject();
|
||||||
|
$repository = new DummyRepository($related = new \stdClass());
|
||||||
|
$token = new UsernamePasswordToken(new User(), 'dummy');
|
||||||
|
|
||||||
|
$security = $this->prophesize(Security::class);
|
||||||
|
$security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
|
||||||
|
|
||||||
|
$workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
|
||||||
|
|
||||||
|
$security = $this->prophesize(Security::class);
|
||||||
|
$security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
|
||||||
|
|
||||||
|
if (StoredObjectRoleEnum::SEE === $attribute) {
|
||||||
|
$workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)
|
||||||
|
->shouldBeCalled()
|
||||||
|
->willReturn($isGrantedStoredObjectAttachment);
|
||||||
|
$workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
|
||||||
|
->willReturn($isGrantedWorkflowPermission);
|
||||||
|
} elseif (StoredObjectRoleEnum::EDIT === $attribute) {
|
||||||
|
$workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)
|
||||||
|
->shouldBeCalled()
|
||||||
|
->willReturn($isGrantedStoredObjectAttachment);
|
||||||
|
$workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($related)
|
||||||
|
->willReturn($isGrantedWorkflowPermission);
|
||||||
|
} else {
|
||||||
|
throw new \LogicException('Invalid attribute for StoredObjectVoter');
|
||||||
|
}
|
||||||
|
|
||||||
|
$storedObjectVoter = new class ($repository, $workflowRelatedEntityPermissionHelper->reveal(), $security->reveal()) extends AbstractStoredObjectVoter {
|
||||||
|
public function __construct(private $repository, $helper, $security)
|
||||||
|
{
|
||||||
|
parent::__construct($security, $helper);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getRepository(): AssociatedEntityToStoredObjectInterface
|
||||||
|
{
|
||||||
|
return $this->repository;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getClass(): string
|
||||||
|
{
|
||||||
|
return \stdClass::class;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function attributeToRole(StoredObjectRoleEnum $attribute): string
|
||||||
|
{
|
||||||
|
return 'SOME_ROLE';
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function canBeAssociatedWithWorkflow(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
$actual = $storedObjectVoter->voteOnAttribute($attribute, $storedObject, $token);
|
||||||
|
|
||||||
|
self::assertEquals($expected, $actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function dataProviderVoteOnAttributeWithStoredObjectPermission(): iterable
|
||||||
|
{
|
||||||
|
foreach (['read' => StoredObjectRoleEnum::SEE, 'write' => StoredObjectRoleEnum::EDIT] as $action => $attribute) {
|
||||||
|
yield 'Not related to any workflow nor attachment ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
true,
|
||||||
|
true,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::ABSTAIN,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::ABSTAIN,
|
||||||
|
];
|
||||||
|
|
||||||
|
yield 'Not related to any workflow nor attachment (refuse) ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::ABSTAIN,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::ABSTAIN,
|
||||||
|
];
|
||||||
|
|
||||||
|
yield 'Is granted by a workflow takes precedence (workflow) ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::ABSTAIN,
|
||||||
|
];
|
||||||
|
|
||||||
|
yield 'Is granted by a workflow takes precedence (stored object) ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::ABSTAIN,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
|
||||||
|
];
|
||||||
|
|
||||||
|
yield 'Is granted by a workflow takes precedence (workflow) although grant ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
|
||||||
|
];
|
||||||
|
|
||||||
|
yield 'Is granted by a workflow takes precedence (stored object) although grant ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
|
||||||
|
];
|
||||||
|
|
||||||
|
yield 'Is granted by a workflow takes precedence (initially refused) (workflow) although grant ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
|
||||||
|
];
|
||||||
|
|
||||||
|
yield 'Is granted by a workflow takes precedence (initially refused) (stored object) although grant ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
|
||||||
|
];
|
||||||
|
|
||||||
|
yield 'Force grant inverse the regular permission (workflow) ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
true,
|
||||||
|
false,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::ABSTAIN,
|
||||||
|
];
|
||||||
|
|
||||||
|
yield 'Force grant inverse the regular permission (so) ('.$action.')' => [
|
||||||
|
$attribute,
|
||||||
|
true,
|
||||||
|
false,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::ABSTAIN,
|
||||||
|
WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider dataProviderVoteOnAttributeWithoutStoredObjectPermission
|
||||||
|
*/
|
||||||
|
public function testVoteOnAttributeWithoutStoredObjectPermission(
|
||||||
StoredObjectRoleEnum $attribute,
|
StoredObjectRoleEnum $attribute,
|
||||||
bool $expected,
|
bool $expected,
|
||||||
bool $canBeAssociatedWithWorkflow,
|
bool $canBeAssociatedWithWorkflow,
|
||||||
@@ -105,6 +261,10 @@ class AbstractStoredObjectVoterTest extends TestCase
|
|||||||
$security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
|
$security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
|
||||||
|
|
||||||
$workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
|
$workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
|
||||||
|
|
||||||
|
$workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
|
||||||
|
$workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
|
||||||
|
|
||||||
if (null !== $isGrantedWorkflowPermissionRead) {
|
if (null !== $isGrantedWorkflowPermissionRead) {
|
||||||
$workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
|
$workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
|
||||||
->willReturn($isGrantedWorkflowPermissionRead)->shouldBeCalled();
|
->willReturn($isGrantedWorkflowPermissionRead)->shouldBeCalled();
|
||||||
@@ -123,7 +283,7 @@ class AbstractStoredObjectVoterTest extends TestCase
|
|||||||
self::assertEquals($expected, $voter->voteOnAttribute($attribute, $storedObject, $token), $message);
|
self::assertEquals($expected, $voter->voteOnAttribute($attribute, $storedObject, $token), $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function dataProviderVoteOnAttribute(): iterable
|
public static function dataProviderVoteOnAttributeWithoutStoredObjectPermission(): iterable
|
||||||
{
|
{
|
||||||
// not associated on a workflow
|
// not associated on a workflow
|
||||||
yield [StoredObjectRoleEnum::SEE, true, false, true, null, null, 'not associated on a workflow, granted by regular access, must not rely on helper'];
|
yield [StoredObjectRoleEnum::SEE, true, false, true, null, null, 'not associated on a workflow, granted by regular access, must not rely on helper'];
|
||||||
|
@@ -0,0 +1,50 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Controller;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Repository\AddressReferenceRepositoryInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
||||||
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
|
use Symfony\Component\Security\Core\Security;
|
||||||
|
|
||||||
|
final readonly class AddressReferenceAggregatedApiController
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private Security $security,
|
||||||
|
private AddressReferenceRepositoryInterface $addressReferenceRepository,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
#[Route(path: '/api/1.0/main/address-reference/aggregated/search')]
|
||||||
|
public function search(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
if (!$this->security->isGranted('IS_AUTHENTICATED')) {
|
||||||
|
throw new AccessDeniedHttpException();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$request->query->has('q')) {
|
||||||
|
throw new BadRequestHttpException('Parameter "q" is required.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$q = trim($request->query->get('q'));
|
||||||
|
|
||||||
|
if ('' === $q) {
|
||||||
|
throw new BadRequestHttpException('Parameter "q" is required and cannot be empty.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $this->addressReferenceRepository->findAggregatedBySearchString($q);
|
||||||
|
|
||||||
|
return new JsonResponse(iterator_to_array($result));
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Controller;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Repository\PostalCodeForAddressReferenceRepositoryInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
||||||
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
|
use Symfony\Component\Security\Core\Security;
|
||||||
|
|
||||||
|
final readonly class PostalCodeForAddressReferenceApiController
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private PostalCodeForAddressReferenceRepositoryInterface $postalCodeForAddressReferenceRepository,
|
||||||
|
private Security $security,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
#[Route('/api/1.0/main/address-reference/postal-code/search')]
|
||||||
|
public function findPostalCodeBySearch(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
|
||||||
|
if (!$this->security->isGranted('IS_AUTHENTICATED')) {
|
||||||
|
throw new AccessDeniedHttpException();
|
||||||
|
}
|
||||||
|
|
||||||
|
$search = $request->query->get('q');
|
||||||
|
|
||||||
|
if (null === $search || '' === trim($search)) {
|
||||||
|
throw new BadRequestHttpException('No search query provided');
|
||||||
|
}
|
||||||
|
|
||||||
|
$postalCodes = iterator_to_array($this->postalCodeForAddressReferenceRepository->findPostalCode($search));
|
||||||
|
|
||||||
|
return new JsonResponse($postalCodes, json: false);
|
||||||
|
}
|
||||||
|
}
|
@@ -11,6 +11,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\MainBundle\Controller;
|
namespace Chill\MainBundle\Controller;
|
||||||
|
|
||||||
|
use Chill\MainBundle\CRUD\Controller\ApiController;
|
||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
use Chill\MainBundle\Pagination\PaginatorFactory;
|
use Chill\MainBundle\Pagination\PaginatorFactory;
|
||||||
@@ -27,7 +28,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
|
|||||||
use Symfony\Component\Security\Core\Security;
|
use Symfony\Component\Security\Core\Security;
|
||||||
use Symfony\Component\Serializer\SerializerInterface;
|
use Symfony\Component\Serializer\SerializerInterface;
|
||||||
|
|
||||||
class WorkflowApiController
|
class WorkflowApiController extends ApiController
|
||||||
{
|
{
|
||||||
public function __construct(private readonly EntityManagerInterface $entityManager, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly SerializerInterface $serializer) {}
|
public function __construct(private readonly EntityManagerInterface $entityManager, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly SerializerInterface $serializer) {}
|
||||||
|
|
||||||
|
@@ -44,7 +44,7 @@ final readonly class WorkflowSignatureStateChangeController
|
|||||||
$signature,
|
$signature,
|
||||||
$request,
|
$request,
|
||||||
EntityWorkflowStepSignatureVoter::CANCEL,
|
EntityWorkflowStepSignatureVoter::CANCEL,
|
||||||
function (EntityWorkflowStepSignature $signature) {$this->signatureStepStateChanger->markSignatureAsCanceled($signature); },
|
fn (EntityWorkflowStepSignature $signature): string => $this->signatureStepStateChanger->markSignatureAsCanceled($signature),
|
||||||
'@ChillMain/WorkflowSignature/cancel.html.twig',
|
'@ChillMain/WorkflowSignature/cancel.html.twig',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -56,11 +56,18 @@ final readonly class WorkflowSignatureStateChangeController
|
|||||||
$signature,
|
$signature,
|
||||||
$request,
|
$request,
|
||||||
EntityWorkflowStepSignatureVoter::REJECT,
|
EntityWorkflowStepSignatureVoter::REJECT,
|
||||||
function (EntityWorkflowStepSignature $signature) {$this->signatureStepStateChanger->markSignatureAsRejected($signature); },
|
fn (EntityWorkflowStepSignature $signature): string => $this->signatureStepStateChanger->markSignatureAsRejected($signature),
|
||||||
'@ChillMain/WorkflowSignature/reject.html.twig',
|
'@ChillMain/WorkflowSignature/reject.html.twig',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param callable(EntityWorkflowStepSignature): string $markSignature
|
||||||
|
*
|
||||||
|
* @throws \Twig\Error\LoaderError
|
||||||
|
* @throws \Twig\Error\RuntimeError
|
||||||
|
* @throws \Twig\Error\SyntaxError
|
||||||
|
*/
|
||||||
private function markSignatureAction(
|
private function markSignatureAction(
|
||||||
EntityWorkflowStepSignature $signature,
|
EntityWorkflowStepSignature $signature,
|
||||||
Request $request,
|
Request $request,
|
||||||
@@ -79,12 +86,13 @@ final readonly class WorkflowSignatureStateChangeController
|
|||||||
$form->handleRequest($request);
|
$form->handleRequest($request);
|
||||||
|
|
||||||
if ($form->isSubmitted() && $form->isValid()) {
|
if ($form->isSubmitted() && $form->isValid()) {
|
||||||
$this->entityManager->wrapInTransaction(function () use ($signature, $markSignature) {
|
$expectedStep = $this->entityManager->wrapInTransaction(fn () => $markSignature($signature));
|
||||||
$markSignature($signature);
|
|
||||||
});
|
|
||||||
|
|
||||||
return new RedirectResponse(
|
return new RedirectResponse(
|
||||||
$this->chillUrlGenerator->returnPathOr('chill_main_workflow_show', ['id' => $signature->getStep()->getEntityWorkflow()->getId()])
|
$this->chillUrlGenerator->forwardReturnPath(
|
||||||
|
'chill_main_workflow_wait',
|
||||||
|
['id' => $signature->getStep()->getEntityWorkflow()->getId(), 'expectedStep' => $expectedStep]
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +1,41 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Controller;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
|
use Chill\MainBundle\Routing\ChillUrlGeneratorInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\RedirectResponse;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
|
use Twig\Environment;
|
||||||
|
|
||||||
|
final readonly class WorkflowWaitStepChangeController
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private ChillUrlGeneratorInterface $chillUrlGenerator,
|
||||||
|
private Environment $twig,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
#[Route('/{_locale}/main/workflow/{id}/wait/{expectedStep}', name: 'chill_main_workflow_wait', methods: ['GET'])]
|
||||||
|
public function waitForSignatureChange(EntityWorkflow $entityWorkflow, string $expectedStep): Response
|
||||||
|
{
|
||||||
|
if ($entityWorkflow->getStep() === $expectedStep) {
|
||||||
|
return new RedirectResponse(
|
||||||
|
$this->chillUrlGenerator->returnPathOr('chill_main_workflow_show', ['id' => $entityWorkflow->getId()])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Response(
|
||||||
|
$this->twig->render('@ChillMain/Workflow/waiting.html.twig', ['workflow' => $entityWorkflow, 'expectedStep' => $expectedStep])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@@ -30,6 +30,7 @@ use Chill\MainBundle\Controller\UserGroupAdminController;
|
|||||||
use Chill\MainBundle\Controller\UserGroupApiController;
|
use Chill\MainBundle\Controller\UserGroupApiController;
|
||||||
use Chill\MainBundle\Controller\UserJobApiController;
|
use Chill\MainBundle\Controller\UserJobApiController;
|
||||||
use Chill\MainBundle\Controller\UserJobController;
|
use Chill\MainBundle\Controller\UserJobController;
|
||||||
|
use Chill\MainBundle\Controller\WorkflowApiController;
|
||||||
use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
|
use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
|
||||||
use Chill\MainBundle\Doctrine\DQL\Age;
|
use Chill\MainBundle\Doctrine\DQL\Age;
|
||||||
use Chill\MainBundle\Doctrine\DQL\Extract;
|
use Chill\MainBundle\Doctrine\DQL\Extract;
|
||||||
@@ -66,6 +67,7 @@ use Chill\MainBundle\Entity\Regroupment;
|
|||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Entity\UserGroup;
|
use Chill\MainBundle\Entity\UserGroup;
|
||||||
use Chill\MainBundle\Entity\UserJob;
|
use Chill\MainBundle\Entity\UserJob;
|
||||||
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
use Chill\MainBundle\Form\CenterType;
|
use Chill\MainBundle\Form\CenterType;
|
||||||
use Chill\MainBundle\Form\CivilityType;
|
use Chill\MainBundle\Form\CivilityType;
|
||||||
use Chill\MainBundle\Form\CountryType;
|
use Chill\MainBundle\Form\CountryType;
|
||||||
@@ -79,6 +81,7 @@ use Chill\MainBundle\Form\UserGroupType;
|
|||||||
use Chill\MainBundle\Form\UserJobType;
|
use Chill\MainBundle\Form\UserJobType;
|
||||||
use Chill\MainBundle\Form\UserType;
|
use Chill\MainBundle\Form\UserType;
|
||||||
use Chill\MainBundle\Security\Authorization\ChillExportVoter;
|
use Chill\MainBundle\Security\Authorization\ChillExportVoter;
|
||||||
|
use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
|
||||||
use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
|
use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
|
||||||
use Ramsey\Uuid\Doctrine\UuidType;
|
use Ramsey\Uuid\Doctrine\UuidType;
|
||||||
use Symfony\Component\Config\FileLocator;
|
use Symfony\Component\Config\FileLocator;
|
||||||
@@ -940,6 +943,21 @@ class ChillMainExtension extends Extension implements
|
|||||||
],
|
],
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'class' => EntityWorkflow::class,
|
||||||
|
'name' => 'workflow',
|
||||||
|
'base_path' => '/api/1.0/main/workflow',
|
||||||
|
'base_role' => EntityWorkflowVoter::SEE,
|
||||||
|
'controller' => WorkflowApiController::class,
|
||||||
|
'actions' => [
|
||||||
|
'_entity' => [
|
||||||
|
'methods' => [
|
||||||
|
Request::METHOD_GET => true,
|
||||||
|
Request::METHOD_HEAD => true,
|
||||||
|
],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
],
|
||||||
],
|
],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
@@ -59,7 +59,7 @@ class UserPasswordType extends AbstractType
|
|||||||
'invalid_message' => 'The password fields must match',
|
'invalid_message' => 'The password fields must match',
|
||||||
'constraints' => [
|
'constraints' => [
|
||||||
new Length([
|
new Length([
|
||||||
'min' => 9,
|
'min' => 14,
|
||||||
'minMessage' => 'The password must be greater than {{ limit }} characters',
|
'minMessage' => 'The password must be greater than {{ limit }} characters',
|
||||||
]),
|
]),
|
||||||
new NotBlank(),
|
new NotBlank(),
|
||||||
|
@@ -14,13 +14,14 @@ namespace Chill\MainBundle\Repository;
|
|||||||
use Chill\MainBundle\Entity\AddressReference;
|
use Chill\MainBundle\Entity\AddressReference;
|
||||||
use Chill\MainBundle\Entity\PostalCode;
|
use Chill\MainBundle\Entity\PostalCode;
|
||||||
use Chill\MainBundle\Search\SearchApiQuery;
|
use Chill\MainBundle\Search\SearchApiQuery;
|
||||||
|
use Doctrine\DBAL\Types\Types;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Doctrine\ORM\EntityRepository;
|
use Doctrine\ORM\EntityRepository;
|
||||||
|
use Doctrine\ORM\NativeQuery;
|
||||||
use Doctrine\ORM\Query\ResultSetMapping;
|
use Doctrine\ORM\Query\ResultSetMapping;
|
||||||
use Doctrine\ORM\Query\ResultSetMappingBuilder;
|
use Doctrine\ORM\Query\ResultSetMappingBuilder;
|
||||||
use Doctrine\Persistence\ObjectRepository;
|
|
||||||
|
|
||||||
final readonly class AddressReferenceRepository implements ObjectRepository
|
final readonly class AddressReferenceRepository implements AddressReferenceRepositoryInterface
|
||||||
{
|
{
|
||||||
private EntityManagerInterface $entityManager;
|
private EntityManagerInterface $entityManager;
|
||||||
|
|
||||||
@@ -65,6 +66,121 @@ final readonly class AddressReferenceRepository implements ObjectRepository
|
|||||||
return $this->repository->findAll();
|
return $this->repository->findAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function findAggregatedBySearchString(string $search, PostalCode|int|null $postalCode = null, int $firstResult = 0, int $maxResults = 50): iterable
|
||||||
|
{
|
||||||
|
$terms = $this->buildTermsFromSearchString($search);
|
||||||
|
if ([] === $terms) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$connection = $this->entityManager->getConnection();
|
||||||
|
$qb = $connection->createQueryBuilder();
|
||||||
|
|
||||||
|
$qb->select('row_number() OVER () AS row_number', 'var.street AS street', 'cmpc.id AS postcode_id', 'cmpc.code AS code', 'cmpc.label AS label', 'jsonb_object_agg(var.address_id, var.streetnumber ORDER BY var.row_number) AS positions')
|
||||||
|
->from('view_chill_main_address_reference', 'var')
|
||||||
|
->innerJoin('var', 'chill_main_postal_code', 'cmpc', 'cmpc.id = var.postcode_id')
|
||||||
|
->groupBy('cmpc.id', 'var.street')
|
||||||
|
->setFirstResult($firstResult)
|
||||||
|
->setMaxResults($maxResults);
|
||||||
|
|
||||||
|
$paramId = 0;
|
||||||
|
|
||||||
|
foreach ($terms as $term) {
|
||||||
|
$qb->andWhere('var.address like UNACCENT(LOWER(?))');
|
||||||
|
$qb->setParameter(++$paramId, "%{$term}%");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null !== $postalCode) {
|
||||||
|
$qb->andWhere('var.postcode_id = ?');
|
||||||
|
$qb->setParameter(++$paramId, $postalCode instanceof PostalCode ? $postalCode->getId() : $postalCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $qb->executeQuery();
|
||||||
|
|
||||||
|
foreach ($result->iterateAssociative() as $row) {
|
||||||
|
yield [...$row, 'positions' => json_decode($row['positions'], true, 512, JSON_THROW_ON_ERROR)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return iterable<AddressReference>
|
||||||
|
*/
|
||||||
|
public function findBySearchString(string $search, PostalCode|int|null $postalCode = null, int $firstResult = 0, int $maxResults = 50): iterable
|
||||||
|
{
|
||||||
|
$terms = $this->buildTermsFromSearchString($search);
|
||||||
|
if ([] === $terms) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$rsm = new ResultSetMappingBuilder($this->entityManager);
|
||||||
|
$rsm->addRootEntityFromClassMetadata(AddressReference::class, 'ar');
|
||||||
|
$baseSql = 'SELECT '.$rsm->generateSelectClause(['ar' => 'ar']).' FROM chill_main_address_reference ar JOIN
|
||||||
|
view_chill_main_address_reference var ON var.address_id = ar.id';
|
||||||
|
$nql = $this->buildQueryBySearchString($rsm, $baseSql, $terms, $postalCode);
|
||||||
|
|
||||||
|
$orderBy = [];
|
||||||
|
$pertinence = [];
|
||||||
|
foreach ($terms as $k => $term) {
|
||||||
|
$pertinence[] =
|
||||||
|
"(EXISTS (SELECT 1 FROM unnest(string_to_array(address, ' ')) AS t WHERE starts_with(t, UNACCENT(LOWER(:order{$k})))))::int";
|
||||||
|
$pertinence[] = "(address LIKE UNACCENT(LOWER(:order{$k})))::int";
|
||||||
|
$nql->setParameter('order'.$k, $term);
|
||||||
|
}
|
||||||
|
$orderBy[] = implode(' + ', $pertinence).' ASC';
|
||||||
|
$orderBy[] = implode('row_number ASC', $orderBy);
|
||||||
|
|
||||||
|
$nql->setSQL($nql->getSQL().' ORDER BY '.implode(', ', $orderBy));
|
||||||
|
|
||||||
|
return $nql->toIterable();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function countBySearchString(string $search, PostalCode|int|null $postalCode = null): int
|
||||||
|
{
|
||||||
|
$terms = $this->buildTermsFromSearchString($search);
|
||||||
|
if ([] === $terms) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$rsm = new ResultSetMappingBuilder($this->entityManager);
|
||||||
|
$rsm->addScalarResult('c', 'c', Types::INTEGER);
|
||||||
|
$nql = $this->buildQueryBySearchString($rsm, 'SELECT COUNT(var.*) AS c FROM view_chill_main_address_reference var', $terms, $postalCode);
|
||||||
|
|
||||||
|
return $nql->getSingleScalarResult();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function buildTermsFromSearchString(string $search): array
|
||||||
|
{
|
||||||
|
return array_filter(
|
||||||
|
array_map(
|
||||||
|
static fn (string $term) => trim($term),
|
||||||
|
explode(' ', $search)
|
||||||
|
),
|
||||||
|
static fn (string $term) => '' !== $term
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function buildQueryBySearchString(ResultSetMapping $rsm, string $select, array $terms, PostalCode|int|null $postalCode = null): NativeQuery
|
||||||
|
{
|
||||||
|
$nql = $this->entityManager->createNativeQuery('', $rsm);
|
||||||
|
|
||||||
|
$sql = $select.' WHERE ';
|
||||||
|
|
||||||
|
$wheres = [];
|
||||||
|
foreach ($terms as $k => $term) {
|
||||||
|
$wheres[] = "var.address like :w{$k}";
|
||||||
|
$nql->setParameter("w{$k}", '%'.$term.'%', Types::STRING);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null !== $postalCode) {
|
||||||
|
$wheres[] = 'var.postcode_id = :postalCode';
|
||||||
|
$nql->setParameter('postalCode', $postalCode instanceof PostalCode ? $postalCode->getId() : $postalCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
$nql->setSQL($sql.implode(' AND ', $wheres));
|
||||||
|
|
||||||
|
return $nql;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mixed|null $limit
|
* @param mixed|null $limit
|
||||||
* @param mixed|null $offset
|
* @param mixed|null $offset
|
||||||
|
@@ -0,0 +1,20 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Repository;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Entity\PostalCode;
|
||||||
|
use Doctrine\Persistence\ObjectRepository;
|
||||||
|
|
||||||
|
interface AddressReferenceRepositoryInterface extends ObjectRepository
|
||||||
|
{
|
||||||
|
public function findAggregatedBySearchString(string $search, PostalCode|int|null $postalCode = null, int $firstResult = 0, int $maxResults = 50): iterable;
|
||||||
|
}
|
@@ -0,0 +1,69 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Repository;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Connection;
|
||||||
|
|
||||||
|
final readonly class PostalCodeForAddressReferenceRepository implements PostalCodeForAddressReferenceRepositoryInterface
|
||||||
|
{
|
||||||
|
public function __construct(private Connection $connection) {}
|
||||||
|
|
||||||
|
public function findPostalCode(string $search, int $firstResult = 0, int $maxResults = 50): iterable
|
||||||
|
{
|
||||||
|
$terms = $this->buildTermsFromSearchString($search);
|
||||||
|
if ([] === $terms) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$qb = $this->connection->createQueryBuilder();
|
||||||
|
|
||||||
|
$qb->from('chill_main_postal_code', 'cmpc')
|
||||||
|
->join('cmpc', 'view_chill_main_address_reference', 'vcmar', 'vcmar.postcode_id = cmpc.id')
|
||||||
|
->join('vcmar', 'country', 'country', condition: 'cmpc.country_id = country.id')
|
||||||
|
->setFirstResult($firstResult)
|
||||||
|
->setMaxResults($maxResults)
|
||||||
|
;
|
||||||
|
|
||||||
|
$qb->select(
|
||||||
|
'DISTINCT ON (cmpc.code, cmpc.label) cmpc.id AS postcode_id',
|
||||||
|
'cmpc.code AS code',
|
||||||
|
'cmpc.label AS label',
|
||||||
|
'country.id AS country_id',
|
||||||
|
'country.countrycode AS country_code',
|
||||||
|
'country.name AS country_name'
|
||||||
|
);
|
||||||
|
|
||||||
|
$paramId = 0;
|
||||||
|
|
||||||
|
foreach ($terms as $term) {
|
||||||
|
$qb->andWhere('vcmar.address like ?');
|
||||||
|
$qb->setParameter(++$paramId, "%{$term}%");
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $qb->executeQuery();
|
||||||
|
|
||||||
|
foreach ($result->iterateAssociative() as $row) {
|
||||||
|
yield [...$row, 'country_name' => json_decode($row['country_name'], true, 512, JSON_THROW_ON_ERROR)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function buildTermsFromSearchString(string $search): array
|
||||||
|
{
|
||||||
|
return array_filter(
|
||||||
|
array_map(
|
||||||
|
static fn (string $term) => trim($term),
|
||||||
|
explode(' ', $search)
|
||||||
|
),
|
||||||
|
static fn (string $term) => '' !== $term
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,20 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Repository;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Search for postal code using optimized materialized view.
|
||||||
|
*/
|
||||||
|
interface PostalCodeForAddressReferenceRepositoryInterface
|
||||||
|
{
|
||||||
|
public function findPostalCode(string $search, int $firstResult = 0, int $maxResults = 50): iterable;
|
||||||
|
}
|
@@ -0,0 +1,13 @@
|
|||||||
|
/**
|
||||||
|
* Extracts the "returnPath" parameter from the current URL's query string and returns it.
|
||||||
|
* If the parameter is not present, returns the provided fallback path.
|
||||||
|
*
|
||||||
|
* @param {string} fallbackPath - The fallback path to use if "returnPath" is not found in the query string.
|
||||||
|
* @return {string} The "returnPath" from the query string, or the fallback path if "returnPath" is not present.
|
||||||
|
*/
|
||||||
|
export function returnPathOr(fallbackPath: string): string {
|
||||||
|
const urlParams = new URLSearchParams(window.location.search);
|
||||||
|
const returnPath = urlParams.get("returnPath");
|
||||||
|
|
||||||
|
return returnPath ?? fallbackPath;
|
||||||
|
}
|
@@ -0,0 +1,16 @@
|
|||||||
|
import { EntityWorkflow } from "ChillMainAssets/types";
|
||||||
|
import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
|
||||||
|
|
||||||
|
export const fetchWorkflow = async (
|
||||||
|
workflowId: number,
|
||||||
|
): Promise<EntityWorkflow> => {
|
||||||
|
try {
|
||||||
|
return await makeFetch<null, EntityWorkflow>(
|
||||||
|
"GET",
|
||||||
|
`/api/1.0/main/workflow/${workflowId}.json`,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`Failed to fetch workflow ${workflowId}:`, error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
@@ -1,5 +1,6 @@
|
|||||||
import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";
|
import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";
|
||||||
import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
|
import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
|
||||||
|
import { Person } from "../../../ChillPersonBundle/Resources/public/types";
|
||||||
|
|
||||||
export interface DateTime {
|
export interface DateTime {
|
||||||
datetime: string;
|
datetime: string;
|
||||||
@@ -74,6 +75,7 @@ export interface Postcode {
|
|||||||
name: string;
|
name: string;
|
||||||
code: string;
|
code: string;
|
||||||
center: Point;
|
center: Point;
|
||||||
|
country: Country;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Point {
|
export interface Point {
|
||||||
@@ -89,6 +91,28 @@ export interface Country {
|
|||||||
|
|
||||||
export type AddressRefStatus = "match" | "to_review" | "reviewed";
|
export type AddressRefStatus = "match" | "to_review" | "reviewed";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An interface to create an address
|
||||||
|
*/
|
||||||
|
export interface AddressCreation {
|
||||||
|
confidential: boolean;
|
||||||
|
isNoAddress: boolean;
|
||||||
|
street: string;
|
||||||
|
streetNumber: string;
|
||||||
|
postcode: Postcode;
|
||||||
|
point: Point; // [number, number]; // [longitude, latitude]
|
||||||
|
addressReference: AddressReference;
|
||||||
|
validFrom: DateTime|null;
|
||||||
|
floor: string;
|
||||||
|
corridor: string;
|
||||||
|
steps: string;
|
||||||
|
flat: string;
|
||||||
|
buildingName: string;
|
||||||
|
distribution: string;
|
||||||
|
extra: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
export interface Address {
|
export interface Address {
|
||||||
type: "address";
|
type: "address";
|
||||||
address_id: number;
|
address_id: number;
|
||||||
@@ -107,7 +131,7 @@ export interface Address {
|
|||||||
confidential: boolean;
|
confidential: boolean;
|
||||||
lines: string[];
|
lines: string[];
|
||||||
addressReference: AddressReference | null;
|
addressReference: AddressReference | null;
|
||||||
validFrom: DateTime;
|
validFrom: DateTime | null; // TODO there is no null for validFrom
|
||||||
validTo: DateTime | null;
|
validTo: DateTime | null;
|
||||||
point: Point | null;
|
point: Point | null;
|
||||||
refStatus: AddressRefStatus;
|
refStatus: AddressRefStatus;
|
||||||
@@ -202,6 +226,58 @@ export interface WorkflowAttachment {
|
|||||||
genericDoc: null | GenericDoc;
|
genericDoc: null | GenericDoc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface Workflow {
|
||||||
|
name: string;
|
||||||
|
text: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface EntityWorkflowStep {
|
||||||
|
type: "entity_workflow_step";
|
||||||
|
id: number;
|
||||||
|
comment: string;
|
||||||
|
currentStep: StepDefinition;
|
||||||
|
isFinal: boolean;
|
||||||
|
isFreezed: boolean;
|
||||||
|
isFinalized: boolean;
|
||||||
|
transitionPrevious: Transition | null;
|
||||||
|
transitionAfter: Transition | null;
|
||||||
|
previousId: number | null;
|
||||||
|
nextId: number | null;
|
||||||
|
transitionPreviousBy: User | null;
|
||||||
|
transitionPreviousAt: DateTime | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Transition {
|
||||||
|
name: string;
|
||||||
|
text: string;
|
||||||
|
isForward: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StepDefinition {
|
||||||
|
name: string;
|
||||||
|
text: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface EntityWorkflow {
|
||||||
|
type: "entity_workflow";
|
||||||
|
id: number;
|
||||||
|
relatedEntityClass: string;
|
||||||
|
relatedEntityId: number;
|
||||||
|
workflow: Workflow;
|
||||||
|
currentStep: EntityWorkflowStep;
|
||||||
|
steps: EntityWorkflowStep[];
|
||||||
|
datas: WorkflowData;
|
||||||
|
title: string;
|
||||||
|
isOnHoldAtCurrentStep: boolean;
|
||||||
|
_permissions: {
|
||||||
|
CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT: boolean;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface WorkflowData {
|
||||||
|
persons: Person[];
|
||||||
|
}
|
||||||
|
|
||||||
export interface ExportGeneration {
|
export interface ExportGeneration {
|
||||||
id: string;
|
id: string;
|
||||||
type: "export_generation";
|
type: "export_generation";
|
||||||
@@ -215,3 +291,8 @@ export interface ExportGeneration {
|
|||||||
export interface PrivateCommentEmbeddable {
|
export interface PrivateCommentEmbeddable {
|
||||||
comments: Record<number, string>;
|
comments: Record<number, string>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Possible states for the WaitingScreen Component.
|
||||||
|
*/
|
||||||
|
export type WaitingScreenState = "pending" | "failure" | "stopped" | "ready";
|
||||||
|
@@ -0,0 +1,33 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
|
||||||
|
import AddressPicker from "ChillMainAssets/vuejs/AddressPicker/AddressPicker.vue";
|
||||||
|
import {Ref, ref} from "vue";
|
||||||
|
|
||||||
|
const showModal: Ref<boolean> = ref(false);
|
||||||
|
|
||||||
|
const modalDialogClasses = {"modal-dialog": true, "modal-dialog-scrollable": true, "modal-xl": true};
|
||||||
|
|
||||||
|
const clickButton = () => {
|
||||||
|
showModal.value = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
const closeModal = () => {
|
||||||
|
showModal.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<modal v-if="showModal" :hide-footer="false" :modal-dialog-class="modalDialogClasses" @close="closeModal">
|
||||||
|
<template v-slot:header>TODO</template>
|
||||||
|
<template v-slot:body>
|
||||||
|
<AddressPicker></AddressPicker>
|
||||||
|
</template>
|
||||||
|
</modal>
|
||||||
|
<button class="btn btn-submit" type="button" @click="clickButton">SEARCH ADDRESS</button>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
|
||||||
|
</style>
|
@@ -0,0 +1,170 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import {Address, AddressReference} from "ChillMainAssets/types";
|
||||||
|
import SearchBar from "ChillMainAssets/vuejs/AddressPicker/Component/SearchBar.vue";
|
||||||
|
import {
|
||||||
|
AddressAggregated,
|
||||||
|
AssociatedPostalCode, fetchAddressReference,
|
||||||
|
getAddressesAggregated,
|
||||||
|
getPostalCodes,
|
||||||
|
} from "ChillMainAssets/vuejs/AddressPicker/driver/local-search";
|
||||||
|
import {computed, Ref, ref} from "vue";
|
||||||
|
import AddressAggregatedList from "ChillMainAssets/vuejs/AddressPicker/Component/AddressAggregatedList.vue";
|
||||||
|
import AddressDetailsForm from "ChillMainAssets/vuejs/AddressPicker/Component/AddressDetailsForm.vue";
|
||||||
|
import AddressForm from "ChillMainAssets/vuejs/AddressPicker/Component/AddressForm.vue";
|
||||||
|
import {trans, SAVE} from "translator";
|
||||||
|
|
||||||
|
interface AddressPickerProps {
|
||||||
|
suggestions?: Address[];
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = withDefaults(defineProps<AddressPickerProps>(), {
|
||||||
|
suggestions: () => [],
|
||||||
|
});
|
||||||
|
|
||||||
|
const addresses: Ref<AddressAggregated[]> = ref([]);
|
||||||
|
const postalCodes: Ref<AssociatedPostalCode[]> = ref([]);
|
||||||
|
const searchTokens: Ref<string[]> = ref([]);
|
||||||
|
const addressReference: Ref<AddressReference|null> = ref(null);
|
||||||
|
|
||||||
|
let abortControllerSearchAddress: null | AbortController = null;
|
||||||
|
let abortControllerSearchPostalCode: null | AbortController = null;
|
||||||
|
|
||||||
|
const searchResultsClasses = computed(() => ({
|
||||||
|
"mid-size": addressReference !== null,
|
||||||
|
}));
|
||||||
|
|
||||||
|
const floor = ref<string>("");
|
||||||
|
const corridor = ref<string>("");
|
||||||
|
const steps = ref<string>("");
|
||||||
|
const flat = ref<string>("");
|
||||||
|
const buildingName = ref<string>("");
|
||||||
|
const extra = ref<string>("");
|
||||||
|
const distribution = ref<string>("");
|
||||||
|
|
||||||
|
|
||||||
|
const onSearch = async function (search: string): Promise<void> {
|
||||||
|
performSearchForAddress(search);
|
||||||
|
performSearchForPostalCode(search);
|
||||||
|
searchTokens.value = [search];
|
||||||
|
};
|
||||||
|
|
||||||
|
const onPickPosition = async (id: string) => {
|
||||||
|
console.log('Pick Position', id);
|
||||||
|
addressReference.value = await fetchAddressReference(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
const performSearchForAddress = async (search: string): Promise<void> => {
|
||||||
|
if (null !== abortControllerSearchAddress) {
|
||||||
|
abortControllerSearchAddress.abort();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("" === search) {
|
||||||
|
addresses.value = [];
|
||||||
|
abortControllerSearchAddress = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
abortControllerSearchAddress = new AbortController();
|
||||||
|
|
||||||
|
console.log("onSearch", search);
|
||||||
|
try {
|
||||||
|
addresses.value = await getAddressesAggregated(
|
||||||
|
search,
|
||||||
|
abortControllerSearchAddress,
|
||||||
|
);
|
||||||
|
abortControllerSearchAddress = null;
|
||||||
|
|
||||||
|
// check if there is only one result
|
||||||
|
if (addresses.value.length === 1 && Object.keys(addresses.value[0].positions).length === 1) {
|
||||||
|
onPickPosition(Object.keys(addresses.value[0].positions)[0]);
|
||||||
|
}
|
||||||
|
} catch (e: unknown) {
|
||||||
|
if (e instanceof DOMException && e.name === "AbortError") {
|
||||||
|
console.log("search aborted for:", search);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const performSearchForPostalCode = async (search: string): Promise<void> => {
|
||||||
|
if (null !== abortControllerSearchPostalCode) {
|
||||||
|
abortControllerSearchPostalCode.abort();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("" === search) {
|
||||||
|
addresses.value = [];
|
||||||
|
abortControllerSearchPostalCode = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
abortControllerSearchPostalCode = new AbortController();
|
||||||
|
|
||||||
|
console.log("onSearch", search);
|
||||||
|
try {
|
||||||
|
postalCodes.value = await getPostalCodes(
|
||||||
|
search,
|
||||||
|
abortControllerSearchPostalCode,
|
||||||
|
);
|
||||||
|
abortControllerSearchPostalCode = null;
|
||||||
|
} catch (e: unknown) {
|
||||||
|
if (e instanceof DOMException && e.name === "AbortError") {
|
||||||
|
console.log("search postal code aborted for:", search);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const save = async(): Promise<void> => {
|
||||||
|
console.log("save");
|
||||||
|
console.log("content", floor, corridor, steps, flat, buildingName, extra, distribution);
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<search-bar @search="onSearch"></search-bar>
|
||||||
|
<div class="address-pick-content">
|
||||||
|
<div class="search-results" :class="searchResultsClasses">
|
||||||
|
<address-aggregated-list :addresses="addresses" :search-tokens="searchTokens" @pick-position="(id) => onPickPosition(id)"></address-aggregated-list>
|
||||||
|
</div>
|
||||||
|
<div v-if="addressReference !== null" class="address-details-form">
|
||||||
|
<address-details-form :address="addressReference"
|
||||||
|
v-model:floor="floor"
|
||||||
|
v-model:corridor="corridor"
|
||||||
|
v-model:steps="steps"
|
||||||
|
v-model:flat="flat"
|
||||||
|
v-model:building-name="buildingName"
|
||||||
|
v-model:extra="extra"
|
||||||
|
v-model:distribution="distribution"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<ul class="record_actions">
|
||||||
|
<li><button class="btn btn-save">{{ trans(SAVE) }}</button></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.address-pick-content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 1rem;
|
||||||
|
|
||||||
|
.search-results {
|
||||||
|
&.mid-size {
|
||||||
|
width: 50%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.address-details-form {
|
||||||
|
width: 50%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
@@ -0,0 +1,25 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import {AddressAggregated} from "ChillMainAssets/vuejs/AddressPicker/driver/local-search";
|
||||||
|
import AddressAggregatedListItem from "ChillMainAssets/vuejs/AddressPicker/Component/AddressAggregatedListItem.vue";
|
||||||
|
|
||||||
|
interface AddressAggregatedListProps {
|
||||||
|
addresses: AddressAggregated[];
|
||||||
|
searchTokens: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<AddressAggregatedListProps>();
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
pickPosition: [id: string]
|
||||||
|
}>();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<template v-for="a in props.addresses" :key="a.row_number">
|
||||||
|
<address-aggregated-list-item :address="a" :search-tokens="props.searchTokens" @pick-position="(id) => emit('pickPosition', id)"></address-aggregated-list-item>
|
||||||
|
</template>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
|
||||||
|
</style>
|
@@ -0,0 +1,82 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import {AddressAggregated} from "ChillMainAssets/vuejs/AddressPicker/driver/local-search";
|
||||||
|
import {computed, ref} from "vue";
|
||||||
|
|
||||||
|
interface AddressAggregatedListItemProps {
|
||||||
|
address: AddressAggregated;
|
||||||
|
searchTokens: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<AddressAggregatedListItemProps>();
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
pickPosition: [id: string]
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const showAllPositions = ref<boolean>(false);
|
||||||
|
const positionsToShow = computed((): Record<string, string> => {
|
||||||
|
const obj: Record<string, any> = {};
|
||||||
|
let count = 0;
|
||||||
|
for (const [id, position] of Object.entries(props.address.positions)) {
|
||||||
|
obj[id] = position;
|
||||||
|
count++;
|
||||||
|
if (count >= 10 && !showAllPositions.value) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return obj;
|
||||||
|
})
|
||||||
|
const needToShowMorePosition = computed(() => {
|
||||||
|
return Object.keys(props.address.positions).length > 10;
|
||||||
|
})
|
||||||
|
|
||||||
|
const onClickButton = (id: string) => {
|
||||||
|
console.log('onClickButton', id);
|
||||||
|
emit('pickPosition', id);
|
||||||
|
}
|
||||||
|
const displayAllPositions = () => {
|
||||||
|
showAllPositions.value = true;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<div class="street">
|
||||||
|
<span>{{ props.address.street }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="postcode">
|
||||||
|
<span>{{ props.address.code }}</span> <span>{{ address.label }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="positions">
|
||||||
|
<ul>
|
||||||
|
<li v-for="(position, id) in positionsToShow" :key="id" >
|
||||||
|
<button type="button" @click="onClickButton(id)" >
|
||||||
|
{{ position }}
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
<li v-if="needToShowMorePosition">
|
||||||
|
<button @click="displayAllPositions">show all</button>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
.street {
|
||||||
|
font-variant: small-caps;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
.postcode {
|
||||||
|
font-variant: small-caps;
|
||||||
|
}
|
||||||
|
.positions ul {
|
||||||
|
list-style-type: none;
|
||||||
|
|
||||||
|
li {
|
||||||
|
display: inline-block;
|
||||||
|
margin-right: 2px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
@@ -0,0 +1,44 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import {AddressReference} from "ChillMainAssets/types";
|
||||||
|
import {computed, ref} from "vue";
|
||||||
|
import {addressReferenceToAddress} from "ChillMainAssets/vuejs/AddressPicker/helper";
|
||||||
|
import AddressDetailsContent from "ChillMainAssets/vuejs/_components/AddressDetails/AddressDetailsContent.vue";
|
||||||
|
import AddressForm from "ChillMainAssets/vuejs/AddressPicker/Component/AddressForm.vue";
|
||||||
|
|
||||||
|
export interface AddressDetailsFormProps {
|
||||||
|
address: AddressReference;
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<AddressDetailsFormProps>();
|
||||||
|
|
||||||
|
const floor = ref<string>("");
|
||||||
|
const corridor = ref<string>("");
|
||||||
|
const steps = ref<string>("");
|
||||||
|
const flat = ref<string>("");
|
||||||
|
const buildingName = ref<string>("");
|
||||||
|
const extra = ref<string>("");
|
||||||
|
const distribution = ref<string>("");
|
||||||
|
|
||||||
|
const address = computed(() => addressReferenceToAddress(props.address));
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<address-form
|
||||||
|
@update:floor="val => (floor = val)"
|
||||||
|
@update:corridor="val => (corridor = val)"
|
||||||
|
@update:steps="val => (steps = val)"
|
||||||
|
@update:flat="val => (flat = val)"
|
||||||
|
@update:building-name="val => (buildingName = val)"
|
||||||
|
@update:extra="val => (extra = val)"
|
||||||
|
@update:distribution="val => (distribution = val)"
|
||||||
|
></address-form>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<address-details-content :address="address"></address-details-content>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
|
||||||
|
</style>
|
@@ -0,0 +1,112 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import {
|
||||||
|
ADDRESS_STREET,
|
||||||
|
ADDRESS_STREET_NUMBER,
|
||||||
|
ADDRESS_FLOOR,
|
||||||
|
ADDRESS_CORRIDOR,
|
||||||
|
ADDRESS_STEPS,
|
||||||
|
ADDRESS_FLAT,
|
||||||
|
ADDRESS_BUILDING_NAME,
|
||||||
|
ADDRESS_DISTRIBUTION,
|
||||||
|
ADDRESS_EXTRA,
|
||||||
|
ADDRESS_FILL_AN_ADDRESS,
|
||||||
|
trans,
|
||||||
|
} from "translator";
|
||||||
|
import {ref} from "vue";
|
||||||
|
|
||||||
|
const isNoAddress = ref(false);
|
||||||
|
|
||||||
|
const floor = defineModel("floor");
|
||||||
|
const corridor = defineModel("corridor");
|
||||||
|
const steps = defineModel("steps");
|
||||||
|
const flat = defineModel("flat");
|
||||||
|
const buildingName = defineModel("buildingName");
|
||||||
|
const extra = defineModel("extra");
|
||||||
|
const distribution = defineModel("distribution");
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="form-floating my-1">
|
||||||
|
<input
|
||||||
|
class="form-control"
|
||||||
|
type="text"
|
||||||
|
name="floor"
|
||||||
|
:placeholder="trans(ADDRESS_FLOOR)"
|
||||||
|
v-model="floor"
|
||||||
|
/>
|
||||||
|
<label for="floor">{{ trans(ADDRESS_FLOOR) }}</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating my-1">
|
||||||
|
<input
|
||||||
|
class="form-control"
|
||||||
|
type="text"
|
||||||
|
name="corridor"
|
||||||
|
:placeholder="trans(ADDRESS_CORRIDOR)"
|
||||||
|
v-model="corridor"
|
||||||
|
/>
|
||||||
|
<label for="corridor">{{ trans(ADDRESS_CORRIDOR) }}</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating my-1">
|
||||||
|
<input
|
||||||
|
class="form-control"
|
||||||
|
type="text"
|
||||||
|
name="steps"
|
||||||
|
:placeholder="trans(ADDRESS_STEPS)"
|
||||||
|
v-model="steps"
|
||||||
|
/>
|
||||||
|
<label for="steps">{{ trans(ADDRESS_STEPS) }}</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating my-1">
|
||||||
|
<input
|
||||||
|
class="form-control"
|
||||||
|
type="text"
|
||||||
|
name="flat"
|
||||||
|
:placeholder="trans(ADDRESS_FLAT)"
|
||||||
|
v-model="flat"
|
||||||
|
/>
|
||||||
|
<label for="flat">{{ trans(ADDRESS_FLAT) }}</label>
|
||||||
|
</div>
|
||||||
|
<div :class="isNoAddress ? 'col-lg-12' : 'col-lg-6'">
|
||||||
|
<div class="form-floating my-1" v-if="!isNoAddress">
|
||||||
|
<input
|
||||||
|
class="form-control"
|
||||||
|
type="text"
|
||||||
|
name="buildingName"
|
||||||
|
maxlength="255"
|
||||||
|
:placeholder="trans(ADDRESS_BUILDING_NAME)"
|
||||||
|
v-model="buildingName"
|
||||||
|
/>
|
||||||
|
<label for="buildingName">{{
|
||||||
|
trans(ADDRESS_BUILDING_NAME)
|
||||||
|
}}</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating my-1">
|
||||||
|
<input
|
||||||
|
class="form-control"
|
||||||
|
type="text"
|
||||||
|
name="extra"
|
||||||
|
maxlength="255"
|
||||||
|
:placeholder="trans(ADDRESS_EXTRA)"
|
||||||
|
v-model="extra"
|
||||||
|
/>
|
||||||
|
<label for="extra">{{ trans(ADDRESS_EXTRA) }}</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-floating my-1" v-if="!isNoAddress">
|
||||||
|
<input
|
||||||
|
class="form-control"
|
||||||
|
type="text"
|
||||||
|
name="distribution"
|
||||||
|
maxlength="255"
|
||||||
|
:placeholder="trans(ADDRESS_DISTRIBUTION)"
|
||||||
|
v-model="distribution"
|
||||||
|
/>
|
||||||
|
<label for="distribution">{{
|
||||||
|
trans(ADDRESS_DISTRIBUTION)
|
||||||
|
}}</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
|
||||||
|
</style>
|
@@ -0,0 +1,39 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { ADDRESS_PICKER_SEARCH_FOR_ADDRESSES, trans } from 'translator';
|
||||||
|
const emits = defineEmits<{
|
||||||
|
search: [search: string];
|
||||||
|
}>();
|
||||||
|
|
||||||
|
let searchTimer = 0;
|
||||||
|
let searchString: string;
|
||||||
|
|
||||||
|
const onInput = function (event: InputEvent) {
|
||||||
|
const target = event.target as HTMLInputElement;
|
||||||
|
const value = target.value;
|
||||||
|
searchString = value;
|
||||||
|
|
||||||
|
if (0 === searchTimer) {
|
||||||
|
window.clearTimeout(searchTimer);
|
||||||
|
searchTimer = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
searchTimer = window.setTimeout(() => {
|
||||||
|
if (value === searchString) {
|
||||||
|
emits("search", value);
|
||||||
|
}
|
||||||
|
}, 500);
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="input-group mb-3">
|
||||||
|
<span class="input-group-text">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-search" viewBox="0 0 16 16">
|
||||||
|
<path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001q.044.06.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1 1 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0"/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
|
<input type="search" class="form-control" @input="onInput" :placeholder="trans(ADDRESS_PICKER_SEARCH_FOR_ADDRESSES)" />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss"></style>
|
@@ -0,0 +1,69 @@
|
|||||||
|
import {AddressReference, TranslatableString} from "ChillMainAssets/types";
|
||||||
|
|
||||||
|
export interface AddressAggregated {
|
||||||
|
row_number: number;
|
||||||
|
street: string;
|
||||||
|
postcode_id: number;
|
||||||
|
code: string;
|
||||||
|
label: string;
|
||||||
|
positions: Record<string, string>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AssociatedPostalCode {
|
||||||
|
postcode_id: number;
|
||||||
|
code: string;
|
||||||
|
label: string;
|
||||||
|
country_id: number;
|
||||||
|
country_code: string;
|
||||||
|
country_name: TranslatableString;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws {DOMException} when fetch is aborted, the property name is always equals to 'AbortError'
|
||||||
|
*/
|
||||||
|
export const getAddressesAggregated = async (
|
||||||
|
search: string,
|
||||||
|
abortController: AbortController,
|
||||||
|
): Promise<AddressAggregated[]> => {
|
||||||
|
const params = new URLSearchParams({ q: search.trim() });
|
||||||
|
let response = null;
|
||||||
|
|
||||||
|
response = await fetch(
|
||||||
|
`/api/1.0/main/address-reference/aggregated/search?${params}`,
|
||||||
|
{ signal: abortController.signal },
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
return await response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(response.statusText);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getPostalCodes = async (
|
||||||
|
search: string,
|
||||||
|
abortController: AbortController,
|
||||||
|
): Promise<AssociatedPostalCode[]> => {
|
||||||
|
const params = new URLSearchParams({ q: search.trim() });
|
||||||
|
let response = null;
|
||||||
|
|
||||||
|
response = await fetch(
|
||||||
|
`/api/1.0/main/address-reference/postal-code/search?${params}`,
|
||||||
|
{ signal: abortController.signal },
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
return await response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(response.statusText);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const fetchAddressReference = async (id: string): Promise<AddressReference> => {
|
||||||
|
const response = await fetch(`/api/1.0/main/address-reference/${id}.json`);
|
||||||
|
if (response.ok) {
|
||||||
|
return await response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(response.statusText);
|
||||||
|
}
|
@@ -0,0 +1,21 @@
|
|||||||
|
import {Address, AddressCreation, AddressReference} from "ChillMainAssets/types";
|
||||||
|
|
||||||
|
export const addressReferenceToAddress = (reference: AddressReference): AddressCreation => {
|
||||||
|
return {
|
||||||
|
street: reference.street,
|
||||||
|
streetNumber: reference.streetNumber,
|
||||||
|
postcode: reference.postcode,
|
||||||
|
floor: "",
|
||||||
|
corridor: "",
|
||||||
|
steps: "",
|
||||||
|
flat: "",
|
||||||
|
buildingName: "",
|
||||||
|
distribution: "",
|
||||||
|
extra: "",
|
||||||
|
confidential: false,
|
||||||
|
addressReference: reference,
|
||||||
|
point: reference.point,
|
||||||
|
isNoAddress: false,
|
||||||
|
validFrom: null,
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,12 @@
|
|||||||
|
import { createApp } from "vue";
|
||||||
|
import AddressButton from "ChillMainAssets/vuejs/AddressPicker/AddressButton.vue";
|
||||||
|
|
||||||
|
document.addEventListener("DOMContentLoaded", async () => {
|
||||||
|
document
|
||||||
|
.querySelectorAll<HTMLDivElement>("div[data-address-picker]")
|
||||||
|
.forEach((elem): void => {
|
||||||
|
const app = createApp(AddressButton);
|
||||||
|
|
||||||
|
app.mount(elem);
|
||||||
|
});
|
||||||
|
});
|
@@ -10,7 +10,8 @@ import { computed, onMounted, ref } from "vue";
|
|||||||
import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
|
import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
|
||||||
import { fetchExportGenerationStatus } from "ChillMainAssets/lib/api/export";
|
import { fetchExportGenerationStatus } from "ChillMainAssets/lib/api/export";
|
||||||
import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
|
import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
|
||||||
import { ExportGeneration } from "ChillMainAssets/types";
|
import WaitingScreen from "../_components/WaitingScreen.vue";
|
||||||
|
import { ExportGeneration, WaitingScreenState } from "ChillMainAssets/types";
|
||||||
|
|
||||||
interface AppProps {
|
interface AppProps {
|
||||||
exportGenerationId: string;
|
exportGenerationId: string;
|
||||||
@@ -34,13 +35,16 @@ const storedObject = computed<null | StoredObject>(() => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const isPending = computed<boolean>(() => status.value === "pending");
|
const isPending = computed<boolean>(() => status.value === "pending");
|
||||||
const isFetching = computed<boolean>(
|
|
||||||
() => tryiesForReady.value < maxTryiesForReady,
|
|
||||||
);
|
|
||||||
const isReady = computed<boolean>(() => status.value === "ready");
|
|
||||||
const isFailure = computed<boolean>(() => status.value === "failure");
|
|
||||||
const filename = computed<string>(() => `${props.title}-${props.createdDate}`);
|
const filename = computed<string>(() => `${props.title}-${props.createdDate}`);
|
||||||
|
|
||||||
|
const state = computed<WaitingScreenState>((): WaitingScreenState => {
|
||||||
|
if (status.value === "empty") {
|
||||||
|
return "pending";
|
||||||
|
}
|
||||||
|
|
||||||
|
return status.value;
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* counter for the number of times that we check for a new status
|
* counter for the number of times that we check for a new status
|
||||||
*/
|
*/
|
||||||
@@ -85,57 +89,36 @@ onMounted(() => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div id="waiting-screen">
|
<WaitingScreen :state="state">
|
||||||
<div
|
<template v-slot:pending>
|
||||||
v-if="isPending && isFetching"
|
<p>
|
||||||
class="alert alert-danger text-center"
|
{{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
|
||||||
>
|
</p>
|
||||||
<div>
|
</template>
|
||||||
<p>
|
|
||||||
{{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
<template v-slot:stopped>
|
||||||
<i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
|
<p>
|
||||||
<span class="sr-only">Loading...</span>
|
{{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
|
||||||
</div>
|
</p>
|
||||||
</div>
|
</template>
|
||||||
<div v-if="isPending && !isFetching" class="alert alert-info">
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
{{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="isFailure" class="alert alert-danger text-center">
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
{{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="isReady" class="alert alert-success text-center">
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
{{ trans(EXPORT_GENERATION_EXPORT_READY) }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p v-if="storedObject !== null">
|
<template v-slot:failure>
|
||||||
<document-action-buttons-group
|
<p>
|
||||||
:stored-object="storedObject"
|
{{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
|
||||||
:filename="filename"
|
</p>
|
||||||
></document-action-buttons-group>
|
</template>
|
||||||
</p>
|
|
||||||
</div>
|
<template v-slot:ready>
|
||||||
</div>
|
<p>
|
||||||
</div>
|
{{ trans(EXPORT_GENERATION_EXPORT_READY) }}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p v-if="storedObject !== null">
|
||||||
|
<document-action-buttons-group
|
||||||
|
:stored-object="storedObject"
|
||||||
|
:filename="filename"
|
||||||
|
></document-action-buttons-group>
|
||||||
|
</p>
|
||||||
|
</template>
|
||||||
|
</WaitingScreen>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
|
||||||
#waiting-screen {
|
|
||||||
> .alert {
|
|
||||||
min-height: 350px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
@@ -0,0 +1,75 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { useIntervalFn } from "@vueuse/core";
|
||||||
|
import { fetchWorkflow } from "ChillMainAssets/lib/workflow/api";
|
||||||
|
import { returnPathOr } from "ChillMainAssets/lib/return_path/returnPathHelper";
|
||||||
|
import { ref } from "vue";
|
||||||
|
import WaitingScreen from "ChillMainAssets/vuejs/_components/WaitingScreen.vue";
|
||||||
|
import { WaitingScreenState } from "ChillMainAssets/types";
|
||||||
|
import {
|
||||||
|
trans,
|
||||||
|
WORKFLOW_WAIT_TITLE,
|
||||||
|
WORKFLOW_WAIT_ERROR_WHILE_WAITING,
|
||||||
|
WORKFLOW_WAIT_SUCCESS,
|
||||||
|
} from "translator";
|
||||||
|
|
||||||
|
interface WaitPostProcessWorkflowComponentProps {
|
||||||
|
workflowId: number;
|
||||||
|
expectedStep: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<WaitPostProcessWorkflowComponentProps>();
|
||||||
|
const counter = ref<number>(0);
|
||||||
|
const MAX_TRYIES = 50;
|
||||||
|
|
||||||
|
const state = ref<WaitingScreenState>("pending");
|
||||||
|
|
||||||
|
const { pause, resume } = useIntervalFn(
|
||||||
|
async () => {
|
||||||
|
try {
|
||||||
|
const workflow = await fetchWorkflow(props.workflowId);
|
||||||
|
counter.value++;
|
||||||
|
if (workflow.currentStep.currentStep.name === props.expectedStep) {
|
||||||
|
window.location.assign(
|
||||||
|
returnPathOr("/fr/main/workflow" + workflow.id + "/show"),
|
||||||
|
);
|
||||||
|
resume();
|
||||||
|
state.value = "ready";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (counter.value > MAX_TRYIES) {
|
||||||
|
pause();
|
||||||
|
state.value = "failure";
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error);
|
||||||
|
pause();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
2000,
|
||||||
|
{ immediate: true },
|
||||||
|
);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="container">
|
||||||
|
<WaitingScreen :state="state">
|
||||||
|
<template v-slot:pending>
|
||||||
|
<p>
|
||||||
|
{{ trans(WORKFLOW_WAIT_TITLE) }}
|
||||||
|
</p>
|
||||||
|
</template>
|
||||||
|
<template v-slot:failure>
|
||||||
|
<p>
|
||||||
|
{{ trans(WORKFLOW_WAIT_ERROR_WHILE_WAITING) }}
|
||||||
|
</p>
|
||||||
|
</template>
|
||||||
|
<template v-slot:ready>
|
||||||
|
<p>
|
||||||
|
{{ trans(WORKFLOW_WAIT_SUCCESS) }}
|
||||||
|
</p>
|
||||||
|
</template>
|
||||||
|
</WaitingScreen>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss"></style>
|
@@ -0,0 +1,51 @@
|
|||||||
|
import { createApp } from "vue";
|
||||||
|
import App from "./App.vue";
|
||||||
|
|
||||||
|
function mountApp(): void {
|
||||||
|
const el = document.querySelector<HTMLDivElement>(".screen-wait");
|
||||||
|
if (!el) {
|
||||||
|
console.error(
|
||||||
|
"WaitPostProcessWorkflow: mount element .screen-wait not found",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const workflowIdAttr = el.getAttribute("data-workflow-id");
|
||||||
|
const expectedStep = el.getAttribute("data-expected-step") || "";
|
||||||
|
|
||||||
|
if (!workflowIdAttr) {
|
||||||
|
console.error(
|
||||||
|
"WaitPostProcessWorkflow: data-workflow-id attribute missing on mount element",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedStep) {
|
||||||
|
console.error(
|
||||||
|
"WaitPostProcessWorkflow: data-expected-step attribute missing on mount element",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const workflowId = Number(workflowIdAttr);
|
||||||
|
if (Number.isNaN(workflowId)) {
|
||||||
|
console.error(
|
||||||
|
"WaitPostProcessWorkflow: data-workflow-id is not a valid number:",
|
||||||
|
workflowIdAttr,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const app = createApp(App, {
|
||||||
|
workflowId,
|
||||||
|
expectedStep,
|
||||||
|
});
|
||||||
|
|
||||||
|
app.mount(el);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (document.readyState === "loading") {
|
||||||
|
document.addEventListener("DOMContentLoaded", mountApp);
|
||||||
|
} else {
|
||||||
|
mountApp();
|
||||||
|
}
|
@@ -1,10 +1,11 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, useTemplateRef } from "vue";
|
import { computed, onMounted, ref, useTemplateRef } from "vue";
|
||||||
import type { WorkflowAttachment } from "ChillMainAssets/types";
|
import type { EntityWorkflow, WorkflowAttachment } from "ChillMainAssets/types";
|
||||||
import PickGenericDocModal from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue";
|
import PickGenericDocModal from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue";
|
||||||
import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
|
import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
|
||||||
import AttachmentList from "ChillMainAssets/vuejs/WorkflowAttachment/Component/AttachmentList.vue";
|
import AttachmentList from "ChillMainAssets/vuejs/WorkflowAttachment/Component/AttachmentList.vue";
|
||||||
import { GenericDoc } from "ChillDocStoreAssets/types";
|
import { GenericDoc } from "ChillDocStoreAssets/types";
|
||||||
|
import { fetchWorkflow } from "ChillMainAssets/lib/workflow/api";
|
||||||
|
|
||||||
interface AppConfig {
|
interface AppConfig {
|
||||||
workflowId: number;
|
workflowId: number;
|
||||||
@@ -34,6 +35,13 @@ const attachedGenericDoc = computed<GenericDocForAccompanyingPeriod[]>(
|
|||||||
) as GenericDocForAccompanyingPeriod[],
|
) as GenericDocForAccompanyingPeriod[],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const workflow = ref<EntityWorkflow | null>(null);
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
workflow.value = await fetchWorkflow(Number(props.workflowId));
|
||||||
|
console.log("workflow", workflow.value);
|
||||||
|
});
|
||||||
|
|
||||||
const openModal = function () {
|
const openModal = function () {
|
||||||
pickDocModal.value?.openModal();
|
pickDocModal.value?.openModal();
|
||||||
};
|
};
|
||||||
@@ -49,20 +57,30 @@ const onPickGenericDoc = ({
|
|||||||
const onRemoveAttachment = (payload: { attachment: WorkflowAttachment }) => {
|
const onRemoveAttachment = (payload: { attachment: WorkflowAttachment }) => {
|
||||||
emit("removeAttachment", payload);
|
emit("removeAttachment", payload);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const canEditAttachement = computed<boolean>(() => {
|
||||||
|
if (null === workflow.value) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return workflow.value._permissions.CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT;
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<pick-generic-doc-modal
|
<pick-generic-doc-modal
|
||||||
|
:workflow="workflow"
|
||||||
:accompanying-period-id="props.accompanyingPeriodId"
|
:accompanying-period-id="props.accompanyingPeriodId"
|
||||||
:to-remove="attachedGenericDoc"
|
:to-remove="attachedGenericDoc"
|
||||||
ref="pickDocModal"
|
ref="pickDocModal"
|
||||||
@pickGenericDoc="onPickGenericDoc"
|
@pickGenericDoc="onPickGenericDoc"
|
||||||
></pick-generic-doc-modal>
|
></pick-generic-doc-modal>
|
||||||
<attachment-list
|
<attachment-list
|
||||||
|
:workflow="workflow"
|
||||||
:attachments="props.attachments"
|
:attachments="props.attachments"
|
||||||
@removeAttachment="onRemoveAttachment"
|
@removeAttachment="onRemoveAttachment"
|
||||||
></attachment-list>
|
></attachment-list>
|
||||||
<ul class="record_actions">
|
<ul v-if="canEditAttachement" class="record_actions">
|
||||||
<li>
|
<li>
|
||||||
<button type="button" class="btn btn-create" @click="openModal">
|
<button type="button" class="btn btn-create" @click="openModal">
|
||||||
Ajouter une pièce jointe
|
Ajouter une pièce jointe
|
||||||
|
@@ -1,10 +1,11 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { WorkflowAttachment } from "ChillMainAssets/types";
|
import { EntityWorkflow, WorkflowAttachment } from "ChillMainAssets/types";
|
||||||
import GenericDocItemBox from "ChillMainAssets/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue";
|
import GenericDocItemBox from "ChillMainAssets/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue";
|
||||||
import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
|
import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
|
||||||
|
|
||||||
interface AttachmentListProps {
|
interface AttachmentListProps {
|
||||||
attachments: WorkflowAttachment[];
|
attachments: WorkflowAttachment[];
|
||||||
|
workflow: EntityWorkflow | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
@@ -36,7 +37,12 @@ const props = defineProps<AttachmentListProps>();
|
|||||||
:stored-object="a.genericDoc.storedObject"
|
:stored-object="a.genericDoc.storedObject"
|
||||||
></document-action-buttons-group>
|
></document-action-buttons-group>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li
|
||||||
|
v-if="
|
||||||
|
!workflow?._permissions
|
||||||
|
.CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT
|
||||||
|
"
|
||||||
|
>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-delete"
|
class="btn btn-delete"
|
||||||
|
@@ -6,8 +6,10 @@ import {
|
|||||||
import PickGenericDocItem from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue";
|
import PickGenericDocItem from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue";
|
||||||
import { fetch_generic_docs_by_accompanying_period } from "ChillDocStoreAssets/js/generic-doc-api";
|
import { fetch_generic_docs_by_accompanying_period } from "ChillDocStoreAssets/js/generic-doc-api";
|
||||||
import { computed, onMounted, ref } from "vue";
|
import { computed, onMounted, ref } from "vue";
|
||||||
|
import { EntityWorkflow } from "ChillMainAssets/types";
|
||||||
|
|
||||||
interface PickGenericDocProps {
|
interface PickGenericDocProps {
|
||||||
|
workflow: EntityWorkflow | null;
|
||||||
accompanyingPeriodId: number;
|
accompanyingPeriodId: number;
|
||||||
pickedList: GenericDocForAccompanyingPeriod[];
|
pickedList: GenericDocForAccompanyingPeriod[];
|
||||||
toRemove: GenericDocForAccompanyingPeriod[];
|
toRemove: GenericDocForAccompanyingPeriod[];
|
||||||
@@ -36,9 +38,21 @@ const isPicked = (genericDoc: GenericDocForAccompanyingPeriod): boolean =>
|
|||||||
) !== -1;
|
) !== -1;
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
genericDocs.value = await fetch_generic_docs_by_accompanying_period(
|
const fetchedGenericDocs = await fetch_generic_docs_by_accompanying_period(
|
||||||
props.accompanyingPeriodId,
|
props.accompanyingPeriodId,
|
||||||
);
|
);
|
||||||
|
const documentClasses = [
|
||||||
|
"Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument",
|
||||||
|
"Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
|
||||||
|
"Chill\\DocStoreBundle\\Entity\\PersonDocument",
|
||||||
|
];
|
||||||
|
|
||||||
|
genericDocs.value = fetchedGenericDocs.filter(
|
||||||
|
(doc) =>
|
||||||
|
!documentClasses.includes(
|
||||||
|
props.workflow?.relatedEntityClass || "",
|
||||||
|
) || props.workflow?.relatedEntityId !== doc.identifiers.id,
|
||||||
|
);
|
||||||
loaded.value = true;
|
loaded.value = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@@ -3,8 +3,10 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
|
|||||||
import { computed, ref, useTemplateRef } from "vue";
|
import { computed, ref, useTemplateRef } from "vue";
|
||||||
import PickGenericDoc from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue";
|
import PickGenericDoc from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue";
|
||||||
import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
|
import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
|
||||||
|
import { EntityWorkflow } from "ChillMainAssets/types";
|
||||||
|
|
||||||
interface PickGenericDocModalProps {
|
interface PickGenericDocModalProps {
|
||||||
|
workflow: EntityWorkflow | null;
|
||||||
accompanyingPeriodId: number;
|
accompanyingPeriodId: number;
|
||||||
toRemove: GenericDocForAccompanyingPeriod[];
|
toRemove: GenericDocForAccompanyingPeriod[];
|
||||||
}
|
}
|
||||||
@@ -80,6 +82,7 @@ defineExpose({ openModal, closeModal });
|
|||||||
</template>
|
</template>
|
||||||
<template v-slot:body>
|
<template v-slot:body>
|
||||||
<pick-generic-doc
|
<pick-generic-doc
|
||||||
|
:workflow="props.workflow"
|
||||||
:accompanying-period-id="props.accompanyingPeriodId"
|
:accompanying-period-id="props.accompanyingPeriodId"
|
||||||
:to-remove="props.toRemove"
|
:to-remove="props.toRemove"
|
||||||
:picked-list="pickeds"
|
:picked-list="pickeds"
|
||||||
|
@@ -4,24 +4,27 @@
|
|||||||
:show-button-details="false"
|
:show-button-details="false"
|
||||||
></address-render-box>
|
></address-render-box>
|
||||||
<address-details-ref-matching
|
<address-details-ref-matching
|
||||||
|
v-if="isAddress(props.address)"
|
||||||
:address="props.address"
|
:address="props.address"
|
||||||
@update-address="onUpdateAddress"
|
@update-address="onUpdateAddress"
|
||||||
></address-details-ref-matching>
|
></address-details-ref-matching>
|
||||||
<address-details-map :address="props.address"></address-details-map>
|
<address-details-map :address="props.address"></address-details-map>
|
||||||
<address-details-geographical-layers
|
<address-details-geographical-layers
|
||||||
|
v-if="isAddress(props.address)"
|
||||||
:address="props.address"
|
:address="props.address"
|
||||||
></address-details-geographical-layers>
|
></address-details-geographical-layers>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { Address } from "../../../types";
|
import {Address, AddressCreation} from "../../../types";
|
||||||
import AddressDetailsMap from "./Parts/AddressDetailsMap.vue";
|
import AddressDetailsMap from "./Parts/AddressDetailsMap.vue";
|
||||||
import AddressRenderBox from "../Entity/AddressRenderBox.vue";
|
import AddressRenderBox from "../Entity/AddressRenderBox.vue";
|
||||||
import AddressDetailsGeographicalLayers from "./Parts/AddressDetailsGeographicalLayers.vue";
|
import AddressDetailsGeographicalLayers from "./Parts/AddressDetailsGeographicalLayers.vue";
|
||||||
import AddressDetailsRefMatching from "./Parts/AddressDetailsRefMatching.vue";
|
import AddressDetailsRefMatching from "./Parts/AddressDetailsRefMatching.vue";
|
||||||
|
import {isAddress} from "ChillMainAssets/vuejs/_components/AddressDetails/helper";
|
||||||
|
|
||||||
interface AddressModalContentProps {
|
interface AddressModalContentProps {
|
||||||
address: Address;
|
address: Address|AddressCreation;
|
||||||
}
|
}
|
||||||
|
|
||||||
const props = defineProps<AddressModalContentProps>();
|
const props = defineProps<AddressModalContentProps>();
|
||||||
|
@@ -12,90 +12,91 @@
|
|||||||
Voir sur
|
Voir sur
|
||||||
<a :href="makeUrlGoogleMap(props.address)" target="_blank"
|
<a :href="makeUrlGoogleMap(props.address)" target="_blank"
|
||||||
>Google Maps</a
|
>Google Maps</a
|
||||||
>
|
> <a
|
||||||
<a :href="makeUrlOsm(props.address)" target="_blank">OSM</a>
|
:href="makeUrlOsm(props.address)" target="_blank"
|
||||||
|
>OSM</a>
|
||||||
</p>
|
</p>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { onMounted, ref } from "vue";
|
import {computed, onMounted, ref} from "vue";
|
||||||
import "leaflet/dist/leaflet.css";
|
import "leaflet/dist/leaflet.css";
|
||||||
import markerIconPng from "leaflet/dist/images/marker-icon.png";
|
import markerIconPng from "leaflet/dist/images/marker-icon.png";
|
||||||
import L, { LatLngExpression, LatLngTuple } from "leaflet";
|
import L, { LatLngExpression, LatLngTuple } from "leaflet";
|
||||||
import { Address, Point } from "../../../../types";
|
import {Address, AddressCreation, Point} from "../../../../types";
|
||||||
|
import {buildAddressLines, getAddressPoint} from "ChillMainAssets/vuejs/_components/AddressDetails/helper";
|
||||||
|
import {useLeafletDisplayLayer, useLeafletMap, useLeafletMarker, useLeafletTileLayer} from "vue-use-leaflet";
|
||||||
|
|
||||||
const lonLatForLeaflet = (point: Point): LatLngTuple => {
|
const lonLatForLeaflet = (point: Point): LatLngTuple => {
|
||||||
return [point.coordinates[1], point.coordinates[0]];
|
return [point.coordinates[1], point.coordinates[0]];
|
||||||
};
|
};
|
||||||
|
|
||||||
export interface MapProps {
|
export interface MapProps {
|
||||||
address: Address;
|
address: Address|AddressCreation;
|
||||||
}
|
}
|
||||||
|
|
||||||
const props = defineProps<MapProps>();
|
const props = defineProps<MapProps>();
|
||||||
|
|
||||||
const map_div = ref<HTMLDivElement | null>(null);
|
const markerIcon = L.icon({
|
||||||
let map: L.Map | null = null;
|
iconUrl: markerIconPng,
|
||||||
let marker: L.Marker | null = null;
|
iconAnchor: [12, 41],
|
||||||
|
});
|
||||||
onMounted(() => {
|
const latLngMarker = computed((): LatLngExpression => {
|
||||||
if (map_div.value === null) {
|
if (props.address === null || props.address.point === null) {
|
||||||
// there is no map div when the address does not have any Point
|
return [0, 0, 0];
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (props.address.point !== null) {
|
return [props.address.point.coordinates[1], props.address.point.coordinates[0], 0]
|
||||||
map = L.map(map_div.value);
|
|
||||||
map.setView(lonLatForLeaflet(props.address.point), 18);
|
|
||||||
|
|
||||||
L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
|
|
||||||
attribution:
|
|
||||||
'© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
|
|
||||||
}).addTo(map);
|
|
||||||
|
|
||||||
const markerIcon = L.icon({
|
|
||||||
iconUrl: markerIconPng,
|
|
||||||
iconAnchor: [12, 41],
|
|
||||||
});
|
|
||||||
|
|
||||||
marker = L.marker(lonLatForLeaflet(props.address.point), {
|
|
||||||
icon: markerIcon,
|
|
||||||
});
|
|
||||||
marker.addTo(map);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const makeUrlGoogleMap = (address: Address): string => {
|
const map_div = ref<HTMLDivElement | null>(null);
|
||||||
|
const map = useLeafletMap(map_div, {zoom: 18, center: latLngMarker});
|
||||||
|
const tileLayer = useLeafletTileLayer(
|
||||||
|
"https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
|
||||||
|
attribution:
|
||||||
|
'© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
|
||||||
|
}
|
||||||
|
);
|
||||||
|
useLeafletDisplayLayer(map, tileLayer);
|
||||||
|
|
||||||
|
|
||||||
|
const marker = useLeafletMarker(latLngMarker, {icon: markerIcon});
|
||||||
|
useLeafletDisplayLayer(map, marker);
|
||||||
|
|
||||||
|
|
||||||
|
const makeUrlGoogleMap = (address: Address|AddressCreation): string => {
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
params.append("api", "1");
|
params.append("api", "1");
|
||||||
if (address.point !== null && address.addressReference !== null) {
|
const point = getAddressPoint(address);
|
||||||
|
if (point !== null && address.addressReference !== null) {
|
||||||
params.append(
|
params.append(
|
||||||
"query",
|
"query",
|
||||||
`${address.point.coordinates[1]} ${address.point.coordinates[0]}`,
|
`${point.coordinates[1]} ${point.coordinates[0]}`,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
params.append("query", address.lines.join(", "));
|
params.append("query", buildAddressLines(address).join(", "));
|
||||||
}
|
}
|
||||||
|
|
||||||
return `https://www.google.com/maps/search/?${params.toString()}`;
|
return `https://www.google.com/maps/search/?${params.toString()}`;
|
||||||
};
|
};
|
||||||
|
|
||||||
const makeUrlOsm = (address: Address): string => {
|
const makeUrlOsm = (address: Address|AddressCreation): string => {
|
||||||
if (address.point !== null && address.addressReference !== null) {
|
const point = getAddressPoint(address);
|
||||||
|
if (point !== null && address.addressReference !== null) {
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
params.append("mlat", `${address.point.coordinates[1]}`);
|
params.append("mlat", `${point.coordinates[1]}`);
|
||||||
params.append("mlon", `${address.point.coordinates[0]}`);
|
params.append("mlon", `${point.coordinates[0]}`);
|
||||||
const hashParams = new URLSearchParams();
|
const hashParams = new URLSearchParams();
|
||||||
hashParams.append(
|
hashParams.append(
|
||||||
"map",
|
"map",
|
||||||
`18/${address.point.coordinates[1]}/${address.point.coordinates[0]}`,
|
`18/${point.coordinates[1]}/${point.coordinates[0]}`,
|
||||||
);
|
);
|
||||||
|
|
||||||
return `https://www.openstreetmap.org/?${params.toString()}#${hashParams.toString()}`;
|
return `https://www.openstreetmap.org/?${params.toString()}#${hashParams.toString()}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
params.append("query", address.lines.join(", "));
|
params.append("query", buildAddressLines(address).join(", "));
|
||||||
|
|
||||||
return `https://www.openstreetmap.org/search?${params.toString()}`;
|
return `https://www.openstreetmap.org/search?${params.toString()}`;
|
||||||
};
|
};
|
||||||
|
@@ -0,0 +1,46 @@
|
|||||||
|
import {Address, AddressCreation, Point} from "ChillMainAssets/types";
|
||||||
|
import addressFormatter, {Input} from "@fragaria/address-formatter";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the given object is of type Address by verifying the existence
|
||||||
|
* of the `lines` property and confirming that it is an array of strings.
|
||||||
|
*
|
||||||
|
* @param {AddressCreation | Address} obj - The object to check.
|
||||||
|
* @return {boolean} Returns true if the object is of type Address, otherwise false.
|
||||||
|
*/
|
||||||
|
export function isAddress(obj: AddressCreation | Address): obj is Address {
|
||||||
|
return (obj as any).lines !== undefined && Array.isArray((obj as any).lines);
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildAddressFormatterObject(address: AddressCreation): Input {
|
||||||
|
return {
|
||||||
|
city: address.postcode.name,
|
||||||
|
postcode: address.postcode.code,
|
||||||
|
countryCode: address.postcode.country.code,
|
||||||
|
street: address.street,
|
||||||
|
houseNumber: address.streetNumber,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const buildAddressLines = (address: AddressCreation|Address): string[] => {
|
||||||
|
if (isAddress(address)) {
|
||||||
|
return address.lines;
|
||||||
|
}
|
||||||
|
|
||||||
|
const lines = addressFormatter.format(buildAddressFormatterObject(address), {output: 'array', countryCode: address.addressReference.postcode.country.code });
|
||||||
|
console.log('lines:', lines);
|
||||||
|
return lines;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const buildAddressText = (address: AddressCreation|Address): string => {
|
||||||
|
return buildAddressLines(address).join(' - ');
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getAddressPoint = (address: AddressCreation|Address): Point|null => {
|
||||||
|
if (isAddress(address)) {
|
||||||
|
return address.point;
|
||||||
|
}
|
||||||
|
|
||||||
|
return address.addressReference?.point;
|
||||||
|
}
|
@@ -4,14 +4,14 @@
|
|||||||
<div v-if="isConfidential">
|
<div v-if="isConfidential">
|
||||||
<confidential :position-btn-far="true">
|
<confidential :position-btn-far="true">
|
||||||
<template #confidential-content>
|
<template #confidential-content>
|
||||||
<div v-if="isMultiline === true">
|
<div v-if="isMultiline">
|
||||||
<p
|
<p
|
||||||
v-for="(l, i) in address.lines"
|
v-for="(l, i) in buildAddressLines(address)"
|
||||||
:key="`line-${i}`"
|
:key="`line-${i}`"
|
||||||
>
|
>
|
||||||
{{ l }}
|
{{ l }}
|
||||||
</p>
|
</p>
|
||||||
<p v-if="showButtonDetails">
|
<p v-if="showButtonDetails && isAddress(address) ">
|
||||||
<address-details-button
|
<address-details-button
|
||||||
:address_id="address.address_id"
|
:address_id="address.address_id"
|
||||||
:address_ref_status="address.refStatus"
|
:address_ref_status="address.refStatus"
|
||||||
@@ -19,8 +19,8 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<p v-if="'' !== address.text" class="street">
|
<p v-if="'' !== buildAddressText(address)" class="street">
|
||||||
{{ address.text }}
|
{{ buildAddressText(address) }}
|
||||||
</p>
|
</p>
|
||||||
<p
|
<p
|
||||||
v-if="null !== address.postcode"
|
v-if="null !== address.postcode"
|
||||||
@@ -29,8 +29,8 @@
|
|||||||
{{ address.postcode.code }}
|
{{ address.postcode.code }}
|
||||||
{{ address.postcode.name }}
|
{{ address.postcode.name }}
|
||||||
</p>
|
</p>
|
||||||
<p v-if="null !== address.country" class="country">
|
<p v-if="null !== address.postcode" class="country">
|
||||||
{{ localizeString(address.country.name) }}
|
{{ localizeString(address.postcode.country.name) }}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -38,11 +38,11 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="!isConfidential">
|
<div v-if="!isConfidential">
|
||||||
<div v-if="isMultiline === true">
|
<div v-if="isMultiline">
|
||||||
<p v-for="(l, i) in address.lines" :key="`line-${i}`">
|
<p v-for="(l, i) in buildAddressLines(address)" :key="`line-${i}`">
|
||||||
{{ l }}
|
{{ l }}
|
||||||
</p>
|
</p>
|
||||||
<p v-if="showButtonDetails">
|
<p v-if="showButtonDetails && isAddress(address) ">
|
||||||
<address-details-button
|
<address-details-button
|
||||||
:address_id="address.address_id"
|
:address_id="address.address_id"
|
||||||
:address_ref_status="address.refStatus"
|
:address_ref_status="address.refStatus"
|
||||||
@@ -50,9 +50,9 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<p v-if="address.text" class="street">
|
<p v-if="'' !== buildAddressText(address)" class="street">
|
||||||
{{ address.text }}
|
{{ buildAddressText(address)}}
|
||||||
<template v-if="showButtonDetails">
|
<template v-if="showButtonDetails && isAddress(address) ">
|
||||||
<address-details-button
|
<address-details-button
|
||||||
:address_id="address.address_id"
|
:address_id="address.address_id"
|
||||||
:address_ref_status="address.refStatus"
|
:address_ref_status="address.refStatus"
|
||||||
@@ -63,68 +63,49 @@
|
|||||||
</div>
|
</div>
|
||||||
</component>
|
</component>
|
||||||
|
|
||||||
<div v-if="useDatePane === true" class="address-more">
|
<div v-if="useDatePane" class="address-more">
|
||||||
<div v-if="address.validFrom">
|
<div v-if="address.validFrom">
|
||||||
<span class="validFrom">
|
<span class="validFrom">
|
||||||
<b>{{ trans(ADDRESS_VALID_FROM) }}</b
|
<b>{{ trans(ADDRESS_VALID_FROM) }}</b
|
||||||
>: {{ $d(address.validFrom.date) }}
|
>: {{ address.validFrom?.datetime8601 }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="address.validTo">
|
<div v-if="isAddress(address) && address.validTo !== null">
|
||||||
<span class="validTo">
|
<span class="validTo">
|
||||||
<b>{{ trans(ADDRESS_VALID_TO) }}</b
|
<b>{{ trans(ADDRESS_VALID_TO) }}</b
|
||||||
>: {{ $d(address.validTo.date) }}
|
>: {{ address.validTo?.datetime8601 }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</component>
|
</component>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script setup lang="ts">
|
||||||
|
import { computed } from "vue";
|
||||||
import Confidential from "ChillMainAssets/vuejs/_components/Confidential.vue";
|
import Confidential from "ChillMainAssets/vuejs/_components/Confidential.vue";
|
||||||
import AddressDetailsButton from "ChillMainAssets/vuejs/_components/AddressDetails/AddressDetailsButton.vue";
|
import AddressDetailsButton from "ChillMainAssets/vuejs/_components/AddressDetails/AddressDetailsButton.vue";
|
||||||
import { trans, ADDRESS_VALID_FROM, ADDRESS_VALID_TO } from "translator";
|
import { trans, ADDRESS_VALID_FROM, ADDRESS_VALID_TO } from "translator";
|
||||||
import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
|
import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
|
||||||
|
import {Address, AddressCreation} from "ChillMainAssets/types";
|
||||||
|
import {isAddress, buildAddressLines, buildAddressText} from "ChillMainAssets/vuejs/_components/AddressDetails/helper";
|
||||||
|
|
||||||
export default {
|
const props = withDefaults(
|
||||||
name: "AddressRenderBox",
|
defineProps<{
|
||||||
methods: { localizeString },
|
address: Address|AddressCreation;
|
||||||
components: {
|
isMultiline?: boolean;
|
||||||
Confidential,
|
useDatePane?: boolean;
|
||||||
AddressDetailsButton,
|
showButtonDetails?: boolean;
|
||||||
},
|
}>(),
|
||||||
props: {
|
{
|
||||||
address: {
|
isMultiline: true,
|
||||||
type: Object,
|
useDatePane: false,
|
||||||
},
|
showButtonDetails: true,
|
||||||
isMultiline: {
|
}
|
||||||
default: true,
|
);
|
||||||
type: Boolean,
|
|
||||||
},
|
const component = computed(() => (props.isMultiline ? "div" : "span"));
|
||||||
useDatePane: {
|
const multiline = computed(() => (props.isMultiline ? "multiline" : ""));
|
||||||
default: false,
|
const isConfidential = computed(() => Boolean(props.address?.confidential));
|
||||||
type: Boolean,
|
|
||||||
},
|
|
||||||
showButtonDetails: {
|
|
||||||
default: true,
|
|
||||||
type: Boolean,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
setup() {
|
|
||||||
return { trans, ADDRESS_VALID_FROM, ADDRESS_VALID_TO };
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
component() {
|
|
||||||
return this.isMultiline === true ? "div" : "span";
|
|
||||||
},
|
|
||||||
multiline() {
|
|
||||||
return this.isMultiline === true ? "multiline" : "";
|
|
||||||
},
|
|
||||||
isConfidential() {
|
|
||||||
return this.address.confidential;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
@@ -0,0 +1,62 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { WaitingScreenState } from "ChillMainAssets/types";
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
state: WaitingScreenState;
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<Props>();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div id="waiting-screen">
|
||||||
|
<div
|
||||||
|
v-if="props.state === 'pending' && !!$slots.pending"
|
||||||
|
class="alert alert-danger text-center"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<slot name="pending"></slot>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
|
||||||
|
<span class="sr-only">Loading...</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="props.state === 'stopped' && !!$slots.stopped"
|
||||||
|
class="alert alert-info"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<slot name="stopped"></slot>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="props.state === 'failure' && !!$slots.failure"
|
||||||
|
class="alert alert-danger text-center"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<slot name="failure"></slot>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="props.state === 'ready' && !!$slots.ready"
|
||||||
|
class="alert alert-success text-center"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<slot name="ready"></slot>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss">
|
||||||
|
#waiting-screen {
|
||||||
|
> .alert {
|
||||||
|
min-height: 350px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
@@ -0,0 +1,15 @@
|
|||||||
|
{% extends '@ChillMain/layout.html.twig' %}
|
||||||
|
|
||||||
|
{% block css %}
|
||||||
|
{{ encore_entry_link_tags('address_picker') }}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block js %}
|
||||||
|
{{ encore_entry_script_tags('address_picker') }}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
<div data-address-picker="data-address-picker"></div>
|
||||||
|
|
||||||
|
{% endblock %}
|
@@ -58,12 +58,14 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
{% if signatures|length > 0 %}
|
||||||
|
<section class="step my-4">{% include '@ChillMain/Workflow/_signature.html.twig' %}</section>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<section class="step my-4">{% include '@ChillMain/Workflow/_attachment.html.twig' %}</section>
|
<section class="step my-4">{% include '@ChillMain/Workflow/_attachment.html.twig' %}</section>
|
||||||
|
|
||||||
<section class="step my-4">{% include '@ChillMain/Workflow/_follow.html.twig' %}</section>
|
<section class="step my-4">{% include '@ChillMain/Workflow/_follow.html.twig' %}</section>
|
||||||
{% if signatures|length > 0 %}
|
{% if entity_workflow.currentStep.sends|length > 0 %}
|
||||||
<section class="step my-4">{% include '@ChillMain/Workflow/_signature.html.twig' %}</section>
|
|
||||||
{% elseif entity_workflow.currentStep.sends|length > 0 %}
|
|
||||||
<section class="step my-4">
|
<section class="step my-4">
|
||||||
<h2>{{ 'workflow.external_views.title'|trans({'numberOfSends': entity_workflow.currentStep.sends|length }) }}</h2>
|
<h2>{{ 'workflow.external_views.title'|trans({'numberOfSends': entity_workflow.currentStep.sends|length }) }}</h2>
|
||||||
{% include '@ChillMain/Workflow/_send_views_list.html.twig' with {'sends': entity_workflow.currentStep.sends} %}
|
{% include '@ChillMain/Workflow/_send_views_list.html.twig' with {'sends': entity_workflow.currentStep.sends} %}
|
||||||
|
@@ -0,0 +1,18 @@
|
|||||||
|
{% extends '@ChillMain/layout.html.twig' %}
|
||||||
|
|
||||||
|
{% block title %}{{ 'workflow.signature.waiting_for'|trans }}{% endblock %}
|
||||||
|
|
||||||
|
{% block css %}
|
||||||
|
{{ encore_entry_link_tags('page_workflow_waiting_post_process') }}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block js %}
|
||||||
|
{{ encore_entry_script_tags('page_workflow_waiting_post_process') }}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<h1>{{ block('title') }}</h1>
|
||||||
|
|
||||||
|
<div class="screen-wait" data-workflow-id="{{ workflow.id|e('html_attr') }}" data-expected-step="{{ expectedStep|e('html_attr') }}"></div>
|
||||||
|
|
||||||
|
{% endblock %}
|
@@ -0,0 +1,53 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Security\Authorization;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
|
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
|
||||||
|
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
|
||||||
|
use Symfony\Component\Workflow\Registry;
|
||||||
|
|
||||||
|
final class EntityWorkflowAttachmentVoter extends Voter
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly Registry $registry,
|
||||||
|
) {}
|
||||||
|
public const EDIT = 'CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT';
|
||||||
|
|
||||||
|
protected function supports(string $attribute, $subject): bool
|
||||||
|
{
|
||||||
|
return $subject instanceof EntityWorkflow && self::EDIT === $attribute;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token): bool
|
||||||
|
{
|
||||||
|
if (!$subject instanceof EntityWorkflow) {
|
||||||
|
throw new \UnexpectedValueException('Subject must be an instance of EntityWorkflow');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($subject->isFinal()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$workflow = $this->registry->get($subject, $subject->getWorkflowName());
|
||||||
|
|
||||||
|
$marking = $workflow->getMarking($subject);
|
||||||
|
foreach ($marking->getPlaces() as $place => $int) {
|
||||||
|
$placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata($place);
|
||||||
|
if ($placeMetadata['isSentExternal'] ?? false) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
@@ -66,6 +66,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
|
|||||||
'name' => $address->getPostCode()->getName(),
|
'name' => $address->getPostCode()->getName(),
|
||||||
'code' => $address->getPostCode()->getCode(),
|
'code' => $address->getPostCode()->getCode(),
|
||||||
'center' => $address->getPostcode()->getCenter(),
|
'center' => $address->getPostcode()->getCenter(),
|
||||||
|
'country' => $this->normalizer->normalize($address->getPostCode()->getCountry(), $format, [AbstractNormalizer::GROUPS => ['read']]),
|
||||||
],
|
],
|
||||||
'country' => [
|
'country' => [
|
||||||
'id' => $address->getPostCode()->getCountry()->getId(),
|
'id' => $address->getPostCode()->getCountry()->getId(),
|
||||||
|
@@ -12,18 +12,25 @@ declare(strict_types=1);
|
|||||||
namespace Chill\MainBundle\Serializer\Normalizer;
|
namespace Chill\MainBundle\Serializer\Normalizer;
|
||||||
|
|
||||||
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
|
use Chill\MainBundle\Security\Authorization\EntityWorkflowAttachmentVoter;
|
||||||
use Chill\MainBundle\Workflow\EntityWorkflowManager;
|
use Chill\MainBundle\Workflow\EntityWorkflowManager;
|
||||||
use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
|
use Chill\MainBundle\Workflow\Helper\MetadataExtractor;
|
||||||
|
use Symfony\Component\Security\Core\Security;
|
||||||
use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
|
use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
|
||||||
use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
|
use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
|
||||||
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
|
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
|
||||||
use Symfony\Component\Workflow\Registry;
|
use Symfony\Component\Workflow\Registry;
|
||||||
|
|
||||||
class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareInterface
|
final class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareInterface
|
||||||
{
|
{
|
||||||
use NormalizerAwareTrait;
|
use NormalizerAwareTrait;
|
||||||
|
|
||||||
public function __construct(private readonly EntityWorkflowManager $entityWorkflowManager, private readonly MetadataExtractor $metadataExtractor, private readonly Registry $registry) {}
|
public function __construct(
|
||||||
|
private readonly EntityWorkflowManager $entityWorkflowManager,
|
||||||
|
private readonly MetadataExtractor $metadataExtractor,
|
||||||
|
private readonly Registry $registry,
|
||||||
|
private readonly Security $security,
|
||||||
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param EntityWorkflow $object
|
* @param EntityWorkflow $object
|
||||||
@@ -46,6 +53,9 @@ class EntityWorkflowNormalizer implements NormalizerInterface, NormalizerAwareIn
|
|||||||
'datas' => $this->normalizer->normalize($handler->getEntityData($object), $format, $context),
|
'datas' => $this->normalizer->normalize($handler->getEntityData($object), $format, $context),
|
||||||
'title' => $handler->getEntityTitle($object),
|
'title' => $handler->getEntityTitle($object),
|
||||||
'isOnHoldAtCurrentStep' => $object->isOnHoldAtCurrentStep(),
|
'isOnHoldAtCurrentStep' => $object->isOnHoldAtCurrentStep(),
|
||||||
|
'_permissions' => [
|
||||||
|
EntityWorkflowAttachmentVoter::EDIT => $this->security->isGranted(EntityWorkflowAttachmentVoter::EDIT, $object),
|
||||||
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -0,0 +1,118 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Tests\Controller;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Controller\AddressReferenceAggregatedApiController;
|
||||||
|
use Chill\MainBundle\Repository\AddressReferenceRepositoryInterface;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Prophecy\PhpUnit\ProphecyTrait;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
||||||
|
use Symfony\Component\Security\Core\Security;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*
|
||||||
|
* @covers \Chill\MainBundle\Controller\AddressReferenceAggregatedApiController
|
||||||
|
*/
|
||||||
|
final class AddressReferenceAggregatedApiControllerTest extends TestCase
|
||||||
|
{
|
||||||
|
use ProphecyTrait;
|
||||||
|
|
||||||
|
public function testAccessDeniedWhenNotAuthenticated(): void
|
||||||
|
{
|
||||||
|
$security = $this->prophesize(Security::class);
|
||||||
|
$security->isGranted('IS_AUTHENTICATED')->willReturn(false);
|
||||||
|
|
||||||
|
$repo = $this->prophesize(AddressReferenceRepositoryInterface::class);
|
||||||
|
|
||||||
|
$controller = new AddressReferenceAggregatedApiController($security->reveal(), $repo->reveal());
|
||||||
|
|
||||||
|
$request = new Request(query: ['q' => 'anything']);
|
||||||
|
|
||||||
|
$this->expectException(AccessDeniedHttpException::class);
|
||||||
|
|
||||||
|
$controller->search($request);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testBadRequestWhenQueryIsMissing(): void
|
||||||
|
{
|
||||||
|
$security = $this->prophesize(Security::class);
|
||||||
|
$security->isGranted('IS_AUTHENTICATED')->willReturn(true);
|
||||||
|
|
||||||
|
$repo = $this->prophesize(AddressReferenceRepositoryInterface::class);
|
||||||
|
|
||||||
|
$controller = new AddressReferenceAggregatedApiController($security->reveal(), $repo->reveal());
|
||||||
|
|
||||||
|
$request = new Request();
|
||||||
|
|
||||||
|
$this->expectException(BadRequestHttpException::class);
|
||||||
|
$this->expectExceptionMessage('Parameter "q" is required.');
|
||||||
|
|
||||||
|
$controller->search($request);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testBadRequestWhenQueryIsEmpty(): void
|
||||||
|
{
|
||||||
|
$security = $this->prophesize(Security::class);
|
||||||
|
$security->isGranted('IS_AUTHENTICATED')->willReturn(true);
|
||||||
|
|
||||||
|
$repo = $this->prophesize(AddressReferenceRepositoryInterface::class);
|
||||||
|
|
||||||
|
$controller = new AddressReferenceAggregatedApiController($security->reveal(), $repo->reveal());
|
||||||
|
|
||||||
|
$request = new Request(query: ['q' => ' ']);
|
||||||
|
|
||||||
|
$this->expectException(BadRequestHttpException::class);
|
||||||
|
$this->expectExceptionMessage('Parameter "q" is required and cannot be empty.');
|
||||||
|
|
||||||
|
$controller->search($request);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSuccessfulSearchReturnsJsonAndCallsRepositoryWithTrimmedQuery(): void
|
||||||
|
{
|
||||||
|
$security = $this->prophesize(Security::class);
|
||||||
|
$security->isGranted('IS_AUTHENTICATED')->willReturn(true);
|
||||||
|
|
||||||
|
$expectedQuery = 'foo';
|
||||||
|
$iterableResult = new \ArrayIterator([
|
||||||
|
[
|
||||||
|
'street' => 'Main Street',
|
||||||
|
'postcode_id' => 123,
|
||||||
|
'code' => '1000',
|
||||||
|
'label' => 'Brussels',
|
||||||
|
'positions' => ['1' => '12', '2' => '14'],
|
||||||
|
'row_number' => 1,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$repo = $this->prophesize(AddressReferenceRepositoryInterface::class);
|
||||||
|
$repo->findAggregatedBySearchString($expectedQuery)->willReturn($iterableResult)->shouldBeCalledOnce();
|
||||||
|
|
||||||
|
$controller = new AddressReferenceAggregatedApiController($security->reveal(), $repo->reveal());
|
||||||
|
|
||||||
|
// Provide spaces around to ensure trimming is applied
|
||||||
|
$request = new Request(query: ['q' => " {$expectedQuery} "]);
|
||||||
|
|
||||||
|
$response = $controller->search($request);
|
||||||
|
|
||||||
|
self::assertSame(200, $response->getStatusCode());
|
||||||
|
$data = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
|
||||||
|
self::assertIsArray($data);
|
||||||
|
self::assertCount(1, $data);
|
||||||
|
self::assertSame('Main Street', $data[0]['street']);
|
||||||
|
self::assertSame(123, $data[0]['postcode_id']);
|
||||||
|
self::assertSame('1000', $data[0]['code']);
|
||||||
|
self::assertSame('Brussels', $data[0]['label']);
|
||||||
|
}
|
||||||
|
}
|
@@ -45,7 +45,7 @@ final class UserControllerTest extends WebTestCase
|
|||||||
self::assertResponseIsSuccessful();
|
self::assertResponseIsSuccessful();
|
||||||
|
|
||||||
$username = 'Test_user'.uniqid();
|
$username = 'Test_user'.uniqid();
|
||||||
$password = 'Password1234!';
|
$password = 'Password_1234!';
|
||||||
|
|
||||||
// Fill in the form and submit it
|
// Fill in the form and submit it
|
||||||
|
|
||||||
@@ -99,7 +99,7 @@ final class UserControllerTest extends WebTestCase
|
|||||||
{
|
{
|
||||||
$client = $this->getClientAuthenticatedAsAdmin();
|
$client = $this->getClientAuthenticatedAsAdmin();
|
||||||
$crawler = $client->request('GET', "/fr/admin/user/{$userId}/edit_password");
|
$crawler = $client->request('GET', "/fr/admin/user/{$userId}/edit_password");
|
||||||
$newPassword = '1234Password!';
|
$newPassword = '1234_Password!';
|
||||||
|
|
||||||
$form = $crawler->selectButton('Changer le mot de passe')->form([
|
$form = $crawler->selectButton('Changer le mot de passe')->form([
|
||||||
'chill_mainbundle_user_password[new_password][first]' => $newPassword,
|
'chill_mainbundle_user_password[new_password][first]' => $newPassword,
|
||||||
|
@@ -0,0 +1,88 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Tests\Repository;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Entity\AddressReference;
|
||||||
|
use Chill\MainBundle\Entity\PostalCode;
|
||||||
|
use Chill\MainBundle\Repository\AddressReferenceRepository;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*
|
||||||
|
* @coversNothing
|
||||||
|
*/
|
||||||
|
class AddressReferenceRepositoryTest extends KernelTestCase
|
||||||
|
{
|
||||||
|
private static AddressReferenceRepository $repository;
|
||||||
|
|
||||||
|
public static function setUpBeforeClass(): void
|
||||||
|
{
|
||||||
|
static::bootKernel();
|
||||||
|
static::$repository = static::getContainer()->get(AddressReferenceRepository::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider generateSearchString
|
||||||
|
*/
|
||||||
|
public function testFindBySearchString(string $search, int|PostalCode|null $postalCode, string $text, ?array $expected = null): void
|
||||||
|
{
|
||||||
|
$actual = static::$repository->findBySearchString($search, $postalCode);
|
||||||
|
|
||||||
|
self::assertIsIterable($actual, $text);
|
||||||
|
|
||||||
|
if (null !== $expected) {
|
||||||
|
self::assertEquals($expected, iterator_to_array($actual));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider generateSearchString
|
||||||
|
*/
|
||||||
|
public function testCountBySearchString(string $search, int|PostalCode|null $postalCode, string $text, ?array $expected = null): void
|
||||||
|
{
|
||||||
|
$actual = static::$repository->countBySearchString($search, $postalCode);
|
||||||
|
|
||||||
|
self::assertIsInt($actual, $text);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider generateSearchString
|
||||||
|
*/
|
||||||
|
public function testFindAggreggateBySearchString(string $search, int|PostalCode|null $postalCode, string $text, ?array $expected = null): void
|
||||||
|
{
|
||||||
|
$actual = static::$repository->findAggregatedBySearchString($search, $postalCode);
|
||||||
|
|
||||||
|
self::assertIsIterable($actual, $text);
|
||||||
|
|
||||||
|
if (null !== $expected) {
|
||||||
|
self::assertEquals($expected, iterator_to_array($actual));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function generateSearchString(): iterable
|
||||||
|
{
|
||||||
|
self::bootKernel();
|
||||||
|
$em = static::getContainer()->get(EntityManagerInterface::class);
|
||||||
|
/** @var AddressReference $ar */
|
||||||
|
$ar = $em->createQuery('SELECT ar FROM '.AddressReference::class.' ar')
|
||||||
|
->setMaxResults(1)
|
||||||
|
->getSingleResult();
|
||||||
|
|
||||||
|
yield ['', null, 'search with empty string', []];
|
||||||
|
yield [' ', null, 'search with spaces only', []];
|
||||||
|
yield ['rue des moulins', null, 'search contains an empty string'];
|
||||||
|
yield ['rue des moulins', $ar->getPostcode()->getId(), 'search with postal code as an id'];
|
||||||
|
yield ['rue des moulins', $ar->getPostcode(), 'search with postal code instance'];
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,61 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Tests\Repository;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Repository\PostalCodeForAddressReferenceRepository;
|
||||||
|
use Doctrine\DBAL\Connection;
|
||||||
|
use PHPUnit\Framework\Attributes\DataProvider;
|
||||||
|
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*
|
||||||
|
* @coversNothing
|
||||||
|
*/
|
||||||
|
final class PostalCodeForAddressReferenceRepositoryTest extends KernelTestCase
|
||||||
|
{
|
||||||
|
private Connection $connection;
|
||||||
|
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
self::bootKernel();
|
||||||
|
$this->connection = self::getContainer()->get(Connection::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return iterable<string[]>
|
||||||
|
*/
|
||||||
|
public static function provideSearches(): iterable
|
||||||
|
{
|
||||||
|
yield [''];
|
||||||
|
yield [' '];
|
||||||
|
yield ['hugo'];
|
||||||
|
yield [' hugo'];
|
||||||
|
yield ['hugo '];
|
||||||
|
yield ['rue victor hugo'];
|
||||||
|
yield ['rue victor hugo'];
|
||||||
|
}
|
||||||
|
|
||||||
|
#[DataProvider('provideSearches')]
|
||||||
|
public function testFindPostalCodeDoesNotErrorAndIsIterable(string $search): void
|
||||||
|
{
|
||||||
|
$repository = new PostalCodeForAddressReferenceRepository($this->connection);
|
||||||
|
|
||||||
|
$result = $repository->findPostalCode($search);
|
||||||
|
|
||||||
|
self::assertIsIterable($result);
|
||||||
|
|
||||||
|
// Ensure it can be converted to an array (and iterate without error)
|
||||||
|
$rows = \is_array($result) ? $result : iterator_to_array($result, false);
|
||||||
|
self::assertIsArray($rows);
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,173 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\MainBundle\Tests\Security\Authorization;
|
||||||
|
|
||||||
|
use Chill\MainBundle\Entity\User;
|
||||||
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
|
use Chill\MainBundle\Security\Authorization\EntityWorkflowAttachmentVoter;
|
||||||
|
use Chill\MainBundle\Workflow\EntityWorkflowMarkingStore;
|
||||||
|
use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Prophecy\PhpUnit\ProphecyTrait;
|
||||||
|
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
|
||||||
|
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
|
||||||
|
use Symfony\Component\Workflow\DefinitionBuilder;
|
||||||
|
use Symfony\Component\Workflow\Metadata\InMemoryMetadataStore;
|
||||||
|
use Symfony\Component\Workflow\Registry;
|
||||||
|
use Symfony\Component\Workflow\SupportStrategy\WorkflowSupportStrategyInterface;
|
||||||
|
use Symfony\Component\Workflow\Transition;
|
||||||
|
use Symfony\Component\Workflow\Workflow;
|
||||||
|
use Symfony\Component\Workflow\WorkflowInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*
|
||||||
|
* @coversNothing
|
||||||
|
*/
|
||||||
|
class EntityWorkflowAttachmentVoterTest extends TestCase
|
||||||
|
{
|
||||||
|
use ProphecyTrait;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider dataVoteOnAttribute
|
||||||
|
*/
|
||||||
|
public function testVoteOnAttribute(EntityWorkflow $entityWorkflow, int $expected): void
|
||||||
|
{
|
||||||
|
$voter = new EntityWorkflowAttachmentVoter($this->buildRegistry());
|
||||||
|
$actual = $voter->vote(
|
||||||
|
new UsernamePasswordToken(new User(), 'default'),
|
||||||
|
$entityWorkflow,
|
||||||
|
['CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT'],
|
||||||
|
);
|
||||||
|
$this->assertEquals($expected, $actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function dataVoteOnAttribute(): iterable
|
||||||
|
{
|
||||||
|
$entity = new EntityWorkflow();
|
||||||
|
$entity->setWorkflowName('dummy');
|
||||||
|
|
||||||
|
$workflow = static::buildRegistry()->get($entity, 'dummy');
|
||||||
|
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entity);
|
||||||
|
$dto->futureDestUsers[] = new User();
|
||||||
|
$workflow->apply(
|
||||||
|
$entity,
|
||||||
|
'to_final_positive',
|
||||||
|
['context' => $dto,
|
||||||
|
'byUser' => new User(),
|
||||||
|
'transition' => 'to_final_positive',
|
||||||
|
'transitionAt' => new \DateTimeImmutable()],
|
||||||
|
);
|
||||||
|
// we need to mark manually as final, as the listener is not registered
|
||||||
|
$entity->getCurrentStep()->setIsFinal(true);
|
||||||
|
|
||||||
|
yield 'on final positive' => [
|
||||||
|
$entity,
|
||||||
|
VoterInterface::ACCESS_DENIED,
|
||||||
|
];
|
||||||
|
|
||||||
|
$entity = new EntityWorkflow();
|
||||||
|
$entity->setWorkflowName('dummy');
|
||||||
|
|
||||||
|
$workflow = static::buildRegistry()->get($entity, 'dummy');
|
||||||
|
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entity);
|
||||||
|
$dto->futureDestUsers[] = new User();
|
||||||
|
$workflow->apply(
|
||||||
|
$entity,
|
||||||
|
'to_final_negative',
|
||||||
|
['context' => $dto,
|
||||||
|
'byUser' => new User(),
|
||||||
|
'transition' => 'to_final_negative',
|
||||||
|
'transitionAt' => new \DateTimeImmutable()],
|
||||||
|
);
|
||||||
|
// we need to mark manually as final, as the listener is not registered
|
||||||
|
$entity->getCurrentStep()->setIsFinal(true);
|
||||||
|
|
||||||
|
yield 'on final negative' => [
|
||||||
|
$entity,
|
||||||
|
VoterInterface::ACCESS_DENIED,
|
||||||
|
];
|
||||||
|
|
||||||
|
$entity = new EntityWorkflow();
|
||||||
|
$entity->setWorkflowName('dummy');
|
||||||
|
|
||||||
|
$workflow = static::buildRegistry()->get($entity, 'dummy');
|
||||||
|
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entity);
|
||||||
|
$dto->futureDestUsers[] = new User();
|
||||||
|
$workflow->apply(
|
||||||
|
$entity,
|
||||||
|
'to_sent_external',
|
||||||
|
['context' => $dto,
|
||||||
|
'byUser' => new User(),
|
||||||
|
'transition' => 'to_sent_external',
|
||||||
|
'transitionAt' => new \DateTimeImmutable()],
|
||||||
|
);
|
||||||
|
|
||||||
|
yield 'on sent_external' => [
|
||||||
|
$entity,
|
||||||
|
VoterInterface::ACCESS_DENIED,
|
||||||
|
];
|
||||||
|
|
||||||
|
$entity = new EntityWorkflow();
|
||||||
|
$entity->setWorkflowName('dummy');
|
||||||
|
|
||||||
|
yield 'on initial' => [
|
||||||
|
$entity,
|
||||||
|
VoterInterface::ACCESS_GRANTED,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function buildRegistry(): Registry
|
||||||
|
{
|
||||||
|
$builder = new DefinitionBuilder();
|
||||||
|
$builder
|
||||||
|
->setInitialPlaces(['initial'])
|
||||||
|
->addPlaces(['initial', 'sent_external', 'final_positive', 'final_negative'])
|
||||||
|
->addTransitions([
|
||||||
|
new Transition('to_final_positive', ['initial'], 'final_positive'),
|
||||||
|
new Transition('to_sent_external', ['initial'], 'sent_external'),
|
||||||
|
new Transition('to_final_negative', ['initial'], 'final_negative'),
|
||||||
|
|
||||||
|
])
|
||||||
|
->setMetadataStore(
|
||||||
|
new InMemoryMetadataStore(
|
||||||
|
placesMetadata: [
|
||||||
|
'sent_external' => [
|
||||||
|
'isSentExternal' => true,
|
||||||
|
],
|
||||||
|
'final_positive' => [
|
||||||
|
'isFinal' => true,
|
||||||
|
'isFinalPositive' => true,
|
||||||
|
],
|
||||||
|
'final_negative' => [
|
||||||
|
'isFinal' => true,
|
||||||
|
'isFinalPositive' => false,
|
||||||
|
],
|
||||||
|
]
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
$workflow = new Workflow($builder->build(), new EntityWorkflowMarkingStore(), name: 'dummy');
|
||||||
|
$registry = new Registry();
|
||||||
|
$registry->addWorkflow($workflow, new class () implements WorkflowSupportStrategyInterface {
|
||||||
|
public function supports(WorkflowInterface $workflow, object $subject): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return $registry;
|
||||||
|
}
|
||||||
|
}
|
@@ -11,6 +11,9 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\MainBundle\Tests\Workflow\Helper;
|
namespace Chill\MainBundle\Tests\Workflow\Helper;
|
||||||
|
|
||||||
|
use Chill\DocStoreBundle\Entity\StoredObject;
|
||||||
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
|
||||||
|
use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
|
||||||
use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
|
use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
|
||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
@@ -148,8 +151,11 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
|
|||||||
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
yield [[], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
'abstain because the user is not present as a dest user'];
|
'abstain because there is no workflow'];
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
|
||||||
|
'force deny because the user is not present as a dest user'];
|
||||||
|
|
||||||
$entityWorkflow = new EntityWorkflow();
|
$entityWorkflow = new EntityWorkflow();
|
||||||
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
@@ -171,6 +177,9 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
|
|||||||
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
|
||||||
'force grant because the user was a previous user'];
|
'force grant because the user was a previous user'];
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
|
||||||
|
'force denied because the user was not a previous user'];
|
||||||
|
|
||||||
$entityWorkflow = new EntityWorkflow();
|
$entityWorkflow = new EntityWorkflow();
|
||||||
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
$dto->futureDestUsers[] = $user = new User();
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
@@ -232,6 +241,13 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
|
|||||||
|
|
||||||
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
'abstain: there is a signature on a canceled workflow'];
|
'abstain: there is a signature on a canceled workflow'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('sent_external', $dto, 'to_sent_external', new \DateTimeImmutable(), $user);
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(), 'force denied: the workflow is sent to an external user'];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testNoWorkflow(): void
|
public function testNoWorkflow(): void
|
||||||
@@ -253,7 +269,217 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
|
|||||||
$entityWorkflowManager = $this->prophesize(EntityWorkflowManager::class);
|
$entityWorkflowManager = $this->prophesize(EntityWorkflowManager::class);
|
||||||
$entityWorkflowManager->findByRelatedEntity(Argument::type('object'))->willReturn($entityWorkflows);
|
$entityWorkflowManager->findByRelatedEntity(Argument::type('object'))->willReturn($entityWorkflows);
|
||||||
|
|
||||||
return new WorkflowRelatedEntityPermissionHelper($security->reveal(), $entityWorkflowManager->reveal(), $this->buildRegistry(), new MockClock($atDateTime ?? new \DateTimeImmutable()));
|
$repository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
|
||||||
|
$repository->findByStoredObject(Argument::type(StoredObject::class))->willReturn([]);
|
||||||
|
|
||||||
|
return new WorkflowRelatedEntityPermissionHelper($security->reveal(), $entityWorkflowManager->reveal(), $repository->reveal(), $this->buildRegistry(), new MockClock($atDateTime ?? new \DateTimeImmutable()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provideDataAllowedByWorkflowReadOperationByAttachment
|
||||||
|
*
|
||||||
|
* @param list<EntityWorkflow> $entityWorkflows
|
||||||
|
*/
|
||||||
|
public function testAllowedByWorkflowReadByAttachment(
|
||||||
|
array $entityWorkflows,
|
||||||
|
User $user,
|
||||||
|
string $expected,
|
||||||
|
?\DateTimeImmutable $atDate,
|
||||||
|
string $message,
|
||||||
|
): void {
|
||||||
|
// all entities must have this workflow name, so we are ok to set it here
|
||||||
|
foreach ($entityWorkflows as $entityWorkflow) {
|
||||||
|
$entityWorkflow->setWorkflowName('dummy');
|
||||||
|
}
|
||||||
|
$helper = $this->buildHelperForAttachment($entityWorkflows, $user, $atDate);
|
||||||
|
|
||||||
|
self::assertEquals($expected, $helper->isAllowedByWorkflowForReadOperation(new StoredObject()), $message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function provideDataAllowedByWorkflowReadOperationByAttachment(): iterable
|
||||||
|
{
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
|
'abstain because the user is not present as a dest user'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
|
||||||
|
'force grant because the user is a current user'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
|
||||||
|
'force grant because the user was a previous user'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futurePersonSignatures[] = new Person();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
|
'Abstain: there is a signature for person, but the attachment is not concerned'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provideDataAllowedByWorkflowWriteOperationByAttachment
|
||||||
|
*
|
||||||
|
* @param list<EntityWorkflow> $entityWorkflows
|
||||||
|
*/
|
||||||
|
public function testAllowedByWorkflowWriteByAttachment(
|
||||||
|
array $entityWorkflows,
|
||||||
|
User $user,
|
||||||
|
string $expected,
|
||||||
|
?\DateTimeImmutable $atDate,
|
||||||
|
string $message,
|
||||||
|
): void {
|
||||||
|
// all entities must have this workflow name, so we are ok to set it here
|
||||||
|
foreach ($entityWorkflows as $entityWorkflow) {
|
||||||
|
$entityWorkflow->setWorkflowName('dummy');
|
||||||
|
}
|
||||||
|
$helper = $this->buildHelperForAttachment($entityWorkflows, $user, $atDate);
|
||||||
|
|
||||||
|
self::assertEquals($expected, $helper->isAllowedByWorkflowForWriteOperation(new StoredObject()), $message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function provideDataAllowedByWorkflowWriteOperationByAttachment(): iterable
|
||||||
|
{
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
yield [[], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
|
'abstain because there is no workflow'];
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
|
'abstain because the user is not present as a dest user (and attachment)'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
|
||||||
|
'force grant because the user is a current user'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, new \DateTimeImmutable(),
|
||||||
|
'force grant because the user was a previous user'];
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
|
'abstain because the user was not a previous user'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$entityWorkflow->setStep('final_positive', $dto, 'to_final_positive', new \DateTimeImmutable(), new User());
|
||||||
|
$entityWorkflow->getCurrentStep()->setIsFinal(true);
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
|
||||||
|
'force denied: user was a previous user, but it is finalized positive'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable());
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$entityWorkflow->setStep('final_negative', $dto, 'to_final_negative', new \DateTimeImmutable());
|
||||||
|
$entityWorkflow->getCurrentStep()->setIsFinal(true);
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
|
'abstain: user was a previous user, it is finalized, but finalized negative'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futurePersonSignatures[] = new Person();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
$signature = $entityWorkflow->getCurrentStep()->getSignatures()->first();
|
||||||
|
$signature->setState(EntityWorkflowSignatureStateEnum::SIGNED)->setStateDate(new \DateTimeImmutable());
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
|
'abstain: there is a signature, but not on the attachment'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futurePersonSignatures[] = new Person();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], new User(), WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
|
'abstain: there is a signature, but the signature is not on the attachment'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futurePersonSignatures[] = new Person();
|
||||||
|
$entityWorkflow->setStep('test', $dto, 'to_test', new \DateTimeImmutable(), new User());
|
||||||
|
$signature = $entityWorkflow->getCurrentStep()->getSignatures()->first();
|
||||||
|
$signature->setState(EntityWorkflowSignatureStateEnum::SIGNED)->setStateDate(new \DateTimeImmutable());
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$entityWorkflow->setStep('final_negative', $dto, 'to_final_negative', new \DateTimeImmutable(), new User());
|
||||||
|
$entityWorkflow->getCurrentStep()->setIsFinal(true);
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::ABSTAIN, new \DateTimeImmutable(),
|
||||||
|
'abstain: there is a signature on a canceled workflow'];
|
||||||
|
|
||||||
|
$entityWorkflow = new EntityWorkflow();
|
||||||
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$dto->futureDestUsers[] = $user = new User();
|
||||||
|
$entityWorkflow->setStep('sent_external', $dto, 'to_sent_external', new \DateTimeImmutable(), $user);
|
||||||
|
|
||||||
|
yield [[$entityWorkflow], $user, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, new \DateTimeImmutable(),
|
||||||
|
'force denied: the workflow is sent to an external user'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param list<EntityWorkflow> $entityWorkflows
|
||||||
|
*/
|
||||||
|
private function buildHelperForAttachment(array $entityWorkflows, User $user, ?\DateTimeImmutable $atDateTime): WorkflowRelatedEntityPermissionHelper
|
||||||
|
{
|
||||||
|
$security = $this->prophesize(Security::class);
|
||||||
|
$security->getUser()->willReturn($user);
|
||||||
|
|
||||||
|
$entityWorkflowManager = $this->prophesize(EntityWorkflowManager::class);
|
||||||
|
$entityWorkflowManager->findByRelatedEntity(Argument::type('object'))->shouldNotBeCalled();
|
||||||
|
|
||||||
|
$repository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
|
||||||
|
$attachments = [];
|
||||||
|
foreach ($entityWorkflows as $entityWorkflow) {
|
||||||
|
$attachments[] = new EntityWorkflowAttachment('dummy', ['id' => 1], $entityWorkflow, new StoredObject());
|
||||||
|
}
|
||||||
|
$repository->findByStoredObject(Argument::type(StoredObject::class))->willReturn($attachments);
|
||||||
|
|
||||||
|
return new WorkflowRelatedEntityPermissionHelper($security->reveal(), $entityWorkflowManager->reveal(), $repository->reveal(), $this->buildRegistry(), new MockClock($atDateTime ?? new \DateTimeImmutable()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static function buildRegistry(): Registry
|
private static function buildRegistry(): Registry
|
||||||
@@ -261,10 +487,13 @@ class WorkflowRelatedEntityPermissionHelperTest extends TestCase
|
|||||||
$builder = new DefinitionBuilder();
|
$builder = new DefinitionBuilder();
|
||||||
$builder
|
$builder
|
||||||
->setInitialPlaces(['initial'])
|
->setInitialPlaces(['initial'])
|
||||||
->addPlaces(['initial', 'test', 'final_positive', 'final_negative'])
|
->addPlaces(['initial', 'test', 'sent_external', 'final_positive', 'final_negative'])
|
||||||
->setMetadataStore(
|
->setMetadataStore(
|
||||||
new InMemoryMetadataStore(
|
new InMemoryMetadataStore(
|
||||||
placesMetadata: [
|
placesMetadata: [
|
||||||
|
'sent_external' => [
|
||||||
|
'isSentExternal' => true,
|
||||||
|
],
|
||||||
'final_positive' => [
|
'final_positive' => [
|
||||||
'isFinal' => true,
|
'isFinal' => true,
|
||||||
'isFinalPositive' => true,
|
'isFinalPositive' => true,
|
||||||
|
@@ -11,8 +11,11 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\MainBundle\Tests\Workflow\Messenger;
|
namespace Chill\MainBundle\Tests\Workflow\Messenger;
|
||||||
|
|
||||||
|
use Chill\DocStoreBundle\Entity\StoredObject;
|
||||||
|
use Chill\DocStoreBundle\Service\StoredObjectToPdfConverter;
|
||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
|
||||||
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
|
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
|
||||||
use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
|
use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
|
||||||
use Chill\MainBundle\Workflow\EntityWorkflowManager;
|
use Chill\MainBundle\Workflow\EntityWorkflowManager;
|
||||||
@@ -23,6 +26,7 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty;
|
|||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Prophecy\Argument;
|
use Prophecy\Argument;
|
||||||
use Prophecy\PhpUnit\ProphecyTrait;
|
use Prophecy\PhpUnit\ProphecyTrait;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
|
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
|
||||||
use Symfony\Component\Mailer\MailerInterface;
|
use Symfony\Component\Mailer\MailerInterface;
|
||||||
use Symfony\Component\Mime\Address;
|
use Symfony\Component\Mime\Address;
|
||||||
@@ -39,24 +43,54 @@ class PostSendExternalMessageHandlerTest extends TestCase
|
|||||||
public function testSendMessageHappyScenario(): void
|
public function testSendMessageHappyScenario(): void
|
||||||
{
|
{
|
||||||
$entityWorkflow = $this->buildEntityWorkflow();
|
$entityWorkflow = $this->buildEntityWorkflow();
|
||||||
|
|
||||||
|
// Prepare attachments (2 attachments)
|
||||||
|
$attachmentStoredObject1 = new StoredObject();
|
||||||
|
$attachmentStoredObject2 = new StoredObject();
|
||||||
|
new EntityWorkflowAttachment('generic_doc', ['id' => 1], $entityWorkflow, $attachmentStoredObject1);
|
||||||
|
new EntityWorkflowAttachment('generic_doc', ['id' => 2], $entityWorkflow, $attachmentStoredObject2);
|
||||||
|
|
||||||
|
// Prepare transition DTO and sends
|
||||||
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
$dto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
$dto->futureDestineeEmails = ['external@example.com'];
|
$dto->futureDestineeEmails = ['external@example.com'];
|
||||||
$dto->futureDestineeThirdParties = [(new ThirdParty())->setEmail('3party@example.com')];
|
$dto->futureDestineeThirdParties = [(new ThirdParty())->setEmail('3party@example.com')];
|
||||||
$entityWorkflow->setStep('send_external', $dto, 'to_send_external', new \DateTimeImmutable(), new User());
|
$entityWorkflow->setStep('send_external', $dto, 'to_send_external', new \DateTimeImmutable(), new User());
|
||||||
|
|
||||||
|
// Repository returns our workflow
|
||||||
$repository = $this->prophesize(EntityWorkflowRepository::class);
|
$repository = $this->prophesize(EntityWorkflowRepository::class);
|
||||||
$repository->find(1)->willReturn($entityWorkflow);
|
$repository->find(1)->willReturn($entityWorkflow);
|
||||||
|
|
||||||
|
// Mailer must send to both recipients
|
||||||
$mailer = $this->prophesize(MailerInterface::class);
|
$mailer = $this->prophesize(MailerInterface::class);
|
||||||
$mailer->send(Argument::that($this->buildCheckAddressCallback('3party@example.com')))->shouldBeCalledOnce();
|
$mailer->send(Argument::that($this->buildCheckAddressCallback('3party@example.com')))->shouldBeCalledOnce();
|
||||||
$mailer->send(Argument::that($this->buildCheckAddressCallback('external@example.com')))->shouldBeCalledOnce();
|
$mailer->send(Argument::that($this->buildCheckAddressCallback('external@example.com')))->shouldBeCalledOnce();
|
||||||
|
|
||||||
|
// Workflow manager and handler
|
||||||
$workflowHandler = $this->prophesize(EntityWorkflowHandlerInterface::class);
|
$workflowHandler = $this->prophesize(EntityWorkflowHandlerInterface::class);
|
||||||
$workflowHandler->getEntityTitle($entityWorkflow, Argument::any())->willReturn('title');
|
$workflowHandler->getEntityTitle($entityWorkflow, Argument::any())->willReturn('title');
|
||||||
$workflowManager = $this->prophesize(EntityWorkflowManager::class);
|
$workflowManager = $this->prophesize(EntityWorkflowManager::class);
|
||||||
$workflowManager->getHandler($entityWorkflow)->willReturn($workflowHandler->reveal());
|
$workflowManager->getHandler($entityWorkflow)->willReturn($workflowHandler->reveal());
|
||||||
|
|
||||||
$handler = new PostSendExternalMessageHandler($repository->reveal(), $mailer->reveal(), $workflowManager->reveal());
|
// Associated stored object for the workflow
|
||||||
|
$associatedStoredObject = new StoredObject();
|
||||||
|
$workflowManager->getAssociatedStoredObject($entityWorkflow)->willReturn($associatedStoredObject);
|
||||||
|
|
||||||
|
// Converter should be called for each attachment and the associated stored object
|
||||||
|
$converter = $this->prophesize(StoredObjectToPdfConverter::class);
|
||||||
|
$converter->addConvertedVersion($attachmentStoredObject1, 'fr')->shouldBeCalledOnce();
|
||||||
|
$converter->addConvertedVersion($attachmentStoredObject2, 'fr')->shouldBeCalledOnce();
|
||||||
|
$converter->addConvertedVersion($associatedStoredObject, 'fr')->shouldBeCalledOnce();
|
||||||
|
|
||||||
|
// Logger (not used in happy path, but required by handler)
|
||||||
|
$logger = $this->prophesize(LoggerInterface::class);
|
||||||
|
|
||||||
|
$handler = new PostSendExternalMessageHandler(
|
||||||
|
$repository->reveal(),
|
||||||
|
$mailer->reveal(),
|
||||||
|
$workflowManager->reveal(),
|
||||||
|
$converter->reveal(),
|
||||||
|
$logger->reveal(),
|
||||||
|
);
|
||||||
|
|
||||||
$handler(new PostSendExternalMessage(1, 'fr'));
|
$handler(new PostSendExternalMessage(1, 'fr'));
|
||||||
|
|
||||||
|
@@ -11,9 +11,12 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\MainBundle\Workflow\Helper;
|
namespace Chill\MainBundle\Workflow\Helper;
|
||||||
|
|
||||||
|
use Chill\DocStoreBundle\Entity\StoredObject;
|
||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
|
||||||
use Chill\MainBundle\Entity\Workflow\EntityWorkflowSignatureStateEnum;
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflowSignatureStateEnum;
|
||||||
|
use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
|
||||||
use Chill\MainBundle\Workflow\EntityWorkflowManager;
|
use Chill\MainBundle\Workflow\EntityWorkflowManager;
|
||||||
use Symfony\Component\Clock\ClockInterface;
|
use Symfony\Component\Clock\ClockInterface;
|
||||||
use Symfony\Component\Security\Core\Security;
|
use Symfony\Component\Security\Core\Security;
|
||||||
@@ -58,21 +61,39 @@ class WorkflowRelatedEntityPermissionHelper
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly Security $security,
|
private readonly Security $security,
|
||||||
private readonly EntityWorkflowManager $entityWorkflowManager,
|
private readonly EntityWorkflowManager $entityWorkflowManager,
|
||||||
|
private readonly EntityWorkflowAttachmentRepository $entityWorkflowAttachmentRepository,
|
||||||
private readonly Registry $registry,
|
private readonly Registry $registry,
|
||||||
private readonly ClockInterface $clock,
|
private readonly ClockInterface $clock,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @param object $entity The entity may be an
|
||||||
|
*
|
||||||
* @return 'FORCE_GRANT'|'FORCE_DENIED'|'ABSTAIN'
|
* @return 'FORCE_GRANT'|'FORCE_DENIED'|'ABSTAIN'
|
||||||
*/
|
*/
|
||||||
public function isAllowedByWorkflowForReadOperation(object $entity): string
|
public function isAllowedByWorkflowForReadOperation(object $entity): string
|
||||||
{
|
{
|
||||||
$entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
|
if ($entity instanceof StoredObject) {
|
||||||
|
$attachments = $this->entityWorkflowAttachmentRepository->findByStoredObject($entity);
|
||||||
|
$entityWorkflows = array_map(static fn (EntityWorkflowAttachment $attachment) => $attachment->getEntityWorkflow(), $attachments);
|
||||||
|
$isAttached = true;
|
||||||
|
} else {
|
||||||
|
$entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
|
||||||
|
$isAttached = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] === $entityWorkflows) {
|
||||||
|
return self::ABSTAIN;
|
||||||
|
}
|
||||||
|
|
||||||
if ($this->isUserInvolvedInAWorkflow($entityWorkflows)) {
|
if ($this->isUserInvolvedInAWorkflow($entityWorkflows)) {
|
||||||
return self::FORCE_GRANT;
|
return self::FORCE_GRANT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($isAttached) {
|
||||||
|
return self::ABSTAIN;
|
||||||
|
}
|
||||||
|
|
||||||
// give a view permission if there is a Person signature pending, or in the 12 hours following
|
// give a view permission if there is a Person signature pending, or in the 12 hours following
|
||||||
// the signature last state
|
// the signature last state
|
||||||
foreach ($entityWorkflows as $workflow) {
|
foreach ($entityWorkflows as $workflow) {
|
||||||
@@ -100,33 +121,51 @@ class WorkflowRelatedEntityPermissionHelper
|
|||||||
*/
|
*/
|
||||||
public function isAllowedByWorkflowForWriteOperation(object $entity): string
|
public function isAllowedByWorkflowForWriteOperation(object $entity): string
|
||||||
{
|
{
|
||||||
$entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
|
if ($entity instanceof StoredObject) {
|
||||||
$runningWorkflows = [];
|
$attachments = $this->entityWorkflowAttachmentRepository->findByStoredObject($entity);
|
||||||
|
$entityWorkflows = array_map(static fn (EntityWorkflowAttachment $attachment) => $attachment->getEntityWorkflow(), $attachments);
|
||||||
|
$isAttached = true;
|
||||||
|
} else {
|
||||||
|
$entityWorkflows = $this->entityWorkflowManager->findByRelatedEntity($entity);
|
||||||
|
$isAttached = false;
|
||||||
|
}
|
||||||
|
|
||||||
// if a workflow is finalized positive, we are not allowed to edit to document any more
|
if ([] === $entityWorkflows) {
|
||||||
|
return self::ABSTAIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
// if a workflow is finalized positive, anyone is allowed to edit the document anymore
|
||||||
foreach ($entityWorkflows as $entityWorkflow) {
|
foreach ($entityWorkflows as $entityWorkflow) {
|
||||||
if ($entityWorkflow->isFinal()) {
|
$workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
|
||||||
$workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
|
$marking = $workflow->getMarkingStore()->getMarking($entityWorkflow);
|
||||||
$marking = $workflow->getMarkingStore()->getMarking($entityWorkflow);
|
foreach ($marking->getPlaces() as $place => $int) {
|
||||||
foreach ($marking->getPlaces() as $place => $int) {
|
$placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata($place);
|
||||||
$placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata($place);
|
if (
|
||||||
if (true === ($placeMetadata['isFinalPositive'] ?? false)) {
|
($entityWorkflow->isFinal() && ($placeMetadata['isFinalPositive'] ?? false))
|
||||||
// the workflow is final, and final positive, so we stop here.
|
|| ($placeMetadata['isSentExternal'] ?? false)
|
||||||
return self::FORCE_DENIED;
|
) {
|
||||||
}
|
// the workflow is final, and final positive, or is sentExternal, so we stop here.
|
||||||
|
return self::FORCE_DENIED;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
// if not finalized positive
|
||||||
|
$entityWorkflow->isFinal() && !($placeMetadata['isFinalPositive'] ?? false)
|
||||||
|
) {
|
||||||
|
return self::ABSTAIN;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
$runningWorkflows[] = $entityWorkflow;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if there is a signature on a **running workflow**, no one can edit the workflow any more
|
$runningWorkflows = array_filter($entityWorkflows, fn (EntityWorkflow $ew) => !$ew->isFinal());
|
||||||
foreach ($runningWorkflows as $entityWorkflow) {
|
|
||||||
foreach ($entityWorkflow->getSteps() as $step) {
|
// if there is a signature on a **running workflow**, no one is allowed edit the workflow anymore
|
||||||
foreach ($step->getSignatures() as $signature) {
|
if (!$isAttached) {
|
||||||
if (EntityWorkflowSignatureStateEnum::SIGNED === $signature->getState()) {
|
foreach ($runningWorkflows as $entityWorkflow) {
|
||||||
return self::FORCE_DENIED;
|
foreach ($entityWorkflow->getSteps() as $step) {
|
||||||
|
foreach ($step->getSignatures() as $signature) {
|
||||||
|
if (EntityWorkflowSignatureStateEnum::SIGNED === $signature->getState()) {
|
||||||
|
return self::FORCE_DENIED;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -137,7 +176,11 @@ class WorkflowRelatedEntityPermissionHelper
|
|||||||
return self::FORCE_GRANT;
|
return self::FORCE_GRANT;
|
||||||
}
|
}
|
||||||
|
|
||||||
return self::ABSTAIN;
|
if ($isAttached) {
|
||||||
|
return self::ABSTAIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
return self::FORCE_DENIED;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -11,9 +11,14 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Chill\MainBundle\Workflow\Messenger;
|
namespace Chill\MainBundle\Workflow\Messenger;
|
||||||
|
|
||||||
|
use Chill\DocStoreBundle\Exception\ConversionWithSameMimeTypeException;
|
||||||
|
use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
|
||||||
|
use Chill\DocStoreBundle\Service\StoredObjectToPdfConverter;
|
||||||
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
|
||||||
use Chill\MainBundle\Entity\Workflow\EntityWorkflowSend;
|
use Chill\MainBundle\Entity\Workflow\EntityWorkflowSend;
|
||||||
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
|
use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
|
||||||
use Chill\MainBundle\Workflow\EntityWorkflowManager;
|
use Chill\MainBundle\Workflow\EntityWorkflowManager;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
|
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
|
||||||
use Symfony\Component\Mailer\MailerInterface;
|
use Symfony\Component\Mailer\MailerInterface;
|
||||||
use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
|
use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
|
||||||
@@ -25,6 +30,8 @@ final readonly class PostSendExternalMessageHandler implements MessageHandlerInt
|
|||||||
private EntityWorkflowRepository $entityWorkflowRepository,
|
private EntityWorkflowRepository $entityWorkflowRepository,
|
||||||
private MailerInterface $mailer,
|
private MailerInterface $mailer,
|
||||||
private EntityWorkflowManager $workflowManager,
|
private EntityWorkflowManager $workflowManager,
|
||||||
|
private StoredObjectToPdfConverter $storedObjectToPdfConverter,
|
||||||
|
private LoggerInterface $logger,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function __invoke(PostSendExternalMessage $message): void
|
public function __invoke(PostSendExternalMessage $message): void
|
||||||
@@ -35,11 +42,38 @@ final readonly class PostSendExternalMessageHandler implements MessageHandlerInt
|
|||||||
throw new UnrecoverableMessageHandlingException(sprintf('Entity workflow with id %d not found', $message->entityWorkflowId));
|
throw new UnrecoverableMessageHandlingException(sprintf('Entity workflow with id %d not found', $message->entityWorkflowId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->convertToPdf($entityWorkflow, $message->lang);
|
||||||
|
|
||||||
foreach ($entityWorkflow->getCurrentStep()->getSends() as $send) {
|
foreach ($entityWorkflow->getCurrentStep()->getSends() as $send) {
|
||||||
$this->sendEmailToDestinee($send, $message);
|
$this->sendEmailToDestinee($send, $message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function convertToPdf(EntityWorkflow $entityWorkflow, string $locale): void
|
||||||
|
{
|
||||||
|
foreach ($entityWorkflow->getAttachments() as $attachment) {
|
||||||
|
try {
|
||||||
|
$this->storedObjectToPdfConverter->addConvertedVersion($attachment->getProxyStoredObject(), $locale);
|
||||||
|
} catch (StoredObjectManagerException $e) {
|
||||||
|
$this->logger->error('Error converting attachment to PDF', ['backtrace' => $e->getTraceAsString(), 'attachment_id' => $attachment->getId()]);
|
||||||
|
} catch (ConversionWithSameMimeTypeException $e) {
|
||||||
|
$this->logger->error('Error converting attachment to PDF: already at the same MIME type', ['backtrace' => $e->getTraceAsString(), 'attachment_id' => $attachment->getId()]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$storedObject = $this->workflowManager->getAssociatedStoredObject($entityWorkflow);
|
||||||
|
|
||||||
|
if (null !== $storedObject) {
|
||||||
|
try {
|
||||||
|
$this->storedObjectToPdfConverter->addConvertedVersion($storedObject, $locale);
|
||||||
|
} catch (StoredObjectManagerException $e) {
|
||||||
|
$this->logger->error('Error converting stored object to PDF', ['backtrace' => $e->getTraceAsString(), 'stored_object_id' => $storedObject->getId(), 'workflow_id' => $entityWorkflow->getId()]);
|
||||||
|
} catch (ConversionWithSameMimeTypeException $e) {
|
||||||
|
$this->logger->error('Error converting stored object to PDF: already at the same MIME type', ['backtrace' => $e->getTraceAsString(), 'stored_object_id' => $storedObject->getId(), 'workflow_id' => $entityWorkflow->getId()]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private function sendEmailToDestinee(EntityWorkflowSend $send, PostSendExternalMessage $message): void
|
private function sendEmailToDestinee(EntityWorkflowSend $send, PostSendExternalMessage $message): void
|
||||||
{
|
{
|
||||||
$entityWorkflow = $send->getEntityWorkflowStep()->getEntityWorkflow();
|
$entityWorkflow = $send->getEntityWorkflowStep()->getEntityWorkflow();
|
||||||
|
@@ -22,6 +22,7 @@ use Psr\Log\LoggerInterface;
|
|||||||
use Symfony\Component\Clock\ClockInterface;
|
use Symfony\Component\Clock\ClockInterface;
|
||||||
use Symfony\Component\Messenger\MessageBusInterface;
|
use Symfony\Component\Messenger\MessageBusInterface;
|
||||||
use Symfony\Component\Workflow\Registry;
|
use Symfony\Component\Workflow\Registry;
|
||||||
|
use Symfony\Component\Workflow\Transition;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handles state changes for signature steps within a workflow.
|
* Handles state changes for signature steps within a workflow.
|
||||||
@@ -50,8 +51,10 @@ class SignatureStepStateChanger
|
|||||||
*
|
*
|
||||||
* @param EntityWorkflowStepSignature $signature the signature entity to be marked as signed
|
* @param EntityWorkflowStepSignature $signature the signature entity to be marked as signed
|
||||||
* @param int|null $atIndex optional index position for the signature within the zone
|
* @param int|null $atIndex optional index position for the signature within the zone
|
||||||
|
*
|
||||||
|
* @return string The expected new workflow's step, after transition is applyied
|
||||||
*/
|
*/
|
||||||
public function markSignatureAsSigned(EntityWorkflowStepSignature $signature, ?int $atIndex): void
|
public function markSignatureAsSigned(EntityWorkflowStepSignature $signature, ?int $atIndex): string
|
||||||
{
|
{
|
||||||
$this->entityManager->refresh($signature, LockMode::PESSIMISTIC_WRITE);
|
$this->entityManager->refresh($signature, LockMode::PESSIMISTIC_WRITE);
|
||||||
|
|
||||||
@@ -60,7 +63,14 @@ class SignatureStepStateChanger
|
|||||||
->setZoneSignatureIndex($atIndex)
|
->setZoneSignatureIndex($atIndex)
|
||||||
->setStateDate($this->clock->now());
|
->setStateDate($this->clock->now());
|
||||||
$this->logger->info(self::LOG_PREFIX.'Mark signature entity as signed', ['signatureId' => $signature->getId(), 'index' => (string) $atIndex]);
|
$this->logger->info(self::LOG_PREFIX.'Mark signature entity as signed', ['signatureId' => $signature->getId(), 'index' => (string) $atIndex]);
|
||||||
|
['transition' => $transition, 'futureUser' => $futureUser] = $this->decideTransition($signature);
|
||||||
|
|
||||||
$this->messageBus->dispatch(new PostSignatureStateChangeMessage((int) $signature->getId()));
|
$this->messageBus->dispatch(new PostSignatureStateChangeMessage((int) $signature->getId()));
|
||||||
|
if (null === $transition) {
|
||||||
|
return $signature->getStep()->getEntityWorkflow()->getStep();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $transition->getTos()[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -71,8 +81,10 @@ class SignatureStepStateChanger
|
|||||||
*
|
*
|
||||||
* This method updates the signature state to 'canceled' and logs the action.
|
* This method updates the signature state to 'canceled' and logs the action.
|
||||||
* It also dispatches a message to notify about the state change.
|
* It also dispatches a message to notify about the state change.
|
||||||
|
*
|
||||||
|
* @return string The expected new workflow's step, after transition is applyied
|
||||||
*/
|
*/
|
||||||
public function markSignatureAsCanceled(EntityWorkflowStepSignature $signature): void
|
public function markSignatureAsCanceled(EntityWorkflowStepSignature $signature): string
|
||||||
{
|
{
|
||||||
$this->entityManager->refresh($signature, LockMode::PESSIMISTIC_WRITE);
|
$this->entityManager->refresh($signature, LockMode::PESSIMISTIC_WRITE);
|
||||||
|
|
||||||
@@ -80,7 +92,15 @@ class SignatureStepStateChanger
|
|||||||
->setState(EntityWorkflowSignatureStateEnum::CANCELED)
|
->setState(EntityWorkflowSignatureStateEnum::CANCELED)
|
||||||
->setStateDate($this->clock->now());
|
->setStateDate($this->clock->now());
|
||||||
$this->logger->info(self::LOG_PREFIX.'Mark signature entity as canceled', ['signatureId' => $signature->getId()]);
|
$this->logger->info(self::LOG_PREFIX.'Mark signature entity as canceled', ['signatureId' => $signature->getId()]);
|
||||||
|
|
||||||
|
['transition' => $transition, 'futureUser' => $futureUser] = $this->decideTransition($signature);
|
||||||
|
|
||||||
$this->messageBus->dispatch(new PostSignatureStateChangeMessage((int) $signature->getId()));
|
$this->messageBus->dispatch(new PostSignatureStateChangeMessage((int) $signature->getId()));
|
||||||
|
if (null === $transition) {
|
||||||
|
return $signature->getStep()->getEntityWorkflow()->getStep();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $transition->getTos()[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -93,8 +113,10 @@ class SignatureStepStateChanger
|
|||||||
* a state change has occurred.
|
* a state change has occurred.
|
||||||
*
|
*
|
||||||
* @param EntityWorkflowStepSignature $signature the signature entity to be marked as rejected
|
* @param EntityWorkflowStepSignature $signature the signature entity to be marked as rejected
|
||||||
|
*
|
||||||
|
* @return string The expected new workflow's step, after transition is applyied
|
||||||
*/
|
*/
|
||||||
public function markSignatureAsRejected(EntityWorkflowStepSignature $signature): void
|
public function markSignatureAsRejected(EntityWorkflowStepSignature $signature): string
|
||||||
{
|
{
|
||||||
$this->entityManager->refresh($signature, LockMode::PESSIMISTIC_WRITE);
|
$this->entityManager->refresh($signature, LockMode::PESSIMISTIC_WRITE);
|
||||||
|
|
||||||
@@ -102,7 +124,16 @@ class SignatureStepStateChanger
|
|||||||
->setState(EntityWorkflowSignatureStateEnum::REJECTED)
|
->setState(EntityWorkflowSignatureStateEnum::REJECTED)
|
||||||
->setStateDate($this->clock->now());
|
->setStateDate($this->clock->now());
|
||||||
$this->logger->info(self::LOG_PREFIX.'Mark signature entity as rejected', ['signatureId' => $signature->getId()]);
|
$this->logger->info(self::LOG_PREFIX.'Mark signature entity as rejected', ['signatureId' => $signature->getId()]);
|
||||||
|
|
||||||
|
['transition' => $transition, 'futureUser' => $futureUser] = $this->decideTransition($signature);
|
||||||
|
|
||||||
$this->messageBus->dispatch(new PostSignatureStateChangeMessage((int) $signature->getId()));
|
$this->messageBus->dispatch(new PostSignatureStateChangeMessage((int) $signature->getId()));
|
||||||
|
|
||||||
|
if (null === $transition) {
|
||||||
|
return $signature->getStep()->getEntityWorkflow()->getStep();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $transition->getTos()[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -117,10 +148,35 @@ class SignatureStepStateChanger
|
|||||||
{
|
{
|
||||||
$this->entityManager->refresh($signature, LockMode::PESSIMISTIC_READ);
|
$this->entityManager->refresh($signature, LockMode::PESSIMISTIC_READ);
|
||||||
|
|
||||||
|
['transition' => $transition, 'futureUser' => $futureUser] = $this->decideTransition($signature);
|
||||||
|
|
||||||
|
if (null === $transition) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$entityWorkflow = $signature->getStep()->getEntityWorkflow();
|
||||||
|
$workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
|
||||||
|
$transitionDto = new WorkflowTransitionContextDTO($entityWorkflow);
|
||||||
|
$transitionDto->futureDestUsers[] = $futureUser;
|
||||||
|
|
||||||
|
$workflow->apply($entityWorkflow, $transition->getName(), [
|
||||||
|
'context' => $transitionDto,
|
||||||
|
'transitionAt' => $this->clock->now(),
|
||||||
|
'transition' => $transition->getName(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->logger->info(self::LOG_PREFIX.'Transition automatically applied', ['signatureId' => $signature->getId()]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array{transition: Transition|null, futureUser: User|null}
|
||||||
|
*/
|
||||||
|
private function decideTransition(EntityWorkflowStepSignature $signature): array
|
||||||
|
{
|
||||||
if (!EntityWorkflowStepSignature::isAllSignatureNotPendingForStep($signature->getStep())) {
|
if (!EntityWorkflowStepSignature::isAllSignatureNotPendingForStep($signature->getStep())) {
|
||||||
$this->logger->info(self::LOG_PREFIX.'This is not the last signature, skipping transition to another place', ['signatureId' => $signature->getId()]);
|
$this->logger->info(self::LOG_PREFIX.'This is not the last signature, skipping transition to another place', ['signatureId' => $signature->getId()]);
|
||||||
|
|
||||||
return;
|
return ['transition' => null, 'futureUser' => null];
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->logger->debug(self::LOG_PREFIX.'Continuing the process to find a transition', ['signatureId' => $signature->getId()]);
|
$this->logger->debug(self::LOG_PREFIX.'Continuing the process to find a transition', ['signatureId' => $signature->getId()]);
|
||||||
@@ -144,7 +200,7 @@ class SignatureStepStateChanger
|
|||||||
if (null === $transition) {
|
if (null === $transition) {
|
||||||
$this->logger->info(self::LOG_PREFIX.'The transition is not configured, will not apply a transition', ['signatureId' => $signature->getId()]);
|
$this->logger->info(self::LOG_PREFIX.'The transition is not configured, will not apply a transition', ['signatureId' => $signature->getId()]);
|
||||||
|
|
||||||
return;
|
return ['transition' => null, 'futureUser' => null];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('person' === $signature->getSignerKind()) {
|
if ('person' === $signature->getSignerKind()) {
|
||||||
@@ -156,19 +212,16 @@ class SignatureStepStateChanger
|
|||||||
if (null === $futureUser) {
|
if (null === $futureUser) {
|
||||||
$this->logger->info(self::LOG_PREFIX.'No previous user, will not apply a transition', ['signatureId' => $signature->getId()]);
|
$this->logger->info(self::LOG_PREFIX.'No previous user, will not apply a transition', ['signatureId' => $signature->getId()]);
|
||||||
|
|
||||||
return;
|
return ['transition' => null, 'futureUser' => null];
|
||||||
}
|
}
|
||||||
|
|
||||||
$transitionDto = new WorkflowTransitionContextDTO($entityWorkflow);
|
foreach ($workflow->getDefinition()->getTransitions() as $transitionObj) {
|
||||||
$transitionDto->futureDestUsers[] = $futureUser;
|
if ($transitionObj->getName() === $transition) {
|
||||||
|
return ['transition' => $transitionObj, 'futureUser' => $futureUser];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$workflow->apply($entityWorkflow, $transition, [
|
throw new \RuntimeException('Transition not found');
|
||||||
'context' => $transitionDto,
|
|
||||||
'transitionAt' => $this->clock->now(),
|
|
||||||
'transition' => $transition,
|
|
||||||
]);
|
|
||||||
|
|
||||||
$this->logger->info(self::LOG_PREFIX.'Transition automatically applied', ['signatureId' => $signature->getId()]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getPreviousSender(EntityWorkflowStep $entityWorkflowStep): ?User
|
private function getPreviousSender(EntityWorkflowStep $entityWorkflowStep): ?User
|
||||||
|
@@ -595,6 +595,44 @@ paths:
|
|||||||
401:
|
401:
|
||||||
description: "Unauthorized"
|
description: "Unauthorized"
|
||||||
|
|
||||||
|
/1.0/main/address-reference/aggregated/search:
|
||||||
|
get:
|
||||||
|
tags:
|
||||||
|
- address
|
||||||
|
summary: Search for address reference aggregated
|
||||||
|
parameters:
|
||||||
|
- name: q
|
||||||
|
in: query
|
||||||
|
required: true
|
||||||
|
description: The search pattern
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
responses:
|
||||||
|
200:
|
||||||
|
description: "ok"
|
||||||
|
401:
|
||||||
|
description: "Unauthorized"
|
||||||
|
400:
|
||||||
|
description: "Bad Request"
|
||||||
|
/1.0/main/address-reference/postal-code/search:
|
||||||
|
get:
|
||||||
|
tags:
|
||||||
|
- address
|
||||||
|
summary: Search for postal code that can contains the search query
|
||||||
|
parameters:
|
||||||
|
- name: q
|
||||||
|
in: query
|
||||||
|
required: true
|
||||||
|
description: The search pattern
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
responses:
|
||||||
|
200:
|
||||||
|
description: "ok"
|
||||||
|
401:
|
||||||
|
description: "Unauthorized"
|
||||||
|
400:
|
||||||
|
description: "Bad Request"
|
||||||
/1.0/main/postal-code/search.json:
|
/1.0/main/postal-code/search.json:
|
||||||
get:
|
get:
|
||||||
tags:
|
tags:
|
||||||
@@ -965,6 +1003,31 @@ paths:
|
|||||||
application/json:
|
application/json:
|
||||||
schema:
|
schema:
|
||||||
$ref: "#/components/schemas/UserJob"
|
$ref: "#/components/schemas/UserJob"
|
||||||
|
/1.0/main/workflow/{id}.json:
|
||||||
|
get:
|
||||||
|
tags:
|
||||||
|
- workflow
|
||||||
|
summary: Return a workflow
|
||||||
|
parameters:
|
||||||
|
- name: id
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
description: The workflow id
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
format: integer
|
||||||
|
minimum: 1
|
||||||
|
responses:
|
||||||
|
200:
|
||||||
|
description: "ok"
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/Workflow"
|
||||||
|
404:
|
||||||
|
description: "not found"
|
||||||
|
401:
|
||||||
|
description: "Unauthorized"
|
||||||
/1.0/main/workflow/my:
|
/1.0/main/workflow/my:
|
||||||
get:
|
get:
|
||||||
tags:
|
tags:
|
||||||
|
@@ -120,5 +120,13 @@ module.exports = function (encore, entries) {
|
|||||||
"vue_onthefly",
|
"vue_onthefly",
|
||||||
__dirname + "/Resources/public/vuejs/OnTheFly/index.js",
|
__dirname + "/Resources/public/vuejs/OnTheFly/index.js",
|
||||||
);
|
);
|
||||||
|
encore.addEntry(
|
||||||
|
'address_picker',
|
||||||
|
__dirname + "/Resources/public/vuejs/AddressPicker/index.ts",
|
||||||
|
)
|
||||||
|
|
||||||
|
encore.addEntry(
|
||||||
|
"page_workflow_waiting_post_process",
|
||||||
|
__dirname + "/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts"
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
@@ -0,0 +1,52 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Chill is a software for social workers
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Chill\Migrations\Main;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20250214154310 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Create view for searching address reference';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
create materialized view public.view_chill_main_address_reference as
|
||||||
|
SELECT row_number() OVER () AS row_number,
|
||||||
|
cmar.street AS street,
|
||||||
|
cmar.streetnumber AS streetnumber,
|
||||||
|
cmar.id AS address_id,
|
||||||
|
lower(unaccent(
|
||||||
|
(((((cmar.street || ' '::text) || cmar.streetnumber) || ' '::text) || cmpc.code::text) || ' '::text) ||
|
||||||
|
cmpc.label::text)) AS address,
|
||||||
|
cmpc.id AS postcode_id
|
||||||
|
FROM chill_main_address_reference cmar
|
||||||
|
JOIN chill_main_postal_code cmpc ON cmar.postcode_id = cmpc.id
|
||||||
|
WHERE cmar.deletedat IS NULL
|
||||||
|
ORDER BY ((cmpc.code::text || ' '::text) || cmpc.label::text), cmar.street, (lpad(cmar.streetnumber, 10, '0'::text));
|
||||||
|
SQL);
|
||||||
|
|
||||||
|
$this->addSql(<<<'SQL'
|
||||||
|
create index if not exists view_chill_internal_address_reference_trgm
|
||||||
|
on view_chill_main_address_reference using gist (postcode_id, address public.gist_trgm_ops);
|
||||||
|
SQL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('DROP MATERIALIZED VIEW view_chill_main_address_reference');
|
||||||
|
}
|
||||||
|
}
|
@@ -181,6 +181,11 @@ address more:
|
|||||||
buildingName: résidence
|
buildingName: résidence
|
||||||
extra: ""
|
extra: ""
|
||||||
distribution: cedex
|
distribution: cedex
|
||||||
|
|
||||||
|
address_picker:
|
||||||
|
# placeholder
|
||||||
|
Search for addresses: Chercher des adresses
|
||||||
|
|
||||||
Create a new address: Créer une nouvelle adresse
|
Create a new address: Créer une nouvelle adresse
|
||||||
Create an address: Créer une adresse
|
Create an address: Créer une adresse
|
||||||
Update address: Modifier l'adresse
|
Update address: Modifier l'adresse
|
||||||
@@ -666,10 +671,17 @@ workflow:
|
|||||||
cancel_are_you_sure: Êtes-vous sûr de vouloir annuler la signature de %signer%
|
cancel_are_you_sure: Êtes-vous sûr de vouloir annuler la signature de %signer%
|
||||||
reject_signature_of: Rejet de la signature de %signer%
|
reject_signature_of: Rejet de la signature de %signer%
|
||||||
reject_are_you_sure: Êtes-vous sûr de vouloir rejeter la signature de %signer%
|
reject_are_you_sure: Êtes-vous sûr de vouloir rejeter la signature de %signer%
|
||||||
|
waiting_for: En attente de modification de l'état de la signature
|
||||||
|
|
||||||
attachments:
|
attachments:
|
||||||
title: Pièces jointes
|
title: Pièces jointes
|
||||||
|
|
||||||
|
wait:
|
||||||
|
title: En attente de traitement
|
||||||
|
error_while_waiting: Le traitement a échoué
|
||||||
|
success: Traitement terminé. Redirection en cours...
|
||||||
|
|
||||||
|
|
||||||
Subscribe final: Recevoir une notification à l'étape finale
|
Subscribe final: Recevoir une notification à l'étape finale
|
||||||
Subscribe all steps: Recevoir une notification à chaque étape
|
Subscribe all steps: Recevoir une notification à chaque étape
|
||||||
CHILL_MAIN_WORKFLOW_APPLY_ALL_TRANSITION: Appliquer les transitions sur tous les workflows
|
CHILL_MAIN_WORKFLOW_APPLY_ALL_TRANSITION: Appliquer les transitions sur tous les workflows
|
||||||
|
Reference in New Issue
Block a user