Update app.py

app.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-from flask import Flask, render_template,request,flash , json, url_for,g , redirect , jsonify , send_file ,make_response 
+from flask import Flask, render_template,request,flash , json, url_for,g , redirect , jsonify , send_file ,make_response
 import os
 import json
 import fitz
@@ -35,6 +35,7 @@ from threading import Thread
 import mainDBAlaa
 import datetime
 import doors_fasterrcnn
+import deploying_3_3
 
 import ezdxf
 app = Flask(__name__)
@@ -139,7 +140,7 @@ def hexRGB(color):
 def stringToRGB():
     vv = eval(request.form.get('answers'))
     
-    if vv[5][2].startswith('3.2'):
+    if ( vv[5][2].startswith('3.2') or vv[5][2].startswith('3.3') ) :
         print('3.2 section')
         pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=vv[0])
         dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
@@ -209,6 +210,21 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
             _, buffer = cv2.imencode('.png', outputimg)
             arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
    #################################  -2.8- #################################
+    elif result[5][2].startswith('3.3'): #section value - 3.2 floor finishes
+            print('IN HEREEEE 3.3')
+            dxfpath=dxffile.read()
+            with tempfile.NamedTemporaryFile(suffix='.dxf', delete=False) as temp_file:
+                temp_file.write(dxfpath)
+                temp_filename = temp_file.name
+                print(temp_filename)
+                doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
+                dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
+                print(dbPath,result[0]) 
+                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
+
+                _, buffer = cv2.imencode('.png', outputimg)
+                arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
+    #################################  -2.8- #################################
     elif result[5][2].startswith('2.8'): #section value - 2.8 floor finishes
             #vv[0] array of pdf names
         imgss=[]
@@ -421,6 +437,7 @@ def getnewlegend():
     pdfpth=''
     alljson = request.get_json()
     list1=alljson.get('dict1')
+    print('list1',list1)
     # list1 = request.args.get('dict1')
     path=alljson.get('path')
     # path = request.args.get('path')
@@ -434,7 +451,8 @@ def getnewlegend():
         pdfpth+='/' +word
     pdfpth+='/'
     dbPath='/TSA JOBS/ADR Test'+pdfpth+'Measured Plan/' 
-    deletedrows1=pilecaps_adr.deletemarkups(list1=list1,dbPath=dbPath,path=path) 
+    print(pdfpth)
+    deletedrows1=google_sheet_Legend.deletemarkups(list1=list1,dbPath=dbPath,path=path) 
     arr1=[deletedrows1.to_dict()]
     print('arr,',arr1)
     return jsonify(arr1)
@@ -467,7 +485,7 @@ def dltmarkupslegend():
     # myDict=eval(deletedrows)
     deletedrows=pd.DataFrame(deletedrows)
     print('deletedrows',deletedrows)
-    if section.startswith('1.0'):
+    if section.startswith('1.0') or section.startswith('3.2'):
         newlgnd=google_sheet_Legend.deletefromlegend(deletedrows=deletedrows,SimilarAreaDictionarycopy=SimilarAreaDictionary, section=section,areaPermArr=areaPermArr)
     elif section.startswith('2.8'):
         newlgnd=google_sheet_Legend.delete3_2(deletedrows,SimilarAreaDictionary)