From 170ce2d51c53c9b3bfeb8a08c26cfb61a513e30c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 31 Jan 2022 16:55:19 +0100 Subject: [PATCH 1/7] minor fix and renaming --- CHANGELOG.md | 10 ++++++++-- .../public/vuejs/AccompanyingCourse/js/i18n.js | 4 ++-- .../Resources/views/Person/list_with_period.html.twig | 2 +- .../ChillPersonBundle/translations/messages.fr.yml | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edd7fbc91..a198c0929 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,14 @@ and this project adheres to ## Unreleased +* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche +* renomme date de début en date d'ouverture dans le formulaire parcours + + +## Test releases + +### test release 2021-01-31 + [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413 [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc. * [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409) @@ -26,8 +34,6 @@ and this project adheres to * [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal -## Test releases - ### test release 2021-01-28 * [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index 249cd7d41..87f6d8d09 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -152,8 +152,8 @@ const appMessages = { not_valid: "Sélectionnez un métier du référent" }, startdate: { - change: "Modifier la date de début", - date: "Date de début", + change: "Date d'ouverture", + date: "Date d'ouverture", }, // catch errors 'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.", diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig index 6f107a593..109e2024a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig @@ -82,7 +82,7 @@

- {{ 'File number'|trans }} {{ acp.id }} + {{ 'Course number'|trans }} {{ acp.id }}

diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index a2a5121a6..f1cb52913 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -81,7 +81,7 @@ Married: Marié(e) 'Family information': Famille 'Contact information': 'Informations de contact' 'Administrative information': Administratif -File number: Dossier n° +Course number: Parcours n° Civility: Civilité choose civility: -- All genders: tous les genres From 0f31a49890fe7beee6b7ded3ea86e22c1350e7ba Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 1 Feb 2022 09:10:32 +0100 Subject: [PATCH 2/7] fix: Update namespace to prevent having issues with PSR4 autoloading. --- .../Tests/Export/Aggregator/ActivityReasonAggregatorTest.php | 2 +- .../Tests/Export/Aggregator/ActivityTypeAggregatorTest.php | 2 +- .../Tests/Export/Aggregator/ActivityUserAggregatorTest.php | 2 +- .../Tests/Export/Filter/ActivityReasonFilterTest.php | 2 +- .../Filter/PersonHavingActivityBetweenDateFilterTest.php | 2 +- .../Tests/CustomFields/CustomFieldsChoiceTest.php | 2 +- .../Tests/CustomFields/CustomFieldsNumberTest.php | 2 +- .../Tests/CustomFields/CustomFieldsTextTest.php | 3 ++- .../Tests/Routing/RoutingLoaderTest.php | 2 +- .../Tests/Authorization/ParentRoleHelperTest.php | 2 +- .../ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php | 3 ++- src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php | 2 +- .../Tests/Security/PasswordRecover/TokenManagerTest.php | 2 +- .../Tests/DependencyInjection/ChillReportExtensionTest.php | 3 ++- .../Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php | 2 +- 15 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php index fb98f0a8e..436bfc697 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\ActivityBundle\Tests\Aggregator; +namespace Chill\ActivityBundle\Tests\Export\Aggregator; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php index 7959825a7..f6efe17a5 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\ActivityBundle\Tests\Aggregator; +namespace Chill\ActivityBundle\Tests\Export\Aggregator; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php index 056ba6049..1447f473b 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\ActivityBundle\Tests\Aggregator; +namespace Chill\ActivityBundle\Tests\Export\Aggregator; use Chill\MainBundle\Test\Export\AbstractAggregatorTest; diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php index cbac6febd..5b8ae08c3 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\ActivityBundle\Tests\Filter; +namespace Chill\ActivityBundle\Tests\Export\Filter; use Chill\MainBundle\Test\Export\AbstractFilterTest; use Doctrine\Common\Collections\ArrayCollection; diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php index f444c368b..94d99c2a7 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\ActivityBundle\Tests\Filter; +namespace Chill\ActivityBundle\Tests\Export\Filter; use Chill\MainBundle\Test\Export\AbstractFilterTest; use DateTime; diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php index db27ec921..d3355b9ce 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php +++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\CustomFieldsBundle\Tests; +namespace Chill\CustomFieldsBundle\Tests\CustomFields; use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice; use Chill\CustomFieldsBundle\Entity\CustomField; diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php index 60381f567..fb0079f05 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php +++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\CustomFieldsBundle\Tests; +namespace Chill\CustomFieldsBundle\Tests\CustomFields; use Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber; use Chill\CustomFieldsBundle\Entity\CustomField; diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php index 50bf689d4..c1dca44c0 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php +++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php @@ -9,10 +9,11 @@ declare(strict_types=1); -namespace Chill\CustomFieldsBundle\Tests; +namespace Chill\CustomFieldsBundle\Tests\CustomFields; use Chill\CustomFieldsBundle\CustomFields\CustomFieldText; use Chill\CustomFieldsBundle\Entity\CustomField; +use Chill\CustomFieldsBundle\Tests\CustomFieldTestHelper; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; /** diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php index 3cde3890a..32c6639bc 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php +++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\CustomFieldsBundle\Tests; +namespace Chill\CustomFieldsBundle\Tests\Routing; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php index 69a3ac733..05b18407a 100644 --- a/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\MainBundle\Tests\Security\Authorization; +namespace Chill\MainBundle\Tests\Authorization; use Chill\MainBundle\Security\ParentRoleHelper; use Chill\PersonBundle\Security\Authorization\PersonVoter; diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php index 55f9b64c5..e7a6ee096 100644 --- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php @@ -9,10 +9,11 @@ declare(strict_types=1); -namespace Chill\MainBundle\Form\Type; +namespace Chill\MainBundle\Tests\Form\Type; use Chill\MainBundle\Entity\GroupCenter; use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Form\CenterType; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Test\TypeTestCase; diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php index 07d7c7ab7..e9cbd5e3c 100644 --- a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\MainBundle\Test\Search; +namespace Chill\MainBundle\Tests\Search; use Chill\MainBundle\Search\ParsingException; use Chill\MainBundle\Search\SearchInterface; diff --git a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php index 7208c3ee9..8e29a190b 100644 --- a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\MainBundle\Tests\PasswordRecover; +namespace Chill\MainBundle\Tests\Security\PasswordRecover; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Security\PasswordRecover\TokenManager; diff --git a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php index 3a883b780..689e24699 100644 --- a/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php +++ b/src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php @@ -9,8 +9,9 @@ declare(strict_types=1); -namespace Chill\ReportBundle\Tests\Controller; +namespace Chill\ReportBundle\Tests\DependencyInjection; +use Exception; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; /** diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php index 1134652f7..39c0f58e4 100644 --- a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php +++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\ThirdPartyBundle\Test\Serializer\Normalizer; +namespace Chill\ThirdPartyBundle\Tests\Serializer\Normalizer; use Chill\ThirdPartyBundle\Entity\ThirdParty; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; From ebdcc5a07dc8b145ff13878ce03b75f840c8b9d4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 1 Feb 2022 09:11:14 +0100 Subject: [PATCH 3/7] fix: Update namespace to prevent having issues with PSR4 autoloading. --- .../Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php index 48a3ab8dd..1aaad8531 100644 --- a/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php +++ b/src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); -namespace Chill\ThirdPartyBundle\Test\Serializer\Normalizer; +namespace Chill\ThirdPartyBundle\Tests\Serializer\Normalizer; use Chill\MainBundle\Entity\Civility; use Chill\ThirdPartyBundle\Entity\ThirdParty; From 50e722e637dfd74e67afb9c74b47d9085ec69cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 31 Jan 2022 21:09:00 +0100 Subject: [PATCH 4/7] fix workflow redirection in accompanying period work edit --- .../EntityWorkflow/ListWorkflowModal.vue | 33 +++++++++++++------ .../EntityWorkflow/PickWorkflow.vue | 15 +++++++-- .../vuejs/AccompanyingCourseWorkEdit/App.vue | 12 ++++++- .../components/AddEvaluation.vue | 11 +++---- .../vuejs/AccompanyingCourseWorkEdit/store.js | 1 + 5 files changed, 53 insertions(+), 19 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue index a188a3a02..2e4125c1a 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue @@ -1,5 +1,5 @@ @@ -53,6 +56,7 @@ export default { PickWorkflow, ListWorkflowVue }, + emits: ['goToGenerateWorkflow'], props: { workflows: { type: Array, @@ -73,9 +77,14 @@ export default { workflowsAvailables: { type: Array, required: true, - } + }, + preventDefaultMoveToGenerate: { + type: Boolean, + required: false, + default: false, + }, }, - data() { + data() { return { modal: { showModal: false, @@ -95,6 +104,10 @@ export default { openModal() { this.modal.showModal = true; }, + goToGenerateWorkflow(data) { + console.log('go to generate workflow intercepted'); + this.$emit('goToGenerateWorkflow', data); + } }, i18n: { messages: { @@ -108,4 +121,4 @@ export default { } - \ No newline at end of file + diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue index 3a39c0eff..e74cd7ef2 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue @@ -6,7 +6,7 @@
@@ -31,7 +31,12 @@ export default { workflowsAvailables: { type: Array, required: true, - } + }, + preventDefaultMoveToGenerate: { + type: Boolean, + required: false, + default: false, + }, }, emits: ['goToGenerateWorkflow'], methods: { @@ -39,6 +44,12 @@ export default { return buildLinkCreate(workflowName, this.relatedEntityClass, this.relatedEntityId); }, goToGenerateWorkflow(event, workflowName) { + console.log('goToGenerateWorkflow', event, workflowName); + + if (!this.$props.preventDefaultMoveToGenerate) { + event.target.click(); + } + this.$emit('goToGenerateWorkflow', {event, workflowName, link: this.makeLink(workflowName)}); } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue index c88de825b..f9d1a747c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue @@ -251,6 +251,7 @@ relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork" :relatedEntityId="this.work.id" :workflowsAvailables="this.work.workflows_availables" + @go-to-generate-workflow="goToGenerateWorkflow" > @@ -284,6 +285,7 @@ import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue'; import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue'; import PickWorkflow from 'ChillMainAssets/vuejs/_components/EntityWorkflow/PickWorkflow.vue'; import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue'; +import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js'; const i18n = { messages: { @@ -334,7 +336,6 @@ export default { ListWorkflowModal, OnTheFly, PickWorkflow, - OnTheFly, PersonText, }, i18n, @@ -461,6 +462,15 @@ export default { removeThirdParty(t) { this.$store.commit('removeThirdParty', t); }, + goToGenerateWorkflow({link}) { + console.log('save before leave to generate workflow') + const callback = (data) => { + window.location.assign(link); + }; + + return this.$store.dispatch('submit', callback) + .catch(e => { console.log(e); throw e; }); + }, submit() { this.$store.dispatch('submit'); }, diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue index 08cb6b3e6..faf4b0ed0 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue @@ -10,16 +10,16 @@