From 1abf468bab979089efc7705a3e1c607311c04591 Mon Sep 17 00:00:00 2001 From: Mohamed-Hacene Date: Wed, 4 Dec 2024 17:16:39 +0100 Subject: [PATCH] feat: add step 1.4 --- backend/core/serializers.py | 9 ++ backend/core/views.py | 2 +- frontend/messages/en.json | 3 +- frontend/src/lib/components/Forms/Form.svelte | 2 +- .../ModelForm/ComplianceAssessmentForm.svelte | 12 ++ frontend/src/lib/utils/crud.ts | 3 +- frontend/src/lib/utils/schemas.ts | 3 +- .../ebios-rm/[id=uuid]/+page.svelte | 6 +- .../workshop-one/base/+page.server.ts | 110 ++++++++++++++++++ .../[id=uuid]/workshop-one/base/+page.svelte | 67 +++++++++++ 10 files changed, 211 insertions(+), 6 deletions(-) create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.server.ts create mode 100644 frontend/src/routes/(app)/(internal)/ebios-rm/[id=uuid]/workshop-one/base/+page.svelte diff --git a/backend/core/serializers.py b/backend/core/serializers.py index f61807a068..6789ac88bd 100644 --- a/backend/core/serializers.py +++ b/backend/core/serializers.py @@ -5,6 +5,7 @@ from core.models import * from iam.models import * +from ebios_rm.models import EbiosRMStudy from rest_framework import serializers from rest_framework.exceptions import PermissionDenied @@ -593,6 +594,14 @@ class ComplianceAssessmentWriteSerializer(BaseModelSerializer): required=False, allow_null=True, ) + ebios_rm_studies = serializers.SlugRelatedField( + many=True, + slug_field="id", + queryset=EbiosRMStudy.objects.all(), + required=False, + allow_null=True, + write_only=True, + ) create_applied_controls_from_suggestions = serializers.BooleanField( write_only=True, required=False, default=False ) diff --git a/backend/core/views.py b/backend/core/views.py index 334d741988..8dfae78bc8 100644 --- a/backend/core/views.py +++ b/backend/core/views.py @@ -1971,7 +1971,7 @@ class ComplianceAssessmentViewSet(BaseModelViewSet): """ model = ComplianceAssessment - filterset_fields = ["framework", "project", "status"] + filterset_fields = ["framework", "project", "status", "ebios_rm_studies"] search_fields = ["name", "description", "ref_id"] ordering_fields = ["name", "description"] diff --git a/frontend/messages/en.json b/frontend/messages/en.json index d16cc46f73..6e7a41f20c 100644 --- a/frontend/messages/en.json +++ b/frontend/messages/en.json @@ -925,5 +925,6 @@ "activityTwo": "Activity 2", "ebiosRmStudy": "Ebios RM study", "qualifications": "Qualifications", - "impacts": "Impacts" + "impacts": "Impacts", + "ebiosRmStudies": "Ebios RM studies" } diff --git a/frontend/src/lib/components/Forms/Form.svelte b/frontend/src/lib/components/Forms/Form.svelte index 8536ca26c7..1c91780fa2 100644 --- a/frontend/src/lib/components/Forms/Form.svelte +++ b/frontend/src/lib/components/Forms/Form.svelte @@ -49,7 +49,7 @@ const { form, message, tainted, delayed, errors, allErrors, enhance } = _form; -{#if debug} +{#if true} diff --git a/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte index c53338fa04..0bba0a55c6 100644 --- a/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte +++ b/frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte @@ -38,6 +38,18 @@ options={getOptions({ objects: model.foreignKeys['baseline'] })} /> {/if} +{#if initialData.ebios_rm_studies} +