ParkSuMin/RIS
Archived
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Debug' of ParkSuMin/Cursovaya into main

Browse Source
This commit is contained in:
ParkSuMin
2024-12-12 08:38:56 +00:00
committed by Gogs
parent 4b7fb893df 165a826cd0
commit ca736ea04f
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App/Database/work.py
View File

@@ -19,6 +19,8 @@ def procedure(db_config, name, args: tuple) -> list:
raise ValueError("Cursor not created") raise ValueError("Cursor not created")
else: else:
cursor.callproc(name, args) cursor.callproc(name, args)
result = cursor.fetchone()[0]
return result
def transaction(cursor, sql): def transaction(cursor, sql):

2
App/Report/report_model.py
View File

@@ -19,7 +19,7 @@ def check_report(input_data: dict) -> bool:
db_config = current_app.config["db_config"] db_config = current_app.config["db_config"]
result = procedure(db_config, "check_report", tuple(input_data.values())) result = procedure(db_config, "check_report", tuple(input_data.values()))
if result is None or result["exist"] == 0: if result is None or result == 0:
return False return False
return True return True

2
App/Report/static/js/check.js
View File

@@ -1,7 +1,7 @@
function check_month(now_month, now_year) { function check_month(now_month, now_year) {
let selected_month = document.getElementById('month').value; let selected_month = document.getElementById('month').value;
let selected_year = document.getElementById('year').value; let selected_year = document.getElementById('year').value;
if (selected_month > now_month && selected_year == now_year) { if (selected_month > now_month && selected_year == now_year || selected_year > now_year) {
alert('Невозможно сформировать отчет за будущий период!'); alert('Невозможно сформировать отчет за будущий период!');
return false; return false;
} }

2
App/cache/wrapper.py vendored
View File

@@ -21,7 +21,7 @@ def fetch_from_cache(cache_name: str, cache_config: dict):
if cached_value: if cached_value:
return cached_value return cached_value
response = f(*args, **kwargs) response = f(*args, **kwargs)
print("response=", response) # print("response=", response)
cache_conn.set_value(cache_name, response, ttl) cache_conn.set_value(cache_name, response, ttl)
return response return response

2
App/checker.py
View File

@@ -11,7 +11,7 @@ def check_auth(func):
return redirect(url_for("auth_bp.auth")) return redirect(url_for("auth_bp.auth"))
user_role = session.get("role") user_role = session.get("role")
user_request = request.endpoint user_request = request.endpoint
print("request_endpoint=", user_request) # print("request_endpoint=", user_request)
user_bp = user_request.split(".")[0] user_bp = user_request.split(".")[0]
access = current_app.config["db_access"] access = current_app.config["db_access"]
if user_role in access and user_bp in access[user_role]: if user_role in access and user_bp in access[user_role]: