Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -440,6 +440,10 @@
                 <div id="2_1textUserGuide" hidden class="othesectionsuserguide">
                   User guide in progress...
 
+                </div>
+                <div id="2_6textUserGuide" hidden class="othesectionsuserguide">
+                  User guide in progress...
+
                 </div>
                 <div id="2_7textUserGuide" hidden class="othesectionsuserguide">
                   User guide in progress...                  
@@ -581,7 +585,7 @@
 
 ///////////////////////////////////////////////BEGIN JS CODE//////////////////////////////////////////////////
 
-var ActiveSections=['1.0','2.1','2.7','2.8','3.2','3.3']
+var ActiveSections=['1.0','2.1','2.6','2.7','2.8','3.2','3.3']
 
 var menuItems = document.querySelectorAll("#UserGuidemenuOptions li");
 
@@ -962,7 +966,7 @@ worker.onmessage= function(event){
                 opt=document.createElement("option");
                 opt.textContent=data[2][d];
                 opt.text=data[2][d];
-                if(!(data[2][d].startsWith('1.0')  )  && !(data[2][d].startsWith('3.2')  ) && !(data[2][d].startsWith('2.8')) && !(data[2][d].startsWith('3.3'))  && !(data[2][d].startsWith('2.1')) && !(data[i].startsWith('2.7'))) //||data[i].startsWith('2.2')))
+                if(!(data[2][d].startsWith('1.0')  )  && !(data[2][d].startsWith('3.2')  ) && !(data[2][d].startsWith('2.8')) &&  !(data[2][d].startsWith('2.6')) && !(data[2][d].startsWith('3.3'))  && !(data[2][d].startsWith('2.1')) && !(data[i].startsWith('2.7'))) //||data[i].startsWith('2.2')))
                   {
                     opt.style.color='#bdbcbc';
                     opt.style.cursor='not-allowed';
@@ -1395,7 +1399,7 @@ console.log('ayhaga', clone.children[5])
           inputs1.add(optn);
 
           }
-        if (section.value.startsWith('2.8'))
+        if (section.value.startsWith('2.8') || section.value.startsWith('2.6'))
           { 
           var opt = document.createElement("OPTION");
           opt.text= 'Select';
@@ -1506,6 +1510,11 @@ function ShowSectionUserguide(element) {
             document.getElementById('2_1textUserGuide').style.display = 'block';
             document.getElementById('2_1textUserGuide').removeAttribute('hidden');
         } 
+        
+        else if (element.textContent.startsWith('2.6')) {
+            document.getElementById('2_6textUserGuide').style.display = 'block';
+            document.getElementById('2_6textUserGuide').removeAttribute('hidden');
+        } 
         else if (element.textContent.startsWith('2.7')) {
             document.getElementById('2_7textUserGuide').style.display = 'block';
             document.getElementById('2_7textUserGuide').removeAttribute('hidden');
@@ -1717,6 +1726,7 @@ var doorSchedulePDF;
 
                 // Action when checkbox is clicked (e.g., log the selected project)
                 let selectedValue = event.target.value;
+                measSelect=selectedValue;
                 console.log("Selected project:", selectedValue);
 
                 // Highlight the selected item
@@ -1742,15 +1752,19 @@ var doorSchedulePDF;
                   pdfname=selectedValue;
                   measSelect.style.boxShadow='none';
 
-                  
-                  document.getElementById("all").style.display = "block";
 
-                  pixelArr=[projname.value, projpart.value,projsec.value, pdfname]
-                // Open popup immediately before initiating the PDF download
-                var eventSource = new EventSource('/pixelimg/' + JSON.stringify(pixelArr));
-                document.getElementById('progressBar').removeAttribute('hidden')
-                document.getElementById('progressBar').style.display='block';
-                eventSource.onmessage = function (event) {
+                  if (!(projsec.value.startsWith('2.6') || projsec.value.startsWith('2.8'))) {
+
+
+                        document.getElementById("all").style.display = "block";
+                        
+                        pixelArr=[projname.value, projpart.value,projsec.value, pdfname]
+                      // Open popup immediately before initiating the PDF download
+                      
+                      var eventSource = new EventSource('/pixelimg/' + JSON.stringify(pixelArr));
+                      document.getElementById('progressBar').removeAttribute('hidden')
+                      document.getElementById('progressBar').style.display='block';
+                      eventSource.onmessage = function (event) {
                           var progress = parseInt(event.data);  // Progress value from Flask
                           if (progress <= 100) {
                               console.log(progress);  // Log progress for debugging
@@ -1773,21 +1787,21 @@ var doorSchedulePDF;
                           document.getElementById('progress').textContent = '0%';
                           document.getElementById("all").style.display = "none";
                               // Display link or any additional data if needed
-                              window.open(data[2]);
+                           window.open(data[2]);
                               downloadPdf(pdfname,'Pixel_Conversion_File_:'+pdfname)
-                                  document.getElementById("all").style.display = "none";
-                                
+                              document.getElementById("all").style.display = "none";
+                            
                                   document.getElementById('measureADRbutton').onclick= function()
                                   {
                                     if (!areaRatio.value){
-                                      if (!(projsec.value.startsWith('3.2')) & !(projsec.value.startsWith('2.8')) & !(projsec.value.startsWith('3.3')) & !(projsec.value.startsWith('2.7')) )
+                                      if (!(projsec.value.startsWith('3.2')) & !(projsec.value.startsWith('2.8')) & !(projsec.value.startsWith('2.6')) &  !(projsec.value.startsWith('3.3')) & !(projsec.value.startsWith('2.7')) )
                                           areaRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
                                     }
-                                    if (!prmRatio.value)
-                                    {
-                                      if (!(projsec.value.startsWith('2.8')))
-                                            prmRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
-                                    }
+                                    if (!prmRatio.value) {
+                                        if (!(projsec.value.startsWith('2.6') || projsec.value.startsWith('2.8'))) {
+                                          prmRatio.style.boxShadow = '0 0 8px 2px rgb(255, 0, 0)';
+                                        }
+                                      }
 
                                   }
                                   document.getElementById('radiosColors').removeAttribute('hidden');
@@ -1870,7 +1884,7 @@ var doorSchedulePDF;
                                   prminpixels=data[1];   
 
 
-                                  if( projsec.value.startsWith('2.8')) {
+                                  if( projsec.value.startsWith('2.8') ||  projsec.value.startsWith('2.6')) {
                                     areaRatio.setAttribute('disabled',true)
                                     areaRatio.style.cursor='not-allowed';
                                     areaRatio.style.backgroundColor='rgba(101, 101, 101, 0.27)'
@@ -1918,7 +1932,7 @@ var doorSchedulePDF;
                               //   pdfnames=getSelectValues(elem)
                               // }
               } 
-
+            }
               // Action for when the label is clicked (no checkbox change)
               function handleLabelClick(event) {
                 // Action when label is clicked (e.g., log the selected project via the label)
@@ -1928,6 +1942,9 @@ var doorSchedulePDF;
                 document.querySelectorAll(".measure-item").forEach(item => {
                   item.style.backgroundColor = ''; // Reset background color for all items
                 });
+                relvSelect=selectedLabel;
+                relvSelect.style.boxShadow='none';
+
                 // event.target.closest(".measure-item").style.backgroundColor = '#919592'; // Highlight the selected item
                     // Show loading indicator
                   document.getElementById("all").style.display = "block";
@@ -2005,7 +2022,7 @@ var doorSchedulePDF;
                           // Action when label is clicked (e.g., log the selected project via the label)
                     let relevantDocumentName = event.target.textContent;
                     console.log("Label clicked: ", relevantDocumentName);
-                    if (projsec.value.startsWith('2.8')){
+                    if (projsec.value.startsWith('2.8') ||projsec.value.startsWith('2.6')){
                       doorSchedulePDF=relevantDocumentName
                       console.log(doorSchedulePDF)
                     }
@@ -2031,7 +2048,7 @@ var doorSchedulePDF;
                 }
               }
 
-                  relvids.push(relvSelect) ;
+                  relvids.push(relvSelect);
                   measids.push(measSelect);
 
               document.addEventListener("click", function(event) {
@@ -2049,7 +2066,7 @@ var doorSchedulePDF;
                     }
 
                     if (!relvSelect.value) {
-                        if (sectionNumber.startsWith('2.8')) {
+                        if (sectionNumber.startsWith('2.8') || sectionNumber.startsWith('2.6')) {
                           relvSelect.style.boxShadow = '0 0 8px 2px rgb(255, 0, 0)';
                             relvSelect.setAttribute("required", "")
                         }
@@ -2062,7 +2079,7 @@ var doorSchedulePDF;
 
 
               if (document.getElementById('arealvlinput')){
-                if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') || projsec.value.startsWith('3.3')  || projsec.value.startsWith('2.1')  || projsec.value.startsWith('2.7')){
+                if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') || projsec.value.startsWith('2.6') || projsec.value.startsWith('3.3')  || projsec.value.startsWith('2.1')  || projsec.value.startsWith('2.7')){
                     document.getElementById('arealvlinput').setAttribute('disabled',true)
                     document.getElementById('selectunitA').setAttribute('disabled',true)
                   }
@@ -2157,7 +2174,7 @@ function ImgSide(imgdata, spreadsheetLink, pdfLink) {
 
 
     
-    if ( projsec.value.startsWith('2.8')){
+    if ( projsec.value.startsWith('2.8') ||  projsec.value.startsWith('2.6')){
       legendbutton.setAttribute('disabled',true);
       legendbutton.style.cursor='not-allowed';
       legendbutton.style.boxShadow = 'none';
@@ -2330,7 +2347,7 @@ function getData(form) {
     ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
     console.log('ratioss',ratio1,ratio2)
   }
-  else if (formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('2.1') ){
+  else if (formvalues['selectprojs'].startsWith('2.8') ||formvalues['selectprojs'].startsWith('2.6') || formvalues['selectprojs'].startsWith('2.1') ){
     ratio1=1;
     ratio2=(formvalues['prmRatio']/ratioPunit)/prminpixels;
     console.log('ratioss',ratio1,ratio2)
@@ -2376,14 +2393,14 @@ function getData(form) {
       answers.push(tomeasureproj, 0,[] , ratio1, ratio2 ,pdfpath);
       formData.append('answers',JSON.stringify(answers)) 
     }
-    else if (formvalues['selectprojs'].startsWith('2.8') )
+    else if (formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('2.6') )
     {
       answers.push(tomeasureproj, 0,[] , 0,0,pdfpath , doorSchedulePDF);
       formData.append('answers',JSON.stringify(answers)) 
     }
   }
  
-  if  (formvalues['selectprojs'].startsWith('1.0') || formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('3.3') || formvalues['selectprojs'].startsWith('2.7') ) //formvalues['selectprojs'].startsWith('2.1') 
+  if  (formvalues['selectprojs'].startsWith('1.0') || formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('2.8') ||  formvalues['selectprojs'].startsWith('2.6') || formvalues['selectprojs'].startsWith('3.3') || formvalues['selectprojs'].startsWith('2.7') ) //formvalues['selectprojs'].startsWith('2.1') 
   {  
     // console.log(formData)
     $.ajax({
@@ -2408,9 +2425,9 @@ function getData(form) {
         // var mp3_url = 'https://media.geeksforgeeks.org/wp-content/uploads/20190531135120/beep.mp3';
         // (new Audio(mp3_url)).play()
         // retrieveLinks()
-           if (!(formvalues['selectprojs'].startsWith('2.8')) )
-              startDropdownUpdates(); // Start the dropdown updates
-
+              if (!(formvalues['selectprojs'].startsWith('2.6') || formvalues['selectprojs'].startsWith('2.8'))) {
+                  startDropdownUpdates();
+                }
 
             document.getElementById("loading").hidden = true;
             document.getElementById("rightside").hidden = false;
@@ -2476,7 +2493,7 @@ function getData(form) {
 
                 
             }
-            if (formvalues['selectprojs'].startsWith('2.8'))
+            if (formvalues['selectprojs'].startsWith('2.8') ||formvalues['selectprojs'].startsWith('2.6'))
             { //base64.b64encode(buffer).decode('utf-8') ,pdflink,list1.to_dict(),  repeated_labels , not_found]
              // /* data[0]--> img , data[1]-->dataframe (goes to legend lsa ) , data [2] -->pdf dropbox shareable link ,data[3]-> spreadsheetId, data[4],spreadsheeturl */   
                 // SimilarAreaDictionary=data[1];
@@ -2523,7 +2540,7 @@ function getData(form) {
             // if (!(formvalues['selectprojs'].startsWith('2.8')))
             // {
               ImgSide(data[0],spreadsheetURL,dropboxLink)
-              if (formvalues['selectprojs'].startsWith('2.8')) {
+              if (formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('2.6')) {
                 let messages = [];
                 if (Repeated_Labels2_8)
                 if (Repeated_Labels2_8.length > 0) {
@@ -2692,7 +2709,7 @@ document.getElementById("myForm").addEventListener("submit", function (e) {
     
     let TopTextModal = document.getElementById("TopTextModal");
     TopTextModal.textContent = "Warning: Missing Inputs";
-    if (sectionNumber.startsWith('2.8')) {
+    if (sectionNumber.startsWith('2.8') || sectionNumber.startsWith('2.6')) {
 
         // If section starts with '2.8', both measureCheckbox and relv-item must be selected
         if (!isChecked & !isRelvClicked) {
@@ -3372,7 +3389,7 @@ if (sectionNumber.startsWith('2.7'))
     textextra.disabled="disabled";
 
 } 
-if (sectionNumber.startsWith('2.8'))
+if (sectionNumber.startsWith('2.8') || sectionNumber.startsWith('2.6'))
 {
   text2extra= cloneExtra.children[3]
   text2extra.style.backgroundColor ="rgba(101, 101, 101, 0.27)";
@@ -3690,7 +3707,7 @@ function chooseFirstdrpdwn()
     optn.value= "Internal Walls";
     inputs.add(optn);
     }
-    if (section.value.startsWith('2.8'))
+    if (section.value.startsWith('2.8') || section.value.startsWith('2.6'))
     {
     var opt = document.createElement("OPTION");
     opt.text= 'Select';
@@ -3890,7 +3907,7 @@ if (sectionNumber.startsWith('2.7'))
     textextra.disabled="disabled";
 
 }
-if (sectionNumber.startsWith('2.8'))
+if (sectionNumber.startsWith('2.8') || sectionNumber.startsWith('2.6'))
 {
   text2extra= document.getElementById("text2extra")
   text2extra.style.backgroundColor = "rgba(101, 101, 101, 0.27)";
@@ -4014,7 +4031,7 @@ function refreshAPIbuutton(dataa){
                               opt=document.createElement("option");
                               opt.textContent=dataa[2][d];
                               opt.text=dataa[2][d];
-                              if(!(dataa[2][d].startsWith('1.0')  ) || (data[i].startsWith('3.2') ) || (data[i].startsWith('2.8')) || (data[i].startsWith('3.3')) || (data[i].startsWith('2.1')) || (data[i].startsWith('2.7')) )//||data[i].startsWith('2.2')))
+                              if(!(dataa[2][d].startsWith('1.0')  ) || (data[i].startsWith('3.2') ) || (data[i].startsWith('2.8')) || (data[i].startsWith('2.6')) || (data[i].startsWith('3.3')) || (data[i].startsWith('2.1')) || (data[i].startsWith('2.7')) )//||data[i].startsWith('2.2')))
                                 {
                                   opt.style.color='#bdbcbc';
                                   opt.style.cursor='not-allowed';