Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -842,7 +842,6 @@
                 <div id="repeatforloopExtra" class="repeatforloopclassExtra0" name="repeatforloopExtraname " > 
                   <label id="modalColumn">Enter column names as shown in the schedule</label> 
                   <button type="button" id="popupbuttonsDeleteTable" class="delete-table-btn" style="margin-bottom: 8px;">Delete Table</button> 
-
                   
 
                   
@@ -1370,7 +1369,6 @@ $.get( '/RetrieveMCTNames/')
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
 
-/****Values of MCTname rows at the end of the conssole( grouping shapes) --> legend summary ****/
 document.getElementById('duplicater').childNodes[1].value=[0,0]
 //___________________________________________________________________________________________________________
 //___________________________________________________________________________________________________________
@@ -2469,54 +2467,54 @@ var doorSchedulePDF;
                       label.textContent = name;
 
                       // Shared click handler
-                      function checkboxRelvClick(event) {
-                        event.stopPropagation();
-                        const container = event.currentTarget;
-                        const checkbox = container.querySelector('input[type="checkbox"]');
-                      
-                        const isMultiSection = projsec.value.startsWith('2.6') || projsec.value.startsWith('2.8');
-                      
-                        if (isMultiSection) {
-                          // --- MULTI (2.6 / 2.8): do NOT flip manually; read browser state ---
-                          container.style.backgroundColor = checkbox.checked ? '#d3f8d3' : '';
-                      
-                          // 1) Gather selected values
-                          const selectedCheckboxes = Array.from(
-                            document.querySelectorAll('input[name="measureCheckboxRelv"]:checked')
-                          );
-                          window.doorSchedulePDFs = selectedCheckboxes.map(cb => cb.value);
-                          console.log('Selected (multi):', window.doorSchedulePDFs);
-                      
-                          // 2) Reorder: selected to the top, keep relative order
-                          const relvContainer = relvSelect; // #relvselectid
-                          const items = Array.from(relvContainer.querySelectorAll('.relv-item'));
-                          const selectedItems = items.filter(it => it.querySelector('input[name="measureCheckboxRelv"]').checked);
-                          const unselectedItems = items.filter(it => !it.querySelector('input[name="measureCheckboxRelv"]').checked);
-                          [...selectedItems, ...unselectedItems].forEach(it => relvContainer.appendChild(it));
-                        } else {
-                          // --- SINGLE (other sections): keep previous behavior ---
-                          document.querySelectorAll('input[name="measureCheckboxRelv"]').forEach(cb => {
-                            cb.checked = false;
-                            cb.closest('.relv-item').style.backgroundColor = '';
-                          });
-                          checkbox.checked = true;
-                          container.style.backgroundColor = '#d3f8d3';
-                      
-                          doorSchedulePDF = checkbox.value;
-                          relvSelect.value = doorSchedulePDF;
-                      
-                          // Reorder single: the one checked goes first
-                          const relvContainer = relvSelect;
-                          const items = Array.from(relvContainer.querySelectorAll('.relv-item'));
-                          const selectedItems = items.filter(it => it.querySelector('input[type="checkbox"]').checked);
-                          const unselectedItems = items.filter(it => !it.querySelector('input[type="checkbox"]').checked);
-                          [...selectedItems, ...unselectedItems].forEach(it => relvContainer.appendChild(it));
-                        }
-                      
-                        // Clear any warning style
-                        const panel = document.getElementById('relvselectid');
-                        if (panel) panel.style.boxShadow = '';
-                      }
+                  function checkboxRelvClick(event) {
+                    event.stopPropagation();
+                    const container = event.currentTarget;
+                    const checkbox = container.querySelector('input[type="checkbox"]');
+                  
+                    const isMultiSection = projsec.value.startsWith('2.6') || projsec.value.startsWith('2.8');
+                  
+                    if (isMultiSection) {
+                      // --- MULTI (2.6 / 2.8): do NOT flip manually; read browser state ---
+                      container.style.backgroundColor = checkbox.checked ? '#d3f8d3' : '';
+                  
+                      // 1) Gather selected values
+                      const selectedCheckboxes = Array.from(
+                        document.querySelectorAll('input[name="measureCheckboxRelv"]:checked')
+                      );
+                      window.doorSchedulePDFs = selectedCheckboxes.map(cb => cb.value);
+                      console.log('Selected (multi):', window.doorSchedulePDFs);
+                  
+                      // 2) Reorder: selected to the top, keep relative order
+                      const relvContainer = relvSelect; // #relvselectid
+                      const items = Array.from(relvContainer.querySelectorAll('.relv-item'));
+                      const selectedItems = items.filter(it => it.querySelector('input[name="measureCheckboxRelv"]').checked);
+                      const unselectedItems = items.filter(it => !it.querySelector('input[name="measureCheckboxRelv"]').checked);
+                      [...selectedItems, ...unselectedItems].forEach(it => relvContainer.appendChild(it));
+                    } else {
+                      // --- SINGLE (other sections): keep previous behavior ---
+                      document.querySelectorAll('input[name="measureCheckboxRelv"]').forEach(cb => {
+                        cb.checked = false;
+                        cb.closest('.relv-item').style.backgroundColor = '';
+                      });
+                      checkbox.checked = true;
+                      container.style.backgroundColor = '#d3f8d3';
+                  
+                      doorSchedulePDF = checkbox.value;
+                      relvSelect.value = doorSchedulePDF;
+                  
+                      // Reorder single: the one checked goes first
+                      const relvContainer = relvSelect;
+                      const items = Array.from(relvContainer.querySelectorAll('.relv-item'));
+                      const selectedItems = items.filter(it => it.querySelector('input[type="checkbox"]').checked);
+                      const unselectedItems = items.filter(it => !it.querySelector('input[type="checkbox"]').checked);
+                      [...selectedItems, ...unselectedItems].forEach(it => relvContainer.appendChild(it));
+                    }
+                  
+                    // Clear any warning style
+                    const panel = document.getElementById('relvselectid');
+                    if (panel) panel.style.boxShadow = '';
+                  }
 
                       // Assign the click event to the container div
                       divRelv.onclick = checkboxRelvClick;
@@ -2670,7 +2668,7 @@ function ImgSide(imgdata, spreadsheetLink, pdfLink, pdfname, baxlink, xmllink) {
             imgcanvas.height = 600;
             imgcanvas.id = 'imgcanvas_' + index;
             imgcanvas.alt = "Larry " + index;
-            imgcanvas.style.zIndex = 999;
+            imgcanvas.style.zIndex = 1;
 
             imgcanvas.addEventListener('click', function () {
                 ImgLarger(imgcanvas.id, imgcanvas.src);
@@ -2684,7 +2682,7 @@ function ImgSide(imgdata, spreadsheetLink, pdfLink, pdfname, baxlink, xmllink) {
         imgcanvas.height = 600;
         imgcanvas.id = 'imgcanvas';
         imgcanvas.alt = "Larry";
-        imgcanvas.style.zIndex = 999;
+        imgcanvas.style.zIndex = 1;
 
         imgcanvas.addEventListener('click', function () {
             ImgLarger(imgcanvas.id, imgcanvas.src);
@@ -2976,8 +2974,11 @@ function getData(form) {
     ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
     console.log('ratioss',ratio1,ratio2)
   }
+  console.log('selectproj', formvalues['selectproj'])
+  console.log('selectprojp', formvalues['selectprojp'])
+  console.log('selectprojs', formvalues['selectprojs'])
   pdfpath.push(formvalues['selectproj'],formvalues['selectprojp'] ,formvalues['selectprojs']) //project name - part - section
-
+  console.log('pdfpath: ', pdfpath)
   if (canvasimg){
     console.log('canvasimg')
     buf=canvasimg.split("data:image/png;base64,")
@@ -3022,7 +3023,7 @@ function getData(form) {
       console.log('formvalues:', formvalues)
       console.log('tomeasureproj:', tomeasureproj)
       // send allTablesData instead of groupedValues
-      answers.push(tomeasureproj, 0,[] , 0,0,pdfpath , doorSchedulePDFs, allTablesData);
+      answers.push(tomeasureproj, 0,[] , 0,0,pdfpath , doorSchedulePDFs ,allTablesData);
       console.log('answers:', answers)
       formData.append('answers',JSON.stringify(answers)) 
       console.log('formData:', formData)
@@ -4637,7 +4638,8 @@ document.getElementById("refreshAPIbutton").onclick = function()
 
 
 
-document.getElementById("popupforextratext").disabled=false;
+// ===== Tabs-based popup using a SEPARATE template =====
+document.getElementById("popupforextratext").disabled = false;
 document.getElementById("popupforextratext").onclick = function () {
   if (sectionNumber.startsWith('2.7')) {
     document.getElementById("Thickness2.7").removeAttribute("hidden");
@@ -4911,6 +4913,7 @@ document.addEventListener('click', function (e) {
 };
 
 
+
 document.getElementById("confirm").onclick = function(){confirmDialogR()};
 function confirmDialogR() {
  /* code executed if confirm is clicked */ 
@@ -5209,9 +5212,6 @@ function getAddedTablesDataSimple_modified() {
   return result;
 }
 
-  
-  
-  
 // Attach listener to all current and future delete buttons
 document.addEventListener('click', function(event) {
   if(event.target.classList.contains('delete-table-btn')) {
@@ -5226,27 +5226,51 @@ document.addEventListener('click', function(event) {
 });
 // After adding tables, run this code:
 function updateDeleteButtonStates() {
-    const allDeleteBtns = document.querySelectorAll('.delete-table-btn');
-    
-    // Reset all buttons to enabled state first
-    allDeleteBtns.forEach(btn => {
-        btn.disabled = false;
-        btn.style.opacity = '1';
-        btn.style.background = '';
-        btn.style.color = '';
-        btn.style.cursor = 'pointer';
-    });
-    
-    // Disable and shade the first button only
-    if (allDeleteBtns.length > 0) {
-        const firstBtn = allDeleteBtns[0];
-        firstBtn.disabled = true;
-        // Apply shaded styling
-        firstBtn.style.opacity = '0.5';
-        firstBtn.style.background = '#ddd';
-        firstBtn.style.color = '#888';
-        firstBtn.style.cursor = 'not-allowed';
-    }
+  const rows = Array.from(document.querySelectorAll('.extraDoorRow'));
+
+  // Enable all delete buttons first
+  rows.forEach(row => {
+    const btn = row.querySelector('.delete-table-btn');
+    if (!btn) return;
+    btn.disabled = false;
+    btn.style.opacity = '1';
+    btn.style.background = '';
+    btn.style.color = '';
+    btn.style.cursor = 'pointer';
+  });
+
+    rows.forEach(row => {
+    const btn = row.querySelector('.addRowForPdfBtn');
+    if (!btn) return;
+    btn.disabled = false;
+    btn.style.opacity = '1';
+    btn.style.background = '';
+    btn.style.color = '';
+    btn.style.cursor = 'pointer';
+  });
+
+  // Group rows by PDF name and disable the first delete button in each group
+  const groups = new Map();
+  rows.forEach(row => {
+    const key = row.dataset.pdfName || '__global__';
+    if (!groups.has(key)) groups.set(key, []);
+    groups.get(key).push(row);
+  });
+
+  groups.forEach(groupRows => {
+    const firstBtn = groupRows[0].querySelector('.delete-table-btn');
+    if (!firstBtn) return;
+    firstBtn.disabled = true;
+    firstBtn.style.opacity = '0.5';
+    firstBtn.style.background = '#ddd';
+    firstBtn.style.color = '#888';
+    firstBtn.style.cursor = 'not-allowed';
+  });
+
+    groups.forEach(groupRowsA => {
+    const firstBtnAdd = groupRowsA[0].querySelector('.addRowForPdfBtn');
+    if (!firstBtnAdd) return;
+  });
 }
 
 // 5. Also call it when the page loads (if needed)
@@ -5273,6 +5297,7 @@ function get_combined_tables(main_table, other_tables){
   console.log("Final output that will be passed to flask:", mergedArray);
   return mergedArray;
 }
+
 (() => {
   const BTN_ID = 'addAnotherTableBtn';
   const WATCH_ROOT = document.body;