Skip to content

Commit e3aa5d0

Browse files
committed
Save and restore taux URL
1 parent 19104e2 commit e3aa5d0

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/components/JehMaker.vue

+3
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ export default class JehMaker extends Vue {
298298
}
299299
300300
exportUrl () {
301+
let json = { fee: this.fee, phases: this.phases, taux: this.taux }
301302
this.$router.push({ name: 'phases', params: { phases: utf8ToB64(JSON.stringify(json)) } })
302303
this.url = window.location.href
303304
this.$copyText(this.url)
@@ -312,12 +313,14 @@ export default class JehMaker extends Vue {
312313
let jsonImported = JSON.parse(b64ToUtf8(b64))
313314
this.fee = jsonImported.fee
314315
this.phases = jsonImported.phases
316+
this.taux = jsonImported.taux
315317
}
316318
317319
importUrl () {
318320
let urlSplit = this.urlImport.split('/')
319321
if (urlSplit.length > 2 && urlSplit[urlSplit.length - 2] === 'p') {
320322
this.importFromB64(urlSplit[urlSplit.length - 1])
323+
this.calculate()
321324
}
322325
}
323326
}

src/components/Taux.vue

+5
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@
1414
</thead>
1515
<tbody>
1616
<tr v-for="label in Object.keys(content)" v-bind:key="label">
17+
<<<<<<< HEAD
1718
<td>{{description[label]}}</td>
1819
<td><sui-input class="w-100" v-model="content[label]" @input="handleInput" type="text"/></td>
20+
=======
21+
<td>{{label}}</td>
22+
<td><sui-input class="w-100" v-model="content[label]" @input="handleInput" type="number"/></td>
23+
>>>>>>> b4d972e (Save and restore taux URL)
1924
</tr>
2025
</tbody>
2126
</table>

0 commit comments

Comments
 (0)