Update API.py

API.py

@@ -141,15 +141,17 @@ def getprjParts(chosenprjname,urlNames=prjnamesURL,urlparts=prjpartsURL):
   global dfNames
   dfNames = pd.read_csv(url_1)
   chosenprjname=chosenprjname.replace('"', '')
-  projectNameID=dfNames.iloc[np.where(dfNames['ProjectName'].astype(str)==chosenprjname)]['ProjectId']  #ProjectName == chosenprjname
+  chosenprjnameList=chosenprjname.split(' ')
+  for i, row in dfNames.iterrows():
+    prjnameString=dfNames['ProjectName'].loc[i]
+    if all(name in prjnameString for name in chosenprjnameList):
+      projectNameID=dfNames.iloc[i]['ProjectId']
+  # projectNameID=dfNames.iloc[np.where(dfNames['ProjectName'].str.startswith(chosenprjnameList[1]))]['ProjectId']  #ProjectName == chosenprjname
   url_2 = urlparts.replace('/edit#gid=', '/export?format=csv&gid=')
   global dfParts
   dfParts = pd.read_csv(url_2)
   dfParts= dfParts.iloc[np.where(dfParts['ProjectId']==int(projectNameID))]
   parts=dfParts['ProjectPart'].tolist()
-  print(parts)
-#Get projectName Id
-  
   return  parts
 
 # %%
@@ -159,13 +161,23 @@ def getprjSections(chosenprjname, chosenpart,urlSection=prjsectionsURL):
   dfSections = pd.read_csv(url_1)
   chosenprjname=chosenprjname.replace('"', '')
   chosenpart=chosenpart.replace('"', '')
-  projectId=dfNames.iloc[np.where(dfNames['ProjectName'].astype(str)==chosenprjname)]['ProjectId']  #ProjectName == chosenprjname
-  projectPartID=dfParts.iloc[np.where(dfParts['ProjectPart'].astype(str)==chosenpart)]['ProjectPartId']
+
+  chosenprjnameList=chosenprjname.split(' ')
+  chosenpartList=chosenpart.split(' ')
+  for i, row in dfNames.iterrows():
+    prjnameString=dfNames['ProjectName'].loc[i]
+    if all(name in prjnameString for name in chosenprjnameList):
+      projectId=dfNames.iloc[i]['ProjectId']
+  # projectId=dfNames.iloc[np.where(dfNames['ProjectName'].astype(str)==chosenprjname)]['ProjectId']  #ProjectName == chosenprjname
+  for i, row in dfParts.iterrows():
+    prjpartString=dfParts['ProjectPart'].loc[i]
+    if all(part in prjpartString for part in chosenpartList):
+      projectPartID=dfParts['ProjectPartId'].loc[i]
+  # projectPartID=dfParts.iloc[np.where(dfParts['ProjectPart'].astype(str)==chosenpart)]['ProjectPartId']
   dfSections=dfSections.iloc[np.where((dfSections['ProjectId']==int(projectId)) & (dfSections['ProjectPartId']==int(projectPartID)) ) ]
   sections=dfSections['ProjectSection'].tolist()
   return sections
-
-
+    
 ##############################################################################
 def update_df(): #get file from drive
     url_1 = prjnamesURL.replace('/edit#gid=', '/export?format=csv&gid=')