feat: add is_scored in db to store score value anyway

intuitem · Apr 25, 2024 · 0a5808b · 0a5808b
1 parent 09348cc
commit 0a5808b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/backend/core/helpers.py b/backend/core/helpers.py
@@ -242,6 +242,7 @@ def get_sorted_requirement_nodes_rec(
                 "name": node.name,
                 "ra_id": str(req_as.id) if requirements_assessed else None,
                 "status": req_as.status if requirements_assessed else None,
+                "is_scored": req_as.is_scored if requirements_assessed else None,   
                 "score": req_as.score if requirements_assessed else None,
                 "max_score": req_as.compliance_assessment.framework.max_score
                 if requirements_assessed
@@ -278,6 +279,7 @@ def get_sorted_requirement_nodes_rec(
                             "description": req.description,
                             "ra_id": str(req_as.id),
                             "status": req_as.status,
+                            "is_scored": req_as.is_scored,
                             "score": req_as.score,
                             "max_score": req_as.compliance_assessment.framework.max_score,
                             "status_display": req_as.get_status_display(),

diff --git a/backend/core/models.py b/backend/core/models.py
@@ -1294,6 +1294,7 @@ def get_global_score(self):
             RequirementAssessment.objects.filter(compliance_assessment=self)
             .exclude(score=None)
             .exclude(status=RequirementAssessment.Status.NOT_APPLICABLE)
+            .exclude(is_scored=False)
         )
         score = requirement_assessments_scored.aggregate(models.Avg("score"))
         if score["score__avg"]:
@@ -1495,6 +1496,10 @@ class Status(models.TextChoices):
         null=True,
         verbose_name=_("Score"),
     )
+    is_scored = models.BooleanField(
+        default=False,
+        verbose_name=_("Is scored"),
+    )
     evidences = models.ManyToManyField(
         Evidence,
         blank=True,

diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
@@ -18,7 +18,10 @@
 	export let form: SuperForm<AnyZodObject>;
 	const { value, errors, constraints } = formFieldProxy(form, field);
 
-	$: scoringEnabled = $value === null ? false : true;
+	$value = $value ?? min_score;
+
+	const isScored = formFieldProxy(form, 'is_scored')['value'];
+
 	$: if (max_score === 100) score_step = 5;
 
 	const status = formFieldProxy(form, 'status')['value'];
@@ -45,7 +48,7 @@
 	<div class="flex flex-row w-full items-center justify-evenly space-x-4">
 		{#if isApplicable}
 			<div class="flex w-full items-center justify-center">
-				{#if scoringEnabled}
+				{#if $isScored}
 					<RangeSlider
 						class="w-full"
 						name="range-slider"
@@ -57,9 +60,8 @@
 					>
 						<div class="flex justify-between items-center">
 							<SlideToggle
-								bind:checked={scoringEnabled}
+								bind:checked={$isScored}
 								active="bg-primary-500"
-								on:click={() => ($value = null)}
 								name="score-slider"
 							>
 								<p class="text-sm text-gray-500">{m.scoringHelpText()}</p></SlideToggle
@@ -85,17 +87,16 @@
 						disabled
 						class="w-full"
 						name="range-slider"
-						value={min_score}
+						value={$value}
 						min={min_score}
 						max={max_score}
 						step={score_step}
 						ticked
 					>
 						<div class="flex justify-between items-center">
 							<SlideToggle
-								bind:checked={scoringEnabled}
+								bind:checked={$isScored}
 								active="bg-primary-500"
-								on:click={() => ($value = min_score)}
 								name="score-slider"
 							>
 								<p class="text-sm text-gray-500">{m.scoringHelpText()}</p></SlideToggle

diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
@@ -155,6 +155,7 @@ export const AssetSchema = baseNamedObject({
 export const RequirementAssessmentSchema = z.object({
 	status: z.string(),
 	score: z.number().optional().nullable(),
+	is_scored: z.boolean().optional(),
 	comment: z.string().optional().nullable(),
 	folder: z.string(),
 	requirement: z.string(),

diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
@@ -65,6 +65,7 @@
 					statusDisplay: node.status_display,
 					statusColor: complianceColorMap[node.status],
 					score: node.score,
+					isScored: node.is_scored,
 					max_score: node.max_score
 				},
 				children: node.children ? transformToTreeView(Object.entries(node.children)) : []

diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte
@@ -9,6 +9,7 @@
 	export let statusColor: string;
 	export let assessable: boolean;
 	export let score: number;
+	export let isScored: boolean;
 	export let max_score: number;
 
 	const lead = localItems(languageTag())[statusI18n] ?? statusDisplay ?? '';
@@ -21,7 +22,7 @@
 		<span class="badge {classesText} h-fit" style="background-color: {statusColor};">
 			{lead}
 		</span>
-		{#if score !== null && statusI18n !== 'notApplicable'}
+		{#if score !== null && statusI18n !== 'notApplicable' && isScored}
 			<span>
 				<ProgressRadial
 					stroke={100}