Corrected normal sorting by name or label in the chart data

Author: steps39

sdeCalcs4Charts.js

@@ -180,9 +180,9 @@ function dataForCharting(sheetName) {
     });
     unitTitle = blankSheets[ct]['Unit of measurement'];
 //console.log(sheetName,measChart);
-    if (!(xAxisSort === 'normal')) {
+//    if (!(xAxisSort === 'normal')) {
         measChart = measChartSort(measChart);
-    }
+//    }
 //console.log(measChart);
     return { unitTitle, measChart }
 }
@@ -414,10 +414,10 @@ testOne = selectedSampleMeasurements[ds];
         }
     });
 //console.log(measChart);
-    if (!(xAxisSort === 'normal')) {
+//    if (!(xAxisSort === 'normal')) {
         measChart = propertyChartSort(measChart);
 //console.log(measChart);
-    }
+//    }
     return measChart
 }
 
@@ -453,10 +453,10 @@ allSamples.sortSamples(ds,'totalArea');
         }
     });
 //console.log(measChart);
-    if (!(xAxisSort === 'normal')) {
+//    if (!(xAxisSort === 'normal')) {
         measChart = propertyChartSort(measChart);
 //console.log(measChart);
-    }
+//    }
     return measChart
 }
 
@@ -510,11 +510,11 @@ function sumsForTotalHCCharting() {
     });
 //console.log(measChart);
 //console.log(xAxisSort);
-    if (!(xAxisSort === 'normal')) {
+//    if (!(xAxisSort === 'normal')) {
 //console.log(measChart);
         measChart = propertyChartSort(measChart);
 //console.log(Object.keys(measChart));
-    }
+//    }
 //console.log(measChart);
     return { unitTitle, measChart }
 }
@@ -561,9 +561,9 @@ function ratiosForPAHs() {
         }
     });
 //console.log('ratios',measChart);
-if (!(xAxisSort === 'normal')) {
+//if (!(xAxisSort === 'normal')) {
     measChart = propertyChartSort(measChart);
-}
+//}
 return {unitTitle, measChart}
 }
 
@@ -609,9 +609,9 @@ function simpleRatiosForPAHs() {
         }
     });
 //console.log('ratios',measChart);
-if (!(xAxisSort === 'normal')) {
+//if (!(xAxisSort === 'normal')) {
     measChart = propertyChartSort(measChart);
-}
+//}
 return {unitTitle, measChart}
 }
 
@@ -652,9 +652,9 @@ function epaRatiosForPAHs() {
             }
         });
 //console.log('ratios',measChart);
-if (!(xAxisSort === 'normal')) {
+//if (!(xAxisSort === 'normal')) {
     measChart = propertyChartSort(measChart);
-}
+//}
     return {unitTitle, measChart}
     }
 
@@ -701,9 +701,9 @@ function ringFractionsForPAHs() {
         }
     });
 //console.log('ratios',measChart);
-if (!(xAxisSort === 'normal')) {
+//if (!(xAxisSort === 'normal')) {
     measChart = propertyChartSort(measChart);
-}
+//}
 return {unitTitle, measChart}
 }
 

sdeCharts.js

@@ -1601,9 +1601,9 @@ console.log('createHighlights',hoveredSample,dateSampled);
         //			}
     });
     //This needs the new sorting logic  *************************************************************************
-    if (!(xAxisSort === 'normal')) {
+//    if (!(xAxisSort === 'normal')) {
         samples.sortComplexSamples();
-    }
+//    }
 //console.log(samples, hoveredSample);
     if (!dateSampled) {
         clickedSamples = findSamplesInSameLocation(hoveredSample);

sdeDataUtilities.js

@@ -44,9 +44,16 @@ Array.prototype.sortComplexSamples = function() {
         if (partsB.length >2) {
             partsB[1] = partsB[1] + ': ' + partsB[2];
         }
-        selectedSampleInfo[partsA[0]].position[partsA[1]]
+//        selectedSampleInfo[partsA[0]].position[partsA[1]]
 //console.log(partsA);
 //console.log(partsB);
+
+        // Sorting by datesampled and label
+        if (xAxisSort === 'normal') {
+            const valueA = (selectedSampleInfo[partsA[0]]['label'] + selectedSampleInfo[partsA[0]].position[partsA[1]]['label']).toLowerCase();
+            const valueB = (selectedSampleInfo[partsB[0]]['label'] + selectedSampleInfo[partsB[0]].position[partsB[1]]['label']).toLowerCase();
+            return valueA.localeCompare(valueB);
+        }
         // Sorting by latitude
         if (xAxisSort === 'latitude') {
             const valueA = selectedSampleInfo[partsA[0]].position[partsA[1]]['Position latitude'];
@@ -171,7 +178,7 @@ Array.prototype.sortComplexSamples = function() {
 
         // Sorting by datetototalarea
         if (xAxisSort === 'datetotalarea') {
-console.log('datetotalarea');
+//console.log('datetotalarea');
             if (partsA[0] === partsB[0]) {
                 const valueA = selectedSampleMeasurements[partsA[0]]['Physical Data'].samples[partsA[1]].totalArea;
                 const valueB = selectedSampleMeasurements[partsB[0]]['Physical Data'].samples[partsB[1]].totalArea;