Update app.py

app.py

@@ -7,10 +7,10 @@ from PIL import Image
 import cv2
 import numpy as np
 import pilecaps_adr
-import base64 
+import base64
 from db import dropbox_connect
 import db
-import cv2 
+import cv2
 import pandas as pd
 import time
 from io import BytesIO, StringIO
@@ -223,11 +223,11 @@ def measureproject(result,dataDoc=0,img=0,dxffile=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()]
+                arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]#,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=[]
+        imgss=[] 
         dpxlinks=[]
         legendLinks=[]
         listofmarkups=[]
@@ -485,7 +485,7 @@ def dltmarkupslegend():
     # myDict=eval(deletedrows)
     deletedrows=pd.DataFrame(deletedrows)
     print('deletedrows',deletedrows)
-    if section.startswith('1.0') or section.startswith('3.2'):
+    if section.startswith('1.0') or section.startswith('3.2') or section.startswith('3.3'):
         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)
@@ -521,10 +521,15 @@ def getlinkscreated(jsdata):
     ids=gc.spreadsheet_ids()
     titles=gc.spreadsheet_titles()
     allpaths=[]
+    print('HEREEEEEEEEEE')
     # for title in titles:
     for i in range(0,len(titles)):
+        print('titles',titles[i])
         if not (titles[i].startswith('API') or (titles[i].startswith('Dropbox')) ) :
+            
             ws=gc.open(titles[i])
+            path_metadata = ws.get_developer_metadata('path')
+            print(path_metadata)
             allpaths.append([titles[i], ws.get_developer_metadata('path')[0].value , drive_service.files().get(fileId=ids[i],fields="createdTime, modifiedTime").execute() ,ids[i] ])
     
     return jsonify(allpaths)
@@ -691,7 +696,7 @@ def cvtSummarytoXML(jsdata):
     # print(result[1])
     xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
     return jsonify(xmllink)
- 
+
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________