From bc828a932d949e1270106296ce21dec7d30dd6f6 Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Wed, 1 Oct 2025 18:41:02 +0300
Subject: [PATCH 01/10] change v-table to v-table-virtual

---
 .../src/components/Pages/StatisticsPage.vue   |  2 +-
 client/src/components/Pagination.vue          | 35 +++++++++++++++++++
 .../src/components/Tables/StatisticsTable.vue |  9 ++---
 3 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 client/src/components/Pagination.vue

diff --git a/client/src/components/Pages/StatisticsPage.vue b/client/src/components/Pages/StatisticsPage.vue
index 4205add..bf8307b 100644
--- a/client/src/components/Pages/StatisticsPage.vue
+++ b/client/src/components/Pages/StatisticsPage.vue
@@ -48,7 +48,7 @@
         <button id="reset-search" class="reset-button" @click="resetSearch">Сброс</button>
       </div>
     </Filters>
-    <StatisticsTable v-if="selectedType === 'table'" :info="statisticsInfo" v-model:search="search"></StatisticsTable>
+    <StatisticsTable v-if="selectedType === 'table'" :info="statisticsInfo"></StatisticsTable>
     <Chart v-else :info="statisticsInfo"></Chart>
   </Navbar>
 </template>
diff --git a/client/src/components/Pagination.vue b/client/src/components/Pagination.vue
new file mode 100644
index 0000000..2da6ab7
--- /dev/null
+++ b/client/src/components/Pagination.vue
@@ -0,0 +1,35 @@
+<template>
+  <div class="col-md-12">
+      <div class="mb-3">
+        Items per Page:
+        <select v-model="pageSize" @change="handlePageSizeChange($event)">
+          <option v-for="size in pageSizes" :key="size" :value="size">
+            {{ size }}
+          </option>
+        </select>
+      </div>
+      <b-pagination
+        v-model="page"
+        :total-rows="count"
+        :per-page="pageSize"
+        size="sm"
+        @change="handlePageChange"
+      ></b-pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Pagination",
+  data() {
+    return {
+      page: 1,
+    };
+  },
+  methods: {
+    handlePageChange(value) {
+      this.page = value;
+    },
+  },
+};
+</script>
diff --git a/client/src/components/Tables/StatisticsTable.vue b/client/src/components/Tables/StatisticsTable.vue
index b4a1708..c147f2e 100644
--- a/client/src/components/Tables/StatisticsTable.vue
+++ b/client/src/components/Tables/StatisticsTable.vue
@@ -1,12 +1,9 @@
 <template>
-  <v-data-table
+  <v-data-table-virtual
     class="custom-table"
     :headers="headers"
     :items="info"
-    item-value="number"
-    outlined
-    v-model="selected"
-    show-select
+    fixed-header
   >
 
     <template v-slot:[`item.FIO`]="{ item }">
@@ -16,7 +13,7 @@
     <template v-slot:[`item.course`]="{ item }">
       <p align="start">{{ item.course }}</p>
     </template>
-  </v-data-table>
+  </v-data-table-virtual>
 </template>
 
 <script>

From 3c07700371564daea2f0c36f51a11c8cc7346550 Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Wed, 1 Oct 2025 18:59:35 +0300
Subject: [PATCH 02/10] add some methods for pagination

---
 .../src/components/Pages/StatisticsPage.vue   | 37 ++++++++++++++++++-
 .../src/components/Tables/StatisticsTable.vue | 18 +++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Pages/StatisticsPage.vue b/client/src/components/Pages/StatisticsPage.vue
index bf8307b..42bf3b4 100644
--- a/client/src/components/Pages/StatisticsPage.vue
+++ b/client/src/components/Pages/StatisticsPage.vue
@@ -48,7 +48,13 @@
         <button id="reset-search" class="reset-button" @click="resetSearch">Сброс</button>
       </div>
     </Filters>
-    <StatisticsTable v-if="selectedType === 'table'" :info="statisticsInfo"></StatisticsTable>
+    <StatisticsTable v-if="selectedType === 'table'" 
+      :info="statisticsInfo"
+      :pageSize="pageSize"
+      :pageSizes="pageSizes"
+      :page="page"
+      :count="count">
+    </StatisticsTable>
     <Chart v-else :info="statisticsInfo"></Chart>
   </Navbar>
 </template>
@@ -97,7 +103,11 @@ export default {
       elementType: '',
       elementName: '',
       startSearch: false,
-      params: {}
+      params: {},
+      page: 1,
+      count: 0,
+      pageSize: 10,
+      pageSizes: [5,10,15,20,25]
     };
   },
 
@@ -169,6 +179,29 @@ export default {
   },
 
   methods: {
+    getRequestParams(searchTitle, page, pageSize) {
+      let params = {};
+      if (page) {
+        params["page"] = page - 1;
+      }
+
+      if (pageSize) {
+        params["size"] = pageSize;
+      }
+      return params;
+    },
+
+    handlePageChange(value) {
+      this.page = value;
+      this.getStatistics();
+    },
+
+    handlePageSizeChange(event) {
+      this.pageSize = event.target.value;
+      this.page = 1;
+      this.getStatistics();
+    },
+
     resetBeginDate() {
       this.beginTimestamp = '';
     },
diff --git a/client/src/components/Tables/StatisticsTable.vue b/client/src/components/Tables/StatisticsTable.vue
index c147f2e..e70e640 100644
--- a/client/src/components/Tables/StatisticsTable.vue
+++ b/client/src/components/Tables/StatisticsTable.vue
@@ -1,4 +1,22 @@
 <template>
+  <div class="col-md-12">
+      <div class="mb-3">
+        Items per Page:
+        <select v-model="pageSize" @change="handlePageSizeChange($event)">
+          <option v-for="size in pageSizes" :key="size" :value="size">
+            {{ size }}
+          </option>
+        </select>
+      </div>
+      <b-pagination
+        v-model="page"
+        :total-rows="count"
+        :per-page="pageSize"
+        size="sm"
+        @change="handlePageChange"
+      ></b-pagination>
+  </div>
+
   <v-data-table-virtual
     class="custom-table"
     :headers="headers"

From 2857e543ca300c2748d7e7eda4077954cb5945dc Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Thu, 2 Oct 2025 16:14:42 +0300
Subject: [PATCH 03/10] Bad gateway trouble

---
 .../src/components/Pages/StatisticsPage.vue   | 59 ++++++++++++-------
 .../src/components/Tables/StatisticsTable.vue | 18 ------
 server/src/api/endpoints/statistics.py        | 28 +++++++--
 server/src/models/filter.py                   | 14 +++++
 4 files changed, 75 insertions(+), 44 deletions(-)

diff --git a/client/src/components/Pages/StatisticsPage.vue b/client/src/components/Pages/StatisticsPage.vue
index 42bf3b4..09b58e4 100644
--- a/client/src/components/Pages/StatisticsPage.vue
+++ b/client/src/components/Pages/StatisticsPage.vue
@@ -48,12 +48,27 @@
         <button id="reset-search" class="reset-button" @click="resetSearch">Сброс</button>
       </div>
     </Filters>
+    <div class="col-md-12">
+      <div class="mb-3">
+        Items per Page:
+        <select v-model="pageSize" @change="handlePageSizeChange($event)">
+          <option v-for="size in pageSizes" :key="size" :value="size">
+            {{ size }}
+          </option>
+        </select>
+      </div>
+      <b-pagination
+        v-model="page"
+        :total-rows="count"
+        :per-page="pageSize"
+        size="lg"
+        first-number
+        last-number
+        @change="handlePageChange"
+      ></b-pagination>
+  </div>
     <StatisticsTable v-if="selectedType === 'table'" 
-      :info="statisticsInfo"
-      :pageSize="pageSize"
-      :pageSizes="pageSizes"
-      :page="page"
-      :count="count">
+      :info="statisticsInfo">
     </StatisticsTable>
     <Chart v-else :info="statisticsInfo"></Chart>
   </Navbar>
@@ -105,9 +120,10 @@ export default {
       startSearch: false,
       params: {},
       page: 1,
-      count: 0,
+      count: 1,
       pageSize: 10,
-      pageSizes: [5,10,15,20,25]
+      pageSizes: [5,10,15,20,25,-1],
+      totalPages: 1,
     };
   },
 
@@ -179,18 +195,6 @@ export default {
   },
 
   methods: {
-    getRequestParams(searchTitle, page, pageSize) {
-      let params = {};
-      if (page) {
-        params["page"] = page - 1;
-      }
-
-      if (pageSize) {
-        params["size"] = pageSize;
-      }
-      return params;
-    },
-
     handlePageChange(value) {
       this.page = value;
       this.getStatistics();
@@ -224,6 +228,7 @@ export default {
       this.eventType = '';
       this.elementType = '';
       this.elementName = '';
+      this.page = 1;
       if (this.startSearch === true) {
         this.getStatistics();
         this.startSearch = false;
@@ -241,7 +246,7 @@ export default {
         action_type: this.actionType,
         event_type: this.eventType,
         element_type: this.elementType,
-        element_name: this.elementName
+        element_name: this.elementName,
       }
 
       if (this.beginTimestamp.length === 0 && this.endTimestamp.length === 0) {
@@ -266,11 +271,18 @@ export default {
 
       Object.assign(this.params, searchParams)
 
+      const totalParams = {
+        page: this.page,
+        pageSize: this.pageSize,
+        params: this.params,
+      }
+
       axios
-          .get(STAT_URL, {params: this.params})
+          .get(STAT_URL, {params: totalParams})
           .then((response) => {
             console.log(response);
-            response.data.forEach(element => {
+            const {totalSessions, sessions, totalPages, currentPage} = response.data;
+            sessions.forEach(element => {
               let firstLayer = {
                 FIO: element.student,
                 course: element.course,
@@ -293,6 +305,9 @@ export default {
                 secondLayer.Date = dateTime;
                 this.statisticsInfo.push(secondLayer);
               })
+              this.page = currentPage;
+              this.count = totalSessions;
+              this.totalPages = totalPages;
             });
           })
           .catch((error) => {
diff --git a/client/src/components/Tables/StatisticsTable.vue b/client/src/components/Tables/StatisticsTable.vue
index e70e640..c147f2e 100644
--- a/client/src/components/Tables/StatisticsTable.vue
+++ b/client/src/components/Tables/StatisticsTable.vue
@@ -1,22 +1,4 @@
 <template>
-  <div class="col-md-12">
-      <div class="mb-3">
-        Items per Page:
-        <select v-model="pageSize" @change="handlePageSizeChange($event)">
-          <option v-for="size in pageSizes" :key="size" :value="size">
-            {{ size }}
-          </option>
-        </select>
-      </div>
-      <b-pagination
-        v-model="page"
-        :total-rows="count"
-        :per-page="pageSize"
-        size="sm"
-        @change="handlePageChange"
-      ></b-pagination>
-  </div>
-
   <v-data-table-virtual
     class="custom-table"
     :headers="headers"
diff --git a/server/src/api/endpoints/statistics.py b/server/src/api/endpoints/statistics.py
index 9a1d91e..573d20f 100644
--- a/server/src/api/endpoints/statistics.py
+++ b/server/src/api/endpoints/statistics.py
@@ -10,7 +10,7 @@
 
 from src.core.modules.service.errors import SessionNotFoundError
 from src.depends import get_statistics_service
-from src.models.filter import SessionFilter
+from src.models.filter import RequestParams
 from src.models.session_data import SessionData, CreateSessionData
 from src.models.session_data import PageData, CreatePageData
 
@@ -23,12 +23,32 @@
     "/",
     status_code=status.HTTP_200_OK,
     response_description="Get statistics",
-    response_model=List[SessionData],
+    response_model={
+        "totalSessions":int,
+        "sessions":List[SessionData],
+        "totalPages":int,
+        "currentPage":int
+    },
     response_model_by_alias=False
 )
-async def get_all_sessions(params: SessionFilter = Depends()):
+async def get_all_sessions(params: RequestParams = Depends()):
     try:
-        return await service.get_all_sessions(params)
+        return {
+            "totalSessions": 0,
+            "sessions": [],
+            "totalPages": 1,
+            "currentPage": 1
+        }
+        page = params_dict.page
+        pageSize = params_dict.pageSize
+        data = service.get_all_sessions(params.params)
+        last = (page+1)*pageSize if (page+1)*pageSize < len(data) else len(data)
+        return await {
+            "totalSessions": len(data),
+            "sessions": data[page*pageSize:last],
+            "totalPages": len(data)//pageSize + 1,
+            "currentPage": page
+        }
     except Exception as e:
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
 
diff --git a/server/src/models/filter.py b/server/src/models/filter.py
index 3a92bb1..942aa4b 100644
--- a/server/src/models/filter.py
+++ b/server/src/models/filter.py
@@ -17,6 +17,7 @@ class SessionFilter(BaseModel):
     element_type: Optional[str] = Field(Query(default=None, description="element type"))
     element_name: Optional[str] = Field(Query(default=None, description="element name"))
 
+
     def query(self) -> dict:
         filter_dict = {}
         action_filter = {}
@@ -51,3 +52,16 @@ def query(self) -> dict:
             filter_dict['course'] = {'$regex': self.course_title, '$options': 'i'}
 
         return filter_dict
+
+
+class RequestParams(BaseModel):
+    page: int,
+    pageSize: int,
+    params: SessionFilter
+
+    def query(self) -> dict:
+        filter_dict = {}
+        filter_dict["page"] = self.page
+        filter_dict["pageSize"] = self.pageSize
+        filter_dict["params"] = self.params
+        return filter_dict
\ No newline at end of file

From 98d110026370ef1f247456a617c51cd7d6a3c978 Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Thu, 2 Oct 2025 16:15:24 +0300
Subject: [PATCH 04/10] Bad gateway trouble

---
 server/src/api/endpoints/statistics.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/server/src/api/endpoints/statistics.py b/server/src/api/endpoints/statistics.py
index 573d20f..d7e32b9 100644
--- a/server/src/api/endpoints/statistics.py
+++ b/server/src/api/endpoints/statistics.py
@@ -33,12 +33,6 @@
 )
 async def get_all_sessions(params: RequestParams = Depends()):
     try:
-        return {
-            "totalSessions": 0,
-            "sessions": [],
-            "totalPages": 1,
-            "currentPage": 1
-        }
         page = params_dict.page
         pageSize = params_dict.pageSize
         data = service.get_all_sessions(params.params)

From 8425b30705c645cb356bbc503e2d31059a5651ce Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Thu, 2 Oct 2025 16:17:23 +0300
Subject: [PATCH 05/10] Bad gateway trouble

---
 client/src/components/Pagination.vue | 35 ----------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 client/src/components/Pagination.vue

diff --git a/client/src/components/Pagination.vue b/client/src/components/Pagination.vue
deleted file mode 100644
index 2da6ab7..0000000
--- a/client/src/components/Pagination.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-  <div class="col-md-12">
-      <div class="mb-3">
-        Items per Page:
-        <select v-model="pageSize" @change="handlePageSizeChange($event)">
-          <option v-for="size in pageSizes" :key="size" :value="size">
-            {{ size }}
-          </option>
-        </select>
-      </div>
-      <b-pagination
-        v-model="page"
-        :total-rows="count"
-        :per-page="pageSize"
-        size="sm"
-        @change="handlePageChange"
-      ></b-pagination>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "Pagination",
-  data() {
-    return {
-      page: 1,
-    };
-  },
-  methods: {
-    handlePageChange(value) {
-      this.page = value;
-    },
-  },
-};
-</script>

From 2a89e6bfa48c3c7509bed9f8b1c05fbb24cd6673 Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Thu, 2 Oct 2025 16:50:26 +0300
Subject: [PATCH 06/10] Unprocessable Entity

---
 server/src/api/endpoints/statistics.py | 12 ++++--------
 server/src/models/filter.py            |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/server/src/api/endpoints/statistics.py b/server/src/api/endpoints/statistics.py
index d7e32b9..ee7aacb 100644
--- a/server/src/api/endpoints/statistics.py
+++ b/server/src/api/endpoints/statistics.py
@@ -1,5 +1,5 @@
 import os
-from typing import List
+from typing import List, Dict, Union
 
 import bson.json_util as json
 from fastapi import APIRouter, HTTPException, Body, Depends
@@ -10,7 +10,7 @@
 
 from src.core.modules.service.errors import SessionNotFoundError
 from src.depends import get_statistics_service
-from src.models.filter import RequestParams
+from src.models.filter import RequestParams, SessionFilter
 from src.models.session_data import SessionData, CreateSessionData
 from src.models.session_data import PageData, CreatePageData
 
@@ -23,16 +23,12 @@
     "/",
     status_code=status.HTTP_200_OK,
     response_description="Get statistics",
-    response_model={
-        "totalSessions":int,
-        "sessions":List[SessionData],
-        "totalPages":int,
-        "currentPage":int
-    },
+    response_model=Dict[str, Union[int, List[SessionData]]],
     response_model_by_alias=False
 )
 async def get_all_sessions(params: RequestParams = Depends()):
     try:
+        print(params)
         page = params_dict.page
         pageSize = params_dict.pageSize
         data = service.get_all_sessions(params.params)
diff --git a/server/src/models/filter.py b/server/src/models/filter.py
index 942aa4b..4f14f2d 100644
--- a/server/src/models/filter.py
+++ b/server/src/models/filter.py
@@ -55,8 +55,8 @@ def query(self) -> dict:
 
 
 class RequestParams(BaseModel):
-    page: int,
-    pageSize: int,
+    page: int
+    pageSize: int
     params: SessionFilter
 
     def query(self) -> dict:

From 71849a39e600e2eece8bddfaad397c245854483a Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Mon, 13 Oct 2025 15:18:24 +0300
Subject: [PATCH 07/10] fix

---
 .../src/components/Pages/StatisticsPage.vue   | 22 ++++++++----------
 server/src/api/endpoints/statistics.py        | 20 ++++------------
 .../src/core/modules/database/statistics.py   |  6 +++--
 server/src/models/filter.py                   | 23 +++++++------------
 4 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/client/src/components/Pages/StatisticsPage.vue b/client/src/components/Pages/StatisticsPage.vue
index 09b58e4..be7415c 100644
--- a/client/src/components/Pages/StatisticsPage.vue
+++ b/client/src/components/Pages/StatisticsPage.vue
@@ -239,6 +239,8 @@ export default {
       this.statisticsInfo = []
       this.params = {}
       const searchParams = {
+        page: this.page,
+        pageSize: this.pageSize,
         student_id: Number(this.ID),
         student_name: this.FIO,
         student_email: this.email,
@@ -249,6 +251,11 @@ export default {
         element_name: this.elementName,
       }
 
+      this.params = {
+        page: this.page,
+        pageSize:this.pageSize
+      }
+
       if (this.beginTimestamp.length === 0 && this.endTimestamp.length === 0) {
         this.params = {}
       }
@@ -269,20 +276,14 @@ export default {
         }
       }
 
-      Object.assign(this.params, searchParams)
 
-      const totalParams = {
-        page: this.page,
-        pageSize: this.pageSize,
-        params: this.params,
-      }
+      Object.assign(this.params, searchParams)
 
       axios
-          .get(STAT_URL, {params: totalParams})
+          .get(STAT_URL, {params: searchParams})
           .then((response) => {
             console.log(response);
-            const {totalSessions, sessions, totalPages, currentPage} = response.data;
-            sessions.forEach(element => {
+            response.data.forEach(element => {
               let firstLayer = {
                 FIO: element.student,
                 course: element.course,
@@ -305,9 +306,6 @@ export default {
                 secondLayer.Date = dateTime;
                 this.statisticsInfo.push(secondLayer);
               })
-              this.page = currentPage;
-              this.count = totalSessions;
-              this.totalPages = totalPages;
             });
           })
           .catch((error) => {
diff --git a/server/src/api/endpoints/statistics.py b/server/src/api/endpoints/statistics.py
index ee7aacb..9a1d91e 100644
--- a/server/src/api/endpoints/statistics.py
+++ b/server/src/api/endpoints/statistics.py
@@ -1,5 +1,5 @@
 import os
-from typing import List, Dict, Union
+from typing import List
 
 import bson.json_util as json
 from fastapi import APIRouter, HTTPException, Body, Depends
@@ -10,7 +10,7 @@
 
 from src.core.modules.service.errors import SessionNotFoundError
 from src.depends import get_statistics_service
-from src.models.filter import RequestParams, SessionFilter
+from src.models.filter import SessionFilter
 from src.models.session_data import SessionData, CreateSessionData
 from src.models.session_data import PageData, CreatePageData
 
@@ -23,22 +23,12 @@
     "/",
     status_code=status.HTTP_200_OK,
     response_description="Get statistics",
-    response_model=Dict[str, Union[int, List[SessionData]]],
+    response_model=List[SessionData],
     response_model_by_alias=False
 )
-async def get_all_sessions(params: RequestParams = Depends()):
+async def get_all_sessions(params: SessionFilter = Depends()):
     try:
-        print(params)
-        page = params_dict.page
-        pageSize = params_dict.pageSize
-        data = service.get_all_sessions(params.params)
-        last = (page+1)*pageSize if (page+1)*pageSize < len(data) else len(data)
-        return await {
-            "totalSessions": len(data),
-            "sessions": data[page*pageSize:last],
-            "totalPages": len(data)//pageSize + 1,
-            "currentPage": page
-        }
+        return await service.get_all_sessions(params)
     except Exception as e:
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
 
diff --git a/server/src/core/modules/database/statistics.py b/server/src/core/modules/database/statistics.py
index b0f9bf2..ca591bc 100644
--- a/server/src/core/modules/database/statistics.py
+++ b/server/src/core/modules/database/statistics.py
@@ -11,13 +11,15 @@ def __init__(self, client):
 
     async def get_all_sessions(self, filters: SessionFilter) -> list:
         stats = []
-        query = filters.query()
+        query, pages = filters.query()
+        start = (pages['page']-1)*pages['pageSize']
+        end = pages['page']*pages['pageSize']
         for session in await self.client.statistics.find(query).to_list(length=None):
             session["_id"] = str(session["_id"])
             session["session_id"] = str(session["session_id"])
             session['actions'] = filter_actions(filters, session['actions'])
             stats.append(session)
-        return stats
+        return stats[start:min(end,len(stats))]
 
     async def get_session(self, record_id: str) -> dict:
         stat = await self.client.statistics.find_one({"_id": ObjectId(record_id)})
diff --git a/server/src/models/filter.py b/server/src/models/filter.py
index 4f14f2d..233ee8c 100644
--- a/server/src/models/filter.py
+++ b/server/src/models/filter.py
@@ -6,6 +6,8 @@
 
 
 class SessionFilter(BaseModel):
+    page: int
+    pageSize: int
     begin_timestamp: Optional[datetime] = Field(Query(default=None, description="start date"))
     end_timestamp: Optional[datetime] = Field(Query(default=None, description="stop date"))
     student_id: Optional[int] = Field(Query(default=None, description="student moodle id"))
@@ -18,9 +20,13 @@ class SessionFilter(BaseModel):
     element_name: Optional[str] = Field(Query(default=None, description="element name"))
 
 
-    def query(self) -> dict:
+    def query(self):
         filter_dict = {}
         action_filter = {}
+        pages = {
+            'page': self.page,
+            'pageSize': self.pageSize
+        }
         if self.begin_timestamp or self.end_timestamp:
             timestamp_filter = {}
             if self.begin_timestamp:
@@ -51,17 +57,4 @@ def query(self) -> dict:
         if self.course_title:
             filter_dict['course'] = {'$regex': self.course_title, '$options': 'i'}
 
-        return filter_dict
-
-
-class RequestParams(BaseModel):
-    page: int
-    pageSize: int
-    params: SessionFilter
-
-    def query(self) -> dict:
-        filter_dict = {}
-        filter_dict["page"] = self.page
-        filter_dict["pageSize"] = self.pageSize
-        filter_dict["params"] = self.params
-        return filter_dict
\ No newline at end of file
+        return filter_dict, pages
\ No newline at end of file

From 9154abc2d16f5ff3f4514e9024590b745deb3262 Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Wed, 15 Oct 2025 13:56:33 +0300
Subject: [PATCH 08/10] fix mongo request

---
 server/src/core/modules/database/statistics.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/src/core/modules/database/statistics.py b/server/src/core/modules/database/statistics.py
index ca591bc..cbd008e 100644
--- a/server/src/core/modules/database/statistics.py
+++ b/server/src/core/modules/database/statistics.py
@@ -13,13 +13,14 @@ async def get_all_sessions(self, filters: SessionFilter) -> list:
         stats = []
         query, pages = filters.query()
         start = (pages['page']-1)*pages['pageSize']
-        end = pages['page']*pages['pageSize']
-        for session in await self.client.statistics.find(query).to_list(length=None):
+        total_rows = await self.client.statistics.count_documents(query)
+        pageSize = total_rows if pages['pageSize'] == -1 else pages['pageSize']
+        for session in await self.client.statistics.find(query).skip(start).limit(pageSize).to_list(length=None):
             session["_id"] = str(session["_id"])
             session["session_id"] = str(session["session_id"])
             session['actions'] = filter_actions(filters, session['actions'])
             stats.append(session)
-        return stats[start:min(end,len(stats))]
+        return [stats, total_rows]
 
     async def get_session(self, record_id: str) -> dict:
         stat = await self.client.statistics.find_one({"_id": ObjectId(record_id)})

From d7eb1e96117ed0eb86b674d41fd32b4af111392c Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Wed, 15 Oct 2025 14:14:46 +0300
Subject: [PATCH 09/10] add pagination buttons

---
 .../src/components/Pages/StatisticsPage.vue   | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/client/src/components/Pages/StatisticsPage.vue b/client/src/components/Pages/StatisticsPage.vue
index be7415c..a3dd39f 100644
--- a/client/src/components/Pages/StatisticsPage.vue
+++ b/client/src/components/Pages/StatisticsPage.vue
@@ -49,6 +49,9 @@
       </div>
     </Filters>
     <div class="col-md-12">
+      <button @click="prevPage">
+        Previous
+      </button>
       <div class="mb-3">
         Items per Page:
         <select v-model="pageSize" @change="handlePageSizeChange($event)">
@@ -57,15 +60,9 @@
           </option>
         </select>
       </div>
-      <b-pagination
-        v-model="page"
-        :total-rows="count"
-        :per-page="pageSize"
-        size="lg"
-        first-number
-        last-number
-        @change="handlePageChange"
-      ></b-pagination>
+      <button @click="nextPage">
+        Next
+      </button>
   </div>
     <StatisticsTable v-if="selectedType === 'table'" 
       :info="statisticsInfo">
@@ -195,9 +192,18 @@ export default {
   },
 
   methods: {
-    handlePageChange(value) {
-      this.page = value;
-      this.getStatistics();
+    prevPage() {
+      if (this.page != 1){
+        this.page = this.page - 1;
+        this.getStatistics();
+      }
+    },
+
+    nextPage() {
+      if (this.page != this.totalPages){
+        this.page = this.page + 1;
+        this.getStatistics();
+      }
     },
 
     handlePageSizeChange(event) {
@@ -283,7 +289,10 @@ export default {
           .get(STAT_URL, {params: searchParams})
           .then((response) => {
             console.log(response);
-            response.data.forEach(element => {
+            let stats = response.data[0]
+            this.count = response.data[1]
+            this.totalPages = Math.ceil(this.count/this.pageSize)
+            stats.forEach(element => {
               let firstLayer = {
                 FIO: element.student,
                 course: element.course,

From a8625d9346547a4467a533c9bd1f680654954402 Mon Sep 17 00:00:00 2001
From: shalamot <vaneck2003@gmail.com>
Date: Wed, 15 Oct 2025 14:19:19 +0300
Subject: [PATCH 10/10] fix response model

---
 server/src/api/endpoints/statistics.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/api/endpoints/statistics.py b/server/src/api/endpoints/statistics.py
index 9a1d91e..46d859f 100644
--- a/server/src/api/endpoints/statistics.py
+++ b/server/src/api/endpoints/statistics.py
@@ -23,7 +23,7 @@
     "/",
     status_code=status.HTTP_200_OK,
     response_description="Get statistics",
-    response_model=List[SessionData],
+    response_model=List,
     response_model_by_alias=False
 )
 async def get_all_sessions(params: SessionFilter = Depends()):