diff --git a/package-lock.json b/package-lock.json index 873d309..935b8f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "socrates-web", - "version": "1.0.6", + "version": "1.0.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "socrates-web", - "version": "1.0.6", + "version": "1.0.7", "dependencies": { "chart.js": "^4.3.0", "element-plus": "^2.3.5", diff --git a/package.json b/package.json index 694f206..0b50c5e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "socrates-web", "private": true, - "version": "1.0.6", + "version": "1.0.7", "type": "module", "homepage": "https://soil-and-land.github.io/socrates-web/", "scripts": { diff --git a/src/components/Input.vue b/src/components/Input.vue index 198fc6c..10e02d2 100644 --- a/src/components/Input.vue +++ b/src/components/Input.vue @@ -265,6 +265,7 @@ function oldDataToSocrates() { store.yieldsMethodDataEntry = store.socratesOld.yields.yieldsMethodDataEntry; store.annualYields = store.socratesOld.yields.annualYields; if (store.socratesOld.parametersEdited) { + store.parametersEdited = true; store.parameters = store.socratesOld.parameters; } } catch (e) { @@ -278,6 +279,10 @@ async function clearForm() { await store.getParameters(); } +function clearResults() { + store.results = null; +} + async function saveResults() { const csv = await toCSV({results: store.results, initialOC: store.initialOC}); const exportedFilename = 'data.csv'; @@ -377,17 +382,16 @@ function isIterable(obj) { - {{ store.showParameters ? 'Hide Parameters' : 'Show Parameters' }} + {{ store.showParameters ? 'Hide Parameters' : 'Edit Parameters' }} -

Parameters Table

-

- Reset Parameters -

- + +
+
@@ -597,9 +601,9 @@ function isIterable(obj) { :nullify="rotation['plant'] === 5 || rotation['plant'] === 6 || rotation['plant'] === 7"/>
- + @@ -680,17 +684,51 @@ function isIterable(obj) { -
+ Run Load Data Clear Form + Clear Results Save Inputs -
+
+ + + + + + + + + + - + v-if="store.results"> + +
+

Results

+
+
+ diff --git a/src/components/LineChart.vue b/src/components/LineChart.vue index f4804a0..16719c1 100644 --- a/src/components/LineChart.vue +++ b/src/components/LineChart.vue @@ -96,9 +96,6 @@ onUpdated(() => {