|
@@ -2528,9 +2528,19 @@ WHERE
|
|
|
$total = $countResult[0]->count;
|
|
|
|
|
|
$orderBy = "care_month.start_date DESC, care_month.number_of_days_with_remote_measurements DESC NULLS LAST, care_month.rm_total_time_in_seconds_by_mcp DESC NULLS LAST, care_month.rm_total_time_in_seconds_by_rmm_pro DESC NULLS LAST";
|
|
|
- $defaultPageSize = 25;
|
|
|
+ if($request->session()->get('rpmManagerPageSize')) {
|
|
|
+ $defaultPageSize = intval($request->session()->get('rpmManagerPageSize'));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ $defaultPageSize = 25;
|
|
|
+ }
|
|
|
$page = $request->input('page') ?: 1;
|
|
|
- $perPage = $request->input('per_page') ?: $defaultPageSize;
|
|
|
+ $perPage = $defaultPageSize;
|
|
|
+ if($request->input('per_page')) { // user input takes precedence
|
|
|
+ $perPage = intval($request->input('per_page'));
|
|
|
+ $request->session()->put('rpmManagerPageSize', $perPage);
|
|
|
+ }
|
|
|
+
|
|
|
$offset = ($page - 1) * $perPage;
|
|
|
|
|
|
// main query
|