Fix load tasks from database

pages/3_📥_Скачать.py

@@ -10,7 +10,7 @@ if st.session_state.get('-LOGGED_IN_BOOL-') and (st.session_state.get('-DISPLAY_
         st.stop()
     # Download buttons
     if st.session_state.get('-DOWNLOAD_VERSION-'):
-        invite, tasks_col, tasks_with_answers_col, keys_only_col, full_coll, rest = st.columns([1, 1, 2, 1, 3, 1])
+        invite, tasks_col, tasks_with_answers_col, full_coll, rest = st.columns([1, 1, 2, 3, 1])
         invite.write('Скачать:')
         with tasks_col:
             d_button(
@@ -22,11 +22,6 @@ if st.session_state.get('-LOGGED_IN_BOOL-') and (st.session_state.get('-DISPLAY_
                 label='Задания+Ключи',
                 data=result['TEACHER_OUT'],
                 file_name=f'{result["name"]}_tasks_and_keys.txt')
-        with keys_only_col:
-            d_button(
-                label='Ключи',
-                data=result['KEYS_ONLY'],
-                file_name=f'{result["name"]}_keys.txt')
         with full_coll:
             d_button(
                 label='Исходник+Задания+Ключи',

utilities_database/user_database_utils.py

@@ -242,19 +242,31 @@ def save_data_in_database(user_task_database, save_type, save_name, cefr_level,
 
 def load_user_tasks_data(user_task_database, save_type, creator_name=None, test_taker_name=None):
     if save_type == 'download':
-        user_data = user_task_database.fetch({'creator_name': creator_name, 'save_type': save_type}).items
-        names = [item['save_name'] for item in user_data]
-        cefr_level = [item['cefr_level'] for item in user_data]
-        time_stamps = [item['time_stamp'] for item in user_data]
+        ITEMS = []
+        user_data = user_task_database.fetch({'creator_name': creator_name, 'save_type': save_type})
+        _last = user_data.last
+        while _last is not None:
+            ITEMS.extend(user_data.items)
+            user_data = user_task_database.fetch({'creator_name': creator_name, 'save_type': save_type}, last=_last)
+            _last = user_data.last
+        names = [item['save_name'] for item in ITEMS]
+        cefr_level = [item['cefr_level'] for item in ITEMS]
+        time_stamps = [item['time_stamp'] for item in ITEMS]
         return_data = pd.DataFrame([names, cefr_level, time_stamps]).transpose()
         return_data.columns = ['Название', 'Уровень', 'Время создания']
     else:
-        user_data = user_task_database.fetch({'test_taker_name': test_taker_name, 'save_type': save_type}).items
-        names = [item['save_name'] for item in user_data]
-        cefr_level = [item['cefr_level'] for item in user_data]
-        time_stamps = [item['time_stamp'] for item in user_data]
-        creator_name = [item['creator_name'] for item in user_data]
-        test_taker_result = [item['test_taker_result'] for item in user_data]
+        ITEMS = []
+        user_data = user_task_database.fetch({'test_taker_name': test_taker_name, 'save_type': save_type})
+        _last = user_data.last
+        while _last is not None:
+            ITEMS.extend(user_data.items)
+            user_data = user_task_database.fetch({'test_taker_name': test_taker_name, 'save_type': save_type}, last=_last)
+            _last = user_data.last
+        names = [item['save_name'] for item in ITEMS]
+        cefr_level = [item['cefr_level'] for item in ITEMS]
+        time_stamps = [item['time_stamp'] for item in ITEMS]
+        creator_name = [item['creator_name'] for item in ITEMS]
+        test_taker_result = [item['test_taker_result'] for item in ITEMS]
         return_data = pd.DataFrame([names, cefr_level, test_taker_result, time_stamps, creator_name]).transpose()
         return_data.columns = ['Название', 'Уровень', 'Оценка', 'Дата прохождения', 'Автор заданий']
     return return_data