From 6b3631a04c641ee56c57b9eca50e8e7d2535f61d Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sun, 5 Sep 2021 13:03:48 +0200
Subject: [PATCH 1/3] enable consultant column

---
 src/components/JehMaker.vue |  8 ++++----
 src/components/Phase.vue    | 13 ++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/JehMaker.vue b/src/components/JehMaker.vue
index 232fe96..4671797 100644
--- a/src/components/JehMaker.vue
+++ b/src/components/JehMaker.vue
@@ -25,12 +25,12 @@
               <Frais v-model="fee" :totalPrice="totalPrice"/>
           </sui-grid-column>
           <sui-grid-column>
-            <!-- <consultants
+            <consultants
               @newConsultant="onNewConsultant"
               @removeConsultant="onRemoveConsultant"
               :consultants="consultants"
               >
-            </consultants> -->
+            </consultants>
           </sui-grid-column>
           <sui-grid-column>
               <DistributionChart :chartData="chartData"></DistributionChart>
@@ -86,7 +86,7 @@
               <!-- <p class="bold-normal">Moyenne : {{ averageMarginJe | percentage }}</p> -->
             </th>
             <th>URSSAF</th>
-            <!-- <th>Intervenants</th> -->
+            <th>Intervenants</th>
             <th>Rémunération</th>
             <th>URSSAF</th>
             <th>net</th>
@@ -118,7 +118,7 @@
             <th></th>
             <th></th>
             <th>{{ totalUrssafJe | euro }}</th>
-            <!-- <th></th> -->
+            <th></th>
             <th>{{ totalPay | euro }}</th>
             <th>{{ totalUrssafConsultant | euro }}</th>
             <th>{{ totalNetConsultant | euro }}</th>
diff --git a/src/components/Phase.vue b/src/components/Phase.vue
index bc987bf..c4343c2 100644
--- a/src/components/Phase.vue
+++ b/src/components/Phase.vue
@@ -34,12 +34,11 @@
     </td>
     <td>{{ phase.marginJE | percentage }}</td>
     <td>{{ phase.urssafJE | euro }}</td>
-    <!-- <td>
+    <td>
       <multiple-select
         :options="consultants"
-        :placeholder="'Intervenant'"
       ></multiple-select>
-    </td> -->
+    </td>
     <td>
       <div class="ui verysmall input">
         <input
@@ -71,7 +70,7 @@ export default class Phase extends Vue {
   // Props
   @Prop() private phase!: PhaseObject
   @Prop() private contributions!: any
-  // @Prop() private consultants!: string[]
+  @Prop() private consultants!: string[]
   @Prop() private taux!: TauxObject
 
   // Data
@@ -91,9 +90,9 @@ export default class Phase extends Vue {
   // Lifecycle hood
   mounted () {
     this.calculate()
-    // if (this.consultants.length) {
-    //   this.consultant = this.consultants[0]
-    // }
+    if (this.consultants.length) {
+      this.consultant = this.consultants[0]
+    }
   }
 
   // Watchers

From c479f4e7d2013457de8554386e8479707d6114b0 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sun, 5 Sep 2021 13:12:44 +0200
Subject: [PATCH 2/3] clean code

---
 src/components/Consultant.vue | 2 --
 src/components/JehMaker.vue   | 4 +---
 src/components/Phase.vue      | 3 ---
 src/components/Taux.vue       | 2 +-
 tests/unit/types.spec.ts      | 1 -
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/components/Consultant.vue b/src/components/Consultant.vue
index 20751ec..581783b 100644
--- a/src/components/Consultant.vue
+++ b/src/components/Consultant.vue
@@ -57,8 +57,6 @@ export default class Phase extends Vue {
 
 <!-- Add 'scoped' attribute to limit CSS to this component only -->
 <style scoped lang='scss'>
-.new-consultant-wrapper {
-}
 .new-consultant-wrapper * {
   margin: 6px;
 }
diff --git a/src/components/JehMaker.vue b/src/components/JehMaker.vue
index 4671797..d1f3152 100644
--- a/src/components/JehMaker.vue
+++ b/src/components/JehMaker.vue
@@ -59,7 +59,6 @@
     </div>
     <div class="ui fluid container scrollable">
       <table class="ui small celled table">
-      <!-- <table class="cell"> -->
         <thead>
           <tr class="center aligned">
             <th></th>
@@ -68,7 +67,7 @@
             <th colspan="2" class="center aligned">JEH</th>
             <th colspan="2"></th>
             <th colspan="2" class="center aligned">Part JE</th>
-            <th colspan="4" class="center aligned">Part intervenant(s)</th> <!-- todo: s que si plusieurs intervenants -->
+            <th colspan="4" class="center aligned">Part intervenant</th>
             <th></th>
           </tr>
           <tr class="center aligned">
@@ -137,7 +136,6 @@
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from 'vue-property-decorator'
 
-// import DistributionChart from './DistributionChart'
 import DistributionChart from '../chart/ReadingChart.vue'
 import { PhaseObject, TauxObject } from '../types'
 import Phase from './Phase.vue'
diff --git a/src/components/Phase.vue b/src/components/Phase.vue
index c4343c2..40575e5 100644
--- a/src/components/Phase.vue
+++ b/src/components/Phase.vue
@@ -52,7 +52,6 @@
     <td>{{ phase.netConsultant | euro }}</td>
     <td>{{ phase.netByConsultant | euro }}</td>
     <td @click="deletePhaseEvent"><i class="icon close"></i></td>
-    <!-- <td>{{ mode }}</td> -->
   </tr>
 </template>
 
@@ -69,7 +68,6 @@ import MultipleSelect from './MultipleSelect.vue'
 export default class Phase extends Vue {
   // Props
   @Prop() private phase!: PhaseObject
-  @Prop() private contributions!: any
   @Prop() private consultants!: string[]
   @Prop() private taux!: TauxObject
 
@@ -170,7 +168,6 @@ export default class Phase extends Vue {
     this.phase.netByConsultant = 0
     this.phase.pcConsultant = 0
   }
-  // toInt(strnb): [number, string] { // convert to integer and if possible then call calculate, otherwise call reset
   toInt (strnb: string): number { // convert to integer and if possible then call calculate, otherwise call reset
     let nb = parseInt(strnb)
     if (isNaN(nb)) {
diff --git a/src/components/Taux.vue b/src/components/Taux.vue
index 0b1bee6..4429d23 100644
--- a/src/components/Taux.vue
+++ b/src/components/Taux.vue
@@ -52,7 +52,7 @@ export default class Taux extends Vue {
     this.open = !this.open
   }
 
-  handleInput (e) {
+  handleInput () {
     this.$emit('input', this.content)
   }
 }
diff --git a/tests/unit/types.spec.ts b/tests/unit/types.spec.ts
index 260e5bf..2fd765f 100644
--- a/tests/unit/types.spec.ts
+++ b/tests/unit/types.spec.ts
@@ -37,7 +37,6 @@ const testSetMethods = [
     },
     taux: new TauxObject(39.04, 0.30116, 0.042, 0.1605, 0)
   }
-  // TODO Add values from 2020 with updated rates
 ]
 
 describe('TauxObject', () => {

From e34304202a63bd6f6945471048b29ab57faa7ec9 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sun, 5 Sep 2021 13:28:22 +0200
Subject: [PATCH 3/3] fix: remove unused consultant var

---
 src/components/Phase.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/Phase.vue b/src/components/Phase.vue
index 40575e5..d292bd9 100644
--- a/src/components/Phase.vue
+++ b/src/components/Phase.vue
@@ -68,7 +68,6 @@ import MultipleSelect from './MultipleSelect.vue'
 export default class Phase extends Vue {
   // Props
   @Prop() private phase!: PhaseObject
-  @Prop() private consultants!: string[]
   @Prop() private taux!: TauxObject
 
   // Data
@@ -83,14 +82,9 @@ export default class Phase extends Vue {
 
   mode: string = 'price' // 'price' or 'pay' (avoid infinite loop cause by watch and calculations)
 
-  consultant: string = '';
-
   // Lifecycle hood
   mounted () {
     this.calculate()
-    if (this.consultants.length) {
-      this.consultant = this.consultants[0]
-    }
   }
 
   // Watchers