From 5499f957a33c6a8edecb26447d6c63add11d75f8 Mon Sep 17 00:00:00 2001
From: nguyenbanhducA1K51 <ducnguyen.wings@gmail.com>
Date: Mon, 3 Apr 2023 11:35:30 -0400
Subject: [PATCH 01/16] add tray selection test

---
 .../seedingInput/seedingInput.html            |  2 +-
 .../seedingInput.tray.defaults.spec.js        | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.html b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.html
index 172cf13823..36bcceb418 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.html
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.html
@@ -27,7 +27,7 @@ <h1 style='text-align:center;'>Seeding Input Log</h1>
             <div v-show='(selectedSeedingType=="")' style='text-align:center;font-size: medium;'>
                 <p>Please Select Tray Seeding or Direct Seeding<label style='color: #da4f3f'>*</label></p>
             </div>
-            <div v-show='(selectedSeedingType=="Tray Seedings")' style='padding: 12px; text-align:center; font-size: medium; margin-top: 45px;'> 
+            <div data-cy="tray-selection" v-show='(selectedSeedingType=="Tray Seedings")' style='padding: 12px; text-align:center; font-size: medium; margin-top: 45px;'> 
                 <dropdown-with-all data-cy="tray-area-selection" :selected-val='selectedArea' :dropdown-list='areaFilter' @selection-changed='setNewArea' style='width: 125px;' :disabled='submitInProgress'>Area:<label style='color: #da4f3f'>*</label></dropdown-with-all>
                 <br>
                 <label>Cells/Tray:<label style='color: #da4f3f'>*</label>
diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
new file mode 100644
index 0000000000..a8992e3959
--- /dev/null
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -0,0 +1,31 @@
+describe('Test the tray seeding ', () => {
+    beforeEach(() => {
+        cy.login("manager1", "farmdata2")
+        cy.visit('/farm/fd2-field-kit/seedingInput')
+        
+
+    })
+
+    it("Check the tray seeding section when 'Tray' is selected ", () => {
+cy.get ("[data-cy=tray-seedings]").check()
+cy.get("[data-cy=tray-selection]").should("be.visible")
+
+    })
+
+    it("Check the dropdown Area ", () => {
+        cy.get ("[data-cy=tray-seedings]").check()
+        
+        cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
+    //    cy.get("[data-cy=tray-area-selection] >>[data-cy=dropdown-input] [data-cy=option1] ").should('have.text',"arv")
+    // cy.get("[data-cy=tray-area-selection] >[data-cy=dropdown-input] >  [data-cy=option1]").should('have.text',"arv")
+
+    // cy.get("[data-cy=tray-area-selection] > [data-cy=option1]")
+
+})
+
+
+
+
+
+    
+})
\ No newline at end of file

From 73d8824ae0b462e270776c575f2b7211831befe0 Mon Sep 17 00:00:00 2001
From: nguyenbanhducA1K51 <ducnguyen.wings@gmail.com>
Date: Mon, 3 Apr 2023 16:39:29 -0400
Subject: [PATCH 02/16] add area dropdown test

---
 .../seedingInput/seedingInput.tray.defaults.spec.js          | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index a8992e3959..54a85394c5 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -16,10 +16,7 @@ cy.get("[data-cy=tray-selection]").should("be.visible")
         cy.get ("[data-cy=tray-seedings]").check()
         
         cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
-    //    cy.get("[data-cy=tray-area-selection] >>[data-cy=dropdown-input] [data-cy=option1] ").should('have.text',"arv")
-    // cy.get("[data-cy=tray-area-selection] >[data-cy=dropdown-input] >  [data-cy=option1]").should('have.text',"arv")
-
-    // cy.get("[data-cy=tray-area-selection] > [data-cy=option1]")
+    
 
 })
 

From ea3dcb077fd3a67853caa17911a1b1e5f5e4110e Mon Sep 17 00:00:00 2001
From: phong260702 <phongdangquoc123@gmail.com>
Date: Mon, 3 Apr 2023 23:19:00 -0400
Subject: [PATCH 03/16] Adding test for seeding field and trays field

---
 .../seedingInput.tray.defaults.spec.js        | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index 54a85394c5..b2edb88cc1 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -6,6 +6,7 @@ describe('Test the tray seeding ', () => {
 
     })
 
+
     it("Check the tray seeding section when 'Tray' is selected ", () => {
 cy.get ("[data-cy=tray-seedings]").check()
 cy.get("[data-cy=tray-selection]").should("be.visible")
@@ -16,13 +17,26 @@ cy.get("[data-cy=tray-selection]").should("be.visible")
         cy.get ("[data-cy=tray-seedings]").check()
         
         cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
-    
 
 })
 
-
-
-
+it("Check tray field", () => {
+    cy.get("[data-cy=num-tray-input]").should("not.visible");
+    cy.get("[data-cy=tray-seedings]").click();
+    cy.get("[data-cy=num-tray-input]").should("be.visible")
+                                    .should("not.be.disabled")
+                                    .children().should("be.empty")
+                                    .type(100).should("have.value", 100);
+});
+
+it("Check seed field", () => {
+    cy.get("[data-cy=num-seed-input]").should("not.be.visible");
+    cy.get("[data-cy=tray-seedings]").click();
+    cy.get("[data-cy=num-seed-input").should("be.visible")
+                                    .should("not.be.disabled")
+                                    .children().should("be.empty")
+                                    .type(110).should("have.value", 110);
+});
 
     
 })
\ No newline at end of file

From 89d9e7b50bc8f57f1bd2e636018a4b3a34f16e91 Mon Sep 17 00:00:00 2001
From: qnhn22 <nhatquan234@gmail.com>
Date: Wed, 5 Apr 2023 11:42:00 -0400
Subject: [PATCH 04/16] Write tests for area dropdown and cells/tray field in
 Tray Seeding Input

---
 .../seedingInput.tray.defaults.spec.js        | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index b2edb88cc1..5e3f787d05 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -20,6 +20,31 @@ cy.get("[data-cy=tray-selection]").should("be.visible")
 
 })
 
+it("Test area dropdown", () => {
+    cy.get("[data-cy=tray-seedings]").check()
+    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input]").children()
+    .should("have.length", 5)
+    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option0")
+    .should("have.value", "CHUAU")
+    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option2")
+    .should("have.value", "JASMINE")
+    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option4")
+    .should("have.value", "SEEDING BENCH")
+})
+
+it("Test cells/tray field", () => {
+    cy.get("[data-cy=tray-seedings]").check()
+    cy.get("[data-cy=num-cell-input]")
+    .should("be.visible")
+    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
+    .should("not.be.disabled")
+    .should("be.empty")
+    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
+    .type("22").blur()
+    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
+    .should("have.value", "22")
+})
+
 it("Check tray field", () => {
     cy.get("[data-cy=num-tray-input]").should("not.visible");
     cy.get("[data-cy=tray-seedings]").click();

From c48590f208288905bba13869614cdf5fed98c5ea Mon Sep 17 00:00:00 2001
From: nguyenbanhducA1K51 <ducnguyen.wings@gmail.com>
Date: Sun, 9 Apr 2023 09:10:26 -0400
Subject: [PATCH 05/16] reformat the tests and add test no area is selected by
 default

---
 .../seedingInput.tray.defaults.spec.js           | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index 5e3f787d05..174d4f930d 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -7,16 +7,14 @@ describe('Test the tray seeding ', () => {
     })
 
 
-    it("Check the tray seeding section when 'Tray' is selected ", () => {
-cy.get ("[data-cy=tray-seedings]").check()
-cy.get("[data-cy=tray-selection]").should("be.visible")
+it("Check the tray seeding section when 'Tray' is selected ", () => {
+    cy.get ("[data-cy=tray-seedings]").check()
+    cy.get("[data-cy=tray-selection]").should("be.visible")})
 
-    })
-
-    it("Check the dropdown Area ", () => {
-        cy.get ("[data-cy=tray-seedings]").check()
-        
-        cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
+it("Check the dropdown Area ", () => {
+    cy.get ("[data-cy=tray-seedings]").check()
+    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
+    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("have.text","")
 
 })
 

From 75272cb95bac3159585f2eeb34eb8e867abb3307 Mon Sep 17 00:00:00 2001
From: phong260702 <phongdangquoc123@gmail.com>
Date: Mon, 10 Apr 2023 03:19:52 -0400
Subject: [PATCH 06/16] Fixing test for input value

---
 .../seedingInput/seedingInput.tray.defaults.spec.js           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index 174d4f930d..39eaa46267 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -48,7 +48,7 @@ it("Check tray field", () => {
     cy.get("[data-cy=tray-seedings]").click();
     cy.get("[data-cy=num-tray-input]").should("be.visible")
                                     .should("not.be.disabled")
-                                    .children().should("be.empty")
+                                    .children().should("have.value","")
                                     .type(100).should("have.value", 100);
 });
 
@@ -57,7 +57,7 @@ it("Check seed field", () => {
     cy.get("[data-cy=tray-seedings]").click();
     cy.get("[data-cy=num-seed-input").should("be.visible")
                                     .should("not.be.disabled")
-                                    .children().should("be.empty")
+                                    .children().should("have.value", "")
                                     .type(110).should("have.value", 110);
 });
 

From 0c1228acc71f41e964efaef5f0760a4ea8f3dc51 Mon Sep 17 00:00:00 2001
From: qnhn22 <nhatquan234@gmail.com>
Date: Tue, 11 Apr 2023 23:36:06 -0400
Subject: [PATCH 07/16] fix testing on tray seeding input

---
 .../seedingInput.tray.defaults.spec.js        | 95 +++++++++----------
 1 file changed, 43 insertions(+), 52 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index 39eaa46267..14270fbff7 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -7,59 +7,50 @@ describe('Test the tray seeding ', () => {
     })
 
 
-it("Check the tray seeding section when 'Tray' is selected ", () => {
-    cy.get ("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=tray-selection]").should("be.visible")})
-
-it("Check the dropdown Area ", () => {
-    cy.get ("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
-    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("have.text","")
-
-})
-
-it("Test area dropdown", () => {
-    cy.get("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input]").children()
-    .should("have.length", 5)
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option0")
-    .should("have.value", "CHUAU")
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option2")
-    .should("have.value", "JASMINE")
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option4")
-    .should("have.value", "SEEDING BENCH")
-})
-
-it("Test cells/tray field", () => {
-    cy.get("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=num-cell-input]")
-    .should("be.visible")
-    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
-    .should("not.be.disabled")
-    .should("be.empty")
-    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
-    .type("22").blur()
-    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
-    .should("have.value", "22")
-})
+    it("Check the tray seeding section when 'Tray' is selected ", () => {
+        cy.get ("[data-cy=tray-seedings]").check()
+        cy.get("[data-cy=tray-selection]").should("be.visible")})
+
+    it("Check the dropdown Area ", () => {
+        cy.get ("[data-cy=tray-seedings]").check()
+        cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
+        cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("have.text","")
+    })
 
-it("Check tray field", () => {
-    cy.get("[data-cy=num-tray-input]").should("not.visible");
-    cy.get("[data-cy=tray-seedings]").click();
-    cy.get("[data-cy=num-tray-input]").should("be.visible")
-                                    .should("not.be.disabled")
-                                    .children().should("have.value","")
-                                    .type(100).should("have.value", 100);
-});
+    it("Test area dropdown", () => {
+        cy.get("[data-cy=tray-seedings]").check()
+        cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input]").children()
+        .should("have.length", 5)
+        cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option0")
+        .should("have.value", "CHUAU")
+        cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option2")
+        .should("have.value", "JASMINE")
+        cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option4")
+        .should("have.value", "SEEDING BENCH")
+    })
 
-it("Check seed field", () => {
-    cy.get("[data-cy=num-seed-input]").should("not.be.visible");
-    cy.get("[data-cy=tray-seedings]").click();
-    cy.get("[data-cy=num-seed-input").should("be.visible")
-                                    .should("not.be.disabled")
-                                    .children().should("have.value", "")
-                                    .type(110).should("have.value", 110);
-});
+    it("Test cells/tray field", () => {
+        cy.get("[data-cy=tray-seedings]").check()
+        cy.get("[data-cy=num-cell-input]")
+        .should("be.visible")
+        cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
+        .should("not.be.disabled")
+        .should("be.empty")
+    })
 
-    
+    it("Check tray field", () => {
+        cy.get("[data-cy=num-tray-input]").should("not.visible");
+        cy.get("[data-cy=tray-seedings]").click();
+        cy.get("[data-cy=num-tray-input]").should("be.visible")
+                                        .should("not.be.disabled")
+                                        .children().should("have.value","")
+    });
+
+    it("Check seed field", () => {
+        cy.get("[data-cy=num-seed-input]").should("not.be.visible");
+        cy.get("[data-cy=tray-seedings]").click();
+        cy.get("[data-cy=num-seed-input").should("be.visible")
+                                        .should("not.be.disabled")
+                                        .children().should("have.value", "")
+    });
 })
\ No newline at end of file

From ea166b039876810211fbea4d1283c6122e43b75b Mon Sep 17 00:00:00 2001
From: nguyenbanhducA1K51 <ducnguyen.wings@gmail.com>
Date: Wed, 12 Apr 2023 14:24:24 -0400
Subject: [PATCH 08/16] reformat the test and modify the test dropdown area

---
 .../seedingInput/seedingInput.tray.defaults.spec.js       | 8 ++------
 .../fd2_field_kit/seedingInput/seedingReport.spec.js      | 0
 2 files changed, 2 insertions(+), 6 deletions(-)
 create mode 100644 farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingReport.spec.js

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index 14270fbff7..0721b97038 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -2,11 +2,7 @@ describe('Test the tray seeding ', () => {
     beforeEach(() => {
         cy.login("manager1", "farmdata2")
         cy.visit('/farm/fd2-field-kit/seedingInput')
-        
-
-    })
-
-
+       })
     it("Check the tray seeding section when 'Tray' is selected ", () => {
         cy.get ("[data-cy=tray-seedings]").check()
         cy.get("[data-cy=tray-selection]").should("be.visible")})
@@ -14,7 +10,7 @@ describe('Test the tray seeding ', () => {
     it("Check the dropdown Area ", () => {
         cy.get ("[data-cy=tray-seedings]").check()
         cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
-        cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("have.text","")
+        cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("have.value",null)
     })
 
     it("Test area dropdown", () => {
diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingReport.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingReport.spec.js
new file mode 100644
index 0000000000..e69de29bb2

From 93c74da3c88b259d1003ad61cc29a59bae43e211 Mon Sep 17 00:00:00 2001
From: nguyenbanhducA1K51 <ducnguyen.wings@gmail.com>
Date: Wed, 12 Apr 2023 14:31:19 -0400
Subject: [PATCH 09/16] create seeding report area filter test

---
 .../fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js

diff --git a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js
new file mode 100644
index 0000000000..e69de29bb2

From 2fc2c16a9ee404a19aeda38656eefa5c23a3ac1c Mon Sep 17 00:00:00 2001
From: nguyenbanhducA1K51 <ducnguyen.wings@gmail.com>
Date: Wed, 12 Apr 2023 18:08:53 -0400
Subject: [PATCH 10/16] add 'All'selected test

---
 .../seedingReport.areaFilter.spec.js          | 19 +++++++++++++++++++
 .../seedingInput.tray.defaults.spec.js        |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js
index e69de29bb2..852dfa2d83 100644
--- a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js
@@ -0,0 +1,19 @@
+describe("Test the tray seeding ", () => {
+    beforeEach(() => {
+      cy.login("manager1", "farmdata2");
+      cy.visit("/farm/fd2-barn-kit/seedingReport");
+    });
+  
+    it("generate multiple areas when 'All' is selected ", () => {
+      cy.get("[data-cy=date-range-selection]").should("exist");
+      cy.get("[data-cy=start-date-select]").should("exist").type("2019-01-01");
+      cy.get("[data-cy=end-date-select]").should("exist").type("2019-03-01");
+      cy.intercept("GET", "**/log.json**").as("getReport");
+      y.get("[data-cy=generate-rpt-btn]").click();
+      cy.wait("@getReport");
+      cy.get("[data-cy=dropdown-input]").should("have.value", "All");
+      cy.get("[data-cy=r0-Area]").should("have.text", "ALF-4");
+      cy.get("[data-cy=r1-Area]").should("have.text", "ALF-2");
+      cy.get("[data-cy=r2-Area]").should("have.text", "CHUAU-2");
+    });
+  });
\ No newline at end of file
diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index 174d4f930d..5ffed08f44 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -14,7 +14,7 @@ it("Check the tray seeding section when 'Tray' is selected ", () => {
 it("Check the dropdown Area ", () => {
     cy.get ("[data-cy=tray-seedings]").check()
     cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
-    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("have.text","")
+    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("have.value",null)
 
 })
 

From ac20313b3235873efbc20f3bcac59c1561f283bb Mon Sep 17 00:00:00 2001
From: phong260702 <phongdangquoc123@gmail.com>
Date: Sun, 16 Apr 2023 02:42:13 -0400
Subject: [PATCH 11/16] Reformat Testing tray and seed fields

---
 .../seedingInput/seedingInput.tray.defaults.spec.js    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index 0721b97038..dd8769650e 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -37,16 +37,16 @@ describe('Test the tray seeding ', () => {
     it("Check tray field", () => {
         cy.get("[data-cy=num-tray-input]").should("not.visible");
         cy.get("[data-cy=tray-seedings]").click();
-        cy.get("[data-cy=num-tray-input]").should("be.visible")
+        cy.get("[data-cy=num-tray-input] > [data-cy=text-input]").should("be.visible")
                                         .should("not.be.disabled")
-                                        .children().should("have.value","")
+                                        .should("have.value","")
     });
 
     it("Check seed field", () => {
-        cy.get("[data-cy=num-seed-input]").should("not.be.visible");
+        cy.get("[data-cy=num-seed-input] ").should("not.be.visible");
         cy.get("[data-cy=tray-seedings]").click();
-        cy.get("[data-cy=num-seed-input").should("be.visible")
+        cy.get("[data-cy=num-seed-input] > [data-cy=text-input]").should("be.visible")
                                         .should("not.be.disabled")
-                                        .children().should("have.value", "")
+                                        .should("have.value", "")
     });
 })
\ No newline at end of file

From 116e9aebc377f3214dbe2e7d527f92bcb40eccab Mon Sep 17 00:00:00 2001
From: qnhn22 <nhatquan234@gmail.com>
Date: Wed, 19 Apr 2023 01:20:47 -0400
Subject: [PATCH 12/16] Write test filter by area

---
 .../seedingReport.areaFilter.spec.js          | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js
index 852dfa2d83..0f3f73999e 100644
--- a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/seedingReport.areaFilter.spec.js
@@ -1,7 +1,8 @@
 describe("Test the tray seeding ", () => {
     beforeEach(() => {
       cy.login("manager1", "farmdata2");
-      cy.visit("/farm/fd2-barn-kit/seedingReport");
+      cy.visit('/farm/fd2-barn-kit/seedingReport');
+      cy.waitForPage();
     });
   
     it("generate multiple areas when 'All' is selected ", () => {
@@ -9,11 +10,32 @@ describe("Test the tray seeding ", () => {
       cy.get("[data-cy=start-date-select]").should("exist").type("2019-01-01");
       cy.get("[data-cy=end-date-select]").should("exist").type("2019-03-01");
       cy.intercept("GET", "**/log.json**").as("getReport");
-      y.get("[data-cy=generate-rpt-btn]").click();
+      cy.get("[data-cy=generate-rpt-btn]").click();
       cy.wait("@getReport");
       cy.get("[data-cy=dropdown-input]").should("have.value", "All");
       cy.get("[data-cy=r0-Area]").should("have.text", "ALF-4");
       cy.get("[data-cy=r1-Area]").should("have.text", "ALF-2");
       cy.get("[data-cy=r2-Area]").should("have.text", "CHUAU-2");
     });
+
+    it("Test filter by area", () => {
+      cy.get("[data-cy=date-range-selection]").should("exist");
+      cy.get("[data-cy=start-date-select]").should("exist").type("2019-01-01");
+      cy.get("[data-cy=end-date-select]").should("exist").type("2019-03-01");
+      cy.intercept("GET", "**/log.json**").as("getReport");
+      cy.get("[data-cy=generate-rpt-btn]").click();
+      cy.wait("@getReport");
+
+      cy.get("[data-cy=area-dropdown] > [data-cy=dropdown-input]")
+      .select("CHUAU-3")
+      .should("have.value", "CHUAU-3")
+
+      cy.get("[data-cy=table-body]").children()
+      .should("have.length", 2)
+
+      for (let r = 0; r < 2; r++) {
+        cy.get("[data-cy=r" + r + "-" + "Area")
+        .should("have.text", "CHUAU-3")
+      }
+    })
   });
\ No newline at end of file

From c1bf1f4b9074f7974030e5f0728aac8e5935e0c1 Mon Sep 17 00:00:00 2001
From: phong260702 <phongdangquoc123@gmail.com>
Date: Wed, 19 Apr 2023 12:35:27 -0400
Subject: [PATCH 13/16] merging change

---
 .../seedingInput.tray.defaults.spec.js        | 110 ------------------
 1 file changed, 110 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
index ab4690918a..dd8769650e 100644
--- a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingInput.tray.defaults.spec.js
@@ -25,7 +25,6 @@ describe('Test the tray seeding ', () => {
         .should("have.value", "SEEDING BENCH")
     })
 
-<<<<<<< HEAD
     it("Test cells/tray field", () => {
         cy.get("[data-cy=tray-seedings]").check()
         cy.get("[data-cy=num-cell-input]")
@@ -34,115 +33,6 @@ describe('Test the tray seeding ', () => {
         .should("not.be.disabled")
         .should("be.empty")
     })
-||||||| 75272cb
-it("Check the tray seeding section when 'Tray' is selected ", () => {
-    cy.get ("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=tray-selection]").should("be.visible")})
-
-it("Check the dropdown Area ", () => {
-    cy.get ("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
-    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("have.text","")
-
-})
-
-it("Test area dropdown", () => {
-    cy.get("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input]").children()
-    .should("have.length", 5)
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option0")
-    .should("have.value", "CHUAU")
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option2")
-    .should("have.value", "JASMINE")
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option4")
-    .should("have.value", "SEEDING BENCH")
-})
-
-it("Test cells/tray field", () => {
-    cy.get("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=num-cell-input]")
-    .should("be.visible")
-    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
-    .should("not.be.disabled")
-    .should("be.empty")
-    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
-    .type("22").blur()
-    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
-    .should("have.value", "22")
-})
-
-it("Check tray field", () => {
-    cy.get("[data-cy=num-tray-input]").should("not.visible");
-    cy.get("[data-cy=tray-seedings]").click();
-    cy.get("[data-cy=num-tray-input]").should("be.visible")
-                                    .should("not.be.disabled")
-                                    .children().should("have.value","")
-                                    .type(100).should("have.value", 100);
-});
-
-it("Check seed field", () => {
-    cy.get("[data-cy=num-seed-input]").should("not.be.visible");
-    cy.get("[data-cy=tray-seedings]").click();
-    cy.get("[data-cy=num-seed-input").should("be.visible")
-                                    .should("not.be.disabled")
-                                    .children().should("have.value", "")
-                                    .type(110).should("have.value", 110);
-});
-=======
-it("Check the tray seeding section when 'Tray' is selected ", () => {
-    cy.get ("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=tray-selection]").should("be.visible")})
-
-it("Check the dropdown Area ", () => {
-    cy.get ("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("be.visible")
-    cy.get("[data-cy=tray-area-selection]>[data-cy=dropdown-input]").should("have.value",null)
-
-})
-
-it("Test area dropdown", () => {
-    cy.get("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input]").children()
-    .should("have.length", 5)
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option0")
-    .should("have.value", "CHUAU")
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option2")
-    .should("have.value", "JASMINE")
-    cy.get("[data-cy=tray-area-selection] > [data-cy=dropdown-input] > [data-cy=option4")
-    .should("have.value", "SEEDING BENCH")
-})
-
-it("Test cells/tray field", () => {
-    cy.get("[data-cy=tray-seedings]").check()
-    cy.get("[data-cy=num-cell-input]")
-    .should("be.visible")
-    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
-    .should("not.be.disabled")
-    .should("be.empty")
-    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
-    .type("22").blur()
-    cy.get("[data-cy=num-cell-input] > [data-cy=text-input]")
-    .should("have.value", "22")
-})
-
-it("Check tray field", () => {
-    cy.get("[data-cy=num-tray-input]").should("not.visible");
-    cy.get("[data-cy=tray-seedings]").click();
-    cy.get("[data-cy=num-tray-input]").should("be.visible")
-                                    .should("not.be.disabled")
-                                    .children().should("have.value","")
-                                    .type(100).should("have.value", 100);
-});
-
-it("Check seed field", () => {
-    cy.get("[data-cy=num-seed-input]").should("not.be.visible");
-    cy.get("[data-cy=tray-seedings]").click();
-    cy.get("[data-cy=num-seed-input").should("be.visible")
-                                    .should("not.be.disabled")
-                                    .children().should("have.value", "")
-                                    .type(110).should("have.value", 110);
-});
->>>>>>> 116e9aebc377f3214dbe2e7d527f92bcb40eccab
 
     it("Check tray field", () => {
         cy.get("[data-cy=num-tray-input]").should("not.visible");

From 5ba36e1fd5ffcaa453e0e182a08d232ff5d7acda Mon Sep 17 00:00:00 2001
From: phong260702 <phongdangquoc123@gmail.com>
Date: Mon, 24 Apr 2023 12:28:09 -0400
Subject: [PATCH 14/16] Add draft test for Checking Total Row Feet

---
 .../directSeedingReportSummary.spec.js        | 32 +++++++++++++++++++
 .../seedingInput/seedingReport.spec.js        |  0
 2 files changed, 32 insertions(+)
 create mode 100644 farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js
 delete mode 100644 farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingReport.spec.js

diff --git a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js
new file mode 100644
index 0000000000..2b63244e5c
--- /dev/null
+++ b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js
@@ -0,0 +1,32 @@
+describe('Test the tray seeding ', () => {
+    beforeEach(() => {
+        cy.login("manager1", "farmdata2");
+        cy.visit('/farm/fd2-barn-kit/seedingReport');
+        cy.waitForPage();
+        cy.get("[data-cy=start-date-select]").should("exist").type("2019-01-01");
+        cy.get("[data-cy=end-date-select]").should("exist").type("2019-03-01");
+        cy.get("[data-cy=generate-rpt-btn]").click();
+        cy.get("[data-cy=seeding-type-dropdown] > [data-cy= dropdown-input]").select("Direct Seedings");
+       })
+
+    it("Check total row feet plated", () => {
+        // cy.get("[data-cy=td-r0c4]");
+        let total = 0;
+        for (let r=0; r <7; r++) {
+            cy.get("[data-cy = td-r"+r+ "c4]").invoke('text').then(value => {
+                total += parseInt(value);
+                cy.log(total);
+            });
+        }
+        cy.log(total);
+
+    })
+    })
+
+
+
+
+    // cy.get("[data-cy = td-r"+1+ "c4]").invoke('text').then(value => {
+    //     return total;
+    // }).invoke('text').should("equal", '26177');
+    // cy.get("[data-cy=direct-total-rowft]").should('have.text', '26177')
\ No newline at end of file
diff --git a/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingReport.spec.js b/farmdata2/farmdata2_modules/fd2_field_kit/seedingInput/seedingReport.spec.js
deleted file mode 100644
index e69de29bb2..0000000000

From f75051bea1cd6ee771cd4800076a886241a520ff Mon Sep 17 00:00:00 2001
From: phong260702 <phongdangquoc123@gmail.com>
Date: Tue, 25 Apr 2023 15:41:34 -0400
Subject: [PATCH 15/16] Improving test for checking total row and bed

---
 .../directSeedingReportSummary.spec.js        | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js
index 2b63244e5c..978711377e 100644
--- a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js
@@ -9,20 +9,35 @@ describe('Test the tray seeding ', () => {
         cy.get("[data-cy=seeding-type-dropdown] > [data-cy= dropdown-input]").select("Direct Seedings");
        })
 
+
     it("Check total row feet plated", () => {
-        // cy.get("[data-cy=td-r0c4]");
         let total = 0;
         for (let r=0; r <7; r++) {
             cy.get("[data-cy = td-r"+r+ "c4]").invoke('text').then(value => {
                 total += parseInt(value);
-                cy.log(total);
+                cy.wrap(total).as("to");
             });
         }
-        cy.log(total);
-
+        cy.get('@to').then(tota => {
+            cy.get("[data-cy = direct-total-rowft]").should("have.text", tota.toString());    
+        });
     })
+
+    it("Check total bed feet plated", () => {
+        let total = 0;
+        for (let r=0; r <7; r++) {
+            cy.get("[data-cy = td-r"+r+ "c5]").invoke('text').then(value => {
+                total += parseInt(value);
+                cy.wrap(total).as("to");
+            });
+        }
+        cy.get('@to').then(tota => {
+            cy.get("[data-cy = direct-total-bedft]").should("have.text", tota.toString());    
+        });
     })
 
+})
+
 
 
 

From 4355602b06adb17ba99b1849819de9e8a627f3a9 Mon Sep 17 00:00:00 2001
From: phong260702 <phongdangquoc123@gmail.com>
Date: Tue, 25 Apr 2023 15:49:14 -0400
Subject: [PATCH 16/16] Removing unnecessary wrap

---
 .../directSeedingReportSummary.spec.js        | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js
index 978711377e..d7f21e97cd 100644
--- a/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js
+++ b/farmdata2/farmdata2_modules/fd2_barn_kit/seedingReport/directSeedingReportSummary.spec.js
@@ -15,8 +15,10 @@ describe('Test the tray seeding ', () => {
         for (let r=0; r <7; r++) {
             cy.get("[data-cy = td-r"+r+ "c4]").invoke('text').then(value => {
                 total += parseInt(value);
-                cy.wrap(total).as("to");
-            });
+                if (r ==6){
+                    cy.wrap(total).as("to");
+                }                
+            });      
         }
         cy.get('@to').then(tota => {
             cy.get("[data-cy = direct-total-rowft]").should("have.text", tota.toString());    
@@ -28,20 +30,14 @@ describe('Test the tray seeding ', () => {
         for (let r=0; r <7; r++) {
             cy.get("[data-cy = td-r"+r+ "c5]").invoke('text').then(value => {
                 total += parseInt(value);
-                cy.wrap(total).as("to");
+                if (r ==6){
+                    cy.wrap(total).as("to");
+                }    
             });
         }
         cy.get('@to').then(tota => {
             cy.get("[data-cy = direct-total-bedft]").should("have.text", tota.toString());    
         });
     })
-
+    
 })
-
-
-
-
-    // cy.get("[data-cy = td-r"+1+ "c4]").invoke('text').then(value => {
-    //     return total;
-    // }).invoke('text').should("equal", '26177');
-    // cy.get("[data-cy=direct-total-rowft]").should('have.text', '26177')
\ No newline at end of file