feat(Survivors): Update the front to the new jobs parsing

leonard-IMBERT · Apr 3, 2019 · 3c5eb47 · 3c5eb47
1 parent b725cd3
commit 3c5eb47
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/Survivor.ts b/src/Survivor.ts
@@ -5,8 +5,8 @@ type Survivor = {
  Health: string,
  Items: string,
  Conditions: string | null,
- Jobs: string | null,
+ Jobs: [{ Name: string, Level: string }],
  id: string | null
 }
 
-export default Survivor;
+export default Survivor;
diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue
@@ -50,7 +50,8 @@ function funct(str: string): (surv: Survivor) => boolean {
  case 'jobs':
  return (surv: Survivor) => value.split(',').every((job) => {
  if (surv.Jobs != null) {
- return surv.Jobs.toLowerCase().match(job.toLowerCase()) != null;
+ return surv.Jobs.reduce((acc, j) => acc + j.Name, '')
+ .toLowerCase().match(job.toLowerCase()) != null;
  } return false;
  });
  case 'items':
@@ -94,17 +95,14 @@ export default class SideBar extends Vue {
  Health: `${inhab.Health}/${inhab.MaxHealth}`,
  Items: `(${numItems}) ${inhab.items.toString().replace(/,/g, ', ')}`,
  Conditions: null,
- Jobs: null,
+ Jobs: inhab.jobs,
  id: uuid.v4(),
  };
 
  // Pretifiying the conditions and jobs
  if (!inhab.conditions.includes('')) {
  survivor.Conditions = inhab.conditions.toString().replace(/,/g, ', ');
  }
- if (!inhab.jobs.includes('')) {
- survivor.Jobs = inhab.jobs.toString().replace(/,/g, ', ');
- }
 
  return survivor;
  });

diff --git a/src/components/Survivor.vue b/src/components/Survivor.vue
@@ -9,7 +9,9 @@
  <li>Health: {{ survivor.Health }}</li>
  <li>Items: {{ survivor.Items }}</li>
  <li v-if="survivor.Conditions != null"> Conditions: {{ survivor.Conditions }}</li>
- <li v-if="survivor.Jobs != null">Jobs: {{ survivor.Jobs }}</li>
+ <li v-if="survivor.Jobs != null">Jobs: {{
+ survivor.Jobs.map(job => `${job.Name} ${job.Level}`).toString()
+ }}</li>
  </ul>
  </div>
  </li>