Отчёт о поставках

App/Report/__init__.py

@@ -24,14 +24,16 @@ def create():
                                title='Создание отчета', 
                                items = report_list)
     else:
-        data = dict(month=request.form.get('month'), year=request.form.get('year'))
+        data = dict(id=request.form.get('category'),
-        id = request.form.get('category')
+                    month=request.form.get('month'), 
-        with open(path.join(path.dirname(__file__), f'access/{id}.json')) as f:
+                    year=request.form.get('year'))
+        
+        with open(path.join(path.dirname(__file__), f'access/{data['id']}.json')) as f:
             report_access = json.load(f)
         
         if session['role'] in report_access['write']:
             proc_name = report_access['procedure']
-            ready_report = make_report(data, int(id),proc_name)
+            ready_report = make_report(data, proc_name)
             if ready_report.status:
                 return render_template("OK.html")
             else:
@@ -48,11 +50,11 @@ def view():
                                title='Просмотр отчета', 
                                items = report_list)
     else:
-        data = dict(month=request.form.get('month'), 
+        data = dict(id=request.form.get('category'),
-                    year=request.form.get('year'), 
+                    month=request.form.get('month'), 
-                    id = request.form.get('category'))
+                    year=request.form.get('year'))
-        id = request.form.get('category')
+        
-        with open(path.join(path.dirname(__file__), f'access/{id}.json')) as f:
+        with open(path.join(path.dirname(__file__), f'access/{data['id']}.json')) as f:
             report_access = json.load(f)
 
         if session['role'] in report_access['read']:

App/Report/report_model.py

@@ -33,14 +33,14 @@ def view_report(input_data: dict, view_script: str) -> InfoRespronse:
                              status=False)
     return InfoRespronse(result, error_message='', status=True)
 
-def make_report(input_data: dict, report_id: int, proc_name: str) -> InfoRespronse:
+def make_report(input_data: dict, proc_name: str) -> InfoRespronse:
     status = check_report(input_data)
     if status:
         return InfoRespronse((), 
                              error_message = 'Отчет уже существует',
                              status=False)
     
-    data = (report_id,*input_data.values())
+    data = tuple(input_data.values())
     result = procedure(current_app.config['db_config'], proc_name, data)
     if result is None:
         return InfoRespronse((), 

App/Report/sql/check_report.sql

@@ -1,4 +1,4 @@
 SELECT EXISTS (
     SELECT 1 FROM reports
-    WHERE month = $month AND year = $year
+    WHERE report_category_id = '$id' AND (month = '$month' AND year = '$year')
 ) AS exist;

App/Report/sql/sellers_report.sql

@@ -0,0 +1,8 @@
+SELECT
+    s.name AS Поставщик,
+    SUM(reports.count) AS 'Количество поставок',
+    SUM(reports.sum) AS Сумма
+FROM reports
+JOIN sellers s ON reports.item_id = s.sel_id
+WHERE report_category_id = '$id' AND (month = '$month' AND year = '$year')
+GROUP BY s.name;

App/data/db_access.json

@@ -5,7 +5,8 @@
   "Управляющий": [ 
   "requests_bp", 
   "report_bp"],
+  "Бухгалтер": [ 
+  "report_bp"],
   "Поставщик": [ 
   "waybill_bp"]
-
 }