fix composer

intuitem · Aug 29, 2024 · b051b88 · b051b88
1 parent 0a498bf
commit b051b88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/backend/core/helpers.py b/backend/core/helpers.py
@@ -36,9 +36,10 @@ def flatten_dict(
 
 STATUS_COLOR_MAP = { # TODO: Move these kinds of color maps to frontend
  "undefined": "#CCC",
- "planned": "#BFDBFE",
+ "--": "#CCC",
+ "to_do": "#BFDBFE",
  "active": "#46D39A",
- "inactive": "#E55759",
+ "deprecated": "#E55759",
  "in_progress": "#5470c6",
  "in_review": "#BBF7D0",
  "done": "#46D39A",
@@ -913,7 +914,7 @@ def compile_risk_assessment_for_composer(user, risk_assessment_list: list):
 
  values = list()
  labels = list()
-
+ # WARNING: this is wrong - FIX ME because we compute the controls multiple times if used accross multiple scenarios
  for st in AppliedControl.Status.choices:
  count = (
  AppliedControl.objects.filter(status=st[0])

diff --git a/backend/core/models.py b/backend/core/models.py
@@ -1190,8 +1190,8 @@ class AppliedControl(NameDescriptionMixin, FolderMixin, PublishInRootFolderMixin
  class Status(models.TextChoices):
  TO_DO = "to_do", _("To do")
  IN_PROGRESS = "in_progress", _("In progress")
- ACTIVE = "active", _("Active")
  ON_HOLD = "on_hold", _("On hold")
+ ACTIVE = "active", _("Active")
  DEPRECATED = "deprecated", _("Deprecated")
  UNDEFINED = "--", _("Undefined")
 

diff --git a/frontend/src/routes/(app)/analytics/composer/+page.svelte b/frontend/src/routes/(app)/analytics/composer/+page.svelte
@@ -13,9 +13,6 @@
  });
 
  let applied_control_status: AppliedControlStatus = data.applied_control_status;
- for (const item in applied_control_status.labels) {
- applied_control_status.labels[item] = localItems()[applied_control_status.localLables[item]];
- }
 </script>
 
 <div class="flex flex-col space-y-4 p-2">