fix: change offset to page

change offset name to page for paginated Reviewed-by: andriacap [Refs ticket]: #4
naturalsolutions · Jan 19, 2023 · 97ae9bb · 97ae9bb
1 parent ca3319e
commit 97ae9bb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/frontend/app/components/monitoring-datatable-g/monitoring-datatable-g.component.html b/frontend/app/components/monitoring-datatable-g/monitoring-datatable-g.component.html
@@ -33,7 +33,7 @@
         [rowHeight]="40"
         [externalPaging]="true"
         [count]="page.count"
-        [offset]="page.offset"
+        [offset]="page.page"
         [limit]="page.limit"
         [rows]="rows"
         [columns]="columns"

diff --git a/frontend/app/components/monitoring-sitesgroups/monitoring-sitesgroups.component.ts b/frontend/app/components/monitoring-sitesgroups/monitoring-sitesgroups.component.ts
@@ -41,7 +41,7 @@ interface SitesGroupsExtended extends Omit<GeoJSON.Feature, "P"|"type"> {
 interface Page {
   count: number;
   limit: number;
-  offset: number;
+  page: number;
 }
 
 interface PaginatedSitesGroup extends Page{
@@ -69,7 +69,7 @@ interface CustomGeoJson {
 })
 export class MonitoringSitesGroupsComponent implements OnInit {
   @ViewChild(DatatableComponent) table: DatatableComponent;
-  @Input() page: Page = {count: 0, limit: 0, offset: 0}; 
+  @Input() page: Page = {count: 0, limit: 0, page: 0}; 
   @Input() dataTable;
   @Input() sitesGroups:CustomGeoJson;
   @Input() columnNameSiteGroup: typeof columnNameSiteGroup = columnNameSiteGroup;
@@ -82,11 +82,11 @@ export class MonitoringSitesGroupsComponent implements OnInit {
     this.getSites()
   }
 
-  getSites(offset=1, params={}) {
+  getSites(page=1, params={}) {
     this._sites_service
-      .getSitesGroups(offset, LIMIT, params)
+      .getSitesGroups(page, LIMIT, params)
       .subscribe((data: PaginatedSitesGroup) => {
-        this.page = {count: data.count, limit: data.limit, offset: data.offset - 1}
+        this.page = {count: data.count, limit: data.limit, page: data.page - 1}
         this.sitesGroups = this._sites_service.setFormatToGeoJson(data)
         this.dataTable = this._sites_service.getDataTable(this.sitesGroups);
       });
@@ -95,7 +95,7 @@ export class MonitoringSitesGroupsComponent implements OnInit {
 
   setPage($event) {
     console.log('setPage Sitesgroups Components')
-    this.getSites($event.offset + 1, this.filters)
+    this.getSites($event.page + 1, this.filters)
   }
 
   onSortEvent(filters) {

diff --git a/frontend/app/services/data-table.service.ts b/frontend/app/services/data-table.service.ts
@@ -5,7 +5,7 @@ import { Observable} from "rxjs";
 interface Page {
   count: number;
   limit: number;
-  offset: number;
+  page: number;
 }
 
 interface ColName {
@@ -31,13 +31,13 @@ objectsStatus:ItemsObjectTable;
 rowStatus:ItemObjectTable;
 idObj:number;
 
-public page: Page = {count: 0, limit: 0, offset: 0}; 
+public page: Page = {count: 0, limit: 0, page: 0}; 
   constructor(
   ) {}
 
 
-  setPaginationConfig(count:number=0,limit:number=0, offset:number=0):Page{
-    return {"count":count,"limit":limit,"offset":offset}
+  setPaginationConfig(count:number=0,limit:number=0, page:number=0):Page{
+    return {"count":count,"limit":limit,"page":page}
   }
 //   setPage(e){
 //     this.obj

diff --git a/frontend/app/services/sites.service.ts b/frontend/app/services/sites.service.ts
@@ -26,7 +26,7 @@ interface SitesGroupsExtended extends Omit<GeoJSON.Feature, "P"|"type"> {
 interface Page {
   count: number;
   limit: number;
-  offset: number;
+  page: number;
 }
 
 interface PaginatedSitesGroup extends Page{
@@ -43,8 +43,8 @@ export class SitesService {
     private _cacheService: CacheService
   ) {}
 
-  getSitesGroups(offset=1, limit=10, params={}) {
-    return this._cacheService.request("get", `sites_groups`, {queryParams: {offset, limit, ...params}});
+  getSitesGroups(page=1, limit=10, params={}) {
+    return this._cacheService.request("get", `sites_groups`, {queryParams: {page, limit, ...params}});
   }
 
   setFormatToGeoJson(data:PaginatedSitesGroup):CustomGeoJson{