Merge pull request #189 from Gid733/master

Minor enhancement

Author: renemadsen

eFormAPI/eFormAPI/Controllers/CasesController.cs

@@ -23,14 +23,14 @@ public OperationDataResult<CaseListModel> Index(CaseRequestModel requestModel)
             try
             {
                 var core = _coreHelper.GetCore();
-                var caseList = core.CaseReadAll(requestModel.TemplateId, null, null,
+                CaseList caseList = core.CaseReadAll(requestModel.TemplateId, null, null,
                     Constants.WorkflowStates.NotRemoved, requestModel.NameFilter,
-                    requestModel.IsSortDsc, requestModel.Sort);
+                    requestModel.IsSortDsc, requestModel.Sort, requestModel.PageIndex, requestModel.PageSize);
                 var model = new CaseListModel()
                 {
-                    NumOfElements = 40,
+                    NumOfElements = caseList.NumOfElements,
                     PageNum = requestModel.PageIndex,
-                    Cases = caseList
+                    Cases = caseList.Cases
                 };
 
                 return new OperationDataResult<CaseListModel>(true, model);

eFormAPI/eFormAPI/eFormAPI.Web.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -133,8 +133,8 @@
     <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
     </Reference>
-    <Reference Include="Microting.eForm, Version=3.0.94.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.3.0.94\lib\net45\Microting.eForm.dll</HintPath>
+    <Reference Include="Microting.eForm, Version=3.0.101.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.3.0.101\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
     <Reference Include="Microting.eFormApi.BasePn, Version=1.1.50.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Microting.eFormApi.BasePn.1.1.50\lib\net461\Microting.eFormApi.BasePn.dll</HintPath>

eFormAPI/eFormAPI/packages.config

@@ -38,7 +38,7 @@
   <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
-  <package id="Microting.eForm" version="3.0.94" targetFramework="net461" />
+  <package id="Microting.eForm" version="3.0.101" targetFramework="net461" />
   <package id="Microting.eFormApi.BasePn" version="1.1.50" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net46" />
   <package id="MySql.Data" version="6.9.12" targetFramework="net461" />

eform-client/src/app/modules/cases/components/cases-table/cases-table.component.html

@@ -179,6 +179,22 @@
       </tbody>
     </table>
   </div>
+  <div class="row justify-content-between mr-2 ml-2">
+    <div class="col-md-1">
+      <eform-page-size
+        [pageSize]="localPageSettings.pageSize"
+        (onPageSizeChanged)="localPageSettings.pageSize = $event; casesRequestModel.pageIndex = 1;
+        updateLocalPageSettings()">
+      </eform-page-size>
+    </div>
+    <div class="col-md-4 ml-auto d-flex justify-content-end p-2">
+      <eform-pagination *ngIf="caseListModel.numOfElements > casesRequestModel.pageSize"
+                        [limit]="casesRequestModel.pageSize"
+                        [size]="caseListModel.numOfElements"
+                        [offset]="casesRequestModel.offset"
+                        (onPageChanged)="changePage($event)"></eform-pagination>
+    </div>
+  </div>
 </div>
 
 <eform-spinner [spinnerVisibility]="spinnerStatus"></eform-spinner>

eform-client/src/app/modules/cases/components/cases-table/cases-table.component.ts

@@ -72,6 +72,7 @@ export class CasesTableComponent implements OnInit {
     this.casesRequestModel.templateId = this.id;
     this.casesRequestModel.isSortDsc = this.localPageSettings.isSortDsc;
     this.casesRequestModel.sort = this.localPageSettings.sort;
+    this.casesRequestModel.pageSize= this.localPageSettings.pageSize;
     this.casesService.getCases(this.casesRequestModel).subscribe(operation => {
       if (operation && operation.success) {
         this.caseListModel = operation.model;