From b12907f7c452b5680574c565b3d103d1150c1367 Mon Sep 17 00:00:00 2001
From: gagan.deep <gagan.deep@ebix.com>
Date: Fri, 11 May 2018 13:14:11 +0530
Subject: [PATCH] Pager Done

---
 400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs                           |  33 +++++++++++++++++++--------------
 400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs                             |  48 ++++++++++++++++++++++++++++++++++++++++--------
 400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx                                   |  24 ++++++++++++++++++++++++
 400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts |   4 ++--
 400-SOURCECODE/Admin/src/app/components/LicenseEntity/license.service.ts                    |  44 ++++++++++++++++++++++----------------------
 400-SOURCECODE/Admin/src/app/components/LicenseEntity/licensemodestysettings.component.ts   |   4 ++--
 400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.service.ts    |   2 +-
 400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.html           |   3 ++-
 400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts             |  66 +++++++++++++++++++++++++++++++++++++++++++++---------------------
 400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.html            |   5 +++--
 400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts              |  71 +++++++++++++++++++++++++++++++++++++++++++++++------------------------
 400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html      |   4 ++--
 400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts        | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
 400-SOURCECODE/Admin/src/app/components/Reports/report.service.ts                           | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------
 400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.html       |   3 ++-
 400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts         | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------
 400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.service.ts      |   8 ++++----
 400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts                     |   2 +-
 500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql                   | Bin 6246 -> 0 bytes
 500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql             | Bin 3670 -> 0 bytes
 500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql               | Bin 14758 -> 0 bytes
 500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql           | Bin 4460 -> 0 bytes
 500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql                          |  16 ++++++++++++++++
 23 files changed, 456 insertions(+), 280 deletions(-)
 create mode 100644 500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql

diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs
index 600ef6a..3bbd90e 100644
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs
@@ -71,12 +71,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
 
         [Route("GetNetAdSummaryReport")]
         [HttpGet]
-        public IHttpActionResult GetNetAdSummaryReport(string sFromDate, string sToDate, decimal iStartPrice, decimal iEndPrice, int iLicenseTypeId)
+        public IHttpActionResult GetNetAdSummaryReport(string sFromDate, string sToDate, decimal iStartPrice, decimal iEndPrice, int iLicenseTypeId, int pageNo, int pageLength)
         {
             try
             {
-                var lstNetAdSummaryReport = dbContext.GetNetAdSummaryReport(sFromDate, sToDate, iStartPrice, iEndPrice, (byte)iLicenseTypeId).ToList();
-                return Ok(lstNetAdSummaryReport);
+                var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
+                var lstNetAdSummaryReport = dbContext.GetNetAdSummaryReport(sFromDate, sToDate, iStartPrice, iEndPrice, (byte)iLicenseTypeId, pageNo, pageLength, spRecordCount).ToList();
+                return Ok(new { NetAdSubscriptionList = lstNetAdSummaryReport, RecordCount = spRecordCount.Value });
             }
             catch (Exception ex)
             {
@@ -84,14 +85,16 @@ namespace AIAHTML5.ADMIN.API.Controllers
             }
         }
 
+
         [Route("GetSiteLicenseUsageReport")]
         [HttpGet]
-        public IHttpActionResult GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccountNumber, int iEdition)
+        public IHttpActionResult GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccountNumber, int iEdition, int pageNo, int pageLength)
         {
             try
             {
-                var lstSiteLicenseUsageReport = dbContext.GetSiteLicenseUsageReport(sFromDate, sToDate, sAccountNumber, (byte)iEdition).ToList();
-                return Ok(lstSiteLicenseUsageReport);
+                var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
+                var lstSiteLicenseUsageReport = dbContext.GetSiteLicenseUsageReport(sFromDate, sToDate, sAccountNumber, (byte)iEdition, pageNo, pageLength, spRecordCount).ToList();
+                return Ok(new { SiteLicenseUsageList = lstSiteLicenseUsageReport, RecordCount = spRecordCount.Value });
             }
             catch (Exception ex)
             {
@@ -101,12 +104,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
 
         [Route("GetDiscountReport")]
         [HttpGet]
-        public IHttpActionResult GetDiscountReport(string sFromDate, string sToDate, int iDiscountCode, string sAccountNumber)
+        public IHttpActionResult GetDiscountReport(string sFromDate, string sToDate, int iDiscountCode, string sAccountNumber, int pageNo, int pageLength)
         {
             try
             {
-                var lstDiscountReport = dbContext.GetDiscountReport(sFromDate, sToDate, iDiscountCode, sAccountNumber).ToList();
-                return Ok(lstDiscountReport);
+                var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
+                var lstDiscountReport = dbContext.GetDiscountReport(sFromDate, sToDate, iDiscountCode, sAccountNumber, pageNo, pageLength, spRecordCount).ToList();
+                return Ok(new { DiscountReportList = lstDiscountReport, RecordCount = spRecordCount.Value });
             }
             catch (Exception ex)
             {
@@ -114,16 +118,17 @@ namespace AIAHTML5.ADMIN.API.Controllers
             }
         }
 
+
         [Route("GetImageExportReport")]
         [HttpGet]
-        public IHttpActionResult GetImageExportReport(string sFromDate, string sToDate, string sAccountNumber)
+        public IHttpActionResult GetImageExportReport(string sFromDate, string sToDate, string sAccountNumber, int pageNo, int pageLength)
         {
             try
             {
-                if (sAccountNumber == null)
-                    sAccountNumber = string.Empty;
-                var lstImageExportReport = dbContext.GetExportedImageDetails(sFromDate, sToDate, sAccountNumber).ToList();
-                return Ok(lstImageExportReport);
+                if (sAccountNumber == null) sAccountNumber = string.Empty;
+                var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
+                var lstImageExportReport = dbContext.GetExportedImageDetails(sFromDate, sToDate, sAccountNumber, pageNo, pageLength, spRecordCount).ToList();
+                return Ok(new { ImageExportList = lstImageExportReport, RecordCount = spRecordCount.Value });
             }
             catch (Exception ex)
             {
diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
index 406ecce..9c8d42d 100644
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
@@ -1113,7 +1113,7 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetDiscountedPrice_Result>("GetDiscountedPrice", inDiscountCodeParameter, outReturnCode, outDiscountPercentage, outDiscountCodeId);
         }
     
-        public virtual ObjectResult<GetDiscountReport_Result> GetDiscountReport(string sStartDate, string sEndDate, Nullable<int> intDiscountID, string sAccoutNumber)
+        public virtual ObjectResult<GetDiscountReport_Result> GetDiscountReport(string sStartDate, string sEndDate, Nullable<int> intDiscountID, string sAccoutNumber, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
         {
             var sStartDateParameter = sStartDate != null ?
                 new ObjectParameter("sStartDate", sStartDate) :
@@ -1131,7 +1131,15 @@ namespace AIAHTML5.ADMIN.API.Entity
                 new ObjectParameter("sAccoutNumber", sAccoutNumber) :
                 new ObjectParameter("sAccoutNumber", typeof(string));
     
-            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetDiscountReport_Result>("GetDiscountReport", sStartDateParameter, sEndDateParameter, intDiscountIDParameter, sAccoutNumberParameter);
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetDiscountReport_Result>("GetDiscountReport", sStartDateParameter, sEndDateParameter, intDiscountIDParameter, sAccoutNumberParameter, pageNoParameter, pageLengthParameter, recordCount);
         }
     
         public virtual ObjectResult<getEditionData_Result> getEditionData()
@@ -1214,7 +1222,7 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetExpiringLicenses_Result>("GetExpiringLicenses", sFromDateParameter, sToDateParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeIdParameter, iAccountTypeIdParameter, sZipParameter, iStateIdParameter, iCountryIdParameter, pageNoParameter, pageLengthParameter, recordCount);
         }
     
-        public virtual ObjectResult<GetExportedImageDetails_Result> GetExportedImageDetails(string sStartDate, string sEndDate, string sAccoutNumber)
+        public virtual ObjectResult<GetExportedImageDetails_Result> GetExportedImageDetails(string sStartDate, string sEndDate, string sAccoutNumber, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
         {
             var sStartDateParameter = sStartDate != null ?
                 new ObjectParameter("sStartDate", sStartDate) :
@@ -1228,7 +1236,15 @@ namespace AIAHTML5.ADMIN.API.Entity
                 new ObjectParameter("sAccoutNumber", sAccoutNumber) :
                 new ObjectParameter("sAccoutNumber", typeof(string));
     
-            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetExportedImageDetails_Result>("GetExportedImageDetails", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter);
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetExportedImageDetails_Result>("GetExportedImageDetails", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, pageNoParameter, pageLengthParameter, recordCount);
         }
     
         public virtual int GetImagePinData()
@@ -1441,7 +1457,7 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetNetAdDetailReport_Result>("GetNetAdDetailReport", sFromDateParameter, sToDateParameter, sLicenseTypeParameter, sAccountTypeParameter, iStartPriceParameter, iEndPriceParameter);
         }
     
-        public virtual ObjectResult<GetNetAdSummaryReport_Result> GetNetAdSummaryReport(string sFromDate, string sToDate, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, Nullable<byte> iLicenseTypeId)
+        public virtual ObjectResult<GetNetAdSummaryReport_Result> GetNetAdSummaryReport(string sFromDate, string sToDate, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, Nullable<byte> iLicenseTypeId, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
         {
             var sFromDateParameter = sFromDate != null ?
                 new ObjectParameter("sFromDate", sFromDate) :
@@ -1463,7 +1479,15 @@ namespace AIAHTML5.ADMIN.API.Entity
                 new ObjectParameter("iLicenseTypeId", iLicenseTypeId) :
                 new ObjectParameter("iLicenseTypeId", typeof(byte));
     
-            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetNetAdSummaryReport_Result>("GetNetAdSummaryReport", sFromDateParameter, sToDateParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeIdParameter);
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetNetAdSummaryReport_Result>("GetNetAdSummaryReport", sFromDateParameter, sToDateParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeIdParameter, pageNoParameter, pageLengthParameter, recordCount);
         }
     
         public virtual ObjectResult<GetProductFeatures_Result> GetProductFeatures(Nullable<int> editionId)
@@ -1557,7 +1581,7 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSiteIpByAccountNumber_Result>("GetSiteIpByAccountNumber", accountNumnerParameter);
         }
     
-        public virtual ObjectResult<GetSiteLicenseUsageReport_Result> GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccoutNumber, Nullable<byte> iEditionId)
+        public virtual ObjectResult<GetSiteLicenseUsageReport_Result> GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccoutNumber, Nullable<byte> iEditionId, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
         {
             var sFromDateParameter = sFromDate != null ?
                 new ObjectParameter("sFromDate", sFromDate) :
@@ -1575,7 +1599,15 @@ namespace AIAHTML5.ADMIN.API.Entity
                 new ObjectParameter("iEditionId", iEditionId) :
                 new ObjectParameter("iEditionId", typeof(byte));
     
-            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSiteLicenseUsageReport_Result>("GetSiteLicenseUsageReport", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, iEditionIdParameter);
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSiteLicenseUsageReport_Result>("GetSiteLicenseUsageReport", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, iEditionIdParameter, pageNoParameter, pageLengthParameter, recordCount);
         }
     
         public virtual ObjectResult<GetSubscribedLicenses_Result> GetSubscribedLicenses(string sFromDate, string sToDate, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, Nullable<byte> iLicenseTypeId, Nullable<byte> iAccountTypeId, string sZip, Nullable<int> iStateId, Nullable<int> iCountryId, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx b/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
index 5db5b5e..73902a4 100644
--- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
+++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
@@ -2122,6 +2122,9 @@ warning 6002: The table/view 'AIADatabaseV5.dbo.VocabTermNumberToSystemMap' does
           <Parameter Name="sEndDate" Type="varchar" Mode="In" />
           <Parameter Name="intDiscountID" Type="int" Mode="In" />
           <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
+          <Parameter Name="pageNo" Type="int" Mode="In" />
+          <Parameter Name="pageLength" Type="int" Mode="In" />
+          <Parameter Name="recordCount" Type="int" Mode="InOut" />
         </Function>
         <Function Name="getEditionData" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo" />
         <Function Name="GetEditionsBySiteAccount" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
@@ -2150,6 +2153,9 @@ warning 6002: The table/view 'AIADatabaseV5.dbo.VocabTermNumberToSystemMap' does
           <Parameter Name="sStartDate" Type="varchar" Mode="In" />
           <Parameter Name="sEndDate" Type="varchar" Mode="In" />
           <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
+          <Parameter Name="pageNo" Type="int" Mode="In" />
+          <Parameter Name="pageLength" Type="int" Mode="In" />
+          <Parameter Name="recordCount" Type="int" Mode="InOut" />
         </Function>
         <Function Name="GetImagePinData" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo" />
         <Function Name="GetIncorrectLoginAttempt" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
@@ -2219,6 +2225,9 @@ warning 6002: The table/view 'AIADatabaseV5.dbo.VocabTermNumberToSystemMap' does
           <Parameter Name="iStartPrice" Type="numeric" Mode="In" />
           <Parameter Name="iEndPrice" Type="numeric" Mode="In" />
           <Parameter Name="iLicenseTypeId" Type="tinyint" Mode="In" />
+          <Parameter Name="pageNo" Type="int" Mode="In" />
+          <Parameter Name="pageLength" Type="int" Mode="In" />
+          <Parameter Name="recordCount" Type="int" Mode="InOut" />
         </Function>
         <Function Name="GetProductFeatures" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
           <Parameter Name="EditionId" Type="int" Mode="In" />
@@ -2267,6 +2276,9 @@ warning 6002: The table/view 'AIADatabaseV5.dbo.VocabTermNumberToSystemMap' does
           <Parameter Name="sToDate" Type="varchar" Mode="In" />
           <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
           <Parameter Name="iEditionId" Type="tinyint" Mode="In" />
+          <Parameter Name="pageNo" Type="int" Mode="In" />
+          <Parameter Name="pageLength" Type="int" Mode="In" />
+          <Parameter Name="recordCount" Type="int" Mode="InOut" />
         </Function>
         <Function Name="GetSubscribedLicenses" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
           <Parameter Name="sFromDate" Type="varchar" Mode="In" />
@@ -5809,6 +5821,9 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]</Definin
             <Parameter Name="sEndDate" Mode="In" Type="String" />
             <Parameter Name="intDiscountID" Mode="In" Type="Int32" />
             <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
           </FunctionImport>
           <FunctionImport Name="getEditionData" ReturnType="Collection(AIADatabaseV5Model.getEditionData_Result)" />
           <FunctionImport Name="GetEditionsBySiteAccount" ReturnType="Collection(AIADatabaseV5Model.GetEditionsBySiteAccount_Result)">
@@ -5837,6 +5852,9 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]</Definin
             <Parameter Name="sStartDate" Mode="In" Type="String" />
             <Parameter Name="sEndDate" Mode="In" Type="String" />
             <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
           </FunctionImport>
           <FunctionImport Name="GetImagePinData" />
           <FunctionImport Name="GetIncorrectLoginAttempt" ReturnType="Collection(Int16)">
@@ -5909,6 +5927,9 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]</Definin
             <Parameter Name="iStartPrice" Mode="In" Type="Decimal" />
             <Parameter Name="iEndPrice" Mode="In" Type="Decimal" />
             <Parameter Name="iLicenseTypeId" Mode="In" Type="Byte" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
           </FunctionImport>
           <FunctionImport Name="GetProductFeatures" ReturnType="Collection(AIADatabaseV5Model.GetProductFeatures_Result)">
           <Parameter Name="EditionId" Mode="In" Type="Int32" />
@@ -5945,6 +5966,9 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]</Definin
             <Parameter Name="sToDate" Mode="In" Type="String" />
             <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
             <Parameter Name="iEditionId" Mode="In" Type="Byte" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
           </FunctionImport>
           <FunctionImport Name="GetSubscribedLicenses" ReturnType="Collection(AIADatabaseV5Model.GetSubscribedLicenses_Result)">
             <Parameter Name="sFromDate" Mode="In" Type="String" />
diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts
index d6eeb78..0243fe8 100644
--- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/editlicensebasicsettings.component.ts
@@ -142,10 +142,10 @@ export class EditLicenseBasicSettings implements OnInit {
 
     AfterUpdateData(data, template) {
         if (data.Status == "false") {
-            this.alerts = "<span>License update unsuccessfull.</span>";
+          this.alerts = "<span>License profile update unsuccessfull.</span>";
         } else {
           //this.modalAlerts = "<p>License updated successfully</p>";
-          this._confirmService.activate("License updated successfully.", "alertMsg");
+          this._confirmService.activate("License profile updated successfully.", "alertMsg");
           //  this.modalRef = this.modalService.show(template);
         }
     }
diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/license.service.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/license.service.ts
index 9eb3b3e..020c9fb 100644
--- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/license.service.ts
+++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/license.service.ts
@@ -25,7 +25,7 @@ export class LicenseService{
         }
         obj.subscriptionStartDate = this.datePipe.transform(obj.subscriptionStartDate, 'MM/dd/yyyy');
         obj.subscriptionEndDate = this.datePipe.transform(obj.subscriptionEndDate, 'MM/dd/yyyy');
-        return this.http.get(this.commonService.resourceBaseUrl + "/License/Licenses?accountNumber=" + obj.accountNumber +
+        return this.http.get(this.commonService.resourceBaseUrl + "License/Licenses?accountNumber=" + obj.accountNumber +
         "&licenseeFirstName=" + obj.licenseeFirstName + "&licenseeLastName=" + obj.licenseeLastName +
         "&licenseTypeId=" + obj.licenseTypeId + "&institutionName=" + obj.institutionName +
         "&stateId=" + obj.stateId + "&countryId=" + obj.countryId + "&emailId=" + obj.emailId + 
@@ -36,81 +36,81 @@ export class LicenseService{
     }
 
     GetLicenseById(Id: number){
-        return this.http.get(this.commonService.resourceBaseUrl + "/License/GetLicense?LicenseId=" + Id)
+        return this.http.get(this.commonService.resourceBaseUrl + "License/GetLicense?LicenseId=" + Id)
         .map(this.extractData)
         .catch((res: Response) => this.handleError(res));
     }
 
     GetLicenceType()
     {        
-        return this.http.get(this.commonService.resourceBaseUrl + "/License/LicenseTypes")
+        return this.http.get(this.commonService.resourceBaseUrl + "License/LicenseTypes")
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetAccountType()
     {        
-        return this.http.get(this.commonService.resourceBaseUrl + "/Account/AccountTypes")
+        return this.http.get(this.commonService.resourceBaseUrl + "Account/AccountTypes")
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetCountry() {
-        return this.http.get(this.commonService.resourceBaseUrl + "/Common/Countries")
+        return this.http.get(this.commonService.resourceBaseUrl + "Common/Countries")
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetState() {
-        return this.http.get(this.commonService.resourceBaseUrl + "/Common/States")
+        return this.http.get(this.commonService.resourceBaseUrl + "Common/States")
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetSecurityQuestions() {
-        return this.http.get(this.commonService.resourceBaseUrl + "/Common/SecurityQuestions")
+        return this.http.get(this.commonService.resourceBaseUrl + "Common/SecurityQuestions")
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetEditions() {
-        return this.http.get(this.commonService.resourceBaseUrl + "/Edition/Editions")
+        return this.http.get(this.commonService.resourceBaseUrl + "Edition/Editions")
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetLicenseAccounts(licenseType: Number) {
-        return this.http.get(this.commonService.resourceBaseUrl + "/License/LicenseAccounts?LicenseType=" + licenseType)
+        return this.http.get(this.commonService.resourceBaseUrl + "License/LicenseAccounts?LicenseType=" + licenseType)
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetSiteById(siteId: number) {
-        return this.http.get(this.commonService.resourceBaseUrl + "/Site/SiteDetail?SiteId=" + siteId)
+        return this.http.get(this.commonService.resourceBaseUrl + "Site/SiteDetail?SiteId=" + siteId)
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetSiteAccountEditions(siteId: number, licenseId: number) {
-        return this.http.get(this.commonService.resourceBaseUrl + "/Site/SiteAccountEditions?SiteId=" + siteId + "&LicenseId=" + licenseId)
+        return this.http.get(this.commonService.resourceBaseUrl + "Site/SiteAccountEditions?SiteId=" + siteId + "&LicenseId=" + licenseId)
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetLicenseSites(accountNo: string, pageNo: number, pageLength: number) {
-        return this.http.get(this.commonService.resourceBaseUrl + "/License/LicenseSites?AccountNo=" + accountNo + "&pageNo=" + pageNo + "&pageLength=" + pageLength)
+        return this.http.get(this.commonService.resourceBaseUrl + "License/LicenseSites?AccountNo=" + accountNo + "&pageNo=" + pageNo + "&pageLength=" + pageLength)
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetLicenseModestySettings(licenseId: number, buildingLevelId: number) {
-        return this.http.get(this.commonService.resourceBaseUrl + "/License/LicenseModestySettings?LicenseId=" + licenseId + "&BuildingLevelId=" + buildingLevelId)
+        return this.http.get(this.commonService.resourceBaseUrl + "License/LicenseModestySettings?LicenseId=" + licenseId + "&BuildingLevelId=" + buildingLevelId)
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
 
     GetLicenseModulesStatus(licenseId: number) {
-        return this.http.get(this.commonService.resourceBaseUrl + "/License/LicenseModulesStatus?LicenseId=" + licenseId)
+        return this.http.get(this.commonService.resourceBaseUrl + "License/LicenseModulesStatus?LicenseId=" + licenseId)
             .map(this.extractData)
             .catch((res: Response) => this.handleError(res));
     }
@@ -154,7 +154,7 @@ export class LicenseService{
         var headers = new Headers({
           'Content-Type': 'application/json'
         });
-        return this.http.post(this.commonService.resourceBaseUrl + "/License/InsertLicense",  
+        return this.http.post(this.commonService.resourceBaseUrl + "License/InsertLicense",  
         JSON.stringify(jsonData), {headers: headers})
           .map(this.extractData)
           .catch((res: Response) => this.handleError(res));
@@ -204,7 +204,7 @@ export class LicenseService{
         var headers = new Headers({
           'Content-Type': 'application/json'
         });
-        return this.http.post(this.commonService.resourceBaseUrl + "/License/UpdateLicense",  
+        return this.http.post(this.commonService.resourceBaseUrl + "License/UpdateLicense",  
         JSON.stringify(jsonData), {headers: headers})
           .map(this.extractData)
           .catch((res: Response) => this.handleError(res));
@@ -230,7 +230,7 @@ export class LicenseService{
         var headers = new Headers({
           'Content-Type': 'application/json'
         });
-        return this.http.post(this.commonService.resourceBaseUrl + "/License/UpdateLicenseBasicSettings",  
+        return this.http.post(this.commonService.resourceBaseUrl + "License/UpdateLicenseBasicSettings",  
         JSON.stringify(jsonData), {headers: headers})
           .map(this.extractData)
           .catch((res: Response) => this.handleError(res));
@@ -252,7 +252,7 @@ export class LicenseService{
         var headers = new Headers({
           'Content-Type': 'application/json'
         });
-        return this.http.post(this.commonService.resourceBaseUrl + "/License/UpdateLicenseModestySettings",  
+        return this.http.post(this.commonService.resourceBaseUrl + "License/UpdateLicenseModestySettings",  
         JSON.stringify(jsonData), {headers: headers})
           .map(this.extractData)
           .catch((res: Response) => this.handleError(res));
@@ -274,14 +274,14 @@ export class LicenseService{
         var headers = new Headers({
           'Content-Type': 'application/json'
         });
-        return this.http.post(this.commonService.resourceBaseUrl + "/License/UpdateLicenseModulesStatus",  
+        return this.http.post(this.commonService.resourceBaseUrl + "License/UpdateLicenseModulesStatus",  
         JSON.stringify(jsonData), {headers: headers})
           .map(this.extractData)
           .catch((res: Response) => this.handleError(res));
     }
 
     DeleteLicense(obj: any) {    
-        return this.http.get(this.commonService.resourceBaseUrl + "/License/DeleteLicense?LicenseId=" + obj.LicenseId)
+        return this.http.get(this.commonService.resourceBaseUrl + "License/DeleteLicense?LicenseId=" + obj.LicenseId)
           .map(this.extractData)
           .catch((res: Response) => this.handleError(res));
     }
@@ -330,14 +330,14 @@ export class LicenseService{
         var headers = new Headers({
           'Content-Type': 'application/json'
         });
-        return this.http.post(this.commonService.resourceBaseUrl + "/Site/InsertUpdateSiteAccount",  
+        return this.http.post(this.commonService.resourceBaseUrl + "Site/InsertUpdateSiteAccount",  
         JSON.stringify(jsonData), {headers: headers})
           .map(this.extractData)
           .catch((res: Response) => this.handleError(res));
     }
 
     DeleteSiteAccount(obj: any) {    
-        return this.http.get(this.commonService.resourceBaseUrl + "/Site/DeleteSiteAccount?SiteId=" + 
+        return this.http.get(this.commonService.resourceBaseUrl + "Site/DeleteSiteAccount?SiteId=" + 
         obj.Id + "&LicenseId=" + obj.LicenseId + "&UserId=" + obj.SiteUserId)
           .map(this.extractData)
           .catch((res: Response) => this.handleError(res));
diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licensemodestysettings.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licensemodestysettings.component.ts
index 98c7ed7..71d3284 100644
--- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licensemodestysettings.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/licensemodestysettings.component.ts
@@ -64,9 +64,9 @@ export class LicenseModestySettings implements OnInit {
             this.GetLicenseEditionModesty();
         }
         else{
-            this.licenseService.GetLicenseSites(this.license.AccountNumber,1,1)
+            this.licenseService.GetLicenseSites(this.license.AccountNumber, 1, 1)
             .subscribe(st => { 
-                this.lstLicenseSites = st; 
+                this.lstLicenseSites = st.LicenseSiteList; 
                 if(this.lstLicenseSites.length == 0){
                     this.modalMessage = 'Account is not a building level account.';
                     this.openModal(template);
diff --git a/400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.service.ts b/400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.service.ts
index 33dad52..32178ad 100644
--- a/400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.service.ts
+++ b/400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.service.ts
@@ -11,7 +11,7 @@ import { GlobalService } from '../../Shared/global';
 @Injectable()
 export class ManageDiscountCodeService {
 
-  constructor(private http: Http, private commonService: GlobalService ) { }
+  constructor(private http: Http, private commonService:GlobalService ) { }
     
   GetDiscountCodes(obj: any) {
     if (obj.startDate == '' || obj.startDate == null) {
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.html b/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.html
index c0a8e22..9780d41 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.html
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.html
@@ -84,7 +84,7 @@
                     <label class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0 hidden-lg hidden-xs">&nbsp;</label>
                   </div>
                   <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-                    <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="GetDiscountReport(this)"><i class="fa fa-file"></i>  Generate Report</button>
+                    <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="SearchRecords()"><i class="fa fa-file"></i>  Generate Report</button>
                     <!--modal-->
                     <!--<div class="modal fade bs-example-modal-sm text-left" tabindex="-1" role="dialog" id="mymodal">
               <div class="modal-dialog modal-sm" role="document">
@@ -153,6 +153,7 @@
               </tr>
             </tbody>
           </table>
+          <admin-pager [recordCount]="recordCount" [pageNo]="pageNo" [pageLength]="pageLength" (pagerEvent)="GetDiscountReport($event)"></admin-pager>
           <div class="row">
             <div class="col-sm-12 marginTop20 text-center">
               <button type="button" class="btn btn-primary btn-sm" (click)="ExportEvent()" [ngClass]="{disabled : !buttonStatus}"><i class="fa fa-file-excel-o"></i>  Export To CSV</button>
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts
index 67b7dcc..080bd11 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/discountcodereport.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -16,17 +16,20 @@ import { DatePipe } from '@angular/common';
 import { BsDatepickerModule, BsDatepickerConfig   } from 'ngx-bootstrap';
 import { Http, Response } from '@angular/http';
 import { LoadingService } from '../../shared/loading.service';
-
+import { PagerComponent } from '../../shared/Pager/pager.component';
+import { ConfirmService } from '../../Shared/Confirm/confirm.service';
 declare var $: any;
 
 @Component({
     templateUrl: './discountcodereport.component.html'
 })
+
 export class DiscountCodeReport implements OnInit {
     public lstDiscountCodeReport: any;
     public lstDiscountCode: any;
     DiscountCodeReportForm: FormGroup;
     DiscountCodeReports: DiscountCodeReports[];
+    NewSubscription = new DiscountCodeReports();
     numberOfDiscountCodeReport: number;
     limit: number;
     page: number = 1;
@@ -47,8 +50,14 @@ export class DiscountCodeReport implements OnInit {
     alerts: string;
     ExportingStart: boolean;
     buttonStatus: boolean;
+    @ViewChild(PagerComponent) pagerComponent: PagerComponent;
+    recordCount: number;
+    pageNo: number;
+    pageLength: number;
+
     constructor(private router: Router, private reportservice: ReportService, private fb: FormBuilder,
-      private modalService: BsModalService, private global: GlobalService, private _loadingService: LoadingService) { }
+      private modalService: BsModalService, private global: GlobalService, 
+      private _loadingService: LoadingService, private _confirmService: ConfirmService) { }
 
     ngOnInit(): void {
       this.ExportingStart = false;
@@ -71,7 +80,7 @@ export class DiscountCodeReport implements OnInit {
         $('#fixed_hdr2').fxdHdrCol({
             fixedCols: 0,
             width: "100%",
-            height: 300,
+            height: 330,
             colModal: [
                 { width: 180, align: 'center' },
                 { width: 230, align: 'center' },
@@ -95,24 +104,32 @@ export class DiscountCodeReport implements OnInit {
             ],
             sort: true
         });
-        document.getElementById("fixed_table_rc").remove();
-        var testScript = document.createElement("script");
-        testScript.setAttribute("id", "fixed_table_rc");
-        testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
-        testScript.setAttribute("type", "text/javascript");
-        document.body.appendChild(testScript);
-        //this.GetSubscriptionCancellationReport();
+        this.pageNo = 1;
+        this.pageLength = 10;
+        this.NoRecord = this.global.NoRecords;
+        this.recordCount = 0;
+        this.pagerComponent = new PagerComponent();
+            
+        if(document.getElementById("fixed_table_rc") != null){
+            document.getElementById("fixed_table_rc").remove();
+            var testScript = document.createElement("script");
+            testScript.setAttribute("id", "fixed_table_rc");
+            testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
+            testScript.setAttribute("type", "text/javascript");
+            document.body.appendChild(testScript);
+        }
         
     }
 
-
-
     GetDiscountCode() {
         this.reportservice.GetDiscountCodes().subscribe(st => { this.lstDiscountCode = st; }, error => this.error = <any>error);
     }
 
-
-    GetDiscountReport(this) {
+    GetDiscountReport(evt: any) {
+      this._loadingService.ShowLoading("global-loading");
+      var tempArr = evt.split(',');
+      this.pageNo = parseInt(tempArr[0]);
+      this.pageLength = parseInt(tempArr[1]);
       this.alerts = '';
       this.global.compareTwoDates(this.DiscountCodeReportForm.controls['sToDate'].value, this.DiscountCodeReportForm.controls['sFromDate'].value);
       if (this.global.ValidationMsg != '') {
@@ -123,17 +140,22 @@ export class DiscountCodeReport implements OnInit {
         this.NewSubscription = this.DiscountCodeReportForm.value;
         var obj = this.NewSubscription;
         if (this.ExportingStart) {          
-          this.reportservice.GetDiscountReport(obj).subscribe((DiscountCodeReports: DiscountCodeReports[]) => { this.ExportService(DiscountCodeReports); }, error => this.error = <any>error);
+          this.reportservice.GetDiscountReport(obj, this.pageNo, this.pageLength).subscribe((DiscountCodeReports: DiscountCodeReports[]) => { this.ExportService(DiscountCodeReports); }, error => this.error = <any>error);
         }
         else {
-          this.reportservice.GetDiscountReport(obj).subscribe((DiscountCodeReports: DiscountCodeReports[]) => { this.BindFormFields(DiscountCodeReports); }, error => this.error = <any>error);
+          this.reportservice.GetDiscountReport(obj, this.pageNo, this.pageLength).subscribe((DiscountCodeReports: DiscountCodeReports[]) => { this.BindFormFields(DiscountCodeReports); }, error => this.error = <any>error);
         }
-        
       }
     }
+
+    SearchRecords() {
+      this.GetDiscountReport('1, ' + this.pageLength);
+    }
+
     BindFormFields(data) {
-      this.lstDiscountCodeReport = data
-      this.numberOfDiscountCodeReport = this.lstDiscountCodeReport.length; this.limit = this.lstDiscountCodeReport.length;
+      this.recordCount = data.RecordCount;
+      this.lstDiscountCodeReport = data.DiscountReportList;
+      this.limit = this.lstDiscountCodeReport.length;
       if (this.lstDiscountCodeReport.length > 0) {
         this.NoRecord = '';
         this.buttonStatus = true;
@@ -145,12 +167,14 @@ export class DiscountCodeReport implements OnInit {
         this.buttonStatus = false;
       }
     }
+
     ExportEvent() {
       if (this.buttonStatus) {
         this.ExportingStart = true;
-        this.GetDiscountReport();
+        this.GetDiscountReport('1, ' + this.recordCount);
       }
     }
+
     ExportService(data: any) {
       this._loadingService.HideLoading("global-loading");
       this.global.ExportToCSV(data, "DiscountReport-" + this.date.getDay() + "-" + this.date.getMonth() + "-" + this.date.getSeconds())
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.html b/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.html
index 9059e4a..b9a09f8 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.html
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.html
@@ -69,7 +69,7 @@
                     <label class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0 hidden-lg hidden-xs">&nbsp;</label>
                   </div>
                   <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-                    <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="GetImageExportReport(this)"><i class="fa fa-file"></i>  Generate Report</button>
+                    <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="SearchRecords()"><i class="fa fa-file"></i>  Generate Report</button>
                     <!--modal-->
                     <!--<div class="modal fade bs-example-modal-sm text-left" tabindex="-1" role="dialog" id="mymodal">
               <div class="modal-dialog modal-sm" role="document">
@@ -130,7 +130,7 @@
             <tbody>
               <tr *ngIf="NoRecord !== ''">
 
-                <td colspan="6"><b style="color: red;text-align: center; padding-left: 606px;"><span [innerHTML]="NoRecord"></span></b></td>
+                <td colspan="9"><b style="color: red;text-align: center; padding-left: 606px;"><span [innerHTML]="NoRecord"></span></b></td>
               </tr>
               <tr *ngFor="let item of lstImageExportReport">
                 <td>{{item.Title}}</td>
@@ -145,6 +145,7 @@
               </tr>
             </tbody>
           </table>
+          <admin-pager [recordCount]="recordCount" [pageNo]="pageNo" [pageLength]="pageLength" (pagerEvent)="GetImageExportReport($event)"></admin-pager>
           <div class="row">
             <div class="col-sm-12 marginTop20 text-center">
               <button type="button" class="btn btn-primary btn-sm" [ngClass]="{disabled : !buttonStatus}" (click)="ExportEvent()"><i class="fa fa-file-excel-o"></i>  Export To CSV</button>
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts
index 65cbadb..78fd2b1 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts
@@ -1,5 +1,4 @@
-
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -17,8 +16,10 @@ import { DatePipe } from '@angular/common';
 import { BsDatepickerModule, BsDatepickerConfig } from 'ngx-bootstrap';
 import { Http, Response } from '@angular/http';
 import { LoadingService } from '../../shared/loading.service';
-
+import { PagerComponent } from '../../shared/Pager/pager.component';
+import { ConfirmService } from '../../Shared/Confirm/confirm.service';
 declare var $: any;
+
 @Component({
   templateUrl: './imageexportreport.component.html'
 })
@@ -48,8 +49,14 @@ export class ImageExportReport implements OnInit {
   ExportingStart: boolean;
   bsConfig: Partial<BsDatepickerConfig>;
   buttonStatus: boolean;
-  constructor(private router: Router, private reportservice: ReportService, private fb: FormBuilder, private modalService: BsModalService,
-    private global: GlobalService, private _loadingService: LoadingService) { }
+  @ViewChild(PagerComponent) pagerComponent: PagerComponent;
+  recordCount: number;
+  pageNo: number;
+  pageLength: number;
+
+  constructor(private router: Router, private reportservice: ReportService, private fb: FormBuilder, 
+    private modalService: BsModalService, private global: GlobalService, 
+    private _loadingService: LoadingService, private _confirmService: ConfirmService) { }
 
   ngOnInit(): void {
     this.buttonStatus = false;
@@ -64,18 +71,11 @@ export class ImageExportReport implements OnInit {
       sAccountNumber: ['']
     });
     this.alerts = '';
-    
-    
-    this.GetImageExportReport();
-    var testScript = document.createElement("script");
-    testScript.setAttribute("id", "fixed_table_rc");
-    testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
-    testScript.setAttribute("type", "text/javascript");
-    document.body.appendChild(testScript);
+    this._loadingService.HideLoading("global-loading");
     $('#fixed_hdr2').fxdHdrCol({
       fixedCols: 0,
       width: "100%",
-      height: 300,
+      height: 330,
       colModal: [
         { width: 180, align: 'center' },
         { width: 230, align: 'center' },
@@ -90,11 +90,27 @@ export class ImageExportReport implements OnInit {
       ],
       sort: true
     });
-    //document.getElementById("fixed_table_rc").remove();
+    this.pageNo = 1;
+    this.pageLength = 10;
+    this.NoRecord = this.global.NoRecords;
+    this.recordCount = 0;
+    this.pagerComponent = new PagerComponent();
+            
+    if(document.getElementById("fixed_table_rc") != null){
+      document.getElementById("fixed_table_rc").remove();
+      var testScript = document.createElement("script");
+      testScript.setAttribute("id", "fixed_table_rc");
+      testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
+      testScript.setAttribute("type", "text/javascript");
+      document.body.appendChild(testScript);
+    }
   }
 
-  GetImageExportReport(this) {
-    debugger;
+  GetImageExportReport(evt: any) {
+    this._loadingService.ShowLoading("global-loading");
+    var tempArr = evt.split(',');
+    this.pageNo = parseInt(tempArr[0]);
+    this.pageLength = parseInt(tempArr[1]);
     this.alerts = '';
     this.global.compareTwoDates(this.ImageExportReportForm.controls['sToDate'].value, this.ImageExportReportForm.controls['sFromDate'].value);
     if (this.global.ValidationMsg != '') {
@@ -105,17 +121,23 @@ export class ImageExportReport implements OnInit {
       this.imageexportreport = this.ImageExportReportForm.value;
       var obj = this.imageexportreport;
       if (this.ExportingStart) {
-        this.reportservice.GetImageExportReport(obj).subscribe((ImageExportReports: ImageExportReports[]) => { this.ExportService(ImageExportReports); }, error => this.error = <any>error);
+        this.reportservice.GetImageExportReport(obj, this.pageNo, this.pageLength).subscribe((ImageExportReports: ImageExportReports[]) => { this.ExportService(ImageExportReports); }, error => this.error = <any>error);
       }
       else {
-        this.reportservice.GetImageExportReport(obj).subscribe((ImageExportReports: ImageExportReports[]) => { this.BindFormFields(ImageExportReports); }, error => this.error = <any>error);
+        this.reportservice.GetImageExportReport(obj, this.pageNo, this.pageLength).subscribe((ImageExportReports: ImageExportReports[]) => { this.BindFormFields(ImageExportReports); }, error => this.error = <any>error);
       }
-      
     }
   }
+
+  SearchRecords() {
+    this.GetImageExportReport('1, ' + this.pageLength);
+  }
+
   BindFormFields(data) {
-    this.lstImageExportReport = data
-    this.numberOfImageExportReport = this.lstImageExportReport.length; this.limit = this.lstImageExportReport.length;
+    this.recordCount = data.RecordCount;
+    this.lstImageExportReport = data.ImageExportList;
+    this.numberOfImageExportReport = this.lstImageExportReport.length; 
+    this.limit = this.lstImageExportReport.length;
     if (this.lstImageExportReport.length > 0) {
       this.NoRecord = '';
       this.buttonStatus = true;
@@ -125,15 +147,16 @@ export class ImageExportReport implements OnInit {
       this.NoRecord = this.global.NoRecords;
       this._loadingService.HideLoading("global-loading");
       this.buttonStatus = false;
-
     }
   }
+
   ExportEvent() {
     if (this.buttonStatus) {
       this.ExportingStart = true;
-      this.GetImageExportReport();
+      this.GetImageExportReport('1, ' + this.recordCount);
     }
   }
+
   ExportService(data: any) {
     this._loadingService.HideLoading("global-loading");
     this.global.ExportToCSV(data, "ImageExportReport-" + this.date.getDay() + "-" + this.date.getMonth() + "-" + this.date.getSeconds())
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html
index 92719ea..f8045a8 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.html
@@ -79,7 +79,7 @@
 
                 <div class="col-sm-12">
                   <div class="form-group marginTop5 text-right">
-                    <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="GetNetAdSummaryReport(this)"><i class="fa fa-file"></i>  Generate Report</button>
+                    <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="SearchRecords()"><i class="fa fa-file"></i>  Generate Report</button>
                     <!--modal-->
                     <!--<div class="modal fade bs-example-modal-sm text-left" tabindex="-1" role="dialog" id="mymodal">
                       <div class="modal-dialog modal-sm" role="document">
@@ -125,7 +125,6 @@
             </thead>
             <tbody>
               <tr *ngIf="NoRecord !== ''">
-
                 <td colspan="6"><b style="color: red;text-align: center; padding-left: 606px;"><span [innerHTML]="NoRecord"></span></b></td>
               </tr>
               <tr *ngFor="let item of lstNetAdSubscriptionReport">
@@ -140,6 +139,7 @@
               </tr>
             </tbody>
           </table>
+          <admin-pager [recordCount]="recordCount" [pageNo]="pageNo" [pageLength]="pageLength" (pagerEvent)="GetNetAdSummaryReport($event)"></admin-pager>
           <div class="row">
             <div class="col-sm-12 marginTop20 text-center">
               <button type="button" class="btn btn-primary btn-sm" [ngClass]="{disabled : !buttonStatus}" (click)="ExportEvent()"><i class="fa fa-file-excel-o"></i>  Export To CSV</button>
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts
index 0bb42ac..604c380 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/netadsubscriptionreport.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -16,6 +16,8 @@ import { DatePipe } from '@angular/common';
 import { BsDatepickerModule, BsDatepickerConfig } from 'ngx-bootstrap';
 import { Http, Response } from '@angular/http';
 import { LoadingService } from '../../shared/loading.service';
+import { PagerComponent } from '../../shared/Pager/pager.component';
+import { ConfirmService } from '../../Shared/Confirm/confirm.service';
 declare var $: any;
 
 @Component({
@@ -26,6 +28,7 @@ export class NetAdSubscriptionReport implements OnInit {
     public lstLicenceType: any;
     NetAdSubscriptionReportForm: FormGroup;
     NetAdSubscriptionReports: NetAdSubscriptionReports[];
+    NetAdSubscriptionReport = new NetAdSubscriptionReports();
     numberOfNetAdSubscriptionReport: number;
     limit: number;
     page: number = 1;
@@ -45,8 +48,14 @@ export class NetAdSubscriptionReport implements OnInit {
     bsConfig: Partial<BsDatepickerConfig>;
     ExportingStart: boolean;
     buttonStatus: boolean;
+    @ViewChild(PagerComponent) pagerComponent: PagerComponent;
+    recordCount: number;
+    pageNo: number;
+    pageLength: number;
+
     constructor(private router: Router, private reportservice: ReportService, private fb: FormBuilder,
-      private modalService: BsModalService, private global: GlobalService, private _loadingService: LoadingService) { }
+      private modalService: BsModalService, private global: GlobalService, 
+      private _loadingService: LoadingService, private _confirmService: ConfirmService) { }
 
     ngOnInit(): void {
       this.ExportingStart = false;
@@ -64,63 +73,74 @@ export class NetAdSubscriptionReport implements OnInit {
         });
         
         this.GetLicenceType();
-        //this.GetSubscriptionReport();
+
         $('#fixed_hdr2').fxdHdrCol({
-            fixedCols: 0,
-            width: "100%",
-            height: 300,
-            colModal: [
-                { width: 180, align: 'center' },
-                { width: 230, align: 'center' },
-                { width: 150, align: 'Center' },
-                { width: 150, align: 'Center' },
-                { width: 350, align: 'Center' },
-                { width: 500, align: 'Center' },
-                { width: 130, align: 'Center' },
-                { width: 120, align: 'center' },
-                { width: 280, align: 'Center' },
-                { width: 180, align: 'center' },
-                { width: 200, align: 'center' },
-                { width: 170, align: 'center' },
-                { width: 80, align: 'center' },
-                { width: 150, align: 'center' },
-                { width: 150, align: 'center' },
-                { width: 180, align: 'Center' },
-                //{ width: 400, align: 'Center' },
-                //{ width: 150, align: 'center' },
-                //{ width: 110, align: 'center' },
-            ],
-            sort: true
+          fixedCols: 0,
+          width: "100%",
+          height: 330,
+          colModal: [
+            { width: 180, align: 'center' },
+            { width: 230, align: 'center' },
+            { width: 150, align: 'Center' },
+            { width: 150, align: 'Center' },
+            { width: 350, align: 'Center' },
+            { width: 500, align: 'Center' },
+            { width: 130, align: 'Center' },
+            { width: 120, align: 'center' },
+            { width: 280, align: 'Center' },
+            { width: 180, align: 'center' },
+            { width: 200, align: 'center' },
+            { width: 170, align: 'center' },
+            { width: 80, align: 'center' },
+            { width: 150, align: 'center' },
+            { width: 150, align: 'center' },
+            { width: 180, align: 'Center' },
+          ],
+          sort: true
         });
-        document.getElementById("fixed_table_rc").remove();
-        var testScript = document.createElement("script");
-        testScript.setAttribute("id", "fixed_table_rc");
-        testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
-        testScript.setAttribute("type", "text/javascript");
-        document.body.appendChild(testScript);
-        //this.GetSubscriptionCancellationReport();
+        this.pageNo = 1;
+        this.pageLength = 10;
+        this.NoRecord = this.global.NoRecords;
+        this.recordCount = 0;
+        this.pagerComponent = new PagerComponent();
+            
+        if(document.getElementById("fixed_table_rc") != null){
+            document.getElementById("fixed_table_rc").remove();
+            var testScript = document.createElement("script");
+            testScript.setAttribute("id", "fixed_table_rc");
+            testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
+            testScript.setAttribute("type", "text/javascript");
+            document.body.appendChild(testScript);
+        }
     }
-
-
   
     GetLicenceType() {
         this.reportservice.GetLicenceType().subscribe(st => { this.lstLicenceType = st; }, error => this.error = <any>error);
     }
-    GetNetAdSummaryReport(this) {
+
+    GetNetAdSummaryReport(evt: any) {
       this._loadingService.ShowLoading("global-loading");
-        this.NewSubscription = this.NetAdSubscriptionReportForm.value;
-        var obj = this.NewSubscription;
-        if (this.ExportingStart) {          
-          this.reportservice.GetNetAdSummaryReport(obj).subscribe((NetAdSubscriptionReports: NetAdSubscriptionReports[]) => { this.ExportService(NetAdSubscriptionReports); }, error => this.error = <any>error);
-        }
-        else {
-          this.reportservice.GetNetAdSummaryReport(obj).subscribe((NetAdSubscriptionReports: NetAdSubscriptionReports[]) => { this.BindFormFields(NetAdSubscriptionReports); }, error => this.error = <any>error);
-        }
-        
+      var tempArr = evt.split(',');
+      this.pageNo = parseInt(tempArr[0]);
+      this.pageLength = parseInt(tempArr[1]);
+      this._loadingService.ShowLoading("global-loading");
+      this.NetAdSubscriptionReport = this.NetAdSubscriptionReportForm.value;
+      var obj = this.NetAdSubscriptionReport;
+      if (this.ExportingStart) {          
+        this.reportservice.GetNetAdSummaryReport(obj, this.pageNo, this.pageLength).subscribe((NetAdSubscriptionReports: NetAdSubscriptionReports[]) => { this.ExportService(NetAdSubscriptionReports); }, error => this.error = <any>error);
+      }
+      else {
+        this.reportservice.GetNetAdSummaryReport(obj, this.pageNo, this.pageLength).subscribe((NetAdSubscriptionReports: NetAdSubscriptionReports[]) => { this.BindFormFields(NetAdSubscriptionReports); }, error => this.error = <any>error);
+      }
     }
+
+    SearchRecords() {
+      this.GetNetAdSummaryReport('1, ' + this.pageLength);
+    }
+    
     BindFormFields(data) {
-      this.lstNetAdSubscriptionReport = data
-      this.numberOfNetAdSubscriptionReport = this.lstNetAdSubscriptionReport.length; this.limit = this.lstNetAdSubscriptionReport.length;
+      this.recordCount = data.RecordCount;
+      this.lstNetAdSubscriptionReport = data.NetAdSubscriptionList;
       if (this.lstNetAdSubscriptionReport.length > 0) {
         this.NoRecord = '';
         this.buttonStatus = true;
@@ -132,12 +152,14 @@ export class NetAdSubscriptionReport implements OnInit {
         this.buttonStatus = false;
       }
     }
+
     ExportEvent() {
       if (this.buttonStatus) {
         this.ExportingStart = true;
-        this.GetNetAdSummaryReport();
+        this.GetNetAdSummaryReport('1, ' + this.recordCount);
       }
     }
+
     ExportService(data: any) {
       this._loadingService.HideLoading("global-loading");
       this.global.ExportToCSV(data, "NetAdSummaryReport-" + this.date.getDay() + "-" + this.date.getMonth() + "-" + this.date.getSeconds())
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/report.service.ts b/400-SOURCECODE/Admin/src/app/components/Reports/report.service.ts
index 2ce7b7b..61591df 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/report.service.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/report.service.ts
@@ -179,88 +179,96 @@ export class ReportService {
     }
 
 
-    GetNetAdSummaryReport(obj: any) {
-        if (obj.sFromDate == '') {
-            obj.sFromDate = '1/1/1';
-        }
-        if (obj.sToDate == '') {
-            obj.sToDate = '1/1/9999';
-        }
-        obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
-        obj.sToDate = this.datePipe.transform(obj.sToDate, 'MM/dd/yyyy');
-        if (obj.icStartPrice == undefined)
-            obj.icStartPrice = 0;
-        if (obj.icEndPrice == undefined)
-            obj.icEndPrice = 0;
+    GetNetAdSummaryReport(obj: any, pageNo: number, pageLength: number) {
+      if (obj.sFromDate == '') {
+        obj.sFromDate = '1/1/1';
+      }
+      if (obj.sToDate == '') {
+        obj.sToDate = '1/1/9999';
+      }
+      obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
+      obj.sToDate = this.datePipe.transform(obj.sToDate, 'MM/dd/yyyy');
+      if (obj.icStartPrice == undefined)
+        obj.icStartPrice = 0;
+      if (obj.icEndPrice == undefined)
+        obj.icEndPrice = 0;
 
-        return this.http.get(this.commonService.resourceBaseUrl + "Report/GetNetAdSummaryReport?sFromDate=" + obj.sFromDate +
-            "&sToDate=" + obj.sToDate +
-            "&iStartPrice=" + obj.icStartPrice +
-            "&iEndPrice=" + obj.icEndPrice +
-            "&iLicenseTypeId=" + obj.iLicenseTypeId)
-            .map(this.extractData)
-            .catch((res: Response) => this.handleError(res));
+      return this.http.get(this.commonService.resourceBaseUrl + "Report/GetNetAdSummaryReport?sFromDate=" + obj.sFromDate +
+        "&sToDate=" + obj.sToDate +
+        "&iStartPrice=" + obj.icStartPrice +
+        "&iEndPrice=" + obj.icEndPrice +
+        "&iLicenseTypeId=" + obj.iLicenseTypeId +
+        "&pageNo=" + pageNo +
+        "&pageLength=" + pageLength)
+        .map(this.extractData)
+        .catch((res: Response) => this.handleError(res));
     }
 
-
-    GetSiteLicenseUsageReport(obj: any) {
-        if (obj.sFromDate == '') {
-            obj.sFromDate = '1/1/1';
-        }
-        if (obj.sToDate == '') {
-            obj.sToDate = '1/1/9999';
-        }
-        obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
-        obj.sToDate = this.datePipe.transform(obj.sToDate, 'MM/dd/yyyy');        
-        if (obj.sAccountNumber == null)
-            obj.sAccountNumber = '';
-        return this.http.get(this.commonService.resourceBaseUrl + "Report/GetSiteLicenseUsageReport?sFromDate=" + obj.sFromDate +
-            "&sToDate=" + obj.sToDate +
-            "&sAccountNumber=" + obj.sAccountNumber +
-            "&iEdition=" + obj.iEdition)
-            .map(this.extractData)
-            .catch((res: Response) => this.handleError(res));
+    GetSiteLicenseUsageReport(obj: any, pageNo: number, pageLength: number) {
+      if (obj.sFromDate == '') {
+        obj.sFromDate = '1/1/1';
+      }
+      if (obj.sToDate == '') {
+        obj.sToDate = '1/1/9999';
+      }
+      obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
+      obj.sToDate = this.datePipe.transform(obj.sToDate, 'MM/dd/yyyy');
+      if (obj.sAccountNumber == null)
+        obj.sAccountNumber = '';
+      return this.http.get(this.commonService.resourceBaseUrl + "Report/GetSiteLicenseUsageReport?sFromDate=" + obj.sFromDate +
+        "&sToDate=" + obj.sToDate +
+        "&sAccountNumber=" + obj.sAccountNumber +
+        "&iEdition=" + obj.iEdition +
+        "&pageNo=" + pageNo +
+        "&pageLength=" + pageLength)
+        .map(this.extractData)
+        .catch((res: Response) => this.handleError(res));
     }
 
-    GetDiscountReport(obj: any) {
-        if (obj.sFromDate == '') {
-            obj.sFromDate = '1/1/1';
-        }
-        if (obj.sToDate == '') {
-            obj.sToDate = '1/1/9999';
-        }
-        obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
-        obj.sToDate = this.datePipe.transform(obj.sToDate, 'MM/dd/yyyy');
-        if (obj.sAccountNumber == null)
-            obj.sAccountNumber = '';
-       
-        return this.http.get(this.commonService.resourceBaseUrl + "Report/GetDiscountReport?sFromDate=" + obj.sFromDate +
-            "&sToDate=" + obj.sToDate +
-            "&iDiscountCode=" + obj.iDiscountCode +
-            "&sAccountNumber=" + obj.sAccountNumber)
-            .map(this.extractData)
-            .catch((res: Response) => this.handleError(res));
+
+    GetDiscountReport(obj: any, pageNo: number, pageLength: number) {
+      if (obj.sFromDate == '') {
+        obj.sFromDate = '1/1/1';
+      }
+      if (obj.sToDate == '') {
+        obj.sToDate = '1/1/9999';
+      }
+      obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
+      obj.sToDate = this.datePipe.transform(obj.sToDate, 'MM/dd/yyyy');
+      if (obj.sAccountNumber == null)
+        obj.sAccountNumber = '';
+
+      return this.http.get(this.commonService.resourceBaseUrl + "Report/GetDiscountReport?sFromDate=" + obj.sFromDate +
+        "&sToDate=" + obj.sToDate +
+        "&iDiscountCode=" + obj.iDiscountCode +
+        "&sAccountNumber=" + obj.sAccountNumber +
+        "&pageNo=" + pageNo +
+        "&pageLength=" + pageLength)
+        .map(this.extractData)
+        .catch((res: Response) => this.handleError(res));
     }
 
 
-    GetImageExportReport(obj: any) {
-        if (obj.sFromDate == '') {
-            obj.sFromDate = '1/1/1';
-        }
-        if (obj.sToDate == '') {
-            obj.sToDate = '1/1/9999';
-        }
-        obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
-        obj.sToDate = this.datePipe.transform(obj.sToDate, 'MM/dd/yyyy');
-       
-        if (obj.sAccountNumber == null)
-            obj.sAccountNumber = '';
-      
-        return this.http.get(this.commonService.resourceBaseUrl + "Report/GetImageExportReport?sFromDate=" + obj.sFromDate +
-            "&sToDate=" + obj.sToDate +            
-            "&sAccountNumber=" + obj.sAccountNumber)
-            .map(this.extractData)
-            .catch((res: Response) => this.handleError(res));
+    GetImageExportReport(obj: any, pageNo: number, pageLength: number) {
+      if (obj.sFromDate == '') {
+        obj.sFromDate = '1/1/1';
+      }
+      if (obj.sToDate == '') {
+        obj.sToDate = '1/1/9999';
+      }
+      obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
+      obj.sToDate = this.datePipe.transform(obj.sToDate, 'MM/dd/yyyy');
+
+      if (obj.sAccountNumber == null)
+        obj.sAccountNumber = '';
+
+      return this.http.get(this.commonService.resourceBaseUrl + "Report/GetImageExportReport?sFromDate=" + obj.sFromDate +
+        "&sToDate=" + obj.sToDate +
+        "&sAccountNumber=" + obj.sAccountNumber +
+        "&pageNo=" + pageNo +
+        "&pageLength=" + pageLength)
+        .map(this.extractData)
+        .catch((res: Response) => this.handleError(res));
     }
 
     extractData(res: Response) {
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.html b/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.html
index 3e029c0..3775d93 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.html
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.html
@@ -84,7 +84,7 @@
                     <label class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0 hidden-lg hidden-xs">&nbsp;</label>
                   </div>
                   <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-                    <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="GetSiteLicenseUsageReport(this)"><i class="fa fa-file"></i>  Generate Report</button>
+                    <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="SearchRecords()"><i class="fa fa-file"></i>  Generate Report</button>
                     <!--<div class="modal fade bs-example-modal-sm text-left" tabindex="-1" role="dialog" id="mymodal">
                       <div class="modal-dialog modal-sm" role="document">
                         <div class="modal-content">
@@ -140,6 +140,7 @@
               </tr>
             </tbody>
           </table>
+          <admin-pager [recordCount]="recordCount" [pageNo]="pageNo" [pageLength]="pageLength" (pagerEvent)="GetSiteLicenseUsageReport($event)"></admin-pager>
           <div class="row">
             <div class="col-sm-12 marginTop20 text-center">
               <button type="button" class="btn btn-primary btn-sm" [ngClass]="{disabled : !buttonStatus}" (click)="ExportEvent()"><i class="fa fa-file-excel-o"></i>  Export To CSV</button>
diff --git a/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts b/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
index 88364ac..08e17f2 100644
--- a/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -16,6 +16,8 @@ import { DatePipe } from '@angular/common';
 import { BsDatepickerModule, BsDatepickerConfig } from 'ngx-bootstrap';
 import { Http, Response } from '@angular/http';
 import { LoadingService } from '../../shared/loading.service';
+import { PagerComponent } from '../../shared/Pager/pager.component';
+import { ConfirmService } from '../../Shared/Confirm/confirm.service';
 declare var $: any;
 
 @Component({
@@ -26,6 +28,7 @@ export class SiteLicenseUsageReport implements OnInit {
     public lstEdition: any;
     SiteLicenseUsageReportForm: FormGroup;
     SiteLicenseUsageReports: SiteLicenseUsageReports[];
+    SiteLicenseUsageReport = new SiteLicenseUsageReports();
     numberOfSiteLicenseUsageReport: number;
     limit: number;
     page: number = 1;
@@ -45,8 +48,14 @@ export class SiteLicenseUsageReport implements OnInit {
     bsConfig: Partial<BsDatepickerConfig>;
     ExportingStart: boolean;
     buttonStatus: boolean;
+    @ViewChild(PagerComponent) pagerComponent: PagerComponent;
+    recordCount: number;
+    pageNo: number;
+    pageLength: number;
+
     constructor(private router: Router, private reportservice: ReportService, private fb: FormBuilder,
-      private modalService: BsModalService, private global: GlobalService, private _loadingService: LoadingService) { }
+      private modalService: BsModalService, private global: GlobalService, 
+      private _loadingService: LoadingService, private _confirmService: ConfirmService) { }
 
     ngOnInit(): void {      
       this.ExportingStart = false;
@@ -63,65 +72,70 @@ export class SiteLicenseUsageReport implements OnInit {
         });
 
         this.GetEdition();
-        //this.GetSubscriptionReport();
+
         $('#fixed_hdr2').fxdHdrCol({
-            fixedCols: 0,
-            width: "100%",
-            height: 300,
-            colModal: [
-                { width: 180, align: 'center' },
-                { width: 230, align: 'center' },
-                { width: 150, align: 'Center' },
-                { width: 150, align: 'Center' },
-                { width: 350, align: 'Center' },
-                { width: 500, align: 'Center' },
-                { width: 130, align: 'Center' },
-                { width: 120, align: 'center' },
-                { width: 280, align: 'Center' },
-                { width: 180, align: 'center' },
-                { width: 200, align: 'center' },
-                { width: 170, align: 'center' },
-                { width: 80, align: 'center' },
-                { width: 150, align: 'center' },
-                { width: 150, align: 'center' },
-                { width: 180, align: 'Center' },
-                //{ width: 400, align: 'Center' },
-                //{ width: 150, align: 'center' },
-                //{ width: 110, align: 'center' },
-            ],
-            sort: true
+          fixedCols: 0,
+          width: "100%",
+          height: 330,
+          colModal: [
+            { width: 180, align: 'center' },
+            { width: 230, align: 'center' },
+            { width: 150, align: 'Center' },
+            { width: 150, align: 'Center' },
+            { width: 350, align: 'Center' },
+            { width: 500, align: 'Center' },
+            { width: 130, align: 'Center' },
+            { width: 120, align: 'center' },
+            { width: 280, align: 'Center' },
+            { width: 180, align: 'center' },
+            { width: 200, align: 'center' },
+            { width: 170, align: 'center' },
+            { width: 80, align: 'center' },
+            { width: 150, align: 'center' },
+            { width: 150, align: 'center' },
+            { width: 180, align: 'Center' },
+          ],
+          sort: true
         });
-        document.getElementById("fixed_table_rc").remove();
-        var testScript = document.createElement("script");
-        testScript.setAttribute("id", "fixed_table_rc");
-        testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
-        testScript.setAttribute("type", "text/javascript");
-        document.body.appendChild(testScript);
-        //this.GetSubscriptionCancellationReport();
+        this.pageNo = 1;
+        this.pageLength = 10;
+        this.NoRecord = this.global.NoRecords;
+        this.recordCount = 0;
+        this.pagerComponent = new PagerComponent();
+            
+        if(document.getElementById("fixed_table_rc") != null){
+            document.getElementById("fixed_table_rc").remove();
+            var testScript = document.createElement("script");
+            testScript.setAttribute("id", "fixed_table_rc");
+            testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
+            testScript.setAttribute("type", "text/javascript");
+            document.body.appendChild(testScript);
+        }
     }
 
-
-
     GetEdition() {
         this.reportservice.GetEdition().subscribe(st => { this.lstEdition = st; }, error => this.error = <any>error);
     }
 
-
-    GetSiteLicenseUsageReport(this) {
+    GetSiteLicenseUsageReport(evt: any) {
       this._loadingService.ShowLoading("global-loading");
-        this.NewSubscription = this.SiteLicenseUsageReportForm.value;
-        var obj = this.NewSubscription;
-        if (this.ExportingStart) {
-
-          this.reportservice.GetSiteLicenseUsageReport(obj).subscribe((SiteLicenseUsageReports: SiteLicenseUsageReports[]) => { this.ExportService(SiteLicenseUsageReports); }, error => this.error = <any>error);
-        }
-        else {
-          this.reportservice.GetSiteLicenseUsageReport(obj).subscribe((SiteLicenseUsageReports: SiteLicenseUsageReports[]) => { this.BindFormFields(SiteLicenseUsageReports); }, error => this.error = <any>error);
-        }
-        
+      var tempArr = evt.split(',');
+      this.pageNo = parseInt(tempArr[0]);
+      this.pageLength = parseInt(tempArr[1]);
+      this._loadingService.ShowLoading("global-loading");
+      this.SiteLicenseUsageReport = this.SiteLicenseUsageReportForm.value;
+      var obj = this.SiteLicenseUsageReport;
+      if (this.ExportingStart) {
+        this.reportservice.GetSiteLicenseUsageReport(obj, this.pageNo, this.pageLength).subscribe((SiteLicenseUsageReports: SiteLicenseUsageReports[]) => { this.ExportService(SiteLicenseUsageReports); }, error => this.error = <any>error);
+      }
+      else {
+        this.reportservice.GetSiteLicenseUsageReport(obj, this.pageNo, this.pageLength).subscribe((SiteLicenseUsageReports: SiteLicenseUsageReports[]) => { this.BindFormFields(SiteLicenseUsageReports); }, error => this.error = <any>error);
+      }
     }
+
     BindFormFields(data) {
-      this.lstSiteLicenseUsageReport = data
+      this.recordCount = data.RecordCount;
+      this.lstSiteLicenseUsageReport = data.SiteLicenseUsageList;
       this.numberOfSiteLicenseUsageReport = this.lstSiteLicenseUsageReport.length; this.limit = this.lstSiteLicenseUsageReport.length;
       if (this.lstSiteLicenseUsageReport.length > 0) {
         this.NoRecord = '';
@@ -134,10 +148,15 @@ export class SiteLicenseUsageReport implements OnInit {
         this.buttonStatus = false;
       }
     }
+    
+    SearchRecords() {
+      this.GetSiteLicenseUsageReport('1, ' + this.pageLength);
+    }
+
     ExportEvent() {
       if (this.buttonStatus) {
         this.ExportingStart = true;
-        this.GetSiteLicenseUsageReport();
+        this.GetSiteLicenseUsageReport('1, ' + this.pageLength);
       }
     }
     ExportService(data: any) {
diff --git a/400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.service.ts b/400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.service.ts
index 46e2106..ef9ac5a 100644
--- a/400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.service.ts
+++ b/400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.service.ts
@@ -15,7 +15,7 @@ export class SubscriptionPriceService {
 
     
   GetSubscriptionPrices(obj: any) {
-    return this.http.get(this.commonService.resourceBaseUrl + "/SubscriptionPrice/GetSubscriptionPrices?editionId="
+    return this.http.get(this.commonService.resourceBaseUrl + "SubscriptionPrice/GetSubscriptionPrices?editionId="
       + obj.editionId + "&pageNo=" + obj.pageNo + "&pageLength=" + obj.pageLength)
       .map(this.extractData)
       .catch((res: Response) => this.handleError(res));
@@ -28,7 +28,7 @@ export class SubscriptionPriceService {
     var headers = new Headers({
       'Content-Type': 'application/json'
     });
-    return this.http.post(this.commonService.resourceBaseUrl + "/SubscriptionPrice/InsertSubscriptionPrice",  
+    return this.http.post(this.commonService.resourceBaseUrl + "SubscriptionPrice/InsertSubscriptionPrice",  
     JSON.stringify(jsonData), {headers: headers})
       .map(this.extractData)
       .catch((res: Response) => this.handleError(res));
@@ -41,7 +41,7 @@ export class SubscriptionPriceService {
     var headers = new Headers({
       'Content-Type': 'application/json'
     });
-    return this.http.post(this.commonService.resourceBaseUrl + "/SubscriptionPrice/UpdateSubscriptionPrices",  
+    return this.http.post(this.commonService.resourceBaseUrl + "SubscriptionPrice/UpdateSubscriptionPrices",  
     JSON.stringify(jsonData), {headers: headers})
       .map(this.extractData)
       .catch((res: Response) => this.handleError(res));
@@ -54,7 +54,7 @@ export class SubscriptionPriceService {
     var headers = new Headers({
       'Content-Type': 'application/json'
     });
-    return this.http.post(this.commonService.resourceBaseUrl + "/SubscriptionPrice/DeleteSubscriptionPrices",  
+    return this.http.post(this.commonService.resourceBaseUrl + "SubscriptionPrice/DeleteSubscriptionPrices",  
     subscriptionPriceIds, {headers: headers})
       .map(this.extractData)
       .catch((res: Response) => this.handleError(res));
diff --git a/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts b/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts
index 4697a28..cf9e3f8 100644
--- a/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/UserEntity/adduser.component.ts
@@ -45,7 +45,7 @@ export class AddUser implements OnInit {
       //this.userservice.GetUserById(this.UserId);
     this.adduserFrm = this.fb.group({
       id: [''],
-      UserName: ['', Validators.required, Validators.minLength(8)],
+      UserName: ['', [Validators.required, Validators.minLength(8)]],
       Password: ['', [Validators.required, Validators.minLength(8)]],
       ConfirmPassword: ['', Validators.required],
       FirstName: ['', Validators.required],
diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql
index ea21cdb..a649d86 100644
Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql differ
diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql
index 19bbd19..615d3f1 100644
Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql differ
diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql
index be224c0..546fbd6 100644
Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql differ
diff --git a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql
index d41e156..ad339b2 100644
Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql differ
diff --git a/500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql b/500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql
new file mode 100644
index 0000000..ec352ed
--- /dev/null
+++ b/500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql
@@ -0,0 +1,16 @@
+ 
+CREATE PROCEDURE [dbo].[usp_GetProductEditionByLicense]   
+ -- Add the parameters for the stored procedure here  
+ @iLicenseId int
+AS  
+BEGIN  
+ -- SET NOCOUNT ON added to prevent extra result sets from  
+ -- interfering with SELECT statements.  
+ SET NOCOUNT ON;  
+	 SELECT     Edition.Id, Edition.Title, Edition.IsActive, Edition.Priority
+	 FROM  Edition
+	 INNER JOIN LicenseToEdition ON  Edition.Id = LicenseToEdition.EditionId
+	 WHERE  LicenseToEdition.LicenseId =@iLicenseId
+END  
+
+
--
libgit2 0.21.4