New filters

service/utils.py

@@ -21,17 +21,21 @@ def raschet(tables, filters, koefs):
     for table in tables:
         if 'point' in table:
             if msk_ao is not None:
-                query = f"select * from {table} where msk_ao={msk_ao} and category in ({categories});"
+                query = f"select * from {table} where msk_ao={msk_ao} and category in ({categories});" if len(categories) > 0 else f"select * from {table} where msk_ao={msk_ao};"
+            elif msk_rayon is not None:
+                query = f"select * from {table} where msk_rayon={msk_rayon} and category in ({categories});" if len(categories) > 0 else f"select * from {table} where msk_rayon={msk_rayon};"
             else:
-                query = f"select * from {table} where msk_rayon={msk_rayon} and category in ({categories});"
+                query = f"select * from {table} where category in ({categories});" if len(categories) > 0 else f"select * from {table};"
             points = pd.read_sql(query, conn)
             points_df = raschet_real(points, koefs)
 
         if 'net' in table:
             if msk_ao is not None:
                 query = f"select * from {table} where msk_ao={msk_ao};"
-            else:
+            elif msk_rayon is not None:
                 query = f"select * from {table} where msk_rayon={msk_rayon};"
+            else:
+                query = f"select * from {table};"
             nets = pd.read_sql(query, conn)
             nets_df = raschet_real(nets, koefs)