From 8d6f2294613ab0c13e1251e6b53737d0003dea77 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sun, 26 Sep 2021 15:10:57 +0200
Subject: [PATCH 01/15] move Taux in JehMaker

---
 src/components/JehMaker.vue | 8 ++++----
 src/views/Home.vue          | 6 +-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/components/JehMaker.vue b/src/components/JehMaker.vue
index 232fe96..048e211 100644
--- a/src/components/JehMaker.vue
+++ b/src/components/JehMaker.vue
@@ -131,6 +131,7 @@
     <div class="ui container">
       <button class="ui primary button" @click="newPhase">Nouvelle phase</button>
     </div>
+    <Taux v-model="taux" />
   </div>
 </template>
 
@@ -144,16 +145,15 @@ import Phase from './Phase.vue'
 import Consultants from './Consultant.vue'
 import Frais from './Frais.vue'
 import ProjetsSidebar from './ProjetsSidebar.vue'
+import Taux from '@/components/Taux.vue'
 import MargesDetails from './MargesDetails.vue'
 import { round, utf8ToB64, b64ToUtf8 } from '../utils'
 
 @Component({
-  components: { Phase, DistributionChart, Consultants, MargesDetails, Frais, ProjetsSidebar }
+  components: { Phase, DistributionChart, Consultants, MargesDetails, Frais, Taux, ProjetsSidebar }
 })
 export default class JehMaker extends Vue {
-  @Prop({ required: true }) taux!: TauxObject;
-
-  // Data
+  taux:TauxObject = new TauxObject()
   projectName:string = '';
   phases: PhaseObject[] = []
   totalPrice:number = 0
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 77e03fb..fb21195 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -4,8 +4,7 @@
   <div class="home ui vertical stripe segment">
       <button @click="toogleSibebar" id="btn__sidebar--open" class="btnmenu"><i class="info circle icon"/></button>
       <h1 is="sui-header">JEH Maker</h1>
-      <JehMaker :taux="taux"/>
-      <Taux v-model="taux" />
+      <JehMaker/>
   </div>
     <div id="footer" class="ui inverted  footer segment">
       Fait avec ♥ par <a href="https://idesys.org">IdéSYS</a>
@@ -17,18 +16,15 @@
 import { PhaseObject, TauxObject } from '../types'
 import { Component, Vue } from 'vue-property-decorator'
 import JehMaker from '@/components/JehMaker.vue' // @ is an alias to /src
-import Taux from '@/components/Taux.vue' // @ is an alias to /src
 import Sidebar from '@/components/Sidebar.vue' // @ is an alias to /src
 
 @Component({
   components: {
     JehMaker,
-    Taux,
     Sidebar
   }
 })
 export default class Home extends Vue {
-  taux:TauxObject = new TauxObject()
   v:boolean = false
 
   toogleSibebar () {

From 7eaee5dcda54032ce3254e0e38f74135c875586a Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sun, 26 Sep 2021 15:11:39 +0200
Subject: [PATCH 02/15] Save and restore taux URL

---
 src/components/JehMaker.vue | 2 ++
 src/components/Taux.vue     | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/src/components/JehMaker.vue b/src/components/JehMaker.vue
index 048e211..f144c4a 100644
--- a/src/components/JehMaker.vue
+++ b/src/components/JehMaker.vue
@@ -251,6 +251,7 @@ export default class JehMaker extends Vue {
     this.projectName = project.projectName
     this.phases = project.phases
     this.fee = project.fee
+    this.taux = jsonImported.taux
 
     if (project.id) {
       this.id = project.id
@@ -373,6 +374,7 @@ export default class JehMaker extends Vue {
     let urlSplit = this.urlImport.split('/')
     if (urlSplit.length > 2 && urlSplit[urlSplit.length - 2] === 'p') {
       this.importFromB64(urlSplit[urlSplit.length - 1])
+      this.calculate()
     }
   }
 }
diff --git a/src/components/Taux.vue b/src/components/Taux.vue
index 0b1bee6..d064d3b 100644
--- a/src/components/Taux.vue
+++ b/src/components/Taux.vue
@@ -14,8 +14,13 @@
           </thead>
           <tbody>
               <tr v-for="label in Object.keys(content)" v-bind:key="label">
+<<<<<<< HEAD
                   <td>{{description[label]}}</td>
                   <td><sui-input class="w-100" v-model="content[label]" @input="handleInput" type="text"/></td>
+=======
+                  <td>{{label}}</td>
+                  <td><sui-input class="w-100"  v-model="content[label]" @input="handleInput" type="number"/></td>
+>>>>>>> b4d972e (Save and restore taux URL)
               </tr>
           </tbody>
         </table>

From fc044b81481c40158d86a37bd2eebf8f83ad57b7 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sat, 30 Oct 2021 10:35:54 +0200
Subject: [PATCH 03/15] remove useless imports

---
 src/components/JehMaker.vue | 2 +-
 src/views/Home.vue          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/JehMaker.vue b/src/components/JehMaker.vue
index f144c4a..97332e4 100644
--- a/src/components/JehMaker.vue
+++ b/src/components/JehMaker.vue
@@ -136,7 +136,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue, Watch } from 'vue-property-decorator'
+import { Component, Vue, Watch } from 'vue-property-decorator'
 
 // import DistributionChart from './DistributionChart'
 import DistributionChart from '../chart/ReadingChart.vue'
diff --git a/src/views/Home.vue b/src/views/Home.vue
index fb21195..4d93f0d 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -13,7 +13,6 @@
 </template>
 
 <script lang="ts">
-import { PhaseObject, TauxObject } from '../types'
 import { Component, Vue } from 'vue-property-decorator'
 import JehMaker from '@/components/JehMaker.vue' // @ is an alias to /src
 import Sidebar from '@/components/Sidebar.vue' // @ is an alias to /src

From ddfb8b518b3aa88d9c7a80eb6fda8b804a4bb93c Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sat, 30 Oct 2021 10:45:32 +0200
Subject: [PATCH 04/15] fix merge

---
 src/components/Taux.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/components/Taux.vue b/src/components/Taux.vue
index d064d3b..98ff777 100644
--- a/src/components/Taux.vue
+++ b/src/components/Taux.vue
@@ -13,14 +13,9 @@
             </tr>
           </thead>
           <tbody>
-              <tr v-for="label in Object.keys(content)" v-bind:key="label">
-<<<<<<< HEAD
+              <tr v-for="label in Object.keys(value)" v-bind:key="label">
                   <td>{{description[label]}}</td>
-                  <td><sui-input class="w-100" v-model="content[label]" @input="handleInput" type="text"/></td>
-=======
-                  <td>{{label}}</td>
-                  <td><sui-input class="w-100"  v-model="content[label]" @input="handleInput" type="number"/></td>
->>>>>>> b4d972e (Save and restore taux URL)
+                  <td><sui-input class="w-100" v-model="value[label]" @input="handleInput" type="text"/></td>
               </tr>
           </tbody>
         </table>
@@ -43,7 +38,7 @@ import { TauxObject } from '../types'
 export default class Taux extends Vue {
   @Prop() value!:TauxObject
 
-  content:TauxObject = this.value
+  // Data
   open:boolean = false;
   description = {
     urssafBase: 'Base URSSAF',
@@ -53,12 +48,13 @@ export default class Taux extends Vue {
     consultantPay: 'Part Etudiant : Total des taux des cotisations indexées sur la rémunération brute'
   }
 
+  // Methods
   toggle () {
     this.open = !this.open
   }
 
   handleInput (e) {
-    this.$emit('input', this.content)
+    this.$emit('input', this.value)
   }
 }
 </script>

From 5b47627836c663b0fcc3172b3fc4d98eccf658ed Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Fri, 29 Oct 2021 19:35:43 +0200
Subject: [PATCH 05/15] cherry pick Fix error in console

---
 src/components/Taux.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Taux.vue b/src/components/Taux.vue
index 98ff777..0cc15c7 100644
--- a/src/components/Taux.vue
+++ b/src/components/Taux.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="value">
     <sui-button @click.native="toggle">Afficher les taux</sui-button>
     <sui-modal v-model="open">
       <sui-modal-header>Taux</sui-modal-header>

From b196da174fa86a72aa6acfca836009287e7d763f Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Fri, 29 Oct 2021 19:35:58 +0200
Subject: [PATCH 06/15] remove unused var

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

diff --git a/src/components/Phase.vue b/src/components/Phase.vue
index bc987bf..344e8e2 100644
--- a/src/components/Phase.vue
+++ b/src/components/Phase.vue
@@ -70,7 +70,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
 

From f9d41daacdd265f4ce907dc72343379dedfb6e1a Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Fri, 29 Oct 2021 19:44:16 +0200
Subject: [PATCH 07/15] fix import from url

---
 src/components/JehMaker.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/JehMaker.vue b/src/components/JehMaker.vue
index 97332e4..02b381f 100644
--- a/src/components/JehMaker.vue
+++ b/src/components/JehMaker.vue
@@ -251,7 +251,13 @@ export default class JehMaker extends Vue {
     this.projectName = project.projectName
     this.phases = project.phases
     this.fee = project.fee
-    this.taux = jsonImported.taux
+    this.taux = new TauxObject(
+      jsonImported.taux.urssafBase,
+      jsonImported.taux.jeContrib,
+      jsonImported.taux.jepay,
+      jsonImported.taux.consultantContrib,
+      jsonImported.taux.consultantPay
+    )
 
     if (project.id) {
       this.id = project.id

From 1815ba9a339fed8bcad87155e7a548ac4830e904 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Fri, 29 Oct 2021 19:48:44 +0200
Subject: [PATCH 08/15] fix change taux


From 255706d994afbbc5314bd974b0cbc898f821ca98 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Fri, 29 Oct 2021 20:07:30 +0200
Subject: [PATCH 09/15] update phases when taux changes

---
 src/components/Phase.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/Phase.vue b/src/components/Phase.vue
index 344e8e2..a9316a6 100644
--- a/src/components/Phase.vue
+++ b/src/components/Phase.vue
@@ -113,6 +113,11 @@ export default class Phase extends Vue {
     this.update('margin')
   }
 
+  @Watch('taux', { deep: true })
+  WatchTaux () {
+    this.calculate()
+  }
+
   // Methods
   update (name: string) {
     let val = this.toInt(this[name])

From c753e2c806bad372cf28f3a804c252710391a5a1 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sat, 30 Oct 2021 10:50:59 +0200
Subject: [PATCH 10/15] fix input type taux

---
 src/components/Taux.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Taux.vue b/src/components/Taux.vue
index 0cc15c7..dccf695 100644
--- a/src/components/Taux.vue
+++ b/src/components/Taux.vue
@@ -15,7 +15,7 @@
           <tbody>
               <tr v-for="label in Object.keys(value)" v-bind:key="label">
                   <td>{{description[label]}}</td>
-                  <td><sui-input class="w-100" v-model="value[label]" @input="handleInput" type="text"/></td>
+                  <td><sui-input class="w-100" v-model="value[label]" @input="handleInput" type="number"/></td>
               </tr>
           </tbody>
         </table>

From a1931184992440e5dff29c50c6ecf1e074230054 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sat, 30 Oct 2021 18:49:12 +0200
Subject: [PATCH 11/15] save taux in project

---
 src/components/JehMaker.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/JehMaker.vue b/src/components/JehMaker.vue
index 02b381f..4e1b192 100644
--- a/src/components/JehMaker.vue
+++ b/src/components/JehMaker.vue
@@ -195,11 +195,12 @@ export default class JehMaker extends Vue {
     }
   }
 
-  get saveObject () : { projectName: string, phases: PhaseObject[], fee: number } {
+  get saveObject () : { projectName: string, phases: PhaseObject[], fee: number, taux: TauxObject } {
     return {
       projectName: this.projectName,
       phases: this.phases,
-      fee: this.fee
+      fee: this.fee,
+      taux: this.taux
     }
   }
 
@@ -252,11 +253,11 @@ export default class JehMaker extends Vue {
     this.phases = project.phases
     this.fee = project.fee
     this.taux = new TauxObject(
-      jsonImported.taux.urssafBase,
-      jsonImported.taux.jeContrib,
-      jsonImported.taux.jepay,
-      jsonImported.taux.consultantContrib,
-      jsonImported.taux.consultantPay
+      project.taux.urssafBase,
+      project.taux.jeContrib,
+      project.taux.jepay,
+      project.taux.consultantContrib,
+      project.taux.consultantPay
     )
 
     if (project.id) {

From ee0e003801d7e76b149a53065a87c8a1fbaf788e Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sun, 28 Nov 2021 17:59:48 +0100
Subject: [PATCH 12/15] move call to calculate()

---
 src/components/JehMaker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/JehMaker.vue b/src/components/JehMaker.vue
index 4e1b192..46c2a3d 100644
--- a/src/components/JehMaker.vue
+++ b/src/components/JehMaker.vue
@@ -264,6 +264,7 @@ export default class JehMaker extends Vue {
       this.id = project.id
     }
     this.closeProjectSidebar()
+    this.calculate()
   }
 
   newPhase () {
@@ -381,7 +382,6 @@ export default class JehMaker extends Vue {
     let urlSplit = this.urlImport.split('/')
     if (urlSplit.length > 2 && urlSplit[urlSplit.length - 2] === 'p') {
       this.importFromB64(urlSplit[urlSplit.length - 1])
-      this.calculate()
     }
   }
 }

From dfd524eb55091cb0889e02be27c3a23977319a87 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sun, 28 Nov 2021 18:09:28 +0100
Subject: [PATCH 13/15] fix unit test

---
 tests/unit/components/JehMaker.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/components/JehMaker.spec.ts b/tests/unit/components/JehMaker.spec.ts
index 4eaf704..c27292c 100644
--- a/tests/unit/components/JehMaker.spec.ts
+++ b/tests/unit/components/JehMaker.spec.ts
@@ -80,6 +80,7 @@ describe('JehMaker.vue', () => {
     wrapper.vm.loadProject({
       projectName: 'projet Toto',
       phases: [],
+      taux: {},
       fee: 123,
       id: 32
     })

From 898b28f2b77b469a33fd8fa85e0bc861408a2f99 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Sun, 28 Nov 2021 19:08:17 +0100
Subject: [PATCH 14/15] fix import Taux component

---
 src/components/JehMaker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/JehMaker.vue b/src/components/JehMaker.vue
index 46c2a3d..16fd3af 100644
--- a/src/components/JehMaker.vue
+++ b/src/components/JehMaker.vue
@@ -145,7 +145,7 @@ import Phase from './Phase.vue'
 import Consultants from './Consultant.vue'
 import Frais from './Frais.vue'
 import ProjetsSidebar from './ProjetsSidebar.vue'
-import Taux from '@/components/Taux.vue'
+import Taux from './Taux.vue'
 import MargesDetails from './MargesDetails.vue'
 import { round, utf8ToB64, b64ToUtf8 } from '../utils'
 

From e9d41ac355dd32e400155a56863d95ce8c4d1330 Mon Sep 17 00:00:00 2001
From: Thykof <thykof@protonmail.ch>
Date: Tue, 4 Jan 2022 23:01:26 +0100
Subject: [PATCH 15/15] trigger ci