- 
+ Запрашиваемый ресурс не найден
diff --git a/app/templates/upload.html b/app/templates/upload.html
index f4a140d0..7a020be8 100644
--- a/app/templates/upload.html
+++ b/app/templates/upload.html
@@ -51,9 +51,6 @@
+ Запрашиваемый ресурс не найден
{{ uploading_label }}
aria-valuenow="10" aria-valuemin="0" aria-valuemax="100" style="width: 10%"> - {% if not (current_user.is_LTI or current_user.is_admin) %} - {{ recaptcha }} - {% endif %}Общий объем загружаемых файлов не должен превышать {{ config.MAX_CONTENT_LENGTH//1024//1024 }} Mб.
diff --git a/app/utils/decimal_places_check.py b/app/utils/decimal_places_check.py
new file mode 100644
index 00000000..b4ed1650
--- /dev/null
+++ b/app/utils/decimal_places_check.py
@@ -0,0 +1,139 @@
+import re
+from collections import defaultdict
+
+
+class DecimalPlacesCheck:
+ DECIMAL_PATTERN = r'\b\d{1,3}(?:[.,]\d{3})*(?:[.,]\d+)?\b'
+
+ def __init__(self, file_info, max_decimal_places=2, max_violations=3):
+ self.file_type = file_info['file_type']['type']
+ self.max_decimal_places = max_decimal_places
+ self.max_violations = max_violations
+
+ def is_valid_number(self, match, text):
+ start_pos = match.start()
+ end_pos = match.end()
+
+ char_before = text[start_pos - 1] if start_pos > 0 else ' '
+
+ if char_before == '.':
+ return False
+
+ if end_pos < len(text):
+ char_after = text[end_pos]
+ if char_after == '.' and end_pos + 1 < len(text) and text[end_pos + 1].isdigit():
+ return False
+
+ return True
+
+ def count_decimal_places(self, number_str):
+ normalized = number_str.replace(',', '.')
+
+ if '.' in normalized:
+ decimal_part = normalized.split('.')[1]
+ return len(decimal_part)
+
+ return 0
+
+ def find_violations_in_text(self, text):
+ violations = []
+ matches = re.finditer(self.DECIMAL_PATTERN, text)
+
+ for match in matches:
+ if not self.is_valid_number(match, text):
+ continue
+
+ number_str = match.group()
+ decimal_places = self.count_decimal_places(number_str)
+
+ if decimal_places > self.max_decimal_places:
+ violations.append((number_str, decimal_places, match))
+
+ return violations
+
+ def find_violations_in_lines(self, lines):
+ violations = []
+
+ for line_idx, line in enumerate(lines):
+ line_violations = self.find_violations_in_text(line)
+
+ for number_str, decimal_places, _ in line_violations:
+ violations.append((line_idx, number_str, decimal_places, line))
+
+ return violations
+
+ def find_violations_in_texts(self, texts):
+ pages = defaultdict(list)
+ total_violations = 0
+
+ for idx, text in texts:
+ lines = re.split(r'\n', text)
+ violations = self.find_violations_in_lines(lines)
+
+ for line_idx, number_str, decimal_places, line in violations:
+ total_violations += 1
+ violation_msg = self.format_violation_message(
+ line_idx, line, number_str, decimal_places
+ )
+ pages[idx].append(violation_msg)
+
+ return (total_violations, pages)
+
+ def highlight_number(self, line, number_str):
+ return line.replace(number_str, f'{number_str}', 1)
+
+ def format_violation_message(self, line_idx, line, number_str, decimal_places):
+ highlighted_line = self.highlight_number(line, number_str)
+ return (
+ f'Строка {line_idx + 1}: {highlighted_line} '
+ f'(найдено {decimal_places} знаков после запятой, '
+ f'максимум: {self.max_decimal_places})'
+ )
+
+ def format_success_message(self):
+ return (
+ f'Проверка пройдена! Все числа имеют допустимое количество '
+ f'десятичных знаков (не более {self.max_decimal_places}).'
+ )
+
+ def format_failure_message(self, total_violations,
+ violations_by_location,
+ format_page_link_fn=None):
+ result_str = (
+ f'Найдены числа с избыточным количеством десятичных знаков!
' + f'Максимально допустимое количество знаков после запятой: {self.max_decimal_places}
' + f'Максимально допустимое количество нарушений: {self.max_violations}
' + f'Всего нарушений: {total_violations}
' + ) + + for location_num, violations in violations_by_location.items(): + if format_page_link_fn: + location_str = f'Страница {format_page_link_fn([location_num])}' + else: + location_str = f'Страница №{location_num}' + + result_str += f'{location_str}:
' + result_str += '
'.join(violations) + result_str += '
' + + return result_str + + def get_result_msg_and_score(self, total_violations, detected_pages, format_page_link_fn=None): + if total_violations > self.max_violations: + result_str = self.format_failure_message( + total_violations, + detected_pages, + format_page_link_fn + ) + result_score = 0 + elif total_violations > 0: + result_str = self.format_failure_message( + total_violations, + detected_pages, + format_page_link_fn + ) + result_score = 1.0 + else: + result_str = self.format_success_message() + result_score = 1.0 + return result_str, result_score \ No newline at end of file diff --git a/assets/scripts/upload.js b/assets/scripts/upload.js index 1db21586..ba5eb3f8 100644 --- a/assets/scripts/upload.js +++ b/assets/scripts/upload.js @@ -44,9 +44,6 @@ const showBdOverwhelmedMessage = () => { alert('База данных перегружена (недостаточно места для загрузки новых файлов). Свяжитесь с администратором'); } -const showRecaptchaMessage = () => { - alert('Пройдите recaptcha, чтобы продолжить!'); -} const resetFileUpload = () => { pdf_uploaded = false; @@ -138,10 +135,6 @@ async function upload() { } formData.append("file", file); formData.append("file_type", file_type); - if ($('div.g-recaptcha').length) { - let response = grecaptcha.getResponse(); - formData.append("g-recaptcha-response", response); - } const bar = $("#uploading_progress"); $("#uploading_progress_holder").css("display", "block"); @@ -198,12 +191,8 @@ async function upload() { } upload_button.click(async () => { - if ($('div.g-recaptcha').length && grecaptcha.getResponse().length === 0) { - showRecaptchaMessage(); - } else { - upload_button.prop("disabled", true); - await upload(); - } + upload_button.prop("disabled", true); + await upload(); }); function toggleTable(tableId) { diff --git a/assets/styles/404.css b/assets/styles/404.css index c833cc62..384902ba 100644 --- a/assets/styles/404.css +++ b/assets/styles/404.css @@ -1,3 +1,3 @@ #middle-container { - background-color: black; + background-color: rgb(255, 255, 255); } diff --git a/requirements.txt b/requirements.txt index ca44fa76..28962a73 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,6 @@ docx2python~=2.0.4 filetype==1.2.0 Flask==2.0.3 flask-login==0.5.0 -flask-recaptcha==0.4.2 flask-security==3.0.0 flower==1.2.0 fsspec==2022.2.0 @@ -20,7 +19,7 @@ numpy==1.26.4 oauthlib~=3.1.0 odfpy==1.4.1 odfpy==1.4.1 -pandas~=2.0.3 +pandas==3.0.0 pdfplumber==0.6.1 PyMuPDF==1.26.6 PyPDF2~=3.0.1 diff --git a/tests/test_recheck.py b/tests/test_recheck.py new file mode 100644 index 00000000..4fc8135c --- /dev/null +++ b/tests/test_recheck.py @@ -0,0 +1,36 @@ +import time +from basic_selenium_test import BasicSeleniumTest +from selenium.webdriver.common.by import By +from selenium.webdriver.support.wait import WebDriverWait +from selenium.webdriver.support import expected_conditions as EC + + +class RecheckTestSelenium(BasicSeleniumTest): + + def test_recheck_file(self): + check_id = self.open_statistic() + if check_id: + URL = self.get_url(f"/recheck/{check_id}") + self.get_driver().get(URL) + obj = WebDriverWait(self.driver, 10).until( + EC.presence_of_element_located((By.ID, "results_title")) + ) + if "Производится проверка файла" in obj.text: + start_time = time.time() + max_time = 240 + while (time.time() - start_time) < max_time: + time.sleep(10) + try: + obj = WebDriverWait(self.driver, 10).until( + EC.presence_of_element_located((By.ID, "results_table")) + ) + if obj is not None: + self.assertNotEquals(obj, None) + return + except: + continue + self.fail("Result of check is not found") + else: + self.fail("No checking status after /recheck") + else: + self.skipTest("No check in system for testing recheck")
' + f'Максимально допустимое количество знаков после запятой: {self.max_decimal_places}
' + f'Максимально допустимое количество нарушений: {self.max_violations}
' + f'Всего нарушений: {total_violations}
' + ) + + for location_num, violations in violations_by_location.items(): + if format_page_link_fn: + location_str = f'Страница {format_page_link_fn([location_num])}' + else: + location_str = f'Страница №{location_num}' + + result_str += f'{location_str}:
' + result_str += '
'.join(violations) + result_str += '
' + + return result_str + + def get_result_msg_and_score(self, total_violations, detected_pages, format_page_link_fn=None): + if total_violations > self.max_violations: + result_str = self.format_failure_message( + total_violations, + detected_pages, + format_page_link_fn + ) + result_score = 0 + elif total_violations > 0: + result_str = self.format_failure_message( + total_violations, + detected_pages, + format_page_link_fn + ) + result_score = 1.0 + else: + result_str = self.format_success_message() + result_score = 1.0 + return result_str, result_score \ No newline at end of file diff --git a/assets/scripts/upload.js b/assets/scripts/upload.js index 1db21586..ba5eb3f8 100644 --- a/assets/scripts/upload.js +++ b/assets/scripts/upload.js @@ -44,9 +44,6 @@ const showBdOverwhelmedMessage = () => { alert('База данных перегружена (недостаточно места для загрузки новых файлов). Свяжитесь с администратором'); } -const showRecaptchaMessage = () => { - alert('Пройдите recaptcha, чтобы продолжить!'); -} const resetFileUpload = () => { pdf_uploaded = false; @@ -138,10 +135,6 @@ async function upload() { } formData.append("file", file); formData.append("file_type", file_type); - if ($('div.g-recaptcha').length) { - let response = grecaptcha.getResponse(); - formData.append("g-recaptcha-response", response); - } const bar = $("#uploading_progress"); $("#uploading_progress_holder").css("display", "block"); @@ -198,12 +191,8 @@ async function upload() { } upload_button.click(async () => { - if ($('div.g-recaptcha').length && grecaptcha.getResponse().length === 0) { - showRecaptchaMessage(); - } else { - upload_button.prop("disabled", true); - await upload(); - } + upload_button.prop("disabled", true); + await upload(); }); function toggleTable(tableId) { diff --git a/assets/styles/404.css b/assets/styles/404.css index c833cc62..384902ba 100644 --- a/assets/styles/404.css +++ b/assets/styles/404.css @@ -1,3 +1,3 @@ #middle-container { - background-color: black; + background-color: rgb(255, 255, 255); } diff --git a/requirements.txt b/requirements.txt index ca44fa76..28962a73 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,6 @@ docx2python~=2.0.4 filetype==1.2.0 Flask==2.0.3 flask-login==0.5.0 -flask-recaptcha==0.4.2 flask-security==3.0.0 flower==1.2.0 fsspec==2022.2.0 @@ -20,7 +19,7 @@ numpy==1.26.4 oauthlib~=3.1.0 odfpy==1.4.1 odfpy==1.4.1 -pandas~=2.0.3 +pandas==3.0.0 pdfplumber==0.6.1 PyMuPDF==1.26.6 PyPDF2~=3.0.1 diff --git a/tests/test_recheck.py b/tests/test_recheck.py new file mode 100644 index 00000000..4fc8135c --- /dev/null +++ b/tests/test_recheck.py @@ -0,0 +1,36 @@ +import time +from basic_selenium_test import BasicSeleniumTest +from selenium.webdriver.common.by import By +from selenium.webdriver.support.wait import WebDriverWait +from selenium.webdriver.support import expected_conditions as EC + + +class RecheckTestSelenium(BasicSeleniumTest): + + def test_recheck_file(self): + check_id = self.open_statistic() + if check_id: + URL = self.get_url(f"/recheck/{check_id}") + self.get_driver().get(URL) + obj = WebDriverWait(self.driver, 10).until( + EC.presence_of_element_located((By.ID, "results_title")) + ) + if "Производится проверка файла" in obj.text: + start_time = time.time() + max_time = 240 + while (time.time() - start_time) < max_time: + time.sleep(10) + try: + obj = WebDriverWait(self.driver, 10).until( + EC.presence_of_element_located((By.ID, "results_table")) + ) + if obj is not None: + self.assertNotEquals(obj, None) + return + except: + continue + self.fail("Result of check is not found") + else: + self.fail("No checking status after /recheck") + else: + self.skipTest("No check in system for testing recheck")