diff --git a/src/views/import/Dataset.vue b/src/views/import/Dataset.vue index b28e7b51..0f075a08 100644 --- a/src/views/import/Dataset.vue +++ b/src/views/import/Dataset.vue @@ -146,6 +146,7 @@ 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); - if (isAsc) { - return first.toString().localeCompare(second.toString(), 'en', {numeric: true}); - } - else { - return second.toString().localeCompare(first.toString(), 'en', {numeric: true}); - } + let first :any = a.data.expUnitId; + let second :any = b.data.expUnitId; + return this.sortAlphaAsNumeric( first, second, isAsc); } - // 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); + 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}); - } }