--
This commit is contained in:
@@ -29,7 +29,7 @@ CSV_TABLES = {
|
||||
"Sales_and_Stock_Statement.csv": ("sales_and_stock_statement", ["name", "headquarter", "report_date", "month", "serial_no", "product_name", "opening", "receipt", "sale", "closing", "value_in_pts"]),
|
||||
"TOUR_PLAN.csv": ("tour_plan", ["name", "headquarter", "serial_no", "report_date", "from_location", "to_location", "pob", "stockiest_visit"]),
|
||||
"STANDARD_TOUR_PLAN.csv": ("standard_tour_plan", ["name", "headquarter", "serial_no", "place"]),
|
||||
"sales_projection.csv": ("sales_projection", ["name", "headquarter", "report_date", "month", "serial_no", "product_name", "pts", "secondary_qty", "value", "closing", "secondary_value", "aug_sales", "value_2"]),
|
||||
"sales_projection.csv": ("sales_projection", ["name", "headquarter", "report_date", "month", "serial_no", "product_name", "pts", "closing_qty", "closing_value", "projection_qty", "projection_value"]),
|
||||
}
|
||||
SERIAL_COLUMNS = {"serial_no", "doctor_sr_no", "chemist_sr_no"}
|
||||
|
||||
@@ -57,7 +57,7 @@ async def apply_sales_projection_account(db) -> None:
|
||||
headquarter = headquarters.name
|
||||
FROM "user" AS account
|
||||
LEFT JOIN headquarters ON headquarters.id = account.headquarters_id
|
||||
WHERE account.role = 'MR' '''
|
||||
WHERE account.id = projection.owner_user_id '''
|
||||
)
|
||||
)
|
||||
|
||||
@@ -76,13 +76,12 @@ async def import_csv_data(only_empty: bool = False) -> None:
|
||||
continue
|
||||
else:
|
||||
await db.execute(text(f'DELETE FROM "{table_name}"'))
|
||||
source_columns = columns[4:] if table_name == "sales_projection" else columns
|
||||
# The Sales Projection CSV is the product list: only Sl. No., product and PTS come
|
||||
# from it; every figure is filled in later, per month, on the form.
|
||||
source_columns = ["serial_no", "product_name", "pts"] if table_name == "sales_projection" else columns
|
||||
rows = read_rows(path, source_columns)
|
||||
if table_name == "sales_projection":
|
||||
rows = [
|
||||
(row_number, {"name": "", "headquarter": "", "report_date": "", "month": "", **data})
|
||||
for row_number, data in rows
|
||||
]
|
||||
rows = [(row_number, {**{c: "" for c in columns}, **data}) for row_number, data in rows]
|
||||
if rows:
|
||||
column_names = ", ".join(f'"{column}"' for column in columns)
|
||||
parameters = ", ".join(f":{column}" for column in columns)
|
||||
|
||||
Reference in New Issue
Block a user