Update app.py

app.py

@@ -39,7 +39,7 @@ prjsectionsURL= 'https://docs.google.com/spreadsheets/d/1I4P7wiCXTAwnld0YQfUJC8b
 
 @app.route("/",methods=["GET", "POST"])
 def getInfotoMeasure():
-    API.AppendtablestoSheets()
+    # API.AppendtablestoSheets()
     return render_template("proposed-GUI.html")
 
 @app.route('/getprojectnames/',methods=['GET'])
@@ -66,7 +66,7 @@ def get_javascript_data(jsdata):
     #get project from the first dropdown
     # jsdata=eval(jsdata)
     documnetsToMeasure,RelevantDocuments=tsadropboxretrieval.retrieveProjects(jsdata)
-    if documnetsToMeasure:
+    if RelevantDocuments:
         return jsonify ([documnetsToMeasure, RelevantDocuments])
     else: 
         return ['No projects found']
@@ -146,7 +146,7 @@ def measure2_1():
     arr=measureproject(result)
     return arr
 #MAIN FUNCTION -- calls python code to measure the chosen plan from the interface
-
+# @app.route('/projecttomeasure/<jsdata>',methods=["GET","POST"])
 def measureproject(result,dataDoc,img=0):
     colorarr=[]
     # result = json.loads(jsdata) 
@@ -410,6 +410,7 @@ def returnAPITables():
 
 @app.route('/refreshAPI',methods=["GET", "POST"])
 def checktables():
+    print('innn')
     table1,table2,table3=API.GenerateTables()
     url_1 = prjnamesURL.replace('/edit#gid=', '/export?format=csv&gid=')
     url_2 = prjpartsURL.replace('/edit#gid=', '/export?format=csv&gid=')
@@ -418,33 +419,79 @@ def checktables():
     table1N = pd.read_csv(url_1)
     table2N = pd.read_csv(url_2)
     table3N = pd.read_csv(url_3)
-    
+    # t1Diff=table1N[~table1N.apply(tuple,1).isin(table1.apply(tuple,1))]
+    # t2Diff=table2N[~table2N.apply(tuple,1).isin(table2.apply(tuple,1))]
+    # t3Diff=table3N[~table3N.apply(tuple,1).isin(table3.apply(tuple,1))]
     t1Diff=table1N[~table1N.isin(table1)].dropna()
+    t1Diff1=table1[~table1.isin(table1N)].dropna()
+
     t2Diff=table2N[~table2N.isin(table2)].dropna()
+    t2Diff1=table2[~table2.isin(table2N)].dropna()
+
     t3Diff=table3N[~table3N.isin(table3)].dropna()
+    t3Diff1=table3[~table3.isin(table3N)].dropna()
     returnString=''
-    if not t1Diff.empty:
-      returnString=['Changes have been made in Projects. Would you like to retrieve them in the console? By saying yes, you may need to repeat the process(if any).','project']
-    if not t2Diff.empty:
-      returnString=['Changes have been made in Parts. Would you like to retrieve them in the console? By saying yes, you may need to repeat the process(if any).','part']
-    if not t3Diff.empty:
-      returnString=['Changes have been made in Sections. Would you like to retrieve them in the console? By saying yes, you may need to repeat the process(if any).','section']
-    if (not t1Diff.empty) and (not t2Diff.empty):
-      returnString=['Changes have been made in Projects and Parts. Would you like to retrieve them in the console? By saying yes, you may need to repeat the process(if any).','projectpart']
-    if (not t1Diff.empty) and (not t3Diff.empty):
-      returnString=['Changes have been made in Projects and Sections. Would you like to retrieve them in the console? By saying yes, you may need to repeat the process(if any).','projectsection']
-    if (not t2Diff.empty) and (not t3Diff.empty):
-      returnString=['Changes have been made in Parts and Sections. Would you like to retrieve them in the console? By saying yes, you may need to repeat the process(if any).','partsection']
-    print(t1Diff)
+    if (not t1Diff.empty) or (not t1Diff1.empty) :
+      returnString=''
+      returnString=['Changes have been made in Projects. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','project']
+    elif (not t2Diff.empty) or (not t2Diff1.empty):
+      returnString=''
+      returnString=['Changes have been made in Parts. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','part']
+    elif (not t3Diff.empty) or (not t3Diff1.empty):
+      returnString=''
+      returnString=['Changes have been made in Sections. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','section']
+    elif ((not t1Diff.empty) or (not t1Diff1.empty)) and ((not t2Diff.empty) or ( not t2Diff1.empty)):
+      returnString=''
+      returnString=['Changes have been made in Projects and Parts. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','projectpart']
+    elif ((not t1Diff.empty) or (not t1Diff1.empty)) and ((not t3Diff.empty) or (not t3Diff1.empty) ):
+      returnString=''
+      returnString=['Changes have been made in Projects and Sections. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','projectsection']
+    elif ((not t2Diff.empty) or (not t2Diff1.empty)) and ((not t3Diff.empty) or (not t3Diff1.empty)):
+      returnString=''
+      returnString=['Changes have been made in Parts and Sections. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','partsection']
+    elif ((not t1Diff.empty) or (not t1Diff1.empty)) and  ((not t2Diff.empty) or (not t2Diff1.empty)) and ((not t3Diff.empty) or (not t3Diff1.empty)):
+      returnString=''
+      returnString=['Changes have been made in Projects, Parts and Sections. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','project']
+    else:
+        print('wala hagaaa')
+    print(t1Diff,t1Diff1)
+    print(returnString)
     return jsonify(returnString)
 
+@app.route('/refreshDropbox',methods=["GET", "POST"])
+def checkdropbox():
+    print('checkingggdf')
+    dfFromDropbox=tsadropboxretrieval.DropboxItemstoDF()
+    dfParquet=tsadropboxretrieval.GetParquetDF()
+    t1Diff=dfFromDropbox[~dfFromDropbox.isin(dfParquet)].dropna()
+    t1Diff1=dfParquet[~dfParquet.isin(dfFromDropbox)].dropna()
+    returnString=''
+    
+    if (not t1Diff.empty) or (not t1Diff1.empty) :
+      print('changess')
+      returnString='Some changes have been made in the dropbox. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).'
+    else:
+        print('nochangess')
+    return jsonify([returnString,dfFromDropbox.to_dict()])
+
+@app.route('/postdropboxprojects',methods=["GET", "POST"])
+def postDropboxprojectsinConsole():
+    dfDropbox = request.args.get('dict')
+    dfDropbox=pd.DataFrame(dfDropbox)
+    print(dfDropbox)
+    print('uploading')
+    # dbxTeam=API.dropbox_upload_file(dfDropbox)
+    return jsonify('posted')
+
+
+
 @app.route('/refreshAPIAppendNewTables',methods=["GET", "POST"])
 def appendNewTables():
     value = request.args.get('keyword')
     print(value)
     API.AppendtablestoSheets()
     return jsonify('appended')
-  
+ 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
 
@@ -453,5 +500,7 @@ def appendNewTables():
 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
+
+
 if  __name__  == "__main__":
     app.run(host="0.0.0.0", port=7860)