From ea2a2a59b32ac2e3203d82551d99fe4ba92ef6d3 Mon Sep 17 00:00:00 2001
From: labmecanicatec <labmecanicatec@udistrital.edu.co>
Date: Mon, 24 Aug 2026 08:30:52 -0500
Subject: [PATCH 1/3] refactor: implement pagination

- Replace null parameters with actual page number and size
- Use page->GetPageNumber() and page->GetPageSize() for pagination
- Improves performance by limiting results per request
---
 Presenters/Admin/ManageBlackoutsPresenter.php    | 2 +-
 Presenters/Admin/ManageGroupsPresenter.php       | 2 +-
 Presenters/Admin/ManageReservationsPresenter.php | 8 +++++---
 Presenters/Admin/ManageResourcesPresenter.php    | 2 +-
 Presenters/Admin/ManageSchedulesPresenter.php    | 2 +-
 Presenters/Admin/ManageUsersPresenter.php        | 8 +++++---
 Presenters/ViewSchedulesPresenter.php            | 2 +-
 7 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Presenters/Admin/ManageBlackoutsPresenter.php b/Presenters/Admin/ManageBlackoutsPresenter.php
index 3c3adc07fd..412a391e3e 100644
--- a/Presenters/Admin/ManageBlackoutsPresenter.php
+++ b/Presenters/Admin/ManageBlackoutsPresenter.php
@@ -80,7 +80,7 @@ public function PageLoad($userTimezone)
 
         $blackouts = $this->manageBlackoutsService->LoadFiltered(
             $this->page->GetPageNumber(),
-            null,
+            $this->page->GetPageSize(),
             $this->page->GetSortField(),
             $this->page->GetSortDirection(),
             $filter,
diff --git a/Presenters/Admin/ManageGroupsPresenter.php b/Presenters/Admin/ManageGroupsPresenter.php
index 82f2300fa0..a525b609e0 100644
--- a/Presenters/Admin/ManageGroupsPresenter.php
+++ b/Presenters/Admin/ManageGroupsPresenter.php
@@ -109,7 +109,7 @@ public function PageLoad()
         } else {
             $groupList = $this->groupRepository->GetList(
                 $this->page->GetPageNumber(),
-                null,
+                $this->page->GetPageSize(),
                 $this->page->GetSortField(),
                 $this->page->GetSortDirection()
             );
diff --git a/Presenters/Admin/ManageReservationsPresenter.php b/Presenters/Admin/ManageReservationsPresenter.php
index 199a6d851d..1effca9053 100644
--- a/Presenters/Admin/ManageReservationsPresenter.php
+++ b/Presenters/Admin/ManageReservationsPresenter.php
@@ -210,7 +210,7 @@ public function PageLoad($userTimezone)
 
         $reservations = $this->manageReservationsService->LoadFiltered(
             $this->page->GetPageNumber(),
-            null,
+            $this->page->GetPageSize(),
             $this->page->GetSortField(),
             $this->page->GetSortDirection(),
             $filter,
@@ -350,7 +350,8 @@ public function ProcessDataRequest($dataRequest)
                         'text' => $terms->Text(),
                         'url' => $terms->Url(),
                         'filename' => $terms->FileName(),
-                        'applicability' => $terms->Applicability()]
+                        'applicability' => $terms->Applicability()
+                    ]
                 );
             } else {
                 $this->page->BindTerms(null);
@@ -746,7 +747,8 @@ public function SetFilterCustomAttributes($filters)
         $this->FilterCustomAttributes = serialize($filters);
     }
 
-    public static $filterKeys = ['FilterStartDateDelta' => -7,
+    public static $filterKeys = [
+        'FilterStartDateDelta' => -7,
         'FilterEndDateDelta' => +7,
         'FilterUserId' => '',
         'FilterUserName' => '',
diff --git a/Presenters/Admin/ManageResourcesPresenter.php b/Presenters/Admin/ManageResourcesPresenter.php
index 6755c67e51..ec017a5564 100644
--- a/Presenters/Admin/ManageResourcesPresenter.php
+++ b/Presenters/Admin/ManageResourcesPresenter.php
@@ -151,7 +151,7 @@ public function PageLoad()
 
         $results = $this->resourceRepository->GetList(
             $this->page->GetPageNumber(),
-            null,
+            $this->page->GetPageSize(),
             null,
             null,
             $filterValues->AsFilter($resourceAttributes)
diff --git a/Presenters/Admin/ManageSchedulesPresenter.php b/Presenters/Admin/ManageSchedulesPresenter.php
index 509c22a70f..c765625658 100644
--- a/Presenters/Admin/ManageSchedulesPresenter.php
+++ b/Presenters/Admin/ManageSchedulesPresenter.php
@@ -446,7 +446,7 @@ public function __construct(
 
     public function PageLoad()
     {
-        $results = $this->manageSchedulesService->GetList($this->page->GetPageNumber(), null);
+        $results = $this->manageSchedulesService->GetList($this->page->GetPageNumber(), $this->page->GetPageSize());
         $schedules = $results->Results();
 
         $sourceSchedules = $this->manageSchedulesService->GetSourceSchedules();
diff --git a/Presenters/Admin/ManageUsersPresenter.php b/Presenters/Admin/ManageUsersPresenter.php
index 683d1f245b..f197a8596e 100644
--- a/Presenters/Admin/ManageUsersPresenter.php
+++ b/Presenters/Admin/ManageUsersPresenter.php
@@ -191,7 +191,7 @@ public function PageLoad()
         } else {
             $userList = $this->userRepository->GetList(
                 $this->page->GetPageNumber(),
-                null,
+                $this->page->GetPageSize(),
                 $this->page->GetSortField(),
                 $this->page->GetSortDirection(),
                 null,
@@ -256,7 +256,8 @@ public function AddUser()
         $extraAttributes = [
             UserAttribute::Organization => $this->page->GetOrganization(),
             UserAttribute::Phone => $this->page->GetPhone(),
-            UserAttribute::Position => $this->page->GetPosition()];
+            UserAttribute::Position => $this->page->GetPosition()
+        ];
 
         $user = $this->manageUsersService->AddUser(
             $this->page->GetUserName(),
@@ -300,7 +301,8 @@ public function UpdateUser()
         $extraAttributes = [
             UserAttribute::Organization => $this->page->GetOrganization(),
             UserAttribute::Phone => $this->page->GetPhone(),
-            UserAttribute::Position => $this->page->GetPosition()];
+            UserAttribute::Position => $this->page->GetPosition()
+        ];
 
         $this->manageUsersService->UpdateUser(
             $this->page->GetUserId(),
diff --git a/Presenters/ViewSchedulesPresenter.php b/Presenters/ViewSchedulesPresenter.php
index f4861adde3..69a1997265 100644
--- a/Presenters/ViewSchedulesPresenter.php
+++ b/Presenters/ViewSchedulesPresenter.php
@@ -35,7 +35,7 @@ public function __construct(
 
     public function PageLoad()
     {
-        $results = $this->manageSchedulesService->GetList(null, null);
+        $results = $this->manageSchedulesService->GetList($this->page->GetPageNumber(), $this->page->GetPageSize());
         $schedules = $results->Results();
 
         $sourceSchedules = $this->manageSchedulesService->GetSourceSchedules();

From b25e853d70b64ae201ace070fcb17f47335f928b Mon Sep 17 00:00:00 2001
From: labmecanicatec <labmecanicatec@udistrital.edu.co>
Date: Mon, 24 Aug 2026 08:37:02 -0500
Subject: [PATCH 2/3] refactor:  add pagination UI components

- Restore CreatePagination and CreatePageLink methods
- Enable page navigation with prev/next buttons
- Display results range and total count
- Add data attributes for pagination handling
- Replace view all behavior with paginated browsing

Assisted-by: Claude:claude-haiku-4.5
---
 Web/scripts/ajax-helpers.js                   |   2 +-
 lib/Common/SmartyPage.php                     | 102 +++++++++++++++---
 tpl/Admin/Blackouts/manage_blackouts.tpl      |   1 +
 tpl/Admin/Groups/manage_groups.tpl            |   1 +
 tpl/Admin/Payments/transaction_log.tpl        |   3 +-
 .../Reservations/manage_reservations.tpl      |   2 +-
 tpl/Admin/Resources/manage_resources.tpl      |   1 +
 tpl/Admin/Schedules/manage_schedules.tpl      |   3 +-
 tpl/Admin/Users/credit_log.tpl                |   4 +-
 tpl/Admin/Users/manage_users.tpl              |   1 +
 tpl/Credits/credit_log.tpl                    |   3 +-
 tpl/Credits/transaction_log.tpl               |   3 +-
 12 files changed, 106 insertions(+), 20 deletions(-)

diff --git a/Web/scripts/ajax-helpers.js b/Web/scripts/ajax-helpers.js
index 716278cb1d..ff2e3c20ab 100644
--- a/Web/scripts/ajax-helpers.js
+++ b/Web/scripts/ajax-helpers.js
@@ -270,7 +270,7 @@ function HtmlDecode(encoded) {
 }
 
 function ajaxPagination(element, callback) {
-  element.find('a.page').on('click', function (e) {
+  element.find('a[data-page][data-page-size]').on('click', function (e) {
     e.preventDefault();
     var a = $(e.target);
     callback(a.data('page'), a.data('page-size'));
diff --git a/lib/Common/SmartyPage.php b/lib/Common/SmartyPage.php
index 58e6b31f84..beecdac2f8 100644
--- a/lib/Common/SmartyPage.php
+++ b/lib/Common/SmartyPage.php
@@ -241,6 +241,7 @@ protected function RegisterFunctions()
         $this->registerPlugin('modifier', 'strtolower', $this->Strtolower(...));
         $this->registerPlugin('function', 'datatable', $this->CreateDataTable(...));
         $this->registerPlugin('function', 'datatablefilter', $this->CreateDataTableFilter(...));
+        $this->registerPlugin('function', 'pagination', $this->CreatePagination(...));
         $this->registerPlugin('modifier', 'microtime', $this->Microtime(...));
         $this->registerPlugin('modifier', 'array_key_exists', $this->ArrayKeyExists(...));
         $this->registerPlugin('modifier', 'count', $this->Count(...));
@@ -657,7 +658,6 @@ public function CreateDataTable($params)
     {
         $tableId = $params['tableId'];
         $searchText = $this->Resources->GetString('Filter');
-        $AllText = $this->Resources->GetString('All');
         $NoResultsFoundText = $this->Resources->GetString('NoResultsFound');
         $copyText = $this->Resources->GetString('Copy');
         $exportText = $this->Resources->GetString('Export');
@@ -665,8 +665,6 @@ public function CreateDataTable($params)
         $showHideText = $this->Resources->GetString('ShowHide');
         $infoText = $this->Resources->GetString('Info');
         $lengthMenuText = $this->Resources->GetString('LengthMenu');
-        $defaultPageSize = $this->GetDefaultDataTablePageSize();
-        $lengthMenu = $this->BuildDataTableLengthMenu($AllText);
 
         if ($tableId == 'report-results') {
             $pagination = '"paging": false,
@@ -675,12 +673,12 @@ public function CreateDataTable($params)
                 "info": false,
                 "ordering": false,';
         } else {
-            $pagination = '"pageLength": ' . $defaultPageSize . ', "lengthMenu": ' . $lengthMenu . ',';
+            $pagination = '"paging": false, "info": false,';
         }
 
         return sprintf(
             '<script>
-           var table =  $("#' . $tableId . '").DataTable({
+           var table =  new DataTable("#' . $tableId . '", {
                 "searching": false,
                 "dom": \'<"d-flex justify-content-center flex-wrap"B><"d-flex justify-content-between flex-wrap mt-2"fil>rt<"d-flex justify-content-center"i><"d-flex justify-content-center"p><"clear">\',
                 ' . $pagination . '
@@ -715,12 +713,9 @@ public function CreateDataTable($params)
                     }
                 ],
                 "initComplete": function(settings, json) {
-                    var table = this.api();
-                    table.on("init.dt", function () {
-                        $(".dt-buttons .btn-secondary").removeClass("btn-secondary").addClass("btn-primary");
-                        $(".dt-buttons").addClass("btn-group-sm");
-                        $(".buttons-collection").addClass("btn-sm");
-                    });
+                    $(".dt-buttons .btn-secondary").removeClass("btn-secondary").addClass("btn-primary");
+                    $(".dt-buttons").addClass("btn-group-sm");
+                    $(".buttons-collection").addClass("btn-sm");
                 },
                 "drawCallback": function (settings) {
                     if (typeof setUpEditables !== "undefined") {
@@ -745,7 +740,7 @@ public function CreateDataTableFilter($params)
 
         return sprintf(
             '<script>
-           var table =  $("#' . $tableId . '").DataTable({
+           const tableFilter =  new DataTable("#' . $tableId . '", {
                 "dom": \'<"d-flex justify-content-between my-1"fl><t>t<"d-flex justify-content-center"i><"d-flex justify-content-center"p><"clear">\',
                 "pageLength": ' . $defaultPageSize . ',
                 "lengthMenu": ' . $lengthMenu . ',
@@ -768,6 +763,89 @@ public function CreateDataTableFilter($params)
         '
         );
     }
+
+    /**
+     * Create pagination links
+     * @param array $params Contains 'pageInfo' (PageInfo object)
+     * @param $smarty
+     * @return string HTML pagination markup
+     */
+    public function CreatePagination($params, $smarty)
+    {
+        /** @var PageInfo $pageInfo */
+        $pageInfo = $params['pageInfo'];
+        $hideCount = isset($params['showCount']) && $params['showCount'] == false;
+
+        if (empty($pageInfo->Total)) {
+            return '';
+        }
+
+        $sb = new StringBuilder();
+
+        $viewAllText = $this->Resources->GetString('ViewAll');
+        if (!$hideCount) {
+            $sb->Append('<div class="pagination-rows text-center mt-2">');
+            $sb->Append($this->Resources->GetString('Rows'));
+            $sb->Append(": {$pageInfo->ResultsStart} - {$pageInfo->ResultsEnd} ({$pageInfo->Total})");
+            $sb->Append('<span>&nbsp;</span>');
+            if ($pageInfo->TotalPages != 1) {
+                $sb->Append($this->CreatePageLink(['class' => 'link-primary', 'page' => 1, 'size' => -1, 'text' => $viewAllText], $smarty));
+            }
+            $sb->Append('</div>');
+        }
+        $size = $pageInfo->PageSize;
+        $currentPage = $pageInfo->CurrentPage;
+
+        $sb->Append('<ul class="pagination justify-content-center flex-wrap">');
+        $sb->Append('<li class="page-item">');
+        $sb->Append($this->CreatePageLink(
+            ['page' => max(1, $currentPage - 1), 'size' => $size, 'text' => '&laquo;', 'class' => 'page-link'],
+            $smarty
+        ));
+        $sb->Append('</li>');
+
+        for ($i = 1; $i <= $pageInfo->TotalPages; $i++) {
+            $isCurrent = ($i == $currentPage);
+            if ($isCurrent) {
+                $sb->Append('<li class="active page-item">');
+            } else {
+                $sb->Append('<li class="page-item">');
+            }
+            $sb->Append($this->CreatePageLink(['page' => $i, 'size' => $size], $smarty));
+            $sb->Append('</li>');
+        }
+        $sb->Append('<li class="page-item">');
+        $sb->Append($this->CreatePageLink(
+            ['page' => min($pageInfo->TotalPages, $currentPage + 1), 'size' => $size, 'text' => '&raquo;'],
+            $smarty
+        ));
+        $sb->Append('</li>');
+        $sb->Append('</ul>');
+
+        return $sb->ToString();
+    }
+
+    /**
+     * Create a single pagination link
+     * @param array $params Contains 'page', 'size', optional 'text'
+     * @param $smarty
+     * @return string HTML link
+     */
+    private function CreatePageLink($params, $smarty)
+    {
+        $url = ServiceLocator::GetServer()->GetUrl();
+        $page = $params['page'];
+        $pageSize = $params['size'];
+        $text = isset($params['text']) ? $params['text'] : $page;
+
+        $newUrl = $this->ReplaceQueryString($url, QueryStringKeys::PAGE, $page);
+        $newUrl = $this->ReplaceQueryString($newUrl, QueryStringKeys::PAGE_SIZE, $pageSize);
+
+        $class = isset($params['class']) ? $params['class'] : 'page-link';
+
+        return sprintf('<a class="%s" href="%s" data-page="%s" data-page-size="%s">%s</a>', $class, $newUrl, $page, $pageSize, $text);
+    }
+
     public function ReplaceQueryString($url, $key, $value)
     {
         $newUrl = $url;
diff --git a/tpl/Admin/Blackouts/manage_blackouts.tpl b/tpl/Admin/Blackouts/manage_blackouts.tpl
index c21dea5fc3..3ec519b570 100644
--- a/tpl/Admin/Blackouts/manage_blackouts.tpl
+++ b/tpl/Admin/Blackouts/manage_blackouts.tpl
@@ -215,6 +215,7 @@
 						{/foreach}
 					</tbody>
 				</table>
+				{pagination pageInfo=$PageInfo}
 			</div>
 		</div>
 	</div>
diff --git a/tpl/Admin/Groups/manage_groups.tpl b/tpl/Admin/Groups/manage_groups.tpl
index 616c7a6877..84c98b5499 100644
--- a/tpl/Admin/Groups/manage_groups.tpl
+++ b/tpl/Admin/Groups/manage_groups.tpl
@@ -132,6 +132,7 @@
                     {/foreach}
                 </tbody>
             </table>
+            {pagination pageInfo=$PageInfo}
         </div>
     </div>
 
diff --git a/tpl/Admin/Payments/transaction_log.tpl b/tpl/Admin/Payments/transaction_log.tpl
index 8b1646512c..9e49850012 100644
--- a/tpl/Admin/Payments/transaction_log.tpl
+++ b/tpl/Admin/Payments/transaction_log.tpl
@@ -39,5 +39,6 @@
             {/foreach}
         </tbody>
     </table>
+    {pagination pageInfo=$PageInfo}
 </div>
-{datatable tableId={$tableId}}
+{datatable tableId=$tableId}
diff --git a/tpl/Admin/Reservations/manage_reservations.tpl b/tpl/Admin/Reservations/manage_reservations.tpl
index 8dae281967..4ba9bd9e61 100644
--- a/tpl/Admin/Reservations/manage_reservations.tpl
+++ b/tpl/Admin/Reservations/manage_reservations.tpl
@@ -315,7 +315,7 @@
 						{/foreach}
 					</tbody>
 				</table>
-
+				{pagination pageInfo=$PageInfo}
 			</div>
 		</div>
 	</div>
diff --git a/tpl/Admin/Resources/manage_resources.tpl b/tpl/Admin/Resources/manage_resources.tpl
index c2f38560e4..bd291cb08f 100644
--- a/tpl/Admin/Resources/manage_resources.tpl
+++ b/tpl/Admin/Resources/manage_resources.tpl
@@ -626,6 +626,7 @@
 					{/foreach}
 				</tbody>
 			</table>
+			{pagination pageInfo=$PageInfo}
 		</div>
 	</div>
 
diff --git a/tpl/Admin/Schedules/manage_schedules.tpl b/tpl/Admin/Schedules/manage_schedules.tpl
index 003894ede2..c6ca03f903 100644
--- a/tpl/Admin/Schedules/manage_schedules.tpl
+++ b/tpl/Admin/Schedules/manage_schedules.tpl
@@ -299,6 +299,7 @@
 						{/foreach}
 					</tbody>
 				</table>
+				{pagination pageInfo=$PageInfo}
 			</div>
 		</div>
 	</div>
@@ -853,7 +854,7 @@
 
 	{csrf_token}
 	{include file="javascript-includes.tpl" InlineEdit=true Fullcalendar=true DataTable=true}
-	{datatablefilter tableId=$tableIdFilter}
+	{datatable tableId=$tableIdFilter}
 	{jsfile src="ajax-helpers.js"}
 	{jsfile src="date-helper.js"}
 	{jsfile src="admin/schedule.js"}
diff --git a/tpl/Admin/Users/credit_log.tpl b/tpl/Admin/Users/credit_log.tpl
index 6985293c9f..60dbd34c2e 100644
--- a/tpl/Admin/Users/credit_log.tpl
+++ b/tpl/Admin/Users/credit_log.tpl
@@ -29,7 +29,7 @@
                 {/foreach}
             </tbody>
         </table>
-
+        {pagination pageInfo=$PageInfo}
     {/if}
 
 </div>
@@ -37,4 +37,4 @@
 {include file="javascript-includes.tpl" DataTable=true}
 {datatable tableId=$tableId}
 
-{include file='globalfooter.tpl'}
\ No newline at end of file
+{include file='globalfooter.tpl'}
diff --git a/tpl/Admin/Users/manage_users.tpl b/tpl/Admin/Users/manage_users.tpl
index d1084214bf..db104c988a 100644
--- a/tpl/Admin/Users/manage_users.tpl
+++ b/tpl/Admin/Users/manage_users.tpl
@@ -248,6 +248,7 @@
                         </tr>
                     </tbody>
                 </table>
+                {pagination pageInfo=$PageInfo}
             </div>
         </div>
     </div>
diff --git a/tpl/Credits/credit_log.tpl b/tpl/Credits/credit_log.tpl
index bfa6106dcf..29e94c803d 100644
--- a/tpl/Credits/credit_log.tpl
+++ b/tpl/Credits/credit_log.tpl
@@ -20,5 +20,6 @@
             {/foreach}
         </tbody>
     </table>
+    {pagination pageInfo=$PageInfo}
 </div>
-{datatable tableId={$tableId}}
\ No newline at end of file
+{datatable tableId=$tableId}
diff --git a/tpl/Credits/transaction_log.tpl b/tpl/Credits/transaction_log.tpl
index 9cb0320f3e..1c23db268a 100644
--- a/tpl/Credits/transaction_log.tpl
+++ b/tpl/Credits/transaction_log.tpl
@@ -28,5 +28,6 @@
             {/foreach}
         </tbody>
     </table>
+    {pagination pageInfo=$PageInfo}
 </div>
-{datatable tableId={$tableId}}
\ No newline at end of file
+{datatable tableId=$tableId}

From da1d1b39a62c2e8436a65facbfe48bfb7a6a2da9 Mon Sep 17 00:00:00 2001
From: labmecanicatec <labmecanicatec@udistrital.edu.co>
Date: Thu, 1 Oct 2026 15:54:58 -0500
Subject: [PATCH 3/3] feat(export): decouple CSV export loading from DataTables
 pagination

Load the full dataset for CSV exports in the users, resources and
reservations presenters instead of relying on the paginated data
used by DataTables, so exports are no longer limited to the
current page.

Assisted-by: Claude:claude-haiku-4.5
---
 Presenters/Admin/ManageGroupsPresenter.php    |  6 ++
 .../Admin/ManageReservationsPresenter.php     | 10 +++-
 Presenters/Admin/ManageResourcesPresenter.php | 60 ++++++++++++++++++-
 Presenters/Admin/ManageUsersPresenter.php     | 35 ++++++++++-
 4 files changed, 103 insertions(+), 8 deletions(-)

diff --git a/Presenters/Admin/ManageGroupsPresenter.php b/Presenters/Admin/ManageGroupsPresenter.php
index a525b609e0..9b16ba885f 100644
--- a/Presenters/Admin/ManageGroupsPresenter.php
+++ b/Presenters/Admin/ManageGroupsPresenter.php
@@ -498,6 +498,12 @@ public function Export()
             return;
         }
 
+        $this->LoadDataForExport();
+    }
+
+    protected function LoadDataForExport()
+    {
+        // Load ALL groups (no pagination)
         /** @var GroupItemView[] $groups */
         $groups = $this->groupRepository->GetList()->Results();
         /** @var UserItemView[] $userGroups */
diff --git a/Presenters/Admin/ManageReservationsPresenter.php b/Presenters/Admin/ManageReservationsPresenter.php
index 1effca9053..9797415cee 100644
--- a/Presenters/Admin/ManageReservationsPresenter.php
+++ b/Presenters/Admin/ManageReservationsPresenter.php
@@ -208,9 +208,13 @@ public function PageLoad($userTimezone)
             $missedCheckout
         );
 
+        // Use no pagination for CSV export to get all results
+        $pageNumber = $this->page->GetFormat() == 'csv' ? null : $this->page->GetPageNumber();
+        $pageSize = $this->page->GetFormat() == 'csv' ? null : $this->page->GetPageSize();
+
         $reservations = $this->manageReservationsService->LoadFiltered(
-            $this->page->GetPageNumber(),
-            $this->page->GetPageSize(),
+            $pageNumber,
+            $pageSize,
             $this->page->GetSortField(),
             $this->page->GetSortDirection(),
             $filter,
@@ -350,7 +354,7 @@ public function ProcessDataRequest($dataRequest)
                         'text' => $terms->Text(),
                         'url' => $terms->Url(),
                         'filename' => $terms->FileName(),
-                        'applicability' => $terms->Applicability()
+                        'applicability' => $terms->Applicability(),
                     ]
                 );
             } else {
diff --git a/Presenters/Admin/ManageResourcesPresenter.php b/Presenters/Admin/ManageResourcesPresenter.php
index ec017a5564..9d4e8c0093 100644
--- a/Presenters/Admin/ManageResourcesPresenter.php
+++ b/Presenters/Admin/ManageResourcesPresenter.php
@@ -1091,10 +1091,67 @@ public function ImportResource()
 
     public function ExportResources()
     {
-        $this->PageLoad();
+        $this->LoadDataForExport();
         $this->page->ShowExportCsv();
     }
 
+    protected function LoadDataForExport()
+    {
+        $resourceAttributes = $this->attributeService->GetByCategory(CustomAttributeCategory::RESOURCE);
+
+        $filterValues = $this->page->GetFilterValues();
+
+        // Load ALL resources matching the filters (no pagination)
+        $results = $this->resourceRepository->GetList(
+            null,  // No pagination
+            null,  // No pagination
+            null,
+            null,
+            $filterValues->AsFilter($resourceAttributes)
+        );
+        $resources = $results->Results();
+        $this->page->BindResources($resources);
+        // Note: We skip BindPageInfo() as pagination info is not needed for CSV export
+
+        // Load all auxiliary data (same as PageLoad)
+        $schedules = $this->scheduleRepository->GetAll();
+        $scheduleList = [];
+
+        /* @var Schedule $schedule */
+        foreach ($schedules as $schedule) {
+            $scheduleList[$schedule->GetId()] = $schedule->GetName();
+        }
+        $this->page->BindSchedules($scheduleList);
+        $this->page->AllSchedules($schedules);
+
+        $resourceTypes = $this->resourceRepository->GetResourceTypes();
+        $resourceTypeList = [];
+
+        /* @var ResourceType $resourceType */
+        foreach ($resourceTypes as $resourceType) {
+            $resourceTypeList[$resourceType->Id()] = $resourceType;
+        }
+        $this->page->BindResourceTypes($resourceTypeList);
+
+        $statusReasons = $this->resourceRepository->GetStatusReasons();
+        $statusReasonList = [];
+
+        foreach ($statusReasons as $reason) {
+            $statusReasonList[$reason->Id()] = $reason;
+        }
+        $this->page->BindResourceStatusReasons($statusReasonList);
+
+        $groups = $this->groupRepository->GetGroupsByRole(RoleLevel::RESOURCE_ADMIN);
+        $this->page->BindAdminGroups($groups);
+
+        $attributeList = $this->attributeService->GetByCategory(CustomAttributeCategory::RESOURCE);
+        $this->page->BindAttributeList($attributeList);
+
+        $this->InitializeFilter($filterValues, $resourceAttributes);
+
+        $this->page->BindResourceGroups($this->resourceRepository->GetResourceGroups(null, new ResourceFilterNone()));
+    }
+
     protected function LoadValidators($action)
     {
         if ($action == ManageResourcesActions::ActionChangeAttribute) {
@@ -1232,7 +1289,6 @@ private function GetResourceImageDirectory($fileName)
             }
         }
         return $path = "$path/$fileName";
-        ;
     }
 }
 
diff --git a/Presenters/Admin/ManageUsersPresenter.php b/Presenters/Admin/ManageUsersPresenter.php
index f197a8596e..3fa5babc13 100644
--- a/Presenters/Admin/ManageUsersPresenter.php
+++ b/Presenters/Admin/ManageUsersPresenter.php
@@ -256,7 +256,7 @@ public function AddUser()
         $extraAttributes = [
             UserAttribute::Organization => $this->page->GetOrganization(),
             UserAttribute::Phone => $this->page->GetPhone(),
-            UserAttribute::Position => $this->page->GetPosition()
+            UserAttribute::Position => $this->page->GetPosition(),
         ];
 
         $user = $this->manageUsersService->AddUser(
@@ -301,7 +301,7 @@ public function UpdateUser()
         $extraAttributes = [
             UserAttribute::Organization => $this->page->GetOrganization(),
             UserAttribute::Phone => $this->page->GetPhone(),
-            UserAttribute::Position => $this->page->GetPosition()
+            UserAttribute::Position => $this->page->GetPosition(),
         ];
 
         $this->manageUsersService->UpdateUser(
@@ -380,10 +380,39 @@ public function ExportUsers()
             return;
         }
 
-        $this->PageLoad();
+        $this->LoadDataForExport();
         $this->page->ShowExportCsv();
     }
 
+    protected function LoadDataForExport()
+    {
+        // Load ALL users matching filters (no pagination)
+        $userList = $this->userRepository->GetList(
+            null,  // No pagination
+            null,  // No pagination
+            $this->page->GetSortField(),
+            $this->page->GetSortDirection(),
+            $this->page->GetUserId() != null ? new SqlFilterEquals(ColumnNames::USER_ID, $this->page->GetUserId()) : null,
+            $this->page->GetUserId() != null ? AccountStatus::ALL : $this->page->GetFilterStatusId()
+        );
+
+        $this->page->BindUsers($userList->Results());
+        // Note: We skip BindPageInfo() as pagination info is not needed for CSV export
+
+        $groups = $this->groupViewRepository->GetList();
+        $this->page->BindGroups($groups->Results());
+
+        $user = $this->userRepository->LoadById(ServiceLocator::GetServer()->GetUserSession()->UserId);
+
+        $resources = $this->GetResourcesThatCurrentUserCanAdminister($user);
+        $this->page->BindResources($resources);
+
+        $attributeList = $this->attributeService->GetByCategory(CustomAttributeCategory::USER);
+        $this->page->BindAttributeList($attributeList);
+
+        $this->page->BindStatusDescriptions();
+    }
+
     public function ProcessDataRequest($dataRequest)
     {
         if ($dataRequest == 'permissions') {