diff --git a/etl/hubspot_to_invoice.py b/etl/hubspot_to_invoice.py index 86fc2fc..ddbaeff 100644 --- a/etl/hubspot_to_invoice.py +++ b/etl/hubspot_to_invoice.py @@ -27,6 +27,7 @@ minimal_df.to_excel(lewis_view, index=False) output_path = os.path.abspath(lewis_view) sp.upload_to_sharepoint(output_path, lewis_view) +sp.upload_to_sharepoint(sp.get_master_rate_card_path(), "COPY_OF_RATE_CARD_USED.xlsx") deal_ids = df["HUBSPOT_DEAL_ID"].tolist() @@ -34,18 +35,38 @@ sp.move_deals_to_completed(deal_ids) """ TODO: - P3) Improve dimirtra script by adding dates to the mixA - # Add dates - # Add owner's name if possible ( might need to do something to add info in hubspot mnaually) - # Add value information - # All notes in a particular order - # Once i prove its concept, set up a call with Cyrus and Dimitra for a quick call to ensure they like what they see and quick fixes - P3 Check to see if emails has arrived - P3) Write documentation for tech demos from Khalims demo - Tuesday - P0) output the copy of rate card that was used P1) - Get read for demo, 3 examples of solar ( JJC AND SCIS), 3 examples of cavity wall ( SCIS and JJC) 12 in total P2) Review deem score with last weeks deem score values to ensure accuracy + + P3) Figure out what to do if I see an address that isn't registered but surveyrod -""" \ No newline at end of file + P3) Write documentation for tech demos from Khalims demo - Handed off to cyrus +""" + +# Look for +# JJC + +# 3 examples of Solar +# No solar example in april deem scroe +# 3 examples Cavity Wall, FOAM, Empty and General ideally +# (in hubspot )111 Duddell Road General ( fibre) - 500, 2 wet rooms +# Empty +# ( in hubspot ) 29 Lower King ( empty ) - 500 +# Foam +# ( in hubspot ) 6 STOKESAY STREET (foam) - 400 + +# SCIS +# 3 examples of Solar +# ( not in hubspot ) 12 short hedges - Solar 1608 +# ( not in hubspot ) 18 short hedge - Solar 1608 +# ( not in hubspot) 6 forety road -Solar 1608 + +# 3 examples Cavity Wall, FOAM, Empty and General ideally +# ( not in hubspot ) 319 Muirfield Road, (Empty Cavity) - 1000 +# ( not in hubspot ) 2 queensway, (Fibre) - 500 +# ( not in hubspot )56 Aughton Crescent -(foam) - To be worked out by Lewis but lets use this as an oppurtunity - + +# Compare value with what I should get and in the deem score. Keep tabs below so I can check easily + +# Change w.c. date to a weird one to speed up automation \ No newline at end of file diff --git a/etl/surveyPrice/surveyPrice.py b/etl/surveyPrice/surveyPrice.py index ded0f61..cac0060 100644 --- a/etl/surveyPrice/surveyPrice.py +++ b/etl/surveyPrice/surveyPrice.py @@ -143,17 +143,15 @@ class SurveyPrice(): def get_all_surveyed_data_from_sharepoint(self): - # TODO: rewrite the function so I pass in sharepointInstaller instead so I can re use the same function for # DIfferent installers - # jjc_pd = self.sharepoint_data_for_installer(SharePointInstaller.JJC) + jjc_pd = self.sharepoint_data_for_installer(SharePointInstaller.JJC) scis_pd = self.sharepoint_data_for_installer(SharePointInstaller.SOUTH_COAST_INSULATION) - # self.all_survey_info_from_sharepoint = pd.concat([jjc_pd, scis_pd], ignore_index=True) - self.all_survey_info_from_sharepoint = scis_pd + self.all_survey_info_from_sharepoint = pd.concat([jjc_pd, scis_pd], ignore_index=True) return self.all_survey_info_from_sharepoint def sharepoint_data_for_installer(self, installer): - sp = SharePointScraper(installer, development=True) + sp = SharePointScraper(installer) file_paths = sp.download_file_for_each_address() surveys = []