Update app.py

app.py

@@ -188,12 +188,12 @@ def measureproject(result,dataDoc,img=0,dxffile=0):
             temp_file.write(dxfpath)
             temp_filename = temp_file.name
             print(temp_filename)
-            doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
+            doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
             dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
             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,[],[],pdflink,[],namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
+            arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,[],namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
     #################################  -2.2- #################################
     # elif result[5][2].startswith('2.2'): #section value - 2.2 rc slabs
         #add here python code
@@ -397,16 +397,19 @@ def getnewlegend():
     dbPath='/TSA JOBS/ADR Test'+pdfpth+'Measured Plan/' 
     deletedrows1=pilecaps_adr.deletemarkups(list1=list1,dbPath=dbPath,path=path) 
     arr1=[deletedrows1.to_dict()]
+    print('arr,',arr1)
     return jsonify(arr1)
 #---------------------------------------------------------------------------
 #if user wishes to delete 
 @app.route('/deletemarkupsroute',methods=["GET", "POST"])
 def dltmarkupslegend():
+    print('IN deletemarkupsroute')
     pdfpth=''
     alljson = request.get_json()
     SimilarAreaDictionary=alljson.get('dict')
     # SimilarAreaDictionary = request.args.get('dict')
     deletedrows=alljson.get('deletedrows')
+    print('deletedrowsssssssssssssssssssssssssssssss',deletedrows)
     # deletedrows = request.args.get('deletedrows')
     path=alljson.get('path')
     # path = request.args.get('path')
@@ -421,14 +424,15 @@ def dltmarkupslegend():
     for word in eval(pdfpathpath):
         pdfpth+='/' +word
     pdfpth+='/'
-    myDict=eval(deletedrows)
-    deletedrows=pd.DataFrame(myDict)
+    # myDict=eval(deletedrows)
+    deletedrows=pd.DataFrame(deletedrows)
     print('deletedrows',deletedrows)
     if section.startswith('1.0'):
         newlgnd=google_sheet_Legend.deletefromlegend(deletedrows=deletedrows,SimilarAreaDictionarycopy=SimilarAreaDictionary, section=section,areaPermArr=areaPermArr)
     else:
         newlgnd=google_sheet_Legend.deletefromlegend(deletedrows=deletedrows,SimilarAreaDictionarycopy=SimilarAreaDictionary, section=section)
     try:
+        # print('newlgnd',newlgnd)
         newlgnd1=google_sheet_Legend.legendGoogleSheets(SimilarAreaDictionary=newlgnd,path=path,spreadsheetId=spreadsheetId ,pdfpath=pdfpth) #new legend
     except:
         print("An exception occurred")
@@ -626,7 +630,7 @@ def cvtSummarytoXML(jsdata):
     # print(result[1])
     xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
     return jsonify(xmllink)
- 
+
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________