Add priority to action plan modeltables (#1127)

Co-authored-by: eric-intuitem <[email protected]>
intuitem · Dec 5, 2024 · 1f13026 · 1f13026
1 parent 5feaa7f
commit 1f13026
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/backend/core/views.py b/backend/core/views.py
@@ -1018,6 +1018,7 @@ def export_csv(self, request):
             "csf_function",
             "status",
             "eta",
+            "priority",
             "owner",
         ]
         writer.writerow(columns)
@@ -1031,6 +1032,7 @@ def export_csv(self, request):
                 control.csf_function,
                 control.status,
                 control.eta,
+                control.priority,
             ]
             if len(control.owner.all()) > 0:
                 owners = ",".join([o.email for o in control.owner.all()])
@@ -2061,26 +2063,7 @@ def action_plan(self, request, pk):
                 )
             )
             applied_controls = [
-                {
-                    "id": applied_control.id,
-                    "name": applied_control.name,
-                    "description": applied_control.description,
-                    "status": applied_control.status,
-                    "category": applied_control.category,
-                    "csf_function": applied_control.csf_function,
-                    "eta": applied_control.eta,
-                    "expiry_date": applied_control.expiry_date,
-                    "link": applied_control.link,
-                    "effort": applied_control.effort,
-                    "cost": applied_control.cost,
-                    "owners": [
-                        {
-                            "id": owner.id,
-                            "email": owner.email,
-                        }
-                        for owner in applied_control.owner.all()
-                    ],
-                }
+                AppliedControlReadSerializer(applied_control).data
                 for applied_control in AppliedControl.objects.filter(
                     requirement_assessments__in=requirement_assessments_objects
                 ).distinct()

diff --git a/backend/library/libraries/RNSI-Algerie-2020.yaml b/backend/library/libraries/RNSI-Algerie-2020.yaml
@@ -1,8 +1,8 @@
 urn: urn:intuitem:risk:library:RNSI-ALGERIE-2020
 locale: fr
 ref_id: RNSI-ALGERIE-2020
-name: "R\xE9f\xE9rentiel National\nde S\xE9curit\xE9 de l\u2019Information Alg\xE9\
-  rie V2020 Par  EKSEC.net"
+name: "R\xE9f\xE9rentiel National de S\xE9curit\xE9 de l\u2019Information Alg\xE9\
+  rie V2020 Par EKSEC.net"
 description: "\"EKSEC est fier de contribuer \xE0 la CISO Assistant Community et \xE0\
   \ l\u2019Alg\xE9rie en int\xE9grant le R\xE9f\xE9rentiel National de S\xE9curit\xE9\
   \ de l\u2019Information (RNSI) de l'Alg\xE9rie.\n\nLe R\xE9f\xE9rentiel National\

diff --git a/...end/src/routes/(app)/(internal)/compliance-assessments/[id=uuid]/action-plan/+page.svelte b/...end/src/routes/(app)/(internal)/compliance-assessments/[id=uuid]/action-plan/+page.svelte
@@ -13,6 +13,7 @@
 
 	const appliedControlsHead = {
 		name: 'name',
+		priority: 'priority',
 		category: 'category',
 		csf_function: 'csfFunction',
 		eta: 'eta',
@@ -23,6 +24,7 @@
 	};
 	const appliedControlsColums = [
 		'name',
+		'priority',
 		'category',
 		'csf_function',
 		'eta',

diff --git a/...tend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/remediation-plan/+page.svelte b/...tend/src/routes/(app)/(internal)/risk-assessments/[id=uuid]/remediation-plan/+page.svelte
@@ -23,6 +23,7 @@
 
 	const APPLIED_CONTROL_FIELDS = [
 		'name',
+		'priority',
 		'description',
 		'category',
 		'csf_function',