From 7d2142dc271ae88e960097a0d944717ba39d13a2 Mon Sep 17 00:00:00 2001
From: "dr.phillips" <dr.phillips@IFASadmins-MacBook-Pro.local>
Date: Mon, 9 Feb 2026 12:35:51 -0500
Subject: [PATCH 1/2] [BI-2615] made custom searchs

---
 src/views/import/Dataset.vue | 47 +++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/views/import/Dataset.vue b/src/views/import/Dataset.vue
index b28e7b51..9503641b 100644
--- a/src/views/import/Dataset.vue
+++ b/src/views/import/Dataset.vue
@@ -146,6 +146,7 @@
         <b-table-column
             v-slot="props"
             field="data.expReplicate"
+            :custom-sort="sortExpReplicate"
             label="Exp Replicate #"
             sortable
             searchable
@@ -157,6 +158,7 @@
             v-slot="props"
             field="data.expBlock"
             label="Exp Block #"
+            :custom-sort="sortExpBlock"
             sortable
             searchable
             :th-attrs="() => ({scope:'col'})"
@@ -167,6 +169,7 @@
             v-slot="props"
             field="data.row"
             label="Row"
+            :custom-sort="sortRow"
             sortable
             searchable
             :th-attrs="() => ({scope:'col'})"
@@ -177,6 +180,8 @@
             v-slot="props"
             field="data.column"
             label="Column"
+            :custom-sort="sortColumn"
+
             sortable
             searchable
             :th-attrs="() => ({scope:'col'})"
@@ -418,33 +423,51 @@ export default class Dataset extends ProgramsBase {
   }
 
   //sort GIDs numerically
+
   sortGID(a: any, b: any, isAsc: boolean){
     let first :number = parseInt(a.data.gid);
     let second :number = parseInt(b.data.gid);
-    if (isAsc) {
-      if( first > second){ return 1; }
-      else if (first < second){ return -1;}
-      else return 0;
-    } else {
-      if( second > first ){ return 1; }
-      else if ( second < first){ return -1;}
-      else return 0;
-    }
+    return this.sortAlphaAsNumeric(first, second, isAsc);
+  }
+  sortColumn(a: any, b: any, isAsc: boolean) {
+    let first: any = (a.data.column);
+    let second: any = (b.data.column);
+    return this.sortAlphaAsNumeric(first, second, isAsc);
+  }
+
+  sortRow(a: any, b: any, isAsc: boolean) {
+    let first: any = (a.data.row);
+    let second: any = (b.data.row);
+    return this.sortAlphaAsNumeric(first, second, isAsc);
+  }
+
+  sortExpBlock(a: any, b: any, isAsc: boolean) {
+    let first: any = (a.data.expBlock);
+    let second: any = (b.data.expBlock);
+    return this.sortAlphaAsNumeric(first, second, isAsc);
+  }
+  sortExpReplicate(a: any, b: any, isAsc: boolean){
+    let first :any = (a.data.expReplicate);
+    let second :any = (b.data.expReplicate);
+    return this.sortAlphaAsNumeric( first, second, isAsc);
   }
 
   // This sorts the Exp Unit ID's in Alphanumeric order (ie. B300,BO2, B1 would sort to B1, B02, B300)
   sortExpUnitId(a: any, b: any, isAsc: boolean){
     let first :any = (a.data.expUnitId);
     let second :any = (b.data.expUnitId);
+    return this.sortAlphaAsNumeric( first, second, isAsc);
+  }
+
+  private sortAlphaAsNumeric( first: any, second: any, isAsc: boolean)  {
     if (isAsc) {
       return first.toString().localeCompare(second.toString(), 'en', {numeric: true});
-    }
-    else {
+    } else {
       return second.toString().localeCompare(first.toString(), 'en', {numeric: true});
     }
   }
 
-  // This sorts the Sub Unit ID's in Alphanumeric order (ie. B300,BO2, B1 would sort to B1, B02, B300)
+// This sorts the Sub Unit ID's in Alphanumeric order (ie. B300,BO2, B1 would sort to B1, B02, B300)
   sortSubUnitId(a: any, b: any, isAsc: boolean) {
     let first: any = (a.data.subExpUnitId);
     let second: any = (b.data.subExpUnitId);

From fc7545a132904804860516d58d89993dd0aa7adb Mon Sep 17 00:00:00 2001
From: "dr.phillips" <dr.phillips@IFASadmins-MacBook-Pro.local>
Date: Tue, 10 Feb 2026 11:57:03 -0500
Subject: [PATCH 2/2] [BI-2615] Removed unneeded parinthesid

---
 src/views/import/Dataset.vue | 45 +++++++++++++++---------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/views/import/Dataset.vue b/src/views/import/Dataset.vue
index 9503641b..0f075a08 100644
--- a/src/views/import/Dataset.vue
+++ b/src/views/import/Dataset.vue
@@ -409,11 +409,8 @@ export default class Dataset extends ProgramsBase {
     first = first ? first : "";  //convert null or undefined to an empty string
     let second = b.data.traitValues[index];
     second = second ? second : "";  //convert null or undefined to an empty string
-    if (isAsc) {
-      return first.localeCompare(second);
-    } else {
-      return second.localeCompare(first);
-    }
+    return this.sortAlphaAsNumeric(first, second, isAsc);
+
   }
 
   //Filter GIDs by exact match
@@ -430,52 +427,48 @@ export default class Dataset extends ProgramsBase {
     return this.sortAlphaAsNumeric(first, second, isAsc);
   }
   sortColumn(a: any, b: any, isAsc: boolean) {
-    let first: any = (a.data.column);
-    let second: any = (b.data.column);
+
+    let first: any = a.data.column;
+    let second: any = b.data.column;
     return this.sortAlphaAsNumeric(first, second, isAsc);
   }
 
   sortRow(a: any, b: any, isAsc: boolean) {
-    let first: any = (a.data.row);
-    let second: any = (b.data.row);
+    let first: any = a.data.row;
+    let second: any = b.data.row;
     return this.sortAlphaAsNumeric(first, second, isAsc);
   }
 
   sortExpBlock(a: any, b: any, isAsc: boolean) {
-    let first: any = (a.data.expBlock);
-    let second: any = (b.data.expBlock);
+    let first: any = a.data.expBlock;
+    let second: any = b.data.expBlock;
     return this.sortAlphaAsNumeric(first, second, isAsc);
   }
   sortExpReplicate(a: any, b: any, isAsc: boolean){
-    let first :any = (a.data.expReplicate);
-    let second :any = (b.data.expReplicate);
+    let first :any = a.data.expReplicate;
+    let second :any = b.data.expReplicate;
     return this.sortAlphaAsNumeric( first, second, isAsc);
   }
 
   // This sorts the Exp Unit ID's in Alphanumeric order (ie. B300,BO2, B1 would sort to B1, B02, B300)
   sortExpUnitId(a: any, b: any, isAsc: boolean){
-    let first :any = (a.data.expUnitId);
-    let second :any = (b.data.expUnitId);
+    let first :any = a.data.expUnitId;
+    let second :any = b.data.expUnitId;
     return this.sortAlphaAsNumeric( first, second, isAsc);
   }
 
-  private sortAlphaAsNumeric( first: any, second: any, isAsc: boolean)  {
-    if (isAsc) {
-      return first.toString().localeCompare(second.toString(), 'en', {numeric: true});
-    } else {
-      return second.toString().localeCompare(first.toString(), 'en', {numeric: true});
-    }
-  }
-
 // This sorts the Sub Unit ID's in Alphanumeric order (ie. B300,BO2, B1 would sort to B1, B02, B300)
   sortSubUnitId(a: any, b: any, isAsc: boolean) {
-    let first: any = (a.data.subExpUnitId);
-    let second: any = (b.data.subExpUnitId);
+    let first: any = a.data.subExpUnitId;
+    let second: any = b.data.subExpUnitId;
+    return this.sortAlphaAsNumeric( first, second, isAsc);
+  }
+  
+  private sortAlphaAsNumeric( first: number, second: number, isAsc: boolean)  {
     if (isAsc) {
       return first.toString().localeCompare(second.toString(), 'en', {numeric: true});
     } else {
       return second.toString().localeCompare(first.toString(), 'en', {numeric: true});
-
     }
   }