From e1be94abffd4a519c1ec2ba193ac903c5f854e0c Mon Sep 17 00:00:00 2001
From: Adrian Powell <afp43@cornell.edu>
Date: Sun, 20 Oct 2024 23:01:23 -0400
Subject: [PATCH 1/2] enable creation of empty seedlots

---
 lib/SGN/Controller/AJAX/Seedlot.pm             | 5 -----
 mason/breeders_toolbox/add_seedlot_dialogs.mas | 5 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/SGN/Controller/AJAX/Seedlot.pm b/lib/SGN/Controller/AJAX/Seedlot.pm
index b0c7e1cba4..ee01d7d15e 100644
--- a/lib/SGN/Controller/AJAX/Seedlot.pm
+++ b/lib/SGN/Controller/AJAX/Seedlot.pm
@@ -467,11 +467,6 @@ sub create_seedlot :Path('/ajax/breeders/seedlot-create/') :Args(0) {
     my $transaction_description = $c->req->param("seedlot_transaction_description");
     my $breeding_program_id = $c->req->param("seedlot_breeding_program_id");
 
-    if (!$weight && !$amount){
-        $c->stash->{rest} = {error=>'A seedlot must have either a weight or an amount.'};
-        $c->detach();
-    }
-
     if (!$timestamp){
         $c->stash->{rest} = {error=>'A seedlot must have a timestamp for the transaction.'};
         $c->detach();
diff --git a/mason/breeders_toolbox/add_seedlot_dialogs.mas b/mason/breeders_toolbox/add_seedlot_dialogs.mas
index 28cc2fa5ea..cfadb7f023 100644
--- a/mason/breeders_toolbox/add_seedlot_dialogs.mas
+++ b/mason/breeders_toolbox/add_seedlot_dialogs.mas
@@ -121,13 +121,13 @@ $cross_uniquename => ''
                 <div class="form-group">
                     <label class="col-sm-3 control-label">Amount (number of seeds): </label>
                     <div class="col-sm-9" >
-                        <input class="form-control" id="seedlot_amount" placeholder="Amount OR Weight(g) Required">
+                        <input class="form-control" id="seedlot_amount" placeholder="Optional">
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">Weight (g): </label>
                     <div class="col-sm-9" >
-                        <input class="form-control" id="seedlot_weight" placeholder="Amount OR Weight(g) Required">
+                        <input class="form-control" id="seedlot_weight" placeholder="Optional">
                     </div>
                 </div>
                 <!--
@@ -207,7 +207,6 @@ jQuery(document).ready(function(){
         if (name == '') { alert("Please provide a name"); return; }
         else if (location == '') { alert("Please provide a location"); return; }
         else if (box_name == '') { alert("Please provide a box name"); return; }
-        else if (amount == '' && weight == '') { alert("Please provide a seed count amount or a weight in grams!"); return; }
         else if (isNaN(amount)) { alert("If inputting a seed count amount, it must be a numeric value."); return; }
         else if (isNaN(weight)) { alert("If inputting a weight, it must be a numeric value."); return; }
         else if (breeding_program_id == '') { alert("Please select a breeding program"); return; }

From 1a9a9559c667f8b3998e72608a33b9b9f35b381a Mon Sep 17 00:00:00 2001
From: Adrian Powell <afp43@cornell.edu>
Date: Thu, 24 Oct 2024 14:22:57 -0400
Subject: [PATCH 2/2] revert to not accepting having both fields blank

---
 mason/breeders_toolbox/add_seedlot_dialogs.mas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mason/breeders_toolbox/add_seedlot_dialogs.mas b/mason/breeders_toolbox/add_seedlot_dialogs.mas
index cfadb7f023..28cc2fa5ea 100644
--- a/mason/breeders_toolbox/add_seedlot_dialogs.mas
+++ b/mason/breeders_toolbox/add_seedlot_dialogs.mas
@@ -121,13 +121,13 @@ $cross_uniquename => ''
                 <div class="form-group">
                     <label class="col-sm-3 control-label">Amount (number of seeds): </label>
                     <div class="col-sm-9" >
-                        <input class="form-control" id="seedlot_amount" placeholder="Optional">
+                        <input class="form-control" id="seedlot_amount" placeholder="Amount OR Weight(g) Required">
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">Weight (g): </label>
                     <div class="col-sm-9" >
-                        <input class="form-control" id="seedlot_weight" placeholder="Optional">
+                        <input class="form-control" id="seedlot_weight" placeholder="Amount OR Weight(g) Required">
                     </div>
                 </div>
                 <!--
@@ -207,6 +207,7 @@ jQuery(document).ready(function(){
         if (name == '') { alert("Please provide a name"); return; }
         else if (location == '') { alert("Please provide a location"); return; }
         else if (box_name == '') { alert("Please provide a box name"); return; }
+        else if (amount == '' && weight == '') { alert("Please provide a seed count amount or a weight in grams!"); return; }
         else if (isNaN(amount)) { alert("If inputting a seed count amount, it must be a numeric value."); return; }
         else if (isNaN(weight)) { alert("If inputting a weight, it must be a numeric value."); return; }
         else if (breeding_program_id == '') { alert("Please select a breeding program"); return; }