Merge branch 'develop' into HeuristicIssues

ruxailab · Apr 23, 2024 · f345e63 · f345e63
2 parents f8e16d2 + a1315ce
commit f345e63
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 32 deletions.
diff --git a/src/components/molecules/HeuristicsTable.vue b/src/components/molecules/HeuristicsTable.vue
@@ -224,7 +224,8 @@
                             padding-bottom: 4px !important;
                           "
                         >
-                          {{ item.id }} - {{ item.title }}
+                           {{ item.id + 1 }}
+                          - {{ item.title }}
                         </v-list-item-title>
                       </v-list-item-content>
                       <div

diff --git a/src/components/molecules/IntroAnalytics.vue b/src/components/molecules/IntroAnalytics.vue
@@ -50,7 +50,7 @@ export default {
       this.$router.push('/analytics/documentation').catch(() => {})
     },
     goToDisc() {
-      window.open('https://discord.gg/XHhnXBjgRh')
+      window.open('https://discord.gg/MFWNpwTq9q')
     },
     callFunc(func) {
       this[func]()

diff --git a/src/components/molecules/IntroAnswer.vue b/src/components/molecules/IntroAnswer.vue
@@ -52,7 +52,7 @@ export default {
       this.$router.push('/answers/documentation').catch(() => {})
     },
     goToDisc() {
-      window.open('https://discord.gg/XHhnXBjgRh')
+      window.open('https://discord.gg/MFWNpwTq9q')
     },
     callFunc(func) {
       this[func]()

diff --git a/src/components/molecules/IntroCoops.vue b/src/components/molecules/IntroCoops.vue
@@ -47,7 +47,7 @@ export default {
       this.$router.push('/cooperators/documentation').catch(() => {})
     },
     goToDisc() {
-      window.open('https://discord.gg/XHhnXBjgRh')
+      window.open('https://discord.gg/MFWNpwTq9q')
     },
     closeIntro() {
       this.$emit('closeIntro')

diff --git a/src/components/molecules/IntroEdit.vue b/src/components/molecules/IntroEdit.vue
@@ -48,7 +48,7 @@ export default {
       this.$router.push('/edit/documentation').catch(() => {})
     },
     goToDisc() {
-      window.open('https://discord.gg/XHhnXBjgRh')
+      window.open('https://discord.gg/MFWNpwTq9q')
     },
     closeIntro() {
       this.$emit('closeIntro')

diff --git a/src/components/molecules/WeightTable.vue b/src/components/molecules/WeightTable.vue
@@ -106,8 +106,8 @@
                                 />
                               </template>
                               <span>
-                                H{{ f + (tabs + 1) }} has
-                                {{ importt[r - 1] }} than H {{ tabs + 1 }}</span
+                                H{{ tabs + 1 }} has
+                                {{ importt[r - 1] }} than H{{ f + (tabs + 1) }}</span
                               >
                             </v-tooltip>
                           </v-radio-group>
@@ -151,21 +151,21 @@ export default {
       scores: null,
       importance: {
         'Equal Importance': 1,
-        'Moderate Importance': 2,
-        'Strong Importance': 3,
-        'Very Strong Importance': 4,
+        'Moderately Importance': 2,
+        'Strongly Importance': 3,
+        'Very Strongly Importance': 4,
         'Extreme Importance': 5,
         'Moderately Less Important': 6,
         'Strongly Less Important': 7,
         'Very Strongly Less Important': 8,
-        'Extremely Less Important': 9,
+        'Extremely Less Important': 9
       },
       importt: [
         'Equal Importance',
-        'Moderate Importance',
-        'Strong Importance',
-        'Very Strong Importance',
-        'Extreme Importance',
+        'Moderately Importance',
+        'Strongly Importance',
+        'Very Strongly Importance',
+        'Extremely Importance',
         'Moderately Less Important',
         'Strongly Less Important',
         'Very Strongly Less Important',

diff --git a/src/components/organisms/HeuristicsAnalytics.vue b/src/components/organisms/HeuristicsAnalytics.vue
@@ -13,6 +13,8 @@
             <v-col class="ma-0 pa-0" cols="2">
               <v-list outlined rounded dense height="560px">
                 <v-subheader>Heuristics</v-subheader>
+                {{ resultHeuristics.length }}
+                {{ heuristicsLength }}
                 <v-divider />
                 <v-list
                   color="grey-lighten-3"
@@ -21,6 +23,7 @@
                   class="list-scroll"
                 >
                   <v-list-item-group v-model="heuristicSelect" color="#fca326">
+
                     <v-list-item v-for="(item, i) in resultHeuristics" :key="i">
                       <v-list-item-content>
                         <v-list-item-title>{{ item.id }}</v-list-item-title>
@@ -336,6 +339,9 @@ export default {
       let index = 0
 
       for (const uid in this.answers) {
+
+        //console.log('answers  ', this.answers)
+
         if (!this.answers[uid]) {
           continue
         }
@@ -345,6 +351,8 @@ export default {
         let SelectHeuristic = this.resultHeuristics.find(
           (h) => h.id === `H${index}`,
         )
+        //console.log('heuristic  ' , heuristic)
+        //console.log('resultHeuristics  ', this.resultHeuristics)
 
         if (!SelectHeuristic) {
           this.resultHeuristics.push({
@@ -357,6 +365,9 @@ export default {
           ]
         }
 
+        //console.log('SelectHeuristic  ',SelectHeuristic)
+        //console.log('heuristicQuestions', heuristic.heuristicQuestions)
+
         heuristic.heuristicQuestions.forEach((hQuestion) => {
           hQuestion.heuristicQuestions.forEach((question, qIndex) => {
             const selectQuestion = SelectHeuristic.questions.find(
@@ -385,7 +396,9 @@ export default {
         })
 
         index++
+        // console.log(uid)
       }
+
     },
     goToCoops() {
       this.$emit('goToCoops')

diff --git a/src/components/organisms/HeuristicsTestAnswer.vue b/src/components/organisms/HeuristicsTestAnswer.vue
@@ -195,22 +195,8 @@
           </v-card>
 
           <!-- Tab 3 - Heuristics-->
-          <v-card
-            v-if="tab == 2"
-            rounded="xl"
-            flat
-            class="mb-6 py-2"
-            style="background: #f5f7ff"
-          >
-            <v-card
-              v-if="evaluatorStatistics.items.length <= 1"
-              class="mx-auto mt-10 mb-10 py-6 if-card"
-              align="center"
-              width="970px"
-            >
-              This page needs more than 1 answer to be generated.
-            </v-card>
-            <div v-else>
+          <v-card v-if="tab == 2" rounded="xl" flat class="mb-6 py-2" style="background: #f5f7ff">
+            <div>
               <v-card-title class="subtitleView">
                 Heuristics Data
               </v-card-title>

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -203,7 +203,7 @@
       "learnMore": "Learn More",
       "docTitle": "Read documentation",
       "docSubtitle": "Click to access the documentation on how to use the page ",
-      "discTitle": "Join the comunity!",
+      "discTitle": "Join the community!",
       "discSubtitle": "You will find support on our discord server."
     },
     "finalReport": {