From 05f603f6c65c0634593bd9869e6e67e6f484561f Mon Sep 17 00:00:00 2001 From: truongquand Date: Sat, 20 Dec 2025 01:43:01 -0500 Subject: [PATCH 1/2] Finished testing for Harvest button - Quan --- .../entrypoints/main/main.exists.e2e.cy.js | 8 + .../src/entrypoints/main/App.vue | 547 +++++++++++++++++- 2 files changed, 526 insertions(+), 29 deletions(-) diff --git a/modules/farm_fd2/src/entrypoints/main/main.exists.e2e.cy.js b/modules/farm_fd2/src/entrypoints/main/main.exists.e2e.cy.js index 26e31602c..cad065721 100644 --- a/modules/farm_fd2/src/entrypoints/main/main.exists.e2e.cy.js +++ b/modules/farm_fd2/src/entrypoints/main/main.exists.e2e.cy.js @@ -57,6 +57,14 @@ describe('FarmData2 Main Page - Launch Pad', () => { altText: 'Transplanting', path: '/fd2/transplanting', }, + { + text: 'Harvest', + dataCyText: 'harvest-text', + dataCyButton: 'harvest-button', + dataCyIcon: 'harvest-icon', + altText: 'Harvest', + path: '/fd2/harvest', + }, ], }, ]; diff --git a/modules/farm_fd2_school/src/entrypoints/main/App.vue b/modules/farm_fd2_school/src/entrypoints/main/App.vue index 56729fd04..185f8ed91 100644 --- a/modules/farm_fd2_school/src/entrypoints/main/App.vue +++ b/modules/farm_fd2_school/src/entrypoints/main/App.vue @@ -1,31 +1,520 @@ - - + computed: { + pageDoneLoading() { + return this.createdCount == 1; + }, + }, + created() { + this.createdCount++; + }, + methods: { + navigateTo(path) { + window.location.href = path; + }, + }, + }; + + + \ No newline at end of file From 59e7000dc50bdc8afdba6e32420c5a2d5f405ee2 Mon Sep 17 00:00:00 2001 From: truongquand Date: Sat, 20 Dec 2025 05:45:55 -0500 Subject: [PATCH 2/2] Finished deleting the Add button in Harvest form --- components/CropSelector/CropSelector.vue | 6 +++++- modules/farm_fd2/src/entrypoints/harvest/App.vue | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/CropSelector/CropSelector.vue b/components/CropSelector/CropSelector.vue index 25e9ada0e..b58b4c917 100644 --- a/components/CropSelector/CropSelector.vue +++ b/components/CropSelector/CropSelector.vue @@ -12,7 +12,7 @@ v-on:update:selected="handleUpdateSelected($event)" v-on:valid="handleValid($event)" v-on:add-clicked="handleAddClicked" - v-bind:popupUrl="popupUrl" + v-bind:popupUrl="showAdd ? popupUrl : null" /> @@ -83,6 +83,10 @@ export default { components: { SelectorBase }, emits: ['error', 'ready', 'update:selected', 'valid'], props: { + showAdd: { + type: Boolean, + default: true, + }, /** * Whether a crop selection is required or not. */ diff --git a/modules/farm_fd2/src/entrypoints/harvest/App.vue b/modules/farm_fd2/src/entrypoints/harvest/App.vue index 98d4668c0..f02d1aca9 100644 --- a/modules/farm_fd2/src/entrypoints/harvest/App.vue +++ b/modules/farm_fd2/src/entrypoints/harvest/App.vue @@ -23,6 +23,7 @@ data-cy="harvest-crop" v-bind:required="true" v-bind:showValidityStyling="true" + v-bind:showAdd="false" v-model:selected="crop" v-on:error="(msg) => showErrorToast('Network Error', msg)" />