Allows selection of samples that have specific types of measurements.

Author: steps39

SedimentDataExplorer.html

@@ -373,21 +373,42 @@
             height: 18px;
             margin-right: 8px;
         }
-        .scatter-flex-container {
+
+
+        .scatter-chart-wrapper {
+    position: relative;
+    width: 100%;
+    height: 400px; /* Set a fixed height or use min-height */
+    flex: 1; /* If using flexbox */
+}
+
+.scatter-chart-wrapper canvas {
+    width: 100% !important;
+    height: 100% !important;
+}
+
+.scatter-flex-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 20px;
+}
+
+                .scatter-flex-container {
             display: flex;
             flex-wrap: wrap;
 /*            gap: 1rem; /* Adds space between charts */
         }
 
         .scatter-chart-wrapper {
             flex: 1 1 100%; /* Default to full width on small screens */
-            flex-grow: 0; /* This prevents items from growing to fill space */
-            flex-shrink: 0;
+            /*flex-grow: 0; This prevents items from growing to fill space */
+/*            flex-shrink: 0;*/
             min-width: 140px; /* Prevents charts from becoming too small */
 /*            height: 300px; /* Crucial: Gives the container a height */
             position: relative; /* Required for Chart.js responsiveness */
         }
 
+
         /* Media queries for responsive columns */
         @media (min-width: 768px) {
             .scatter-chart-wrapper {
@@ -687,14 +708,21 @@ <h2>Select Samples</h2>
                 <label for="maxDepth">Maximum depth:</label><input type="number" id="maxDepth">
                 <label for="containsText">Filter by name (contains text):</label><input type="text" id="containsText">
             </div>
+            <div>Must have measurement of - <input type="checkbox" id="tracemetaldatasample"><label for="tracemetaldatasample">Trace metal data</label>
+                <input type="checkbox" id="pahdatasample"><label for="pahdatasample">PAH data</label>
+                <input type="checkbox" id="pcbdatasample"><label for="pcbdatasample">PCB data</label>
+                <input type="checkbox" id="bdedatasample"><label for="bdedatasample">BDE data</label>
+                <input type="checkbox" id="organotinsdatasample"><label for="organotinsdatasample">Organotins data</label>
+                <input type="checkbox" id="organochlorinedatasample"><label for="organochlorinedatasample">Organochlorine data</label>
+                <input type="checkbox" id="physicaldatasample"><label for="physicaldatasample">Physical data</label>
+            </div>
             <button onclick="applySampleFilter()">Apply Filter</button>
             <hr>
             <div id="sampleCheckboxes" style="max-height: 300px; overflow-y: auto; border: 1px solid var(--border-color); padding: 0.5rem; border-radius: 4px;"></div>
             <div class="modal-footer">
                 <button onclick="cancelSampleSelection()" class="secondary">Cancel</button>
                 <button onclick="closeSampleSelection()">Confirm Selections and Close</button>
             </div>
-            <div>Must have non-zero - <input type="checkbox" id="tracemetaldatasample"><label for="tracemetaldatasample">Trace metal data</label><input type="checkbox" id="pahdatasample"><label for="pahdatasample">PAH data</label><input type="checkbox" id="pcbdatasample"><label for="pcbdatasample">PCB data</label><input type="checkbox" id="bdedatasample"><label for="bdedatasample">BDE data</label><input type="checkbox" id="organotinsdatasample"><label for="organotinsdatasample">Organotins data</label><input type="checkbox" id="organochlorinedatasample"><label for="organochlorinedatasample">Organochlorine data</label><input type="checkbox" id="physicaldatasample"><label for="physicaldatasample">Physical data</label></div>
         </div>
     </div>
     <div id="chemicalModal" class="modal">

SedimentDataExplorer.js

@@ -120,7 +120,9 @@
         'Total Hydrocarbon', 'Gorham LMW Sum', 'Gorham HMW Sum', 'ICES7 PCB Sum'
     ];
 
-    const primarySortingOptions = ['None', 'Date of Sampling', 'Sample Name', 'Date & Sample Name'];
+    const primarySortingOptions = [
+        'None', 'Date of Sampling', 'Sample Name', 'Date & Sample Name', 'Sample Name & Date',
+        'Dataset Name', 'Dataset Name & Sample Name ', 'Sample Name & Dataset Name'];
     const secondarySortingOptions = [
         'Latitude', 'Longitude', 'Min Depth', 'Max Depth', 'Mean Depth',
         'Total Area', 'Total Solids', 'Organic Matter', 
@@ -1137,7 +1139,7 @@ fred = df;
 //fred = sampleMeasurements[dateSampled]['Physical Data'].samples[allSamples[0]];
 //                        if (!sampleMeasurements[dateSampled]['Physical Data'].samples[allSamples[0]]['Total solids (% total sediment)']) {
 //                        if (sampleMeasurements[dateSampled]['Physical Data'].samples[allSamples[0]]['Total solids (% total sediment)'] === undefined) {
-console.log('New test: No total solids');
+console.log('New test: No total solids',dateSampled, sheetName);
 // Code that reads Total Solids column into physical data
                         if (!('Total solids (% total sediment)' in sampleMeasurements[dateSampled]['Physical Data'].samples[allSamples[0]])) {
 col = startCol + 3;
@@ -1198,14 +1200,16 @@ let missingTotalSolids = true;
                         if (df[startRow - 3][startCol + 4].includes('Exempt')) {
                             deltaExempt = 1;
                         }
+                        let blankLine = 0;
                         for (let col = startCol + 6 + deltaExempt; col < df[startRow - 1].length; col++) {
                             meas.sizes.push(parseFloat(df[startRow - 2][col]) || 0);
-                            for (let row = startRow; row < 38; row++) {
+                            for (let row = startRow; row < df.length; row++) {
                                 sample = df[row][startCol + 2]; //bodge to pick up sample id
                                 // If sample id not present then use Laboratory sample number instead
                                 if (sample == undefined || sample == null) {
                                     sample = df[row][startCol];
                                 }
+                                //Stop if no sample id - end of data - may break if blank rows in data
                                 if (!(sample == undefined || sample == null)) {
                                     //console.log(sheetName, col, row, sample);
                                     if (!meas.samples) {
@@ -1237,6 +1241,11 @@ let missingTotalSolids = true;
                                     //console.log(sample);
                                     meas.samples[sample].psd.push(parseFloat(df[row][col]) || 0);
                                     //console.log('meas.psd ',df[row][col]);
+                                } else {
+                                    blankLine += 1;
+                                    if (blankLine > 5) { // Allow for up to 5 blank lines in PSD data
+                                        break;
+                                    }
                                 }
                             }
                         }

sdeCalcs4Charts.js

@@ -452,7 +452,7 @@ function dataForTotalScatterCharting(sheetName, chartType) {
                     //let xValue;
                     switch (chartType) {
                         case "totalArea":
-                            //console.log(ds,s);
+                            console.log(ds,s);
                             xValue = sampleMeasurements[ds]['Physical Data'].samples[s].totalArea;
                             break;