diff --git a/App/Report/__init__.py b/App/Report/__init__.py index 73ce20b..a824f02 100644 --- a/App/Report/__init__.py +++ b/App/Report/__init__.py @@ -1,6 +1,7 @@ from flask import request, Blueprint, render_template, session, url_for from checker import check_auth from os import path +from datetime import date from .report_model import view_report, make_report import json @@ -22,7 +23,8 @@ def create(): return render_template('report_basic.html', is_write=True, title='Создание отчетов', - items=report_list) + items=report_list, + date_today=date.today()) else: data = dict(id=request.form.get('category'), month=request.form.get('month'), @@ -48,7 +50,8 @@ def view(): return render_template('report_basic.html', is_write=False, title='Просмотр отчетов', - items=report_list) + items=report_list, + date_today=date.today()) else: data = dict(id=request.form.get('category'), month=request.form.get('month'), diff --git a/App/Report/access/2.json b/App/Report/access/2.json index d7a7537..270aaf5 100644 --- a/App/Report/access/2.json +++ b/App/Report/access/2.json @@ -3,5 +3,5 @@ "write" : ["Бухгалтер"], "read" : ["Управляющий"], "view" : "sellers_report", - "procedure" : "report_sellers" + "procedure" : "report_sellers_2" } \ No newline at end of file diff --git a/App/Report/templates/report_basic.html b/App/Report/templates/report_basic.html index ab2de71..1cf4630 100644 --- a/App/Report/templates/report_basic.html +++ b/App/Report/templates/report_basic.html @@ -5,6 +5,7 @@