Merge branch 'dynamic-spider-chart' of fyindr/siimee into dev

backend/db/data-generator/mock.js

@@ -443,16 +443,16 @@ module.exports = {
         },
         {
             response_key_id: 3,
-            response_key_category: 'collaborative_vs_independent',
+            response_key_category: 'dynamic_vs_ordered',
             response_key_prompt:
-                'Do you structure and encourage your team to be a Collaborative or Independent environment?',
+                'Do you structure and encourage your team to be a Collaborative or Independent environment? (NEEDS UPDATED COPY)',
             response_key_description: 'first round draft scoring question',
         },
         {
             response_key_id: 4,
-            response_key_category: 'innovative_vs_conventional',
+            response_key_category: 'precise_vs_resourceful',
             response_key_prompt:
-                'Do you find higher success in employees on your team that are Innovative or Conventional?',
+                'Do you find higher success in employees on your team that are Innovative or Conventional? (NEEDS UPDATED COPY)',
             response_key_description: 'first round draft scoring question',
         },
         {

backend/db/seeds/04-responses.js

@@ -28,7 +28,7 @@ exports.seed = async knex => {
     for (let i = 1; i <= len; i += 1) {
         responsesToPush.push(responses.shift())
         if (i % batchSize === 0 || i > responses.length) {
-            // await knex('responses').insert(responsesToPush)
+            await knex('responses').insert(responsesToPush)
             responsesToPush = []
         }
     }

backend/lib/services/profile/index.js

@@ -62,9 +62,8 @@ module.exports = class ProfileService extends Schmervice.Service {
             .withGraphFetched('tags')
             .withGraphFetched('responses')
             .withGraphFetched('user')
-
         tagger.setProfileTags(matchingProfile, matchingProfile, this.tagLookup)
-        const complete = new profiler.CompleteProfile(matchingProfile)
+        const complete = new profiler.CompleteProfile(matchingProfile, true)
         return complete
     }
 

backend/lib/services/profile/profiler.js

@@ -7,7 +7,7 @@ const tagger = require('./tagger')
  * !: This needs to match the responseSchema in profiles.js
  */
 class CompleteProfile {
-    constructor(profile, type, includeResponses = false) {
+    constructor(profile, includeResponses = false, type) {
         this.user_id = profile.user_id // int user_id
         this.profile_id = profile.profile_id // int profile_id
         this.user_name = profile.user.user_name // string user_name

frontend/src/components/ProfileCard.vue

@@ -29,6 +29,7 @@ w-card.profile-card-list--card.xs12
             SummaryBar(
                 :aspects='aspects'
                 :is-tab='true'
+                :name='card.name'
                 :tab-content='card.summary'
                 @tab-change='onTab'
             )

frontend/src/components/SummaryBar.vue

@@ -30,9 +30,9 @@ section.w-flex.column.pb5
                     p {{ tabContent[item].tab }}
                     SpiderChart(
                         :labels='aspects.map(label => label.name)'
-                        :profile-data='profileScore'
+                        :profile-data='aspects.map(data => data.percentage)'
                         :target-data='targetScore'
-                        profile-name='lucy'
+                        :profile-name='name'
                         v-if='isTab'
                     )
 
@@ -62,6 +62,7 @@ section.w-flex.column.pb5
 
 <script>
 import SpiderChart from './SpiderChart.vue'
+import { currentProfile } from '../services'
 
 export default {
     components: { SpiderChart },
@@ -74,6 +75,10 @@ export default {
             required: true,
             type: Object,
         },
+        name:{
+            required:true,
+            type: String
+        },
         isTab: {
             required: false,
             type: Boolean,
@@ -86,10 +91,18 @@ export default {
         },
     },
     emits: ['tab-change'],
-    data: () => ({
-        profileScore: [5.7, 5.2, 4.8, 5.2, 4.9, 4.9],
-        targetScore: [5.3, 4.8, 5.7, 4.8, 5.6, 4.8],
-    }),
+    computed: {
+        targetScore(){
+            try{
+                let aspectResponses = currentProfile._profile.responses.filter(r => [1,2,3,4,5,6].indexOf(r.response_key_id) !== -1)
+                return aspectResponses.map(r => Number(r.val)) 
+            }
+            catch(e){
+                console.warn('error: No aspect responses for current profile.')
+                return [1,1,1,1,1,1]
+            }
+        }
+    },
     methods: {
         onTabChanged(tabs) {
             this.$emit('tab-change', tabs)

frontend/src/entities/card/card.js

@@ -40,7 +40,7 @@ class SummaryGroup {
 }
 
 class Aspect {
-    constructor({ name, labels, percentage = 50 }) {
+    constructor({ name, labels, percentage = 1 }) {
         this.name = name
         this.labels = labels
         this.percentage = percentage
@@ -73,6 +73,15 @@ const cardAspects = [
     }),
 ]
 
+const responseKeyIdToAspectName = {
+    1: 'vision',
+    2: 'creativity',
+    3: 'dynamism',
+    4: 'precision',
+    5: 'focus',
+    6: 'attention',
+}
+
 /**
  * Class representing a profile card
  * NOT to be confused with a profile
@@ -123,6 +132,16 @@ const makeCardFromProfile = profile => {
     c.ethinicity = profile?.profile_prefs?.ethnicity?.val
     c.locale = `${profile.city}, ${profile.state}`
     c.email = profile.user_email
+
+
+    let aspectResponses = profile?.responses.filter(r => [1,2,3,4,5,6].indexOf(r.response_key_id) !== -1)
+    if(aspectResponses.length){ // if user has responses for aspects we overwrite default percentages
+        c.aspects.map(a => {
+            a.percentage = Number(aspectResponses.find(r => responseKeyIdToAspectName[r.response_key_id] == a.name).val )
+            return a 
+        })
+    }
+
     // TODO: delete me later
     if (profile.profile_description) {
         c.summary.updateTab('about', profile.profile_description)