fixes

ISSResearch · Aug 21, 2024 · 314e3aa · 314e3aa
1 parent be57fd5
commit 314e3aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/backend-app/project/serializers.py b/backend-app/project/serializers.py
@@ -57,8 +57,12 @@ class Meta:
     def get_project(self, instance: ProjectGoal) -> int: return instance.project.id
 
     def get_attribute(self, instance: ProjectGoal) -> str:
-        level_name = instance.attribute.level.name
-        return f"{level_name}: {instance.attribute.name}"
+        make_name = lambda a: f"{a.name}({a.level.name})"
+
+        attribute = instance.attribute
+        parent = attribute.parent
+
+        return (f"{make_name(parent)}: " if parent else "") + make_name(attribute)
 
     def get_complete(self, instance: ProjectGoal) -> int:
         return instance.attribute.attributegroup_set.count()
diff --git a/frontend-app/src/components/common/GoalCard/index.jsx b/frontend-app/src/components/common/GoalCard/index.jsx
@@ -9,7 +9,7 @@ import "./styles.css";
 */
 export default function GoalCard({ goalItem, onDelete }) {
   const { attribute, amount, complete, id } = goalItem;
-  const progress = Math.min(Math.ceil(complete / amount * 100));
+  const progress = Math.min(100, Math.ceil(complete / amount * 100));
 
   return <article className="goal__card">
     <h3>{attribute}</h3>