div improvements after feedback

- change sorting - change order - skip question when "none" is selected
scout-ch · Dec 15, 2024 · 3178e69 · 3178e69
1 parent d2cc869
commit 3178e69
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 41 deletions.
diff --git a/src/i18n/de.json b/src/i18n/de.json
@@ -30,7 +30,8 @@
       "title": "Neues Projekt",
       "evaluation": {
         "title": "Resultat",
-        "restart": "Antworten bearbeiten"
+        "restart": "Antworten bearbeiten",
+        "reset": "Antworten löschen"
       },
       "tools": {
         "app": "App",
@@ -55,7 +56,7 @@
           }
         },
         "simultan": {
-          "text": "Müssen mehrere Personen gleichzeitig mit dem Tool etwas erarbeiten/verändern können?",
+          "text": "Müssen mehrere Personen gleichzeitig mit dem Tool etwas erarbeiten/verändern können (Kollaboration)?",
           "responses": {
             "no": "Nein",
             "yes": "Ja"
@@ -117,7 +118,7 @@
           }
         },
         "modification": {
-          "text": "Wie viel Vorwissen braucht es für das Anpassen der Inhalte?",
+          "text": "Wie viel technisches Vorwissen braucht es für das Anpassen der Inhalte?",
           "responses": {
             "much": "Viel",
             "medium": "Mittel",

diff --git a/src/pages/DigitalisationPage.tsx b/src/pages/DigitalisationPage.tsx
@@ -19,7 +19,7 @@ export default function DigitalisationPage() {
     <p>{t('digitalisation_page.introduction')}</p>
     <Infobox>
       {t('digitalisation_page.new_project')}{' '}
-      <Link to="/digitalisation/new-project">{t('digitalisation_page.title')}</Link>
+      <Link to="/digitalisation/new-project">{t('new_project_guidelines_page.title')}</Link>
     </Infobox>
     <h2>{t('digitalisation_page.content')}</h2>
     <ul>

diff --git a/src/pages/digitalisation/NewDigitalisationProjectPage.tsx b/src/pages/digitalisation/NewDigitalisationProjectPage.tsx
@@ -166,6 +166,12 @@ export default function NewDigitalisationProjectPage() {
     setCurrentQuestion(0)
   }
 
+  function reset() {
+    setShowScore(false)
+    setCurrentQuestion(0)
+    setReplies(defaultReplies)
+  }
+
   const questionsRoot: Root = questionJson
   const questions: Question[] = questionsRoot.questions
 
@@ -200,7 +206,7 @@ export default function NewDigitalisationProjectPage() {
     })
 
     return <div className='result-section'>
-      {score.sort((a, b) => b.score - a.score).map((a) => {
+      {score.sort((a, b) => (b.score - a.score) || (a.warnings.length - b.warnings.length)).map((a) => {
         let warnings = a.warnings
         return <div>
           <h3>{t(`new_project_digitalisation_page.tools.${a.key}`)} (Score: {a.score})</h3>
@@ -230,6 +236,7 @@ export default function NewDigitalisationProjectPage() {
       {showScore ? <div className='score-section'>
         <h2>{t("new_project_digitalisation_page.evaluation.title")}</h2>
         <Button type="button" onClick={() => restart()}>{t('new_project_digitalisation_page.evaluation.restart')}</Button>
+        <Button type="button" onClick={() => reset()}>{t('new_project_digitalisation_page.evaluation.reset')}</Button>
         {calculateResult()}
       </div> :
         <div className='question-section'>

diff --git a/src/questions.json b/src/questions.json
@@ -206,6 +206,7 @@
       "responses": [
         {
           "key": "none",
+          "next_question": 6,
           "tools": [
             "app",
             "game",
@@ -424,103 +425,103 @@
     },
     {
       "index": 9,
-      "key": "modification",
+      "key": "moderation",
       "responses": [
         {
-          "key": "much",
+          "key": "often",
           "tools": [
-            "app",
-            "game",
             "youtube",
             "e_learning",
-            "website",
             "podcast",
-            "office",
-            "pdf",
             "pm_tool",
             "collaboration"
           ],
           "kills": []
         },
         {
-          "key": "medium",
+          "key": "little",
           "tools": [
-            "youtube",
-            "website",
-            "podcast",
-            "office",
-            "pdf",
-            "pm_tool"
+            "app",
+            "office"
           ],
           "kills": [
-            "app",
-            "game",
+            "youtube",
             "e_learning",
+            "podcast",
+            "pm_tool",
             "collaboration"
           ]
         },
         {
-          "key": "little",
+          "key": "none",
           "tools": [
-            "office",
-            "pdf",
-            "pm_tool"
+            "game",
+            "website",
+            "pdf"
           ],
           "kills": [
             "app",
-            "game",
             "youtube",
             "e_learning",
-            "website",
             "podcast",
+            "office",
+            "pm_tool",
             "collaboration"
           ]
         }
       ]
     },
     {
       "index": 10,
-      "key": "moderation",
+      "key": "modification",
       "responses": [
         {
-          "key": "often",
+          "key": "much",
           "tools": [
+            "app",
+            "game",
             "youtube",
             "e_learning",
+            "website",
             "podcast",
+            "office",
+            "pdf",
             "pm_tool",
             "collaboration"
           ],
           "kills": []
         },
         {
-          "key": "little",
+          "key": "medium",
           "tools": [
-            "app",
-            "office"
+            "youtube",
+            "website",
+            "podcast",
+            "office",
+            "pdf",
+            "pm_tool"
           ],
           "kills": [
-            "youtube",
+            "app",
+            "game",
             "e_learning",
-            "podcast",
-            "pm_tool",
             "collaboration"
           ]
         },
         {
-          "key": "none",
+          "key": "little",
           "tools": [
-            "game",
-            "website",
-            "pdf"
+            "office",
+            "pdf",
+            "pm_tool"
           ],
           "kills": [
             "app",
+            "game",
             "youtube",
             "e_learning",
+            "website",
             "podcast",
-            "office",
-            "pm_tool",
             "collaboration"
           ]
         }