Merge branch 'Debug' of ParkSuMin/Cursovaya into main

App/Database/work.py

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

App/Report/report_model.py

@@ -19,7 +19,7 @@ def check_report(input_data: dict) -> bool:
     db_config = current_app.config["db_config"]
 
     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 True
 

App/Report/static/js/check.js

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

App/cache/wrapper.py

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

App/checker.py

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