Issue Fixes

Harpreet Banwait
1 parent a9083d30
Showing 20 changed files with 319 additions and 57 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/App_Start/WebApiConfig.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SubscriptionPriceController.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/GetNetAdSummaryReport_Result.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/GetSiteLicenseUsageReport_Result.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/LicenseModel.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/SubscriptionPriceModel.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.ts
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.module.ts
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.ts
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.service.ts
500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql
500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql
500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql
500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql
500-DBDump/AIA-StoredProcedures/usp_CheckSubscriptionForLicense.sql
@@ -21,7 +21,7 @@ namespace AIAHTML5.ADMIN.API
             string Enablecors = ConfigurationManager.AppSettings["Enablecors"];
             if (Enablecors == "false")
             {
-                EnableCorsAttribute cors = new EnableCorsAttribute("http://localhost:4200, http://192.168.86.13:91", "*", "GET,POST");
+                EnableCorsAttribute cors = new EnableCorsAttribute("http://localhost:4200, http://192.168.86.13:92", "*", "GET,POST");
                 config.EnableCors(cors);
             }
@@ -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)
             {
@@ -86,12 +87,13 @@ 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 +103,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)
             {
@@ -116,14 +119,14 @@ 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)
             {
@@ -109,14 +109,14 @@ namespace AIAHTML5.ADMIN.API.Controllers
             }
         }
-        [Route("DeleteSubscriptionPrices")]
-        [HttpPost]
-        public HttpResponseMessage DeleteSubscriptionPrices(List<int> subscriptionPriceIds)
+        [Route("DeleteSubscriptionPrice")]
+        [HttpGet]
+        public HttpResponseMessage DeleteSubscriptionPrice(int subscriptionPriceId)
         {
             bool Status = false;
             try
             {
-                Status = SubscriptionPriceModel.DeleteSubscriptionPrices(dbContext, subscriptionPriceIds);
+                Status = SubscriptionPriceModel.DeleteSubscriptionPrice(dbContext, subscriptionPriceId);
                 if (Status)
                 {
                     return Request.CreateResponse(HttpStatusCode.OK, Status.ToString());
@@ -133,6 +133,23 @@ namespace AIAHTML5.ADMIN.API.Controllers
             }
         }
+        [Route("CheckSubscriptionPlanForLicense")]
+        [HttpGet]
+        public HttpResponseMessage CheckSubscriptionPlanForLicense(int subscriptionPriceId)
+        {
+            bool Status = false;
+            try
+            {
+                Status = SubscriptionPriceModel.CheckSubscriptionPlanForLicense(dbContext, subscriptionPriceId);
+                return Request.CreateResponse(HttpStatusCode.OK, Status.ToString());
+            }
+            catch (Exception ex)
+            {
+                // Log exception code goes here  
+                return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
+            }
+        }
+
         protected HttpResponseMessage ToJson(dynamic obj)
         {
             var response = Request.CreateResponse(HttpStatusCode.OK);
@@ -138,5 +138,22 @@ namespace AIAHTML5.ADMIN.API.Controllers
                 return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
             }
         }
+
+        [Route("CheckDuplicateLicenseUserGroup")]
+        [HttpGet]
+        public HttpResponseMessage CheckDuplicateLicenseUserGroup(int LicenseId, string Title)
+        {
+            bool Status = false;
+            try
+            {
+                Status = UserGroupModel.CheckDuplicateLicenseUserGroup(dbContext, LicenseId, Title);
+                return Request.CreateResponse(HttpStatusCode.OK, Status.ToString());
+            }
+            catch (Exception ex)
+            {
+                // Log exception code goes here  
+                return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
+            }
+        }
     }
 }
@@ -1075,7 +1075,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) :
@@ -1093,7 +1093,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()
@@ -1176,7 +1184,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) :
@@ -1190,7 +1198,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()
@@ -1394,7 +1410,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) :
@@ -1416,7 +1432,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)
@@ -1551,7 +1575,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) :
@@ -1569,7 +1593,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)
@@ -3748,5 +3780,27 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_InsertResellerLicenseAccount_Result>("usp_InsertResellerLicenseAccount", sLicenseeFnameParameter, sLicenseeLnameParameter, iLicenseTypeIdParameter, iAccountTypeIdParameter, sInstitutionNameParameter, sAddress1Parameter, sAddress2Parameter, sCityParameter, sZipParameter, iStateIdParameter, iCountryIdParameter, sPhoneParameter, sEmailIdParameter, iTotalLoginsParameter, sStartDateParameter, sEndDateParameter, sEditionListParameter, iTotalPriceParameter, iCreatorIdParameter, sProductKeyParameter, iNoofImagesParameter);
         }
+    
+        public virtual int usp_CheckSubscriptionForLicense(Nullable<byte> id, ObjectParameter status)
+        {
+            var idParameter = id.HasValue ?
+                new ObjectParameter("Id", id) :
+                new ObjectParameter("Id", typeof(byte));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_CheckSubscriptionForLicense", idParameter, status);
+        }
+    
+        public virtual int usp_CheckDuplicateLicenseUserGroup(Nullable<int> licenseId, string title, ObjectParameter status)
+        {
+            var licenseIdParameter = licenseId.HasValue ?
+                new ObjectParameter("LicenseId", licenseId) :
+                new ObjectParameter("LicenseId", typeof(int));
+    
+            var titleParameter = title != null ?
+                new ObjectParameter("Title", title) :
+                new ObjectParameter("Title", typeof(string));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_CheckDuplicateLicenseUserGroup", licenseIdParameter, titleParameter, status);
+        }
     }
 }
@@ -377,6 +377,9 @@
           <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">
@@ -405,6 +408,9 @@
           <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">
@@ -474,6 +480,9 @@
           <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" />
@@ -522,6 +531,9 @@
           <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" />
@@ -910,6 +922,15 @@
           <Parameter Name="AccountNo" Type="varchar" Mode="In" />
           <Parameter Name="Status" Type="bit" Mode="InOut" />
         </Function>
+        <Function Name="usp_CheckDuplicateLicenseUserGroup" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
+          <Parameter Name="LicenseId" Type="int" Mode="In" />
+          <Parameter Name="Title" Type="varchar" Mode="In" />
+          <Parameter Name="Status" Type="bit" Mode="InOut" />
+        </Function>
+        <Function Name="usp_CheckSubscriptionForLicense" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
+          <Parameter Name="Id" Type="tinyint" Mode="In" />
+          <Parameter Name="Status" Type="bit" Mode="InOut" />
+        </Function>
         <Function Name="usp_DB_TblRowCOUNT" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo" />
         <Function Name="usp_DeleteLicenseUserGroup" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
           <Parameter Name="UserGroupId" Type="int" Mode="In" />
@@ -1489,6 +1510,9 @@
             <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)">
@@ -1517,6 +1541,9 @@
             <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)">
@@ -1586,6 +1613,9 @@
             <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" />
@@ -1634,6 +1664,9 @@
             <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" />
@@ -2095,7 +2128,7 @@
           <Parameter Name="SiteId" Mode="In" Type="Int32" />
           </FunctionImport>
           <FunctionImport Name="usp_GetSubscriptionPlans" ReturnType="Collection(AIADatabaseV5Model.usp_GetSubscriptionPlans_Result)">
-          <Parameter Name="iEditionId" Mode="In" Type="Byte" />
+            <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" />
@@ -2272,6 +2305,15 @@
             <Parameter Name="sProductKey" Mode="In" Type="String" />
             <Parameter Name="iNoofImages" Mode="In" Type="Int32" />
           </FunctionImport>
+          <FunctionImport Name="usp_CheckSubscriptionForLicense">
+            <Parameter Name="Id" Mode="In" Type="Byte" />
+            <Parameter Name="Status" Mode="InOut" Type="Boolean" />
+          </FunctionImport>
+          <FunctionImport Name="usp_CheckDuplicateLicenseUserGroup">
+            <Parameter Name="LicenseId" Mode="In" Type="Int32" />
+            <Parameter Name="Title" Mode="In" Type="String" />
+            <Parameter Name="Status" Mode="InOut" Type="Boolean" />
+          </FunctionImport>
         </EntityContainer>
         <ComplexType Name="DA_GetBaseLayer_Result">
           <Property Type="Int32" Name="Id" Nullable="false" />
@@ -2802,6 +2844,7 @@
           <Property Type="Int32" Name="RenewSubscription" Nullable="true" />
           <Property Type="Int32" Name="InActiveSubscription" Nullable="true" />
           <Property Type="Int32" Name="NetAdSubscription" Nullable="true" />
+          <Property Type="Int64" Name="RowNum" Nullable="true" />
         </ComplexType>
         <ComplexType Name="GetProductFeatures_Result">
           <Property Type="Byte" Name="Id" Nullable="false" />
@@ -2865,6 +2908,7 @@
           <Property Type="String" Name="LicenseCreationDate" Nullable="true" MaxLength="30" />
           <Property Type="Int32" Name="TotalLogins" Nullable="true" />
           <Property Type="String" Name="LastLogin" Nullable="true" MaxLength="30" />
+          <Property Type="Int64" Name="RowNum" Nullable="true" />
         </ComplexType>
         <ComplexType Name="GetSubscribedLicenses_Result">
           <Property Type="Int64" Name="RowNum" Nullable="true" />
@@ -4144,6 +4188,7 @@
                 <ScalarProperty Name="RenewSubscription" ColumnName="RenewSubscription" />
                 <ScalarProperty Name="InActiveSubscription" ColumnName="InActiveSubscription" />
                 <ScalarProperty Name="NetAdSubscription" ColumnName="NetAdSubscription" />
+                <ScalarProperty Name="RowNum" ColumnName="RowNum" />
               </ComplexTypeMapping>
             </ResultMapping>
           </FunctionImportMapping>
@@ -4237,6 +4282,7 @@
                 <ScalarProperty Name="LicenseCreationDate" ColumnName="LicenseCreationDate" />
                 <ScalarProperty Name="TotalLogins" ColumnName="TotalLogins" />
                 <ScalarProperty Name="LastLogin" ColumnName="LastLogin" />
+                <ScalarProperty Name="RowNum" ColumnName="RowNum" />
               </ComplexTypeMapping>
             </ResultMapping>
           </FunctionImportMapping>
@@ -4891,6 +4937,8 @@
               </ComplexTypeMapping>
             </ResultMapping>
           </FunctionImportMapping>
+          <FunctionImportMapping FunctionImportName="usp_CheckSubscriptionForLicense" FunctionName="AIADatabaseV5Model.Store.usp_CheckSubscriptionForLicense" />
+          <FunctionImportMapping FunctionImportName="usp_CheckDuplicateLicenseUserGroup" FunctionName="AIADatabaseV5Model.Store.usp_CheckDuplicateLicenseUserGroup" />
         </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>
@@ -21,5 +21,6 @@ namespace AIAHTML5.ADMIN.API.Entity
         public Nullable<int> RenewSubscription { get; set; }
         public Nullable<int> InActiveSubscription { get; set; }
         public Nullable<int> NetAdSubscription { get; set; }
+        public Nullable<long> RowNum { get; set; }
     }
 }
@@ -20,5 +20,6 @@ namespace AIAHTML5.ADMIN.API.Entity
         public string LicenseCreationDate { get; set; }
         public Nullable<int> TotalLogins { get; set; }
         public string LastLogin { get; set; }
+        public Nullable<long> RowNum { get; set; }
     }
 }
@@ -113,15 +113,12 @@ namespace AIAHTML5.ADMIN.API.Models
             try
             {
                 var result = dbContext.usp_GetAccountNumber(LicenseType).ToList();
-                int i = 0;
                 if (result.Count > 0)
                 {
                     foreach (var item in result)
                     {
                         LicenseAccountObj = new Tuple<int, string>(item.Id, item.AccountNumber);
                         LicenseAccountList.Add(LicenseAccountObj);
-                        i++;
-                        if (i > 100) break;
                     }
                 }
             }
@@ -78,16 +78,26 @@ namespace AIAHTML5.ADMIN.API.Models
             }
         }
-        public static bool DeleteSubscriptionPrices(AIADatabaseV5Entities dbContext, List<int> subscriptionPriceIds)
+        public static bool DeleteSubscriptionPrice(AIADatabaseV5Entities dbContext, int subscriptionPriceId)
         {
             var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
             try
             {
-                foreach (var item in subscriptionPriceIds)
-                {
-                    dbContext.usp_DeleteSubscriptionPlan((byte?)item, spStatus);
-                    if (!(bool)spStatus.Value) break;
-                }
+                dbContext.usp_DeleteSubscriptionPlan((byte?)subscriptionPriceId, spStatus);
+                return (bool)spStatus.Value;
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+        }
+
+        public static bool CheckSubscriptionPlanForLicense(AIADatabaseV5Entities dbContext, int subscriptionPriceId)
+        {
+            var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
+            try
+            {
+                dbContext.usp_CheckSubscriptionForLicense((byte?)subscriptionPriceId, spStatus);
                 return (bool)spStatus.Value;
             }
             catch (Exception ex)
@@ -95,5 +105,6 @@ namespace AIAHTML5.ADMIN.API.Models
                 return false;
             }
         }
+
     }
 }
 \ No newline at end of file
@@ -113,6 +113,19 @@ namespace AIAHTML5.ADMIN.API.Models
             }
         }
+        public static bool CheckDuplicateLicenseUserGroup(AIADatabaseV5Entities dbContext, int LicenseId, string Title)
+        {
+            var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
+            try
+            {
+                dbContext.usp_CheckDuplicateLicenseUserGroup(LicenseId, Title, spStatus);
+                return (bool)spStatus.Value;
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+        }
     }
 }
 \ No newline at end of file
@@ -14,10 +14,14 @@ import { Router } from &#39;@angular/router&#39;;
 })
 export class AppComponent implements OnInit {
-
+  DisplayName: string = "";
   constructor(private userservice: UserService, private global: GlobalService, private router: Router) { }
-  ngOnInit(): void { }
+  ngOnInit(): void {
+    
+    this.DisplayName = this.global.DisplayName;
+    this.router.navigate(['/updateuserprofile']);
+  }
   logout() {
     localStorage.removeItem('loggedInUserDetails');
     window.location.href = this.global.LiveURL; 
@@ -44,6 +44,7 @@ import { ConfirmService } from &#39;./Shared/Confirm/confirm.service&#39;;
 import { ConfirmComponent } from "./Shared/Confirm/confirm.component"
 import { BsDatepickerModule, ModalModule } from 'ngx-bootstrap';
 import { BsModalService } from 'ngx-bootstrap/modal';
+import { ScrollEventModule } from 'ngx-scroll-event';
 import { ContenteditableModelDirective } from './shared/contenteditabledirective';
 import { LoadingService } from './shared/loading.service';
 import { PagerComponent } from './shared/Pager/pager.component';
@@ -76,7 +77,7 @@ import { NumberOnlyDirective } from &#39;./shared/numberonlydirective&#39;;
   ],
   imports: [
     BrowserModule, AppRoutingModule, HttpClientModule, FormsModule, ReactiveFormsModule, HttpModule, Ng2Bs3ModalModule,
-    BsDatepickerModule.forRoot(), ModalModule.forRoot()//ModalModule.forRoot()
+    BsDatepickerModule.forRoot(), ModalModule.forRoot(), ScrollEventModule//ModalModule.forRoot()
    // , AngularFireModule.initializeApp(firebaseConfig),
   ],
   providers: [GlobalService, ConfirmService, BsModalService, LoadingService, CsvService,
@@ -89,8 +90,8 @@ import { NumberOnlyDirective } from &#39;./shared/numberonlydirective&#39;;
     //  useClass: MyInterceptor,
     //  multi: true
     //}
-    //{ provide: APP_BASE_HREF, useValue: '/Admin-UI' }
-    { provide: APP_BASE_HREF, useValue: '/' }
+    { provide: APP_BASE_HREF, useValue: '/Admin' }
+    //{ provide: APP_BASE_HREF, useValue: '/' }
   ],
   bootstrap: [AppComponent]
@@ -40,6 +40,7 @@ NoRecord: string;
 recordCount: number;
 pageNo: number;
 pageLength: number;
+RecordDeleted: number[];
   constructor(private subscriptionPriceService: SubscriptionPriceService, private router: Router,
     private fb: FormBuilder, private modalService: BsModalService, private global: GlobalService, 
@@ -62,11 +63,11 @@ pageLength: number;
         });
         $('#fixed_hdr2').fxdHdrCol({
           fixedCols: 0,
-          width: "80%",
+          width: "100%",
           height: 300,
           colModal: [
             { width: 150, align: 'center' },
-            { width: 400, align: 'center' },
+            { width: 490, align: 'center' },
             { width: 200, align: 'Center' },
             { width: 200, align: 'Center' },
             { width: 200, align: 'Center' },
@@ -145,7 +146,7 @@ pageLength: number;
            // this.alerts = "<span>Subscription price save unsuccessfull</span>";
            this._confirmService.activate("Subscription prices insert unsuccessfull", "alertMsg");
         } else {
-            this.modalAlerts = "<p>Subscription price saved successfully</p>";
+            this.modalAlerts = "<p>Subscriptions saved successfully</p>";
             this.CancelAdd();
             this.modalRef = this.modalService.show(template);
         }
@@ -156,7 +157,7 @@ pageLength: number;
             //this.alerts = "<span>Subscription prices update unsuccessfull</span>\n";
             this._confirmService.activate("Subscription prices update unsuccessfull", "alertMsg");
         } else {
-            this.modalAlerts = "<p>Subscription prices updated successfully</p>";
+            this.modalAlerts = "<p>Subscriptions updated successfully</p>";
             this.modalRef = this.modalService.show(template);
         }
     }
@@ -209,15 +210,64 @@ pageLength: number;
         this.modalRef.hide();
         console.log(this.checkedRecords);  
         this.alerts = '';
+        var deletedSubscriptions = '';
+        var unDeletedSubscriptions = '';
+        let cnt = 0;
         if(this.alerts == ''){
-            var obj =  this.checkedRecords.filter(C => C > 0);
-                return this.subscriptionPriceService.DeleteSubscriptionPrices(obj)
+            this.RecordDeleted = [];
+            this.checkedRecords.filter(C => C > 0).forEach(element => {
+                this.subscriptionPriceService.CheckSubscriptionPlanForLicense(element)
                 .subscribe(
-                data => (this.AfterDeleteData(data, template)),
+                data => { 
+                    if (data == "True") {
+                        cnt++;
+                        unDeletedSubscriptions += this.subscriptionPrices.find(C => C.Id == element).Title + ", ";
+                        if(cnt == this.checkedRecords.filter(C => C > 0).length)
+                        {
+                            this.modalAlerts = '';
+                            if(deletedSubscriptions != ''){
+                                this.modalAlerts = "<p>Subscription prices " + deletedSubscriptions.substr(0, deletedSubscriptions.length - 2) + " deleted successfully</p>";
+                            }
+                            if(unDeletedSubscriptions != ''){
+                                this.modalAlerts += "<p>Subscription prices " + unDeletedSubscriptions.substr(0, unDeletedSubscriptions.length - 2) + " are already mapped to licenses and cannot be deleted.</p>";
+                            }
+                            this.modalRef = this.modalService.show(template);
+                            this.SearchRecords(this.selectedEditionId);
+                        }
+                    } 
+                    else{
+                        this.subscriptionPriceService.DeleteSubscriptionPrice(element)
+                        .subscribe(
+                        data => { 
+                            if (data == "True") {
+                                cnt++;
+                                deletedSubscriptions += this.subscriptionPrices.find(C => C.Id == element).Title + ", ";
+                            }
+                            if(cnt == this.checkedRecords.filter(C => C > 0).length)
+                            {
+                                this.modalAlerts = '';
+                                if(deletedSubscriptions != ''){
+                                    this.modalAlerts = "<p>Subscription prices " + deletedSubscriptions.substr(0, deletedSubscriptions.length - 2) + " deleted successfully</p>";
+                                }
+                                if(unDeletedSubscriptions != ''){
+                                    this.modalAlerts += "<p>Subscription prices " + unDeletedSubscriptions.substr(0, unDeletedSubscriptions.length - 2) + " are already mapped to licenses and cannot be deleted.</p>";
+                                }
+                                this.modalRef = this.modalService.show(template);
+                                this.SearchRecords(this.selectedEditionId);
+                            }
+                        },
+                        error => {
+                            this.error = <any>error; 
+                            this.alerts = "<span>" + this.error + "</span>";
+                        })
+                    }
+                },
                 error => {
                     this.error = <any>error; 
                     this.alerts = "<span>" + this.error + "</span>";
                 });
+            });
+            
         }
     }
 import { Injectable, Inject } from '@angular/core';
 //import { HttpClient, HttpParams, HttpRequest} from "@angular/common/http";
-import { Http, Response, Headers, RequestOptions, HttpModule } from '@angular/http';
+import { Http, Response, Headers, RequestOptions, RequestOptionsArgs, RequestMethod, HttpModule } from '@angular/http';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/observable/throw';
@@ -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));
@@ -47,15 +47,22 @@ export class SubscriptionPriceService {
       .catch((res: Response) => this.handleError(res));
   }
-  DeleteSubscriptionPrices(obj: any) {    
+  DeleteSubscriptionPrice(obj: any) {    
     //let options = new RequestOptions({ headers: this.headers });
-    var subscriptionPriceIds = obj;
-    console.log(subscriptionPriceIds);
-    var headers = new Headers({
+    console.log(obj);
+    let subscriptionPriceId = obj;
+    let headers = new Headers({
       'Content-Type': 'application/json'
     });
-    return this.http.post(this.commonService.resourceBaseUrl + "SubscriptionPrice/DeleteSubscriptionPrices",  
-    subscriptionPriceIds, {headers: headers})
+    return this.http.get(this.commonService.resourceBaseUrl + "SubscriptionPrice/DeleteSubscriptionPrice?subscriptionPriceId=" + subscriptionPriceId)  
+      .map(this.extractData)
+      .catch((res: Response) => this.handleError(res));
+  }
+
+  CheckSubscriptionPlanForLicense(obj: any) {    
+    //let options = new RequestOptions({ headers: this.headers });
+    console.log(obj);
+    return this.http.get(this.commonService.resourceBaseUrl + "SubscriptionPrice/CheckSubscriptionPlanForLicense?subscriptionPriceId=" + obj)
       .map(this.extractData)
       .catch((res: Response) => this.handleError(res));
   }
 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql differ
 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql differ
 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql differ
 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql differ
+USE [AIADatabaseV5]
+GO
+/****** Object:  StoredProcedure [dbo].[usp_CheckSubscriptionForLicense]    Script Date: 2/1/2018 12:15:55 PM ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+
+-- ====================================================  
+-- Author:  Magic Software  
+-- Create date: 22-May-2018  
+-- Description: To check the licenses exist for a subscription plan  
+-- ==================================================== 
+
+if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[usp_CheckSubscriptionForLicense]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+drop procedure [dbo].[usp_CheckSubscriptionForLicense]
+GO
+ 
+create PROCEDURE [dbo].[usp_CheckSubscriptionForLicense]
+ -- Add the parameters for the stored procedure here  
+	 @Id tinyint,
+	@Status bit out  
+AS  
+BEGIN  
+ -- SET NOCOUNT ON added to prevent extra result sets from  
+ -- interfering with SELECT statements.  
+ SET NOCOUNT ON;  
+  
+ set @Status = 0;  
+  if(exists(select * from [LicenseSubscriptionDetail] where SubscriptionPlanId = @Id))  
+  begin
+	set @Status = 1;
+  end
+  
+END  
+
+
+GO