Merge pull request #124 from Hestia-Homes/feature/month_end_january

save
This commit is contained in:
Jun-te Kim 2026-02-12 16:37:53 +00:00 committed by GitHub
commit 358c99c2e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 9 deletions

View file

@ -344,15 +344,25 @@ for board, all_records in board_to_record.items():
if not design.empty:
filtered_dfs.append(design)
# Lodgement
lodg1 = get_df(df, "lodgement invoicing status", ["to invoice"], "Lodgement")
if not lodg1.empty:
filtered_dfs.append(lodg1)
ignore = [
"9349630181", # WCHG Walkups-Operations
"18232420839", # Powys County Council:
"8830772914", # "L&Q London"
"9641491000", # Watford Warm Homes
"9601691730",
"9671463094", # Seddon
]
if board not in ignore:
# Lodgement
lodg1 = get_df(df, "lodgement invoicing status", ["to invoice"], "Lodgement")
if not lodg1.empty:
filtered_dfs.append(lodg1)
# Retrofit Evaluation
re = get_df(df, "evaluation invoicing status", ["to invoice"], "retrofit evaluation")
if not re.empty:
filtered_dfs.append(re)
if board not in ignore:
re = get_df(df, "evaluation invoicing status", ["to invoice"], "retrofit evaluation")
if not re.empty:
filtered_dfs.append(re)
# POST EPC
post_epc = get_df(df, "Post EPC invoicing status", ["epc to invoice"], "POST EPC")

View file

@ -21,10 +21,10 @@ rate_card_data_2502_accent_housing = {
"First half of MTP", "Second half of MTP", "full cost mtp", "Design Archetype Complex",
"Design Archetype Simple", "Design Repetitive Complex", "Design Repetitive Simple",
"Design Revision", "design type not specified", "Coordination Stage 2", "POST EPC", "POST EPR", "POST ATT", "post EPC NO SHOW", "RE",
"Lodgement"
"Lodgement", "RA"
],
"rate": [
150, 130, 280, junte, junte, junte, junte, junte, "please ask andreas", junte, junte, junte, junte, junte, junte, junte
150, 130, 280, 650, 415, 225, 195, 195, "please ask andreas", 175, 150, 60, 125, 45, 60, 255, 259
]
}
# ToDO
@ -83,6 +83,10 @@ def get_df(df, column_name, success_critera, job_name=None):
return _
# RA
ra = get_df(df, "ra invoicing status", ["to invoice"], "RA")
if not ra.empty:
filtered_dfs.append(ra)
modeling = get_df(df, "mtp invoicing status", ["modelling to invoice"], "First half of mtp")