Merge pull request #242 from moevm/for_approbation

For approbation

Author: HadronCollider

app/bd_helper/bd_helper.py

@@ -6,6 +6,7 @@
 
 from app.bd_helper.bd_types import User, Presentation, Checks, Consumers, CriteriaPack, Logs
 from app.utils.pdf_converter import convert_to_pdf
+from app.utils.time import timezone_offset
 
 from datetime import datetime, timezone
 
@@ -218,7 +219,7 @@ def get_unpassed_checks():
 
 def set_passbacked_flag(checks_id, flag):
     upd_check = {"$set": {'is_passbacked': flag,
-                          'lms_passback_time': datetime.now(timezone.utc)}}
+                          'lms_passback_time': datetime.now()}}
     check = checks_collection.update_one({'_id': checks_id}, upd_check)
     return check if check else None
 
@@ -255,10 +256,17 @@ def get_storage():
 def get_all_checks():
     return checks_collection.find()
 
-# get checks cursor with specified parameters
 
+def get_checks(filter={}, latest=None, limit=10, offset=0, sort=None, order=None):
+    if latest:
+        return get_latest_check_cursor(filter, limit, offset, sort, order)
+    else:
+        return get_checks_cursor(filter, limit, offset, sort, order)
+
+# get checks cursor with specified parameters
 
 def get_checks_cursor(filter={}, limit=10, offset=0, sort=None, order=None):
+
     sort = 'lms_passback_time' if sort == 'moodle-date' else sort
 
     count = checks_collection.count_documents(filter)
@@ -307,7 +315,7 @@ def format_check(check):
     grade_passback_time = check['lms_passback_time']
     grade_passback_ts = grade_passback_time.strftime(
         "%H:%M:%S - %b %d %Y") if grade_passback_time else '-'
-    return (str(check['_id']), check['user'], check['filename'], check['_id'].generation_time.strftime("%H:%M:%S - %b %d %Y"),
+    return (str(check['_id']), check['user'], check['filename'], (check['_id'].generation_time + timezone_offset).strftime("%H:%M:%S - %b %d %Y"),
             grade_passback_ts, check['score'])
 
 

app/bd_helper/bd_types.py

@@ -12,6 +12,11 @@ def __str__(self) -> str:
         return f"{self.__class__.__name__}: {', '.join([f'{key}: {value}' for key, value in vars(self).items()])}"
 
 
+DEFAULT_CRITERIA = {'template_name': True, 'slides_number': {'sld_num': sld_num['bsc'], 'detect_additional': True},
+                    'slides_enum': True, 'slides_headers': True, 'goals_slide': True, 'probe_slide': True,
+                    'actual_slide': True, 'conclusion_slide': True, 'slide_every_task': 50,
+                    'conclusion_actual': 50, 'conclusion_along': True}
+
 # You shouldn't create this or change username and presentations explicitly
 class User(Packable, UserMixin):
     def __init__(self, dictionary=None):
@@ -21,14 +26,12 @@ def __init__(self, dictionary=None):
         self.name = dictionary.get('name', '')
         self.password_hash = dictionary.get('password_hash', '')
         self.presentations = dictionary.get('presentations', [])
-        self.criteria = dictionary.get('criteria', {'template_name': True,'slides_number': {'sld_num': sld_num['bsc'], 'detect_additional': True},
-                                              'slides_enum': True, 'slides_headers': True, 'goals_slide': True, 'probe_slide': True,
-                                              'actual_slide': True, 'conclusion_slide': True, 'slide_every_task': 50,
-                                              'conclusion_actual': 50, 'conclusion_along': True})
+        self.criteria = dictionary.get('criteria', DEFAULT_CRITERIA)
         self.is_LTI = dictionary.get('is_LTI', False)
         self.lms_user_id = dictionary.get('lms_user_id', None)
         self.is_admin = dictionary.get('is_admin', False)
         self.params_for_passback = dictionary.get('params_for_passback', None)
+        self.formats = dictionary.get('formats', [])
 
     def pack(self):
         package = super(User, self).pack()
@@ -91,10 +94,7 @@ def __init__(self, dictionary=None):
         if '_id' in dictionary:
             self._id = dictionary.get('_id', '')
 
-        self.enabled_checks = dictionary.get('enabled_checks', {'slides_number': {'sld_num': sld_num['bsc'], 'detect_additional': True},
-                                              'slides_enum': True, 'slides_headers': True, 'goals_slide': True, 'probe_slide': True,
-                                              'actual_slide': True, 'conclusion_slide': True, 'slide_every_task': 50,
-                                              'conclusion_actual': 50, 'conclusion_along': True})
+        self.enabled_checks = dictionary.get('enabled_checks', DEFAULT_CRITERIA)
         self.score = dictionary.get('score', -1)
         self.filename = dictionary.get('filename', '')
         self.conv_pdf_fs_id = dictionary.get('conv_pdf_fs_id', '')

app/main/api_checker.py

@@ -6,7 +6,7 @@
               'goals_and_tasks': 'Цель и задачи',
               'approbation': 'Апробация',
               'conclusion': 'Заключение',
-              'relevance': 'Актуальность'
+              'relevance': ['Актуальность', 'Актуальности', 'Актуальностью']
               }
 key_slide = Namespace(**key_slides)
 

app/main/checker.py

@@ -7,25 +7,26 @@
               'goals_and_tasks': 'Цель и задачи',
               'approbation': 'Апробация',
               'conclusion': 'Заключение',
-              'relevance': 'Актуальность'
+              'relevance': ['Актуальность', 'Актуальности', 'Актуальностью']
               }
 key_slide = Namespace(**key_slides)
 
 def check(presentation, checks, presentation_name):
     check_names = checks.enabled_checks.keys()
     set_enabled = dict.fromkeys(check_names, False)
-    check_classes = [TemplateNameCheck(presentation, presentation_name),
-                     SldNumCheck(presentation, checks.enabled_checks['slides_number']),
-                     SldEnumCheck(presentation, checks.conv_pdf_fs_id),
-                     TitleFormatCheck(presentation, checks.conv_pdf_fs_id),
-                     FindDefSld(presentation, key_slide.goals_and_tasks, checks.conv_pdf_fs_id),
-                     FindDefSld(presentation, key_slide.approbation, checks.conv_pdf_fs_id),
-                     SearchKeyWord(presentation, key_slide.relevance, checks.conv_pdf_fs_id),
-                     FindDefSld(presentation, key_slide.conclusion, checks.conv_pdf_fs_id),
-                     FindTasks(presentation, key_slide.goals_and_tasks, checks.enabled_checks['slide_every_task']),
-                     SldSimilarity(presentation, key_slide.goals_and_tasks, key_slide.conclusion, checks.enabled_checks['conclusion_actual']),
-                     FurtherDev(presentation, key_slide.goals_and_tasks, key_slide.conclusion, checks.conv_pdf_fs_id)]
-    set_checks = dict(zip(check_names, check_classes))
+    set_checks = {
+        'template_name': TemplateNameCheck(presentation, presentation_name),
+        'slides_number': SldNumCheck(presentation, checks.enabled_checks['slides_number']),
+        'slides_enum': SldEnumCheck(presentation, checks.conv_pdf_fs_id),
+        'slides_headers': TitleFormatCheck(presentation, checks.conv_pdf_fs_id),
+        'goals_slide': FindDefSld(presentation, key_slide.goals_and_tasks, checks.conv_pdf_fs_id),
+        'probe_slide': FindDefSld(presentation, key_slide.approbation, checks.conv_pdf_fs_id),
+        'actual_slide': SearchKeyWord(presentation, key_slide.relevance, checks.conv_pdf_fs_id),
+        'conclusion_slide': FindDefSld(presentation, key_slide.conclusion, checks.conv_pdf_fs_id),
+        'slide_every_task': FindTasks(presentation, key_slide.goals_and_tasks, checks.enabled_checks['slide_every_task']),
+        'conclusion_actual': SldSimilarity(presentation, key_slide.goals_and_tasks, key_slide.conclusion, checks.enabled_checks['conclusion_actual']),
+        'conclusion_along': FurtherDev(presentation, key_slide.goals_and_tasks, key_slide.conclusion, checks.conv_pdf_fs_id)
+    }
     enabled_checks = dict((key, value) for key, value in checks.enabled_checks.items() if value)
 
     for k, v in enabled_checks.items():

app/main/checks/find_tasks.py

@@ -21,5 +21,5 @@ def check(self):
             return answer(True, "Все задачи найдены на слайдах")
         elif len(slides_with_tasks) == 3 :
             return answer(False, *find_tasks_on_slides_feedback(slides_with_tasks))
-        elif len(slides_with_tasks) == 1:
+        else:
             return answer(False, slides_with_tasks)

app/main/checks/search_keyword.py

@@ -1,14 +1,17 @@
+import re
+
 from app.main.checks.base_check import BaseCheck, answer
 
+
 class SearchKeyWord(BaseCheck):
     def __init__(self, presentation, key_slide, pdf_id):
         super().__init__(presentation)
-        self.key_slide = key_slide
+        self.key_slide = f"({'|'.join((key.lower() for key in key_slide))})"
         self.pdf_id = pdf_id
 
     def check(self):
         for i, text in enumerate(self.presentation.get_text_from_slides(), 1):
-            if self.key_slide.lower() in str(text).lower():
+            if re.search(self.key_slide, str(text).lower()):
                 found = self.format_page_link([i])
                 return answer(True, 'Найден под номером: {}'.format(', '.join(map(str, found))))
         return answer(False, 'Слайд не найден')

app/main/checks/sld_num.py

@@ -16,7 +16,7 @@ def __init__(self, presentation, slides_number):
         'in_range': 'Количество слайдов в допустимых границах',
         'lt_min': 'Число слайдов меньше допустимого',
         'gt_max': 'Число слайдов превышает допустимое',
-        'gt_max_suspected': 'Проверьте неозаглавленные запасные слайды'
+        'gt_max_suspected': 'Проверьте, что запасные слайды расположенны после слайда с заголовком “Запасные слайды”'
         }
 
     def sldnum_verdict(self, find_additional, msg):

app/main/odp/presentation_odp.py

@@ -23,3 +23,6 @@ def parse_styles(self):
             for child in style.childNodes:
                 style_params.update(tict.dictify(child.attributes))
             self.auto_styles[style_name] = style_params
+
+    def __str__(self):
+        return super().__str__()

app/main/odp/slide_odp.py

@@ -52,3 +52,6 @@ def __walk_children(self, child, child_container):
         else:
             for in_child in child.childNodes:
                 self.__walk_children(in_child, child_container)
+
+    def __str__(self):
+        return super().__str__()

app/main/pptx/presentation_pptx.py

@@ -10,5 +10,8 @@ def __init__(self, presentation_name):
         self.add_slides()
 
     def add_slides(self):
-        for slide in self.prs.slides:
-            self.slides.append(SlidePPTX(slide, self.prs.slide_width, self.prs.slide_height))
+        for index, slide in enumerate(self.prs.slides, 1):
+            self.slides.append(SlidePPTX(slide, self.prs.slide_width, self.prs.slide_height, index))
+
+    def __str__(self):
+        return super().__str__()