diff --git a/RSI/__pycache__/__init__.cpython-39.pyc b/RSI/__pycache__/__init__.cpython-39.pyc index 6739edd..34dd4b6 100644 Binary files a/RSI/__pycache__/__init__.cpython-39.pyc and b/RSI/__pycache__/__init__.cpython-39.pyc differ diff --git a/RSI/__pycache__/settings.cpython-39.pyc b/RSI/__pycache__/settings.cpython-39.pyc index 5ffe58d..b9d9549 100644 Binary files a/RSI/__pycache__/settings.cpython-39.pyc and b/RSI/__pycache__/settings.cpython-39.pyc differ diff --git a/RSI/__pycache__/urls.cpython-39.pyc b/RSI/__pycache__/urls.cpython-39.pyc index 977dd48..57c8a7c 100644 Binary files a/RSI/__pycache__/urls.cpython-39.pyc and b/RSI/__pycache__/urls.cpython-39.pyc differ diff --git a/RSI/__pycache__/wsgi.cpython-39.pyc b/RSI/__pycache__/wsgi.cpython-39.pyc index 983bdc0..5ea61a5 100644 Binary files a/RSI/__pycache__/wsgi.cpython-39.pyc and b/RSI/__pycache__/wsgi.cpython-39.pyc differ diff --git a/__pycache__/helpers.cpython-39.pyc b/__pycache__/helpers.cpython-39.pyc index c3abf02..079d9bb 100644 Binary files a/__pycache__/helpers.cpython-39.pyc and b/__pycache__/helpers.cpython-39.pyc differ diff --git a/app/__pycache__/__init__.cpython-39.pyc b/app/__pycache__/__init__.cpython-39.pyc index d177bcd..35cd699 100644 Binary files a/app/__pycache__/__init__.cpython-39.pyc and b/app/__pycache__/__init__.cpython-39.pyc differ diff --git a/app/__pycache__/admin.cpython-39.pyc b/app/__pycache__/admin.cpython-39.pyc index ffc08e0..9ad3a99 100644 Binary files a/app/__pycache__/admin.cpython-39.pyc and b/app/__pycache__/admin.cpython-39.pyc differ diff --git a/app/__pycache__/apps.cpython-39.pyc b/app/__pycache__/apps.cpython-39.pyc index 80a3b98..f372bdf 100644 Binary files a/app/__pycache__/apps.cpython-39.pyc and b/app/__pycache__/apps.cpython-39.pyc differ diff --git a/app/__pycache__/cityandprovince.cpython-39.pyc b/app/__pycache__/cityandprovince.cpython-39.pyc index 2adbe7d..668f95d 100644 Binary files a/app/__pycache__/cityandprovince.cpython-39.pyc and b/app/__pycache__/cityandprovince.cpython-39.pyc differ diff --git a/app/__pycache__/excel_processing.cpython-39.pyc b/app/__pycache__/excel_processing.cpython-39.pyc index 91a1fcf..0d83709 100644 Binary files a/app/__pycache__/excel_processing.cpython-39.pyc and b/app/__pycache__/excel_processing.cpython-39.pyc differ diff --git a/app/__pycache__/filtersets.cpython-39.pyc b/app/__pycache__/filtersets.cpython-39.pyc index f5da017..a1dcfe7 100644 Binary files a/app/__pycache__/filtersets.cpython-39.pyc and b/app/__pycache__/filtersets.cpython-39.pyc differ diff --git a/app/__pycache__/helper.cpython-39.pyc b/app/__pycache__/helper.cpython-39.pyc index 16bf342..77f6159 100644 Binary files a/app/__pycache__/helper.cpython-39.pyc and b/app/__pycache__/helper.cpython-39.pyc differ diff --git a/app/__pycache__/helper_excel.cpython-39.pyc b/app/__pycache__/helper_excel.cpython-39.pyc index 7b69508..ccd9942 100644 Binary files a/app/__pycache__/helper_excel.cpython-39.pyc and b/app/__pycache__/helper_excel.cpython-39.pyc differ diff --git a/app/__pycache__/models.cpython-39.pyc b/app/__pycache__/models.cpython-39.pyc index 0a3f598..4664990 100644 Binary files a/app/__pycache__/models.cpython-39.pyc and b/app/__pycache__/models.cpython-39.pyc differ diff --git a/app/__pycache__/scripts.cpython-39.pyc b/app/__pycache__/scripts.cpython-39.pyc index 2de3648..6c7920e 100644 Binary files a/app/__pycache__/scripts.cpython-39.pyc and b/app/__pycache__/scripts.cpython-39.pyc differ diff --git a/app/__pycache__/serializers.cpython-39.pyc b/app/__pycache__/serializers.cpython-39.pyc index 39e965d..ae53dfc 100644 Binary files a/app/__pycache__/serializers.cpython-39.pyc and b/app/__pycache__/serializers.cpython-39.pyc differ diff --git a/app/__pycache__/urls.cpython-39.pyc b/app/__pycache__/urls.cpython-39.pyc index 8daa7bd..a07d22b 100644 Binary files a/app/__pycache__/urls.cpython-39.pyc and b/app/__pycache__/urls.cpython-39.pyc differ diff --git a/app/__pycache__/views.cpython-39.pyc b/app/__pycache__/views.cpython-39.pyc index 2c5413a..96a1436 100644 Binary files a/app/__pycache__/views.cpython-39.pyc and b/app/__pycache__/views.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0001_initial.cpython-39.pyc b/app/migrations/__pycache__/0001_initial.cpython-39.pyc index 59257f6..9c4f972 100644 Binary files a/app/migrations/__pycache__/0001_initial.cpython-39.pyc and b/app/migrations/__pycache__/0001_initial.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0002_remove_poultry_allowinsert_and_more.cpython-39.pyc b/app/migrations/__pycache__/0002_remove_poultry_allowinsert_and_more.cpython-39.pyc index 8ceafba..b648d65 100644 Binary files a/app/migrations/__pycache__/0002_remove_poultry_allowinsert_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0002_remove_poultry_allowinsert_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0003_poultry_allowinsert_poultry_allowupdate_and_more.cpython-39.pyc b/app/migrations/__pycache__/0003_poultry_allowinsert_poultry_allowupdate_and_more.cpython-39.pyc index ae2ac43..44072ef 100644 Binary files a/app/migrations/__pycache__/0003_poultry_allowinsert_poultry_allowupdate_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0003_poultry_allowinsert_poultry_allowupdate_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0004_poultryhatching_date_poultryhatching_hatchingage.cpython-39.pyc b/app/migrations/__pycache__/0004_poultryhatching_date_poultryhatching_hatchingage.cpython-39.pyc index 99eba7f..547f000 100644 Binary files a/app/migrations/__pycache__/0004_poultryhatching_date_poultryhatching_hatchingage.cpython-39.pyc and b/app/migrations/__pycache__/0004_poultryhatching_date_poultryhatching_hatchingage.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0005_remove_poultryhatching_basehatchingcount_and_more.cpython-39.pyc b/app/migrations/__pycache__/0005_remove_poultryhatching_basehatchingcount_and_more.cpython-39.pyc index bc336e1..2e5e7f3 100644 Binary files a/app/migrations/__pycache__/0005_remove_poultryhatching_basehatchingcount_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0005_remove_poultryhatching_basehatchingcount_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0006_poultryhatching_basehatchingcount_and_more.cpython-39.pyc b/app/migrations/__pycache__/0006_poultryhatching_basehatchingcount_and_more.cpython-39.pyc index 75b8bac..3779d12 100644 Binary files a/app/migrations/__pycache__/0006_poultryhatching_basehatchingcount_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0006_poultryhatching_basehatchingcount_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0007_transportingchickendetail.cpython-39.pyc b/app/migrations/__pycache__/0007_transportingchickendetail.cpython-39.pyc index 1175350..43febf8 100644 Binary files a/app/migrations/__pycache__/0007_transportingchickendetail.cpython-39.pyc and b/app/migrations/__pycache__/0007_transportingchickendetail.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0008_transportingchickendetail_certid_and_more.cpython-39.pyc b/app/migrations/__pycache__/0008_transportingchickendetail_certid_and_more.cpython-39.pyc index 03764f8..566ab29 100644 Binary files a/app/migrations/__pycache__/0008_transportingchickendetail_certid_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0008_transportingchickendetail_certid_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0009_transportingchickendetail_broilerflockrequestid_and_more.cpython-39.pyc b/app/migrations/__pycache__/0009_transportingchickendetail_broilerflockrequestid_and_more.cpython-39.pyc index b3ab61f..9593d5c 100644 Binary files a/app/migrations/__pycache__/0009_transportingchickendetail_broilerflockrequestid_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0009_transportingchickendetail_broilerflockrequestid_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0010_transportingchickendetail_province_and_more.cpython-39.pyc b/app/migrations/__pycache__/0010_transportingchickendetail_province_and_more.cpython-39.pyc index 313c525..ea50bb7 100644 Binary files a/app/migrations/__pycache__/0010_transportingchickendetail_province_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0010_transportingchickendetail_province_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0011_poultryhatching_pedigreename.cpython-39.pyc b/app/migrations/__pycache__/0011_poultryhatching_pedigreename.cpython-39.pyc index f761acf..a2806f8 100644 Binary files a/app/migrations/__pycache__/0011_poultryhatching_pedigreename.cpython-39.pyc and b/app/migrations/__pycache__/0011_poultryhatching_pedigreename.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0012_transportingchickendetail_age.cpython-39.pyc b/app/migrations/__pycache__/0012_transportingchickendetail_age.cpython-39.pyc index 9804eba..6b3eae6 100644 Binary files a/app/migrations/__pycache__/0012_transportingchickendetail_age.cpython-39.pyc and b/app/migrations/__pycache__/0012_transportingchickendetail_age.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0013_poultryhatching_leftover.cpython-39.pyc b/app/migrations/__pycache__/0013_poultryhatching_leftover.cpython-39.pyc index 4f7d0cb..c526004 100644 Binary files a/app/migrations/__pycache__/0013_poultryhatching_leftover.cpython-39.pyc and b/app/migrations/__pycache__/0013_poultryhatching_leftover.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0014_poultry_locationnamecity_and_more.cpython-39.pyc b/app/migrations/__pycache__/0014_poultry_locationnamecity_and_more.cpython-39.pyc index 71e298c..2542a5d 100644 Binary files a/app/migrations/__pycache__/0014_poultry_locationnamecity_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0014_poultry_locationnamecity_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0015_hatching_transportingdetail.cpython-39.pyc b/app/migrations/__pycache__/0015_hatching_transportingdetail.cpython-39.pyc index 03f06a8..7d2aa5a 100644 Binary files a/app/migrations/__pycache__/0015_hatching_transportingdetail.cpython-39.pyc and b/app/migrations/__pycache__/0015_hatching_transportingdetail.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0016_remove_transportingdetail_certid_and_more.cpython-39.pyc b/app/migrations/__pycache__/0016_remove_transportingdetail_certid_and_more.cpython-39.pyc index ecdb4fc..917e50b 100644 Binary files a/app/migrations/__pycache__/0016_remove_transportingdetail_certid_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0016_remove_transportingdetail_certid_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0017_hatching_archivedate.cpython-39.pyc b/app/migrations/__pycache__/0017_hatching_archivedate.cpython-39.pyc index c129df3..2826a4b 100644 Binary files a/app/migrations/__pycache__/0017_hatching_archivedate.cpython-39.pyc and b/app/migrations/__pycache__/0017_hatching_archivedate.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0018_remove_hatching_capacityfemale.cpython-39.pyc b/app/migrations/__pycache__/0018_remove_hatching_capacityfemale.cpython-39.pyc index 767ddaa..ff34316 100644 Binary files a/app/migrations/__pycache__/0018_remove_hatching_capacityfemale.cpython-39.pyc and b/app/migrations/__pycache__/0018_remove_hatching_capacityfemale.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0019_hatching_capacityfemale.cpython-39.pyc b/app/migrations/__pycache__/0019_hatching_capacityfemale.cpython-39.pyc index e78fe77..9a667c4 100644 Binary files a/app/migrations/__pycache__/0019_hatching_capacityfemale.cpython-39.pyc and b/app/migrations/__pycache__/0019_hatching_capacityfemale.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0020_killhouse.cpython-39.pyc b/app/migrations/__pycache__/0020_killhouse.cpython-39.pyc index dc398b3..682493b 100644 Binary files a/app/migrations/__pycache__/0020_killhouse.cpython-39.pyc and b/app/migrations/__pycache__/0020_killhouse.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0021_hatching_killingave_transportingdetail_out_and_more.cpython-39.pyc b/app/migrations/__pycache__/0021_hatching_killingave_transportingdetail_out_and_more.cpython-39.pyc index e73ac3e..ff7dcb6 100644 Binary files a/app/migrations/__pycache__/0021_hatching_killingave_transportingdetail_out_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0021_hatching_killingave_transportingdetail_out_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0022_alter_hatching_killingave.cpython-39.pyc b/app/migrations/__pycache__/0022_alter_hatching_killingave.cpython-39.pyc index 6d63858..7691652 100644 Binary files a/app/migrations/__pycache__/0022_alter_hatching_killingave.cpython-39.pyc and b/app/migrations/__pycache__/0022_alter_hatching_killingave.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0023_killhouse_cityid_killhouse_provinceid.cpython-39.pyc b/app/migrations/__pycache__/0023_killhouse_cityid_killhouse_provinceid.cpython-39.pyc index 2f93d9e..9b67d95 100644 Binary files a/app/migrations/__pycache__/0023_killhouse_cityid_killhouse_provinceid.cpython-39.pyc and b/app/migrations/__pycache__/0023_killhouse_cityid_killhouse_provinceid.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0024_poultry_city_poultry_province.cpython-39.pyc b/app/migrations/__pycache__/0024_poultry_city_poultry_province.cpython-39.pyc index e0a61cd..9c722eb 100644 Binary files a/app/migrations/__pycache__/0024_poultry_city_poultry_province.cpython-39.pyc and b/app/migrations/__pycache__/0024_poultry_city_poultry_province.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0025_delete_transportingdetail.cpython-39.pyc b/app/migrations/__pycache__/0025_delete_transportingdetail.cpython-39.pyc index 1f5979c..08f48a2 100644 Binary files a/app/migrations/__pycache__/0025_delete_transportingdetail.cpython-39.pyc and b/app/migrations/__pycache__/0025_delete_transportingdetail.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0026_transportingdetail.cpython-39.pyc b/app/migrations/__pycache__/0026_transportingdetail.cpython-39.pyc index 0cd67ee..7f78c94 100644 Binary files a/app/migrations/__pycache__/0026_transportingdetail.cpython-39.pyc and b/app/migrations/__pycache__/0026_transportingdetail.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0027_hatching_samasat_discharge_percentage_and_more.cpython-39.pyc b/app/migrations/__pycache__/0027_hatching_samasat_discharge_percentage_and_more.cpython-39.pyc index 4e301d9..21ce775 100644 Binary files a/app/migrations/__pycache__/0027_hatching_samasat_discharge_percentage_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0027_hatching_samasat_discharge_percentage_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0028_hatching_goodsum.cpython-39.pyc b/app/migrations/__pycache__/0028_hatching_goodsum.cpython-39.pyc index 19f755f..16e7714 100644 Binary files a/app/migrations/__pycache__/0028_hatching_goodsum.cpython-39.pyc and b/app/migrations/__pycache__/0028_hatching_goodsum.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0029_apkinfo.cpython-39.pyc b/app/migrations/__pycache__/0029_apkinfo.cpython-39.pyc index b5340f6..be18a6f 100644 Binary files a/app/migrations/__pycache__/0029_apkinfo.cpython-39.pyc and b/app/migrations/__pycache__/0029_apkinfo.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0030_transportcarcassdetail.cpython-39.pyc b/app/migrations/__pycache__/0030_transportcarcassdetail.cpython-39.pyc index e56f092..ebd53f9 100644 Binary files a/app/migrations/__pycache__/0030_transportcarcassdetail.cpython-39.pyc and b/app/migrations/__pycache__/0030_transportcarcassdetail.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0031_auto_20250921_1447.cpython-39.pyc b/app/migrations/__pycache__/0031_auto_20250921_1447.cpython-39.pyc index 34613e0..32b680d 100644 Binary files a/app/migrations/__pycache__/0031_auto_20250921_1447.cpython-39.pyc and b/app/migrations/__pycache__/0031_auto_20250921_1447.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0032_delete_transportcarcassdetail.cpython-39.pyc b/app/migrations/__pycache__/0032_delete_transportcarcassdetail.cpython-39.pyc index 58b7dfd..de27cb5 100644 Binary files a/app/migrations/__pycache__/0032_delete_transportcarcassdetail.cpython-39.pyc and b/app/migrations/__pycache__/0032_delete_transportcarcassdetail.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0033_transportcarcassdetail.cpython-39.pyc b/app/migrations/__pycache__/0033_transportcarcassdetail.cpython-39.pyc index 6fcc93a..4ff96d3 100644 Binary files a/app/migrations/__pycache__/0033_transportcarcassdetail.cpython-39.pyc and b/app/migrations/__pycache__/0033_transportcarcassdetail.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0034_guilds.cpython-39.pyc b/app/migrations/__pycache__/0034_guilds.cpython-39.pyc index 962dc22..043a7ef 100644 Binary files a/app/migrations/__pycache__/0034_guilds.cpython-39.pyc and b/app/migrations/__pycache__/0034_guilds.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0035_guilds_is_steward.cpython-39.pyc b/app/migrations/__pycache__/0035_guilds_is_steward.cpython-39.pyc index c57f669..55d59fa 100644 Binary files a/app/migrations/__pycache__/0035_guilds_is_steward.cpython-39.pyc and b/app/migrations/__pycache__/0035_guilds_is_steward.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0036_driver.cpython-39.pyc b/app/migrations/__pycache__/0036_driver.cpython-39.pyc index ccde44a..2b74ea9 100644 Binary files a/app/migrations/__pycache__/0036_driver.cpython-39.pyc and b/app/migrations/__pycache__/0036_driver.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0037_driver_product.cpython-39.pyc b/app/migrations/__pycache__/0037_driver_product.cpython-39.pyc index f3ec73e..73b2db2 100644 Binary files a/app/migrations/__pycache__/0037_driver_product.cpython-39.pyc and b/app/migrations/__pycache__/0037_driver_product.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0038_auto_20250927_0848.cpython-39.pyc b/app/migrations/__pycache__/0038_auto_20250927_0848.cpython-39.pyc index 89fddf8..885b524 100644 Binary files a/app/migrations/__pycache__/0038_auto_20250927_0848.cpython-39.pyc and b/app/migrations/__pycache__/0038_auto_20250927_0848.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0039_alter_transportcarcassdetail_tracking.cpython-39.pyc b/app/migrations/__pycache__/0039_alter_transportcarcassdetail_tracking.cpython-39.pyc index 409a5cc..bf996d4 100644 Binary files a/app/migrations/__pycache__/0039_alter_transportcarcassdetail_tracking.cpython-39.pyc and b/app/migrations/__pycache__/0039_alter_transportcarcassdetail_tracking.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0040_transportcarcassdetail_product_date.cpython-39.pyc b/app/migrations/__pycache__/0040_transportcarcassdetail_product_date.cpython-39.pyc index bcd4d85..a8d257c 100644 Binary files a/app/migrations/__pycache__/0040_transportcarcassdetail_product_date.cpython-39.pyc and b/app/migrations/__pycache__/0040_transportcarcassdetail_product_date.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0041_transportcarcassdetail_has_product_date.cpython-39.pyc b/app/migrations/__pycache__/0041_transportcarcassdetail_has_product_date.cpython-39.pyc index 9a7d7ab..1e409fd 100644 Binary files a/app/migrations/__pycache__/0041_transportcarcassdetail_has_product_date.cpython-39.pyc and b/app/migrations/__pycache__/0041_transportcarcassdetail_has_product_date.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0042_alter_driver_created_by_alter_driver_modified_by_and_more.cpython-39.pyc b/app/migrations/__pycache__/0042_alter_driver_created_by_alter_driver_modified_by_and_more.cpython-39.pyc index 7780844..0c73810 100644 Binary files a/app/migrations/__pycache__/0042_alter_driver_created_by_alter_driver_modified_by_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0042_alter_driver_created_by_alter_driver_modified_by_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0043_allproductstransport.cpython-39.pyc b/app/migrations/__pycache__/0043_allproductstransport.cpython-39.pyc index 56e91f8..4c4e584 100644 Binary files a/app/migrations/__pycache__/0043_allproductstransport.cpython-39.pyc and b/app/migrations/__pycache__/0043_allproductstransport.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0044_evacuationdetail.cpython-39.pyc b/app/migrations/__pycache__/0044_evacuationdetail.cpython-39.pyc index 8d56f9c..c069029 100644 Binary files a/app/migrations/__pycache__/0044_evacuationdetail.cpython-39.pyc and b/app/migrations/__pycache__/0044_evacuationdetail.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0045_remove_evacuationdetail_broilerflockrequestid_and_more.cpython-39.pyc b/app/migrations/__pycache__/0045_remove_evacuationdetail_broilerflockrequestid_and_more.cpython-39.pyc index 94e82f5..d7f9428 100644 Binary files a/app/migrations/__pycache__/0045_remove_evacuationdetail_broilerflockrequestid_and_more.cpython-39.pyc and b/app/migrations/__pycache__/0045_remove_evacuationdetail_broilerflockrequestid_and_more.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/0046_rasadyarappinfo.cpython-39.pyc b/app/migrations/__pycache__/0046_rasadyarappinfo.cpython-39.pyc index 959ffb1..842d0fb 100644 Binary files a/app/migrations/__pycache__/0046_rasadyarappinfo.cpython-39.pyc and b/app/migrations/__pycache__/0046_rasadyarappinfo.cpython-39.pyc differ diff --git a/app/migrations/__pycache__/__init__.cpython-39.pyc b/app/migrations/__pycache__/__init__.cpython-39.pyc index 0f40f12..f60a861 100644 Binary files a/app/migrations/__pycache__/__init__.cpython-39.pyc and b/app/migrations/__pycache__/__init__.cpython-39.pyc differ diff --git a/app/views.py b/app/views.py index d050534..ccbc602 100644 --- a/app/views.py +++ b/app/views.py @@ -4735,31 +4735,40 @@ class AllProductsTransportDashboardView(APIView): product_type = request.GET.get('product_type') date1 = request.GET.get('date1') or None date2 = request.GET.get('date2') or None - + filters={'trash':False} if province == 'undefined': province = None - queryset = AllProductsTransport.objects.filter(trash=False) if product_type and product_type != 'undefined': - queryset = queryset.filter(product=product_type) + filters['product'] = product_type + if date1 and date2 and date1 != 'undefined' and date2 != 'undefined': try: start_date = datetime.datetime.strptime(str(date1), '%Y-%m-%d') end_date = datetime.datetime.strptime(str(date2), '%Y-%m-%d') - queryset = queryset.filter(date__gte=start_date, date__lte=end_date) + filters['date__gte'] = start_date + filters['date__lte'] = end_date except ValueError: pass destination_province = request.GET.get('destination_province') kill_house_filterset_class = AllProductsTransportFilterSet + if destination_province and destination_province != 'undefined': + if destination_province == 'مرکزی': + filters['destination_province'] = 'مركزي' + else: + filters['destination_province'] = destination_province + queryset = AllProductsTransport.objects.filter(**filters) if search and search != 'undefined' and search.strip(): queryset = queryset.filter( build_query(kill_house_filterset_class.Meta.fields, search) ) + if role: if role == 'KillHouse': + filters_query = {'trash':False} filters_kill_house = {} if province: filters_kill_house['Province'] = province @@ -4772,15 +4781,15 @@ class AllProductsTransportDashboardView(APIView): ) kill_house_codes = kill_house.values_list('PartIdCode', flat=True) - bars = queryset.filter(jihadi_origin__in=kill_house_codes) + filters_query['jihadi_origin__in']=kill_house_codes + # bars = queryset.filter(jihadi_origin__in=kill_house_codes) if destination_province and destination_province != 'undefined': - if destination_province=='مرکزی': - bars = bars.filter(destination_province='مركزي') - + if destination_province == 'مرکزی': + filters_query['destination_province'] = 'مركزي' else: - bars = bars.filter(destination_province=destination_province) - + filters_query['destination_province'] = destination_province + bars = queryset.filter(**filters_query) aggregation = bars.aggregate( total=Sum('quantity'), input_total=Sum('quantity', filter=Q(out=False)), @@ -4823,6 +4832,7 @@ class AllProductsTransportDashboardView(APIView): else: filters_steward = {} + filters_query = {'ttrash':False} if province: filters_steward['province'] = province kill_house_filterset_class = AllProductsTransportFilterSet @@ -4840,12 +4850,11 @@ class AllProductsTransportDashboardView(APIView): ).order_by('-modify_date') if destination_province and destination_province != 'undefined': - if destination_province == 'مرکزی': - bars = bars.filter(destination_province='مركزي') - + filters_query['destination_province'] = 'مركزي' else: - bars = bars.filter(destination_province=destination_province) + filters_query['destination_province'] = destination_province + bars = bars(**filters_query) aggregation = bars.aggregate( total=Sum('quantity'), input_total=Sum('quantity', filter=Q(out=False)), @@ -4885,8 +4894,11 @@ class AllProductsTransportDashboardView(APIView): "last_update": last_update, }, status=status.HTTP_200_OK) - if destination_province and destination_province != 'undefined': - queryset = queryset.filter(destination_province=destination_province) + # if destination_province and destination_province != 'undefined': + # if destination_province == 'مرکزی': + # queryset = queryset.filter(destination_province='مركزي') + # else: + # queryset = queryset.filter(destination_province=destination_province) aggregation = queryset.aggregate( total=Sum('quantity'), diff --git a/authentication/__pycache__/__init__.cpython-39.pyc b/authentication/__pycache__/__init__.cpython-39.pyc index 2eb3c6b..ba104ec 100644 Binary files a/authentication/__pycache__/__init__.cpython-39.pyc and b/authentication/__pycache__/__init__.cpython-39.pyc differ diff --git a/authentication/__pycache__/admin.cpython-39.pyc b/authentication/__pycache__/admin.cpython-39.pyc index 0434e32..8970a7a 100644 Binary files a/authentication/__pycache__/admin.cpython-39.pyc and b/authentication/__pycache__/admin.cpython-39.pyc differ diff --git a/authentication/__pycache__/apps.cpython-39.pyc b/authentication/__pycache__/apps.cpython-39.pyc index b19ad11..bf50178 100644 Binary files a/authentication/__pycache__/apps.cpython-39.pyc and b/authentication/__pycache__/apps.cpython-39.pyc differ diff --git a/authentication/__pycache__/models.cpython-39.pyc b/authentication/__pycache__/models.cpython-39.pyc index b4dd9ab..ed1dd29 100644 Binary files a/authentication/__pycache__/models.cpython-39.pyc and b/authentication/__pycache__/models.cpython-39.pyc differ diff --git a/authentication/__pycache__/serializers.cpython-39.pyc b/authentication/__pycache__/serializers.cpython-39.pyc index 7483bad..8579ce2 100644 Binary files a/authentication/__pycache__/serializers.cpython-39.pyc and b/authentication/__pycache__/serializers.cpython-39.pyc differ diff --git a/authentication/__pycache__/urls.cpython-39.pyc b/authentication/__pycache__/urls.cpython-39.pyc index f08aa32..9924065 100644 Binary files a/authentication/__pycache__/urls.cpython-39.pyc and b/authentication/__pycache__/urls.cpython-39.pyc differ diff --git a/authentication/__pycache__/views.cpython-39.pyc b/authentication/__pycache__/views.cpython-39.pyc index 6b2bfed..7e8ce58 100644 Binary files a/authentication/__pycache__/views.cpython-39.pyc and b/authentication/__pycache__/views.cpython-39.pyc differ diff --git a/authentication/migrations/__pycache__/0001_initial.cpython-39.pyc b/authentication/migrations/__pycache__/0001_initial.cpython-39.pyc index ab417b3..3822c8e 100644 Binary files a/authentication/migrations/__pycache__/0001_initial.cpython-39.pyc and b/authentication/migrations/__pycache__/0001_initial.cpython-39.pyc differ diff --git a/authentication/migrations/__pycache__/0002_city_lat_city_lng_province_lat_province_lng.cpython-39.pyc b/authentication/migrations/__pycache__/0002_city_lat_city_lng_province_lat_province_lng.cpython-39.pyc index 1ba5a03..2c547e2 100644 Binary files a/authentication/migrations/__pycache__/0002_city_lat_city_lng_province_lat_province_lng.cpython-39.pyc and b/authentication/migrations/__pycache__/0002_city_lat_city_lng_province_lat_province_lng.cpython-39.pyc differ diff --git a/authentication/migrations/__pycache__/0003_auto_20250809_1248.cpython-39.pyc b/authentication/migrations/__pycache__/0003_auto_20250809_1248.cpython-39.pyc index 4d64063..d52bd05 100644 Binary files a/authentication/migrations/__pycache__/0003_auto_20250809_1248.cpython-39.pyc and b/authentication/migrations/__pycache__/0003_auto_20250809_1248.cpython-39.pyc differ diff --git a/authentication/migrations/__pycache__/0004_province_tel_prefix.cpython-39.pyc b/authentication/migrations/__pycache__/0004_province_tel_prefix.cpython-39.pyc index d7a93f2..9f79d0e 100644 Binary files a/authentication/migrations/__pycache__/0004_province_tel_prefix.cpython-39.pyc and b/authentication/migrations/__pycache__/0004_province_tel_prefix.cpython-39.pyc differ diff --git a/authentication/migrations/__pycache__/__init__.cpython-39.pyc b/authentication/migrations/__pycache__/__init__.cpython-39.pyc index ee1aabe..f413242 100644 Binary files a/authentication/migrations/__pycache__/__init__.cpython-39.pyc and b/authentication/migrations/__pycache__/__init__.cpython-39.pyc differ