Update templates/proposed-GUI.html

templates/proposed-GUI.html

@@ -522,7 +522,7 @@ function displayprojsections(projectid,Partid){
       opt.text=data[i];
       thirddropdown.append(opt);
 
-      if(!(data[i].startsWith('1.0')  ) && !(data[i].startsWith('3.2')) && !(data[i].startsWith('2.8'))) // ||data[i].startsWith('2.2')))
+      if(!(data[i].startsWith('1.0')  ) && !(data[i].startsWith('3.2')) && !(data[i].startsWith('2.8')) && !(data[i].startsWith('3.3')) ) // ||data[i].startsWith('2.2')))
         {
           opt.style.color='#bdbcbc';
           opt.style.cursor='not-allowed';
@@ -646,7 +646,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[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('3.3')) ) //||data[i].startsWith('2.2')))
                   {
                     opt.style.color='#bdbcbc';
                     opt.style.cursor='not-allowed';
@@ -871,7 +871,7 @@ console.log('ayhaga', clone.children[5])
       clone.getElementsByClassName('repeatforloopclasshidden')[0].setAttribute('id', 'repeatforloop'+addciconval+'0');
       clone.getElementsByClassName('repeatforloopclasshidden')[0].setAttribute('name', 'repeatforloopname'+addciconval+'0');
       clone.getElementsByClassName('repeatforloopclasshidden')[0].setAttribute('class', 'repeatforloopclass'+addciconval+'0');
-      if (thirddropdown.value.startsWith('3.2'))
+      if (thirddropdown.value.startsWith('3.2') || thirddropdown.value.startsWith('3.3') )
              { 
 
               clone.children[5].children[1].setAttribute('disabled','True')
@@ -956,7 +956,7 @@ console.log('ayhaga', clone.children[5])
           optn2.value= "Internal Doors";
           inputs1.add(optn2);
           }
-        if (section.value.startsWith('2.8'))
+          if (section.value.startsWith('3.3'))
           {
           var opt = document.createElement("OPTION");
           opt.text= 'Select';
@@ -964,6 +964,20 @@ console.log('ayhaga', clone.children[5])
           opt.hidden=true;
           inputs1.add(opt);
 
+          var optn = document.createElement("OPTION");
+          optn.text= 'Ceiling';
+          optn.value= "Ceiling";
+          inputs1.add(optn);
+
+          }
+        if (section.value.startsWith('2.8'))
+          { 
+          var opt = document.createElement("OPTION");
+          opt.text= 'Select';
+          opt.value= "";
+          opt.hidden=true;
+          inputs1.add(opt);
+
           var optn = document.createElement("OPTION");
           optn.text= 'Single Door';
           optn.value= "Single Door";
@@ -975,6 +989,7 @@ console.log('ayhaga', clone.children[5])
           inputs1.add(optn1);
 
           }
+          
         }
 
 
@@ -1057,7 +1072,7 @@ function getSelectValues(select) {
     .success (function(data){
 
     document.getElementById("all").style.display = "none";
-    if (sections.value.startsWith('3.2')){
+    if (sections.value.startsWith('3.2') || sections.value.startsWith('3.3') ){
       document.getElementById('dxfdiv').removeAttribute('hidden'); 
       document.getElementById('pdftodxfFile').setAttribute('required',true)
     }
@@ -1164,7 +1179,7 @@ function getSelectValues(select) {
                   document.getElementById("all").style.display = "block";
 
                   pixelArr=[projname.value, projpart.value,projsec.value, pdfname]
-                  if (projsec.value.startsWith('3.2'))
+                  if (projsec.value.startsWith('3.2') || projsec.value.startsWith('3.3') )
                     downloadPdf(pdfname)
                   
                   $.get( '/pixelimg/'+JSON.stringify(pixelArr)) 
@@ -1179,7 +1194,7 @@ function getSelectValues(select) {
                     document.getElementById('measureADRbutton').onclick= function()
                     {
                       if (!areaRatio.value){
-                        if (!(projsec.value.startsWith('3.2')) & !(projsec.value.startsWith('2.8')))
+                        if (!(projsec.value.startsWith('3.2')) & !(projsec.value.startsWith('2.8')) & !(projsec.value.startsWith('3.3')) )
                             areaRatio.style.boxShadow='0 0 8px 2px rgb(255, 0, 0)';
                       }
                       if (!prmRatio.value)
@@ -1206,7 +1221,7 @@ function getSelectValues(select) {
                     areaRatio.style.textAlign='right';
                     areaRatio.step=".0000001";
                     
-                    if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') ){ 
+                    if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') || projsec.value.startsWith('3.3') ){ 
                       areaRatio.setAttribute('disabled',true)
                       document.getElementById('selectunitA').setAttribute('disabled',true)
                     }
@@ -1304,7 +1319,7 @@ function getSelectValues(select) {
           ShowPopUp();
      });
      if (document.getElementById('arealvlinput')){
-        if(projsec.value.startsWith('3.2') || (projsec.value.startsWith('2.8')  )){
+        if( projsec.value.startsWith('3.2') || projsec.value.startsWith('2.8') || projsec.value.startsWith('3.3') ){
             document.getElementById('arealvlinput').setAttribute('disabled',true)
             document.getElementById('selectunitA').setAttribute('disabled',true)
           }
@@ -1450,7 +1465,7 @@ function getData(form) {
   tomeasureproj=formvalues['measureselectname']; //proj name
 
 
-  if( formvalues['selectprojs'].startsWith('3.2')){
+  if( formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('3.3') ){
     ratio1=1
     ratio2=prminpixels/(formvalues['prmRatio']/ratioPunit);
     console.log(ratio2, prminpixels,formvalues['prmRatio'],ratioPunit)
@@ -1476,7 +1491,7 @@ function getData(form) {
   else{
     console.log('else')
     
-    if (formvalues['selectprojs'].startsWith('3.2'))
+    if ( formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('3.3') )
       {
         console.log('elseif')
         answers.push(tomeasureproj, 0,[], ratio1, ratio2 ,pdfpath); 
@@ -1498,7 +1513,7 @@ function getData(form) {
 
   }
  
-  if  (formvalues['selectprojs'].startsWith('1.0')||formvalues['selectprojs'].startsWith('3.2')||formvalues['selectprojs'].startsWith('2.8'))
+  if  (formvalues['selectprojs'].startsWith('1.0') || formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('3.3') )
   {  
     // console.log(formData)
     $.ajax({
@@ -1537,7 +1552,7 @@ function getData(form) {
             document.getElementById("loading").hidden = true;
             document.getElementById("rightside").hidden = false;
             document.getElementById('duplicater').removeAttribute('hidden');
-            if (formvalues['selectprojs'].startsWith('3.2'))
+            if (formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('3.3') )
              { 
               document.getElementById('duplicater').children[8].children[1].setAttribute('disabled','True')
               document.getElementById('duplicater').children[8].children[2].setAttribute('disabled','True')
@@ -1567,7 +1582,7 @@ function getData(form) {
               document.getElementById('measureADRbutton').style.boxShadow='none';
             });
 
-            if (formvalues['selectprojs'].startsWith('3.2'))
+            if (formvalues['selectprojs'].startsWith('3.2') || formvalues['selectprojs'].startsWith('3.3') )
             { //
             // /* data[0]--> img , SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
 
@@ -1576,7 +1591,10 @@ function getData(form) {
                 spreadsheetId=data[3];
                 // spreadsheetURL=data[4];
                 list1= data[5];
+                
                 dropboxLink=data[6];
+                // console.log(dropboxLink)
+                
 
                 
             }
@@ -1641,7 +1659,8 @@ function getData(form) {
             let delrows2 = {
               content : {},
               id     : {},
-              subject :{}
+              subject :{},
+              color:{}
             };
 
             var delrows1='';
@@ -1650,7 +1669,7 @@ function getData(form) {
             pdfpath.push(formvalues['selectproj'],formvalues['selectprojp'] ,formvalues['selectprojs'])
             var rightsideids=[];
           
-if (formvalues['selectprojs'].startsWith('1.0')  || formvalues['selectprojs'].startsWith('3.2')  || formvalues['selectprojs'].startsWith('2.8') )
+if (formvalues['selectprojs'].startsWith('1.0')  || formvalues['selectprojs'].startsWith('3.2')  || formvalues['selectprojs'].startsWith('2.8') || formvalues['selectprojs'].startsWith('3.3') )
 {// Set the interval in milliseconds
 const interval = 20000;
 const initialDelay = 0;
@@ -2352,7 +2371,7 @@ window.onclick = elem => {
       $("#"+elem.target.parentElement.id).insertBefore(clone,document.getElementById('doneebackground')); 
     }
 
-    if (thirddropdown.value.startsWith('3.2'))
+    if (thirddropdown.value.startsWith('3.2') || thirddropdown.value.startsWith('3.3'))
     { 
       document.getElementById( 'repeatforloop'+  elem.target.parentElement.parentElement.childNodes[1].value[0] +elem.target.parentElement.parentElement.childNodes[1].value[1]).children[1].setAttribute('disabled','True')
       document.getElementById( 'repeatforloop'+  elem.target.parentElement.parentElement.childNodes[1].value[0] +elem.target.parentElement.parentElement.childNodes[1].value[1]).children[2].setAttribute('disabled','True')
@@ -2616,6 +2635,18 @@ function chooseFirstdrpdwn()
     optn2.value= "Internal Doors";
     inputs.add(optn2);
     }
+    if (section.value.startsWith('3.3'))
+    {
+    var opt = document.createElement("OPTION");
+    opt.text= 'Select';
+    opt.value= "";
+    opt.hidden=true;
+    inputs.add(opt);
+    var optn = document.createElement("OPTION");
+    optn.text= 'Ceiling';
+    optn.value= "Ceiling";
+    inputs.add(optn);
+    }
     if (section.value.startsWith('2.8'))
     {
     var opt = document.createElement("OPTION");
@@ -2816,7 +2847,7 @@ function getlegendstoDirectory(){
                     newlabelsec.textContent=prjSectionsforLgnd[cc];
                     newlabelsec.id='prjsec';
                     newlabelsec.className='prjsecclass';
-                    if (!(newlabelsec.textContent.toString().startsWith('1.0') ) && !(newlabelsec.textContent.toString().startsWith('3.2') ) && !(newlabelsec.textContent.toString().startsWith('2.8') ) )//|| newlabelsec.textContent.startsWith('2.2')  || newlabelsec.textContent.startsWith('2.1')))
+                    if (!(newlabelsec.textContent.toString().startsWith('1.0') ) && !(newlabelsec.textContent.toString().startsWith('3.2') ) && !(newlabelsec.textContent.toString().startsWith('2.8')) && !(newlabelsec.textContent.toString().startsWith('3.3')) )//|| newlabelsec.textContent.startsWith('2.2')  || newlabelsec.textContent.startsWith('2.1')))
                     { 
                     newlabelsec.style.color='lightgray';
                     i.style.color='lightgray'
@@ -3170,7 +3201,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('2.2')))
+                              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.2')))
                                 {
                                   opt.style.color='#bdbcbc';
                                   opt.style.cursor='not-allowed';