From 937cc9a7bd46dfd1eb547c64ddb5f95d785ab88d Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Mon, 15 Apr 2024 14:45:14 +0200
Subject: [PATCH 01/12] feat: add scoring notion

---
 backend/core/models.py                        |  6 ++
 backend/core/views.py                         |  6 ++
 .../src/lib/components/Forms/Score.svelte     | 70 +++++++++++++++++++
 frontend/src/lib/utils/crud.ts                |  2 +-
 frontend/src/lib/utils/schemas.ts             |  1 +
 .../[id=uuid]/+page.svelte                    |  2 +
 6 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/lib/components/Forms/Score.svelte

diff --git a/backend/core/models.py b/backend/core/models.py
index 04762a1ad..3c5bb57fd 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -1465,6 +1465,7 @@ def quality_check(self) -> dict:
 
 
 class RequirementAssessment(AbstractBaseModel, FolderMixin):
+
     class Status(models.TextChoices):
         TODO = "to_do", _("To do")
         IN_PROGRESS = "in_progress", _("In progress")
@@ -1473,12 +1474,17 @@ class Status(models.TextChoices):
         COMPLIANT = "compliant", _("Compliant")
         NOT_APPLICABLE = "not_applicable", _("Not applicable")
 
+
     status = models.CharField(
         max_length=100,
         choices=Status.choices,
         default=Status.TODO,
         verbose_name=_("Status"),
     )
+    score = models.IntegerField(
+        default=-1,
+        choices=[(i, i) for i in range(-1, 101)]
+    )
     evidences = models.ManyToManyField(
         Evidence,
         blank=True,
diff --git a/backend/core/views.py b/backend/core/views.py
index b53230040..8999bcc66 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -1373,6 +1373,12 @@ def to_review(self, request):
     @action(detail=False, name="Get status choices")
     def status(self, request):
         return Response(dict(RequirementAssessment.Status.choices))
+    
+    @action(detail=False, name="Get score choices")
+    def score(self, request):
+        dict_score = dict([('--', -1)])
+        dict_score.update([(i, i) for i in range(0, 101)])
+        return Response(dict_score)
 
 
 @api_view(["GET"])
diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
new file mode 100644
index 000000000..d16de226c
--- /dev/null
+++ b/frontend/src/lib/components/Forms/Score.svelte
@@ -0,0 +1,70 @@
+<script lang="ts">
+	import { formFieldProxy, type SuperForm } from 'sveltekit-superforms/client';
+	import { localItems, toCamelCase } from '$lib/utils/locales';
+	import { languageTag } from '$paraglide/runtime';
+	import type { AnyZodObject } from 'zod';
+
+	let _class = '';
+
+	export { _class as class };
+	export let label: string | undefined = undefined;
+	export let field: string;
+	export let helpText: string | undefined = undefined;
+
+	export let color_map = {};
+
+	export let form: SuperForm<AnyZodObject>;
+
+	const { value, errors, constraints } = formFieldProxy(form, field);
+
+	interface Option {
+		label: unknown;
+		value: unknown;
+	}
+
+	export let options: Option[];
+
+	$: classesTextField = (errors: string[] | undefined) =>
+		errors && errors.length > 0 ? 'input-error' : '';
+</script>
+
+<div>
+	{#if label !== undefined}
+		{#if $constraints?.required}
+			<label class="text-sm font-semibold" for={field}
+				>{label} <span class="text-red-500">*</span></label
+			>
+		{:else}
+			<label class="text-sm font-semibold" for={field}>{label}</label>
+		{/if}
+	{/if}
+	{#if $errors && $errors.length > 0}
+		<div>
+			{#each $errors as error}
+				<p class="text-error-500 text-xs font-medium">{error}</p>
+			{/each}
+		</div>
+	{/if}
+	<div class="control">
+		<select
+			class="{'select ' + _class} {classesTextField($errors)}"
+			data-testid="form-input-{field.replaceAll('_', '-')}"
+			name={field}
+			aria-invalid={$errors ? 'true' : undefined}
+			placeholder=""
+			bind:value={$value}
+			{...$constraints}
+			{...$$restProps}
+		>
+			{#each options as option}
+				<option value={option.label}>
+					{option.value}
+					</option
+				>
+			{/each}
+		</select>
+	</div>
+	{#if helpText}
+		<p class="text-sm text-gray-500">{helpText}</p>
+	{/if}
+</div>
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index c8ec94b36..c56cffeae 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -390,7 +390,7 @@ export const URL_MODEL_MAP: ModelMap = {
 		localFrGender: 'f',
 		verboseName: 'Requirement assessment',
 		verboseNamePlural: 'Requirement assessments',
-		selectFields: [{ field: 'status' }],
+		selectFields: [{ field: 'status' }, { field: 'score' }],
 		foreignKeyFields: [
 			{ field: 'applied_controls', urlModel: 'applied-controls' },
 			{ field: 'evidences', urlModel: 'evidences' },
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
index 90fdc861e..fa4208243 100644
--- a/frontend/src/lib/utils/schemas.ts
+++ b/frontend/src/lib/utils/schemas.ts
@@ -151,6 +151,7 @@ export const AssetSchema = baseNamedObject({
 
 export const RequirementAssessmentSchema = z.object({
 	status: z.string(),
+	score: z.number().optional().nullable(),
 	comment: z.string().optional().nullable(),
 	folder: z.string(),
 	requirement: z.string(),
diff --git a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
index bc03d3bf4..1fa3c43e8 100644
--- a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
@@ -11,6 +11,7 @@
 	import SuperForm from '$lib/components/Forms/Form.svelte';
 	import HiddenInput from '$lib/components/Forms/HiddenInput.svelte';
 	import Select from '$lib/components/Forms/Select.svelte';
+	import Score from '$lib/components/Forms/Score.svelte';
 	import TextArea from '$lib/components/Forms/TextArea.svelte';
 	import CreateModal from '$lib/components/Modals/CreateModal.svelte';
 	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
@@ -266,6 +267,7 @@
 			<HiddenInput {form} field="compliance_assessment" />
 			<div class="flex flex-col space-y-3 mt-3">
 				<Select {form} options={data.model.selectOptions['status']} field="status" label="Status" />
+				<Score {form} options={data.model.selectOptions['score']} field="score" label="score" />
 				<TextArea {form} field="observation" label="Observation" />
 
 				<div class="flex flex-row justify-between space-x-4">

From a10a773ff7cf71e5c206a2aa2a70c3ac50d31d2c Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Mon, 15 Apr 2024 20:53:00 +0200
Subject: [PATCH 02/12] feat: improve score notion update

---
 backend/core/views.py                         |  6 --
 .../src/lib/components/Forms/Score.svelte     | 70 ++++++++++---------
 frontend/src/lib/utils/crud.ts                |  2 +-
 .../[id=uuid]/+page.svelte                    |  2 +-
 4 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/backend/core/views.py b/backend/core/views.py
index 8999bcc66..b53230040 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -1373,12 +1373,6 @@ def to_review(self, request):
     @action(detail=False, name="Get status choices")
     def status(self, request):
         return Response(dict(RequirementAssessment.Status.choices))
-    
-    @action(detail=False, name="Get score choices")
-    def score(self, request):
-        dict_score = dict([('--', -1)])
-        dict_score.update([(i, i) for i in range(0, 101)])
-        return Response(dict_score)
 
 
 @api_view(["GET"])
diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
index d16de226c..4d7cfe40d 100644
--- a/frontend/src/lib/components/Forms/Score.svelte
+++ b/frontend/src/lib/components/Forms/Score.svelte
@@ -1,31 +1,32 @@
 <script lang="ts">
 	import { formFieldProxy, type SuperForm } from 'sveltekit-superforms/client';
-	import { localItems, toCamelCase } from '$lib/utils/locales';
-	import { languageTag } from '$paraglide/runtime';
+	import { ProgressRadial } from '@skeletonlabs/skeleton';
+	import { RangeSlider } from '@skeletonlabs/skeleton';
 	import type { AnyZodObject } from 'zod';
 
-	let _class = '';
-
-	export { _class as class };
 	export let label: string | undefined = undefined;
 	export let field: string;
-	export let helpText: string | undefined = undefined;
-
-	export let color_map = {};
 
 	export let form: SuperForm<AnyZodObject>;
 
 	const { value, errors, constraints } = formFieldProxy(form, field);
+	
+	$: scoringEnabled = $value < 0 ? false : true
 
-	interface Option {
-		label: unknown;
-		value: unknown;
+	function preventNegative(value: number){
+		if(value < 0){
+			return 0
+		}
+		return value
+	
 	}
 
-	export let options: Option[];
-
-	$: classesTextField = (errors: string[] | undefined) =>
-		errors && errors.length > 0 ? 'input-error' : '';
+	function displayNoValue(value: number){
+		if(value === -1){
+			return '--'
+		}
+		return value
+	}
 </script>
 
 <div>
@@ -45,26 +46,29 @@
 			{/each}
 		</div>
 	{/if}
-	<div class="control">
-		<select
-			class="{'select ' + _class} {classesTextField($errors)}"
-			data-testid="form-input-{field.replaceAll('_', '-')}"
+	<div class="flex flex-row w-full items-center space-x-4 ml-2">
+		<input
 			name={field}
-			aria-invalid={$errors ? 'true' : undefined}
-			placeholder=""
-			bind:value={$value}
+			type="checkbox"
+			class="checkbox"
+			data-testid="form-input-{field.replaceAll('_', '-')}"
+			bind:checked={scoringEnabled}
+			on:change={() => $value = -1}
 			{...$constraints}
 			{...$$restProps}
-		>
-			{#each options as option}
-				<option value={option.label}>
-					{option.value}
-					</option
-				>
-			{/each}
-		</select>
+			{...$constraints}
+			{...$$restProps}
+		/>
+		<div class="flex w-1/2 items-center justify-center">
+			<RangeSlider disabled={!scoringEnabled} class="w-full" name="range-slider" bind:value={$value} max={100} step={1}></RangeSlider>
+		</div>
+		<div class="flex w-1/2 items-center justify-center">
+			{#if scoringEnabled}
+				<ProgressRadial stroke={175} value={preventNegative($value)} width={'w-32'}>{displayNoValue($value)}</ProgressRadial>
+			{:else}
+				<ProgressRadial stroke={175} value={0} width={'w-32'}>--</ProgressRadial>
+			{/if}
+		</div>
 	</div>
-	{#if helpText}
-		<p class="text-sm text-gray-500">{helpText}</p>
-	{/if}
+	<p class="text-sm text-gray-500">Check to enable scoring</p>
 </div>
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index c56cffeae..c8ec94b36 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -390,7 +390,7 @@ export const URL_MODEL_MAP: ModelMap = {
 		localFrGender: 'f',
 		verboseName: 'Requirement assessment',
 		verboseNamePlural: 'Requirement assessments',
-		selectFields: [{ field: 'status' }, { field: 'score' }],
+		selectFields: [{ field: 'status' }],
 		foreignKeyFields: [
 			{ field: 'applied_controls', urlModel: 'applied-controls' },
 			{ field: 'evidences', urlModel: 'evidences' },
diff --git a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
index 1fa3c43e8..2e3076961 100644
--- a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
@@ -267,7 +267,7 @@
 			<HiddenInput {form} field="compliance_assessment" />
 			<div class="flex flex-col space-y-3 mt-3">
 				<Select {form} options={data.model.selectOptions['status']} field="status" label="Status" />
-				<Score {form} options={data.model.selectOptions['score']} field="score" label="score" />
+				<Score {form} field="score" label="Score" />
 				<TextArea {form} field="observation" label="Observation" />
 
 				<div class="flex flex-row justify-between space-x-4">

From 197628ab1e52600399f509f7eaaef79f9b7d6c37 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Mon, 15 Apr 2024 20:58:58 +0200
Subject: [PATCH 03/12] locale: add scoring help text

---
 frontend/messages/en.json                      | 3 ++-
 frontend/messages/fr.json                      | 3 ++-
 frontend/src/lib/components/Forms/Score.svelte | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 198a3aef7..e5ce5f4e5 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -500,5 +500,6 @@
 	"missingMandatoyObjects1": "Some mandatory objects to {model} are not created or imported yet",
 	"missingMandatoyObjects2": "Please add them before proceeding",
 	"attemptToDeleteOnlyAdminAccountError": "You can't delete the only admin account of your application.",
-	"attemptToRemoveOnlyAdminUserGroup": "You can't remove the only admin user of the application from the admin user group."
+	"attemptToRemoveOnlyAdminUserGroup": "You can't remove the only admin user of the application from the admin user group.",
+	"scoringHelpText": "Check to enable scoring"
 }
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index 20e596122..cdb6c8b30 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -500,5 +500,6 @@
 	"missingMandatoyObjects1": "Des objets obligatoires pour {model} ne sont pas encore créés ou importés",
 	"missingMandatoyObjects2": "Veuillez les ajouter avant de continuer",
 	"attemptToDeleteOnlyAdminAccountError": "Vous ne pouvez pas supprimer votre unique compte administrateur de l'application.",
-	"attemptToRemoveOnlyAdminUserGroup": "Vous ne pouvez pas retirer le seul compte administrateur de l'application du groupe des administrateurs."
+	"attemptToRemoveOnlyAdminUserGroup": "Vous ne pouvez pas retirer le seul compte administrateur de l'application du groupe des administrateurs.",
+	"scoringHelpText": "Cocher pour activer le score"
 }
diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
index 4d7cfe40d..4da8205c8 100644
--- a/frontend/src/lib/components/Forms/Score.svelte
+++ b/frontend/src/lib/components/Forms/Score.svelte
@@ -2,6 +2,7 @@
 	import { formFieldProxy, type SuperForm } from 'sveltekit-superforms/client';
 	import { ProgressRadial } from '@skeletonlabs/skeleton';
 	import { RangeSlider } from '@skeletonlabs/skeleton';
+	import * as m from '$paraglide/messages';
 	import type { AnyZodObject } from 'zod';
 
 	export let label: string | undefined = undefined;
@@ -70,5 +71,5 @@
 			{/if}
 		</div>
 	</div>
-	<p class="text-sm text-gray-500">Check to enable scoring</p>
+	<p class="text-sm text-gray-500">{m.scoringHelpText()}</p>
 </div>

From 42e1fc8d80674abadf2e21d96f8b9955f9346239 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 16 Apr 2024 11:54:03 +0200
Subject: [PATCH 04/12] feat: use null instead of -1

---
 backend/core/models.py                         |  5 +++--
 frontend/src/lib/components/Forms/Score.svelte | 16 +++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/core/models.py b/backend/core/models.py
index 3c5bb57fd..f37514a09 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -1482,8 +1482,9 @@ class Status(models.TextChoices):
         verbose_name=_("Status"),
     )
     score = models.IntegerField(
-        default=-1,
-        choices=[(i, i) for i in range(-1, 101)]
+        null=True,
+        blank=True,
+        choices=[(i, i) for i in range(0, 101)]
     )
     evidences = models.ManyToManyField(
         Evidence,
diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
index 4da8205c8..34ccd9fe2 100644
--- a/frontend/src/lib/components/Forms/Score.svelte
+++ b/frontend/src/lib/components/Forms/Score.svelte
@@ -12,10 +12,12 @@
 
 	const { value, errors, constraints } = formFieldProxy(form, field);
 	
-	$: scoringEnabled = $value < 0 ? false : true
+	$: scoringEnabled = $value === null ? false : true
 
-	function preventNegative(value: number){
-		if(value < 0){
+	console.log($value)
+
+	function preventNull(value: number){
+		if(value === null){
 			return 0
 		}
 		return value
@@ -23,7 +25,7 @@
 	}
 
 	function displayNoValue(value: number){
-		if(value === -1){
+		if(value === null){
 			return '--'
 		}
 		return value
@@ -54,18 +56,18 @@
 			class="checkbox"
 			data-testid="form-input-{field.replaceAll('_', '-')}"
 			bind:checked={scoringEnabled}
-			on:change={() => $value = -1}
+			on:change={() => $value = null}
 			{...$constraints}
 			{...$$restProps}
 			{...$constraints}
 			{...$$restProps}
 		/>
 		<div class="flex w-1/2 items-center justify-center">
-			<RangeSlider disabled={!scoringEnabled} class="w-full" name="range-slider" bind:value={$value} max={100} step={1}></RangeSlider>
+			<RangeSlider disabled={!scoringEnabled} class="w-full" name="range-slider" bind:value={$value} max={100} step={1} ticked></RangeSlider>
 		</div>
 		<div class="flex w-1/2 items-center justify-center">
 			{#if scoringEnabled}
-				<ProgressRadial stroke={175} value={preventNegative($value)} width={'w-32'}>{displayNoValue($value)}</ProgressRadial>
+				<ProgressRadial stroke={175} value={preventNull($value)} width={'w-32'}>{displayNoValue($value)}</ProgressRadial>
 			{:else}
 				<ProgressRadial stroke={175} value={0} width={'w-32'}>--</ProgressRadial>
 			{/if}

From 6432bb91b5dd514ee89c43f4739ae980783b72d9 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 16 Apr 2024 13:45:01 +0200
Subject: [PATCH 05/12] feat: add min and max score choice

---
 backend/core/models.py                          | 17 +++++++++++++++--
 backend/core/serializers.py                     |  2 +-
 backend/library/utils.py                        |  2 ++
 frontend/src/lib/components/Forms/Score.svelte  | 10 +++++-----
 .../[id=uuid]/+page.svelte                      |  7 ++++++-
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/backend/core/models.py b/backend/core/models.py
index f37514a09..7dc5e30c1 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -328,6 +328,12 @@ def __str__(self) -> str:
 
 
 class Framework(ReferentialObjectMixin):
+    min_score = models.IntegerField(
+        default=0, verbose_name=_("Minimum score")
+    )
+    max_score = models.IntegerField(
+        default=100, verbose_name=_("Maximum score")
+    )
     library = models.ForeignKey(
         Library,
         on_delete=models.CASCADE,
@@ -1482,9 +1488,9 @@ class Status(models.TextChoices):
         verbose_name=_("Status"),
     )
     score = models.IntegerField(
-        null=True,
         blank=True,
-        choices=[(i, i) for i in range(0, 101)]
+        null=True,
+        verbose_name=_("Score"),
     )
     evidences = models.ManyToManyField(
         Evidence,
@@ -1508,6 +1514,13 @@ class Status(models.TextChoices):
         verbose_name=_("Applied controls"),
         related_name="requirement_assessments",
     )
+    
+    def get_score_choices(self):
+        return [(i, i) for i in range(self.compliance_assessment.framework.min_score, self.compliance_assessment.framework.max_score + 1)]
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._meta.get_field('score').choices = self.get_score_choices()
 
     def __str__(self) -> str:
         return self.requirement.display_short
diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index 805eab409..863dab9df 100644
--- a/backend/core/serializers.py
+++ b/backend/core/serializers.py
@@ -476,7 +476,7 @@ class Meta:
 
 
 class ComplianceAssessmentReadSerializer(AssessmentReadSerializer):
-    framework = FieldsRelatedField()
+    framework = FieldsRelatedField(["id", "min_score", "max_score"])
 
     class Meta:
         model = ComplianceAssessment
diff --git a/backend/library/utils.py b/backend/library/utils.py
index b06b74878..23cef7234 100644
--- a/backend/library/utils.py
+++ b/backend/library/utils.py
@@ -290,6 +290,8 @@ def import_framework(self, library_object: Library):
             ref_id=self.framework_data["ref_id"],
             name=self.framework_data.get("name"),
             description=self.framework_data.get("description"),
+            min_score=self.framework_data.get("min_score", 0),
+            max_score=self.framework_data.get("max_score", 100),
             provider=library_object.provider,
             locale=library_object.locale,
             default_locale=library_object.default_locale,  # Change this in the future ?
diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
index 34ccd9fe2..fcab806a1 100644
--- a/frontend/src/lib/components/Forms/Score.svelte
+++ b/frontend/src/lib/components/Forms/Score.svelte
@@ -8,19 +8,19 @@
 	export let label: string | undefined = undefined;
 	export let field: string;
 
-	export let form: SuperForm<AnyZodObject>;
+	export let min_score: number;
+	export let max_score: number;
 
+	export let form: SuperForm<AnyZodObject>;
 	const { value, errors, constraints } = formFieldProxy(form, field);
 	
 	$: scoringEnabled = $value === null ? false : true
 
-	console.log($value)
-
 	function preventNull(value: number){
 		if(value === null){
 			return 0
 		}
-		return value
+		return value * 100 / max_score
 	
 	}
 
@@ -63,7 +63,7 @@
 			{...$$restProps}
 		/>
 		<div class="flex w-1/2 items-center justify-center">
-			<RangeSlider disabled={!scoringEnabled} class="w-full" name="range-slider" bind:value={$value} max={100} step={1} ticked></RangeSlider>
+			<RangeSlider disabled={!scoringEnabled} class="w-full" name="range-slider" bind:value={$value} min={min_score} max={max_score} step={1} ticked></RangeSlider>
 		</div>
 		<div class="flex w-1/2 items-center justify-center">
 			{#if scoringEnabled}
diff --git a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
index 2e3076961..083e235ab 100644
--- a/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/requirement-assessments/[id=uuid]/+page.svelte
@@ -267,7 +267,12 @@
 			<HiddenInput {form} field="compliance_assessment" />
 			<div class="flex flex-col space-y-3 mt-3">
 				<Select {form} options={data.model.selectOptions['status']} field="status" label="Status" />
-				<Score {form} field="score" label="Score" />
+				<Score 
+				{form}
+				min_score={data.compliance_assessment.framework.min_score}
+				max_score={data.compliance_assessment.framework.max_score}
+				field="score"
+				label="Score" />
 				<TextArea {form} field="observation" label="Observation" />
 
 				<div class="flex flex-row justify-between space-x-4">

From 5c91b6ce0b5bc44c69e20e0e14ee14b5c93f53bc Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 16 Apr 2024 13:51:13 +0200
Subject: [PATCH 06/12] locale: add min_score and max_score translations

---
 frontend/messages/en.json         | 4 +++-
 frontend/messages/fr.json         | 4 +++-
 frontend/src/lib/utils/locales.ts | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index e5ce5f4e5..c4f7c6df6 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -501,5 +501,7 @@
 	"missingMandatoyObjects2": "Please add them before proceeding",
 	"attemptToDeleteOnlyAdminAccountError": "You can't delete the only admin account of your application.",
 	"attemptToRemoveOnlyAdminUserGroup": "You can't remove the only admin user of the application from the admin user group.",
-	"scoringHelpText": "Check to enable scoring"
+	"scoringHelpText": "Check to enable scoring",
+	"minScore": "Minimum score",
+	"maxScore": "Maximum score"
 }
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index cdb6c8b30..84fdbecb1 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -501,5 +501,7 @@
 	"missingMandatoyObjects2": "Veuillez les ajouter avant de continuer",
 	"attemptToDeleteOnlyAdminAccountError": "Vous ne pouvez pas supprimer votre unique compte administrateur de l'application.",
 	"attemptToRemoveOnlyAdminUserGroup": "Vous ne pouvez pas retirer le seul compte administrateur de l'application du groupe des administrateurs.",
-	"scoringHelpText": "Cocher pour activer le score"
+	"scoringHelpText": "Cocher pour activer le score",
+	"minScore": "Score minimum",
+	"maxScore": "Score maximum"
 }
diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts
index 22b921956..8102dc9f0 100644
--- a/frontend/src/lib/utils/locales.ts
+++ b/frontend/src/lib/utils/locales.ts
@@ -315,7 +315,9 @@ export function localItems(languageTag: string): LocalItems {
 		libraryAlreadyExistsError: m.libraryAlreadyImportedError({ languageTag: languageTag }),
 		invalidLibraryFileError: m.invalidLibraryFileError({ languageTag: languageTag }),
 		attemptToDeleteOnlyAdminAccountError: m.attemptToDeleteOnlyAdminAccountError({ languageTag: languageTag }),
-		attemptToRemoveOnlyAdminUserGroup: m.attemptToRemoveOnlyAdminUserGroup({ languageTag: languageTag })
+		attemptToRemoveOnlyAdminUserGroup: m.attemptToRemoveOnlyAdminUserGroup({ languageTag: languageTag }),
+		minScore: m.minScore({ languageTag: languageTag }),
+		maxScore: m.maxScore({ languageTag: languageTag })
 	};
 	return LOCAL_ITEMS;
 }

From 4ff080ccc4ee87a8c3224f2921511f9faa331df9 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 16 Apr 2024 14:45:04 +0200
Subject: [PATCH 07/12] feat: display scoring in tree view

---
 backend/core/helpers.py                              |  4 ++++
 frontend/src/lib/components/Forms/Score.svelte       |  4 ++--
 .../compliance-assessments/[id=uuid]/+page.svelte    |  4 +++-
 .../[id=uuid]/TreeViewItemLead.svelte                | 12 +++++++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/backend/core/helpers.py b/backend/core/helpers.py
index 2a12568c2..345a8930c 100644
--- a/backend/core/helpers.py
+++ b/backend/core/helpers.py
@@ -238,6 +238,8 @@ 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,
+                "score": req_as.score if requirements_assessed else None,
+                "max_score": req_as.compliance_assessment.framework.max_score if requirements_assessed else None,
                 "status_display": req_as.get_status_display() if requirements_assessed else None,
                 "status_i18n": camel_case(req_as.status) if requirements_assessed else None,
                 "node_content": node.display_long,
@@ -266,6 +268,8 @@ def get_sorted_requirement_nodes_rec(
                             "description": req.description,
                             "ra_id": str(req_as.id),
                             "status": req_as.status,
+                            "score": req_as.score,
+                            "max_score": req_as.compliance_assessment.framework.max_score,
                             "status_display": req_as.get_status_display(),
                             "status_i18n": camel_case(req_as.status),
                             "style": "leaf",
diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
index fcab806a1..58aebb5c3 100644
--- a/frontend/src/lib/components/Forms/Score.svelte
+++ b/frontend/src/lib/components/Forms/Score.svelte
@@ -67,9 +67,9 @@
 		</div>
 		<div class="flex w-1/2 items-center justify-center">
 			{#if scoringEnabled}
-				<ProgressRadial stroke={175} value={preventNull($value)} width={'w-32'}>{displayNoValue($value)}</ProgressRadial>
+				<ProgressRadial stroke={100} value={preventNull($value)} font={100} width={'w-32'}>{displayNoValue($value)}</ProgressRadial>
 			{:else}
-				<ProgressRadial stroke={175} value={0} width={'w-32'}>--</ProgressRadial>
+				<ProgressRadial stroke={100} value={0} font={100} width={'w-32'}>--</ProgressRadial>
 			{/if}
 		</div>
 	</div>
diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
index a2d75073e..6c837319d 100644
--- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
@@ -63,7 +63,9 @@
 					statusI18n: node.status_i18n,
 					assessable: node.assessable,
 					statusDisplay: node.status_display,
-					statusColor: complianceColorMap[node.status]
+					statusColor: complianceColorMap[node.status],
+					score: node.score,
+					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
index 94e3e59b4..976683f10 100644
--- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte
+++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte
@@ -1,11 +1,14 @@
 <script lang="ts">
 	import { localItems } from '$lib/utils/locales';
 	import { languageTag } from '$paraglide/runtime';
+	import { ProgressRadial } from '@skeletonlabs/skeleton';
 
 	export let statusI18n: string;
 	export let statusDisplay: string;
 	export let statusColor: string;
 	export let assessable: boolean;
+	export let score: number;
+	export let max_score: number;
 
 	const lead = localItems(languageTag())[statusI18n] ?? statusDisplay ?? '';
 
@@ -13,7 +16,14 @@
 </script>
 
 {#if assessable}
-	<span class="badge {classesText}" style="background-color: {statusColor};">
+<div class="flex flex-row space-x-2 items-center">
+	{#if score !== null}
+		<span>
+			<ProgressRadial stroke={100} font={150} value={score * 100 / max_score} width={'w-12'}>{score}</ProgressRadial>
+		</span>
+	{/if}
+	<span class="badge {classesText} h-fit" style="background-color: {statusColor};">
 		{lead}
 	</span>
+</div>
 {/if}

From 521969ce5633712d973080f825a8970fcca02c15 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 16 Apr 2024 16:07:53 +0200
Subject: [PATCH 08/12] feat: calculate global score

---
 backend/core/models.py                              |  5 +++++
 backend/core/views.py                               |  6 ++++++
 .../[id=uuid]/+page.server.ts                       |  6 +++++-
 .../compliance-assessments/[id=uuid]/+page.svelte   | 13 +++++++++----
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/backend/core/models.py b/backend/core/models.py
index 7dc5e30c1..4cd054f10 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -1294,6 +1294,11 @@ class Result(models.TextChoices):
     class Meta:
         verbose_name = _("Compliance assessment")
         verbose_name_plural = _("Compliance assessments")
+        
+    def get_global_score(self):
+        requirement_assessments_scored = RequirementAssessment.objects.filter(compliance_assessment=self).exclude(score=None)
+        score = requirement_assessments_scored.aggregate(models.Avg('score'))
+        return score['score__avg'] or -1
 
     def get_requirements_status_count(self):
         requirements_status_count = []
diff --git a/backend/core/views.py b/backend/core/views.py
index b53230040..b49a85c90 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -1223,6 +1223,12 @@ def quality_check(self, request):
             for a in compliance_assessments
         ]
         return Response({"results": res})
+    
+    @action(detail=True, methods=["get"])
+    def global_score(self, request, pk):
+        """Returns the global score of the compliance assessment"""
+        return Response({"score": self.get_object().get_global_score(), 
+                         "max_score": self.get_object().framework.max_score})
 
     @action(detail=True, methods=["get"], url_path="quality_check")
     def quality_check_detail(self, request, pk):
diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.server.ts b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.server.ts
index 619db72be..fa5c16324 100644
--- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.server.ts
+++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.server.ts
@@ -17,5 +17,9 @@ export const load = (async ({ fetch, params }) => {
 		`${BASE_API_URL}/${URLModel}/${params.id}/donut_data/`
 	).then((res) => res.json());
 
-	return { URLModel, compliance_assessment, object, tree, compliance_assessment_donut_values };
+	const global_score = await fetch(
+		`${BASE_API_URL}/${URLModel}/${params.id}/global_score/`
+	).then((res) => res.json());
+
+	return { URLModel, compliance_assessment, object, tree, compliance_assessment_donut_values, global_score };
 }) satisfies PageServerLoad;
diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
index 6c837319d..f38b7a304 100644
--- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
@@ -88,7 +88,7 @@
 
 	let expandedNodes: TreeViewNode[] = [];
 
-	import { localStorageStore } from '@skeletonlabs/skeleton';
+	import { ProgressRadial, localStorageStore } from '@skeletonlabs/skeleton';
 	import type { Writable } from 'svelte/store';
 
 	const expandedNodesState: Writable<any> = localStorageStore('expandedNodes', expandedNodes, {
@@ -100,8 +100,8 @@
 </script>
 
 <div class="flex flex-col space-y-4 whitespace-pre-line">
-	<div class="card px-6 py-4 bg-white flex flex-row justify-between shadow-lg">
-		<div class="flex flex-col space-y-2 whitespace-pre-line">
+	<div class="card px-6 py-4 bg-white flex flex-row justify-between shadow-lg w-full">
+		<div class="flex flex-col space-y-2 whitespace-pre-line w-1/6">
 			{#each Object.entries(data.compliance_assessment).filter( ([key, _]) => ['name', 'description', 'project', 'framework', 'authors', 'reviewers', 'status'].includes(key) ) as [key, value]}
 				<div class="flex flex-col">
 					<div
@@ -159,7 +159,12 @@
 				</div>
 			{/each}
 		</div>
-		<div class="w-full">
+		{#if data.global_score.score >= 0}
+			<div class="flex items-center cursor-pointer">
+				<ProgressRadial stroke={100} font={150} value={data.global_score.score * 100 / data.global_score.max_score} width={'w-52'}>{data.global_score.score}</ProgressRadial>
+			</div>
+		{/if}
+		<div class="w-1/2">
 			<DonutChart
 				s_label={m.complianceAssessments()}
 				values={compliance_assessment_donut_values.values}

From 821af8635a537faf3f75132615f89e993eaec19e Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 16 Apr 2024 16:08:28 +0200
Subject: [PATCH 09/12] feat: add migration

---
 ..._max_score_framework_min_score_and_more.py | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 backend/core/migrations/0009_framework_max_score_framework_min_score_and_more.py

diff --git a/backend/core/migrations/0009_framework_max_score_framework_min_score_and_more.py b/backend/core/migrations/0009_framework_max_score_framework_min_score_and_more.py
new file mode 100644
index 000000000..a605812dc
--- /dev/null
+++ b/backend/core/migrations/0009_framework_max_score_framework_min_score_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 5.0.4 on 2024-04-16 14:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0008_alter_complianceassessment_status_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='framework',
+            name='max_score',
+            field=models.IntegerField(default=100, verbose_name='Maximum score'),
+        ),
+        migrations.AddField(
+            model_name='framework',
+            name='min_score',
+            field=models.IntegerField(default=0, verbose_name='Minimum score'),
+        ),
+        migrations.AddField(
+            model_name='requirementassessment',
+            name='score',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Score'),
+        ),
+    ]

From db0d6d332a719fb24cc4a046d5d55aab81654339 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 16 Apr 2024 16:47:38 +0200
Subject: [PATCH 10/12] feat: add colors for score displaying

---
 frontend/src/lib/components/Forms/Score.svelte   |  3 ++-
 frontend/src/lib/utils/helpers.ts                | 16 +++++++++++++++-
 .../[id=uuid]/+page.svelte                       |  3 ++-
 .../[id=uuid]/TreeViewItemLead.svelte            |  9 +++++----
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
index 58aebb5c3..85b0b432e 100644
--- a/frontend/src/lib/components/Forms/Score.svelte
+++ b/frontend/src/lib/components/Forms/Score.svelte
@@ -4,6 +4,7 @@
 	import { RangeSlider } from '@skeletonlabs/skeleton';
 	import * as m from '$paraglide/messages';
 	import type { AnyZodObject } from 'zod';
+	import { displayScoreColor } from '$lib/utils/helpers';
 
 	export let label: string | undefined = undefined;
 	export let field: string;
@@ -67,7 +68,7 @@
 		</div>
 		<div class="flex w-1/2 items-center justify-center">
 			{#if scoringEnabled}
-				<ProgressRadial stroke={100} value={preventNull($value)} font={100} width={'w-32'}>{displayNoValue($value)}</ProgressRadial>
+				<ProgressRadial stroke={100} meter={displayScoreColor($value, max_score)} value={preventNull($value)} font={100} width={'w-32'}>{displayNoValue($value)}</ProgressRadial>
 			{:else}
 				<ProgressRadial stroke={100} value={0} font={100} width={'w-32'}>--</ProgressRadial>
 			{/if}
diff --git a/frontend/src/lib/utils/helpers.ts b/frontend/src/lib/utils/helpers.ts
index 50f259b3e..567f02896 100644
--- a/frontend/src/lib/utils/helpers.ts
+++ b/frontend/src/lib/utils/helpers.ts
@@ -1,4 +1,4 @@
-export function formatStringToDate(inputString: string,locale: string="en") {
+export function formatStringToDate(inputString: string, locale: string="en") {
 	const date = new Date(inputString);
 	return date.toLocaleDateString(locale, {
 		year: 'numeric',
@@ -23,4 +23,18 @@ export function getRequirementTitle(ref_id: string, name: string) {
 		pattern == 2 ? ref_id :
 		pattern == 1 ? name : '';
 	return title;
+}
+
+export function displayScoreColor(value: number, max_score: number){
+	value = value * 100 / max_score
+	if(value < 25){
+		return 'stroke-red-500'
+	}
+	if(value < 50){
+		return 'stroke-orange-500'
+	}
+	if(value < 75){
+		return 'stroke-yellow-500'
+	}
+	return 'stroke-green-500'
 }
\ No newline at end of file
diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
index f38b7a304..0a0fb9e90 100644
--- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
@@ -90,6 +90,7 @@
 
 	import { ProgressRadial, localStorageStore } from '@skeletonlabs/skeleton';
 	import type { Writable } from 'svelte/store';
+	import { displayScoreColor } from '$lib/utils/helpers';
 
 	const expandedNodesState: Writable<any> = localStorageStore('expandedNodes', expandedNodes, {
 		storage: 'session'
@@ -161,7 +162,7 @@
 		</div>
 		{#if data.global_score.score >= 0}
 			<div class="flex items-center cursor-pointer">
-				<ProgressRadial stroke={100} font={150} value={data.global_score.score * 100 / data.global_score.max_score} width={'w-52'}>{data.global_score.score}</ProgressRadial>
+				<ProgressRadial stroke={100} meter={displayScoreColor(data.global_score.score, data.global_score.max_score)} font={125} value={data.global_score.score * 100 / data.global_score.max_score} width={'w-52'}>{data.global_score.score}</ProgressRadial>
 			</div>
 		{/if}
 		<div class="w-1/2">
diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte
index 976683f10..695673d4a 100644
--- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte
+++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { displayScoreColor } from '$lib/utils/helpers';
 	import { localItems } from '$lib/utils/locales';
 	import { languageTag } from '$paraglide/runtime';
 	import { ProgressRadial } from '@skeletonlabs/skeleton';
@@ -17,13 +18,13 @@
 
 {#if assessable}
 <div class="flex flex-row space-x-2 items-center">
+	<span class="badge {classesText} h-fit" style="background-color: {statusColor};">
+		{lead}
+	</span>
 	{#if score !== null}
 		<span>
-			<ProgressRadial stroke={100} font={150} value={score * 100 / max_score} width={'w-12'}>{score}</ProgressRadial>
+			<ProgressRadial stroke={100} meter={displayScoreColor(score, max_score)} font={150} value={score * 100 / max_score} width={'w-10'}>{score}</ProgressRadial>
 		</span>
 	{/if}
-	<span class="badge {classesText} h-fit" style="background-color: {statusColor};">
-		{lead}
-	</span>
 </div>
 {/if}

From 859046476c12c0de09c3496841101a78c72d0966 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 16 Apr 2024 17:00:43 +0200
Subject: [PATCH 11/12] ci: fix compliance assessment api test

---
 backend/app_tests/api/test_api_compliance_assessments.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/app_tests/api/test_api_compliance_assessments.py b/backend/app_tests/api/test_api_compliance_assessments.py
index 0ff2003d7..543bf048e 100644
--- a/backend/app_tests/api/test_api_compliance_assessments.py
+++ b/backend/app_tests/api/test_api_compliance_assessments.py
@@ -122,6 +122,8 @@ def test_get_compliance_assessments(self, test):
                 "framework": {
                     "id": str(Framework.objects.all()[0].id),
                     "str": str(Framework.objects.all()[0]),
+                    "min_score": 0,
+                    "max_score": 100
                 },
             },
             user_group=test.user_group,
@@ -150,6 +152,8 @@ def test_create_compliance_assessments(self, test):
                 "framework": {
                     "id": str(Framework.objects.all()[0].id),
                     "str": str(Framework.objects.all()[0]),
+                    "min_score": Framework.objects.all()[0].min_score,
+                    "max_score": Framework.objects.all()[0].max_score
                 },
             },
             user_group=test.user_group,
@@ -190,6 +194,8 @@ def test_update_compliance_assessments(self, test):
                 "framework": {
                     "id": str(Framework.objects.all()[0].id),
                     "str": str(Framework.objects.all()[0]),
+                    "min_score": Framework.objects.all()[0].min_score,
+                    "max_score": Framework.objects.all()[0].max_score
                 },
             },
             user_group=test.user_group,

From a20a6f5cb04a39a8753265b1f207d96c1ce3f273 Mon Sep 17 00:00:00 2001
From: Mohamed-Hacene <mohamedhacene.b@gmail.com>
Date: Tue, 16 Apr 2024 18:00:14 +0200
Subject: [PATCH 12/12] chore: rename preventNull by formatValue

---
 frontend/src/lib/components/Forms/Score.svelte | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
index 85b0b432e..ce300b529 100644
--- a/frontend/src/lib/components/Forms/Score.svelte
+++ b/frontend/src/lib/components/Forms/Score.svelte
@@ -17,12 +17,11 @@
 	
 	$: scoringEnabled = $value === null ? false : true
 
-	function preventNull(value: number){
+	function formatValue(value: number){
 		if(value === null){
 			return 0
 		}
 		return value * 100 / max_score
-	
 	}
 
 	function displayNoValue(value: number){
@@ -68,7 +67,7 @@
 		</div>
 		<div class="flex w-1/2 items-center justify-center">
 			{#if scoringEnabled}
-				<ProgressRadial stroke={100} meter={displayScoreColor($value, max_score)} value={preventNull($value)} font={100} width={'w-32'}>{displayNoValue($value)}</ProgressRadial>
+				<ProgressRadial stroke={100} meter={displayScoreColor($value, max_score)} value={formatValue($value)} font={100} width={'w-32'}>{displayNoValue($value)}</ProgressRadial>
 			{:else}
 				<ProgressRadial stroke={100} value={0} font={100} width={'w-32'}>--</ProgressRadial>
 			{/if}