ADAM / AIAHTML5

Commit dad2616be09999189f4007229a32182d5a6cd3dc

Authored by Harpreet Banwait
1 parent a9083d30

Issue Fixes

Inline Side-by-side
Showing 20 changed files with 319 additions and 57 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/App_Start/WebApiConfig.cs
  View file @dad2616
... ... @@ -21,7 +21,7 @@ namespace AIAHTML5.ADMIN.API
21 21 string Enablecors = ConfigurationManager.AppSettings["Enablecors"];
22 22 if (Enablecors == "false")
23 23 {
24   - EnableCorsAttribute cors = new EnableCorsAttribute("http://localhost:4200, http://192.168.86.13:91", "*", "GET,POST");
  24 + EnableCorsAttribute cors = new EnableCorsAttribute("http://localhost:4200, http://192.168.86.13:92", "*", "GET,POST");
25 25 config.EnableCors(cors);
26 26 }
27 27  
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs
  View file @dad2616
... ... @@ -71,12 +71,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
71 71  
72 72 [Route("GetNetAdSummaryReport")]
73 73 [HttpGet]
74   - public IHttpActionResult GetNetAdSummaryReport(string sFromDate, string sToDate, decimal iStartPrice, decimal iEndPrice, int iLicenseTypeId)
  74 + public IHttpActionResult GetNetAdSummaryReport(string sFromDate, string sToDate, decimal iStartPrice, decimal iEndPrice, int iLicenseTypeId, int pageNo, int pageLength)
75 75 {
76 76 try
77 77 {
78   - var lstNetAdSummaryReport = dbContext.GetNetAdSummaryReport(sFromDate, sToDate, iStartPrice, iEndPrice, (byte)iLicenseTypeId).ToList();
79   - return Ok(lstNetAdSummaryReport);
  78 + var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
  79 + var lstNetAdSummaryReport = dbContext.GetNetAdSummaryReport(sFromDate, sToDate, iStartPrice, iEndPrice, (byte)iLicenseTypeId, pageNo, pageLength, spRecordCount).ToList();
  80 + return Ok(new { NetAdSubscriptionList = lstNetAdSummaryReport, RecordCount = spRecordCount.Value });
80 81 }
81 82 catch (Exception ex)
82 83 {
... ... @@ -86,12 +87,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
86 87  
87 88 [Route("GetSiteLicenseUsageReport")]
88 89 [HttpGet]
89   - public IHttpActionResult GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccountNumber, int iEdition)
  90 + public IHttpActionResult GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccountNumber, int iEdition, int pageNo, int pageLength)
90 91 {
91 92 try
92 93 {
93   - var lstSiteLicenseUsageReport = dbContext.GetSiteLicenseUsageReport(sFromDate, sToDate, sAccountNumber, (byte)iEdition).ToList();
94   - return Ok(lstSiteLicenseUsageReport);
  94 + var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
  95 + var lstSiteLicenseUsageReport = dbContext.GetSiteLicenseUsageReport(sFromDate, sToDate, sAccountNumber, (byte)iEdition, pageNo, pageLength, spRecordCount).ToList();
  96 + return Ok(new { SiteLicenseUsageList = lstSiteLicenseUsageReport, RecordCount = spRecordCount.Value });
95 97 }
96 98 catch (Exception ex)
97 99 {
... ... @@ -101,12 +103,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
101 103  
102 104 [Route("GetDiscountReport")]
103 105 [HttpGet]
104   - public IHttpActionResult GetDiscountReport(string sFromDate, string sToDate, int iDiscountCode, string sAccountNumber)
  106 + public IHttpActionResult GetDiscountReport(string sFromDate, string sToDate, int iDiscountCode, string sAccountNumber, int pageNo, int pageLength)
105 107 {
106 108 try
107 109 {
108   - var lstDiscountReport = dbContext.GetDiscountReport(sFromDate, sToDate, iDiscountCode, sAccountNumber).ToList();
109   - return Ok(lstDiscountReport);
  110 + var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
  111 + var lstDiscountReport = dbContext.GetDiscountReport(sFromDate, sToDate, iDiscountCode, sAccountNumber, pageNo, pageLength, spRecordCount).ToList();
  112 + return Ok(new { DiscountReportList = lstDiscountReport, RecordCount = spRecordCount.Value });
110 113 }
111 114 catch (Exception ex)
112 115 {
... ... @@ -116,14 +119,14 @@ namespace AIAHTML5.ADMIN.API.Controllers
116 119  
117 120 [Route("GetImageExportReport")]
118 121 [HttpGet]
119   - public IHttpActionResult GetImageExportReport(string sFromDate, string sToDate, string sAccountNumber)
  122 + public IHttpActionResult GetImageExportReport(string sFromDate, string sToDate, string sAccountNumber, int pageNo, int pageLength)
120 123 {
121 124 try
122 125 {
123   - if (sAccountNumber == null)
124   - sAccountNumber = string.Empty;
125   - var lstImageExportReport = dbContext.GetExportedImageDetails(sFromDate, sToDate, sAccountNumber).ToList();
126   - return Ok(lstImageExportReport);
  126 + if (sAccountNumber == null) sAccountNumber = string.Empty;
  127 + var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
  128 + var lstImageExportReport = dbContext.GetExportedImageDetails(sFromDate, sToDate, sAccountNumber, pageNo, pageLength, spRecordCount).ToList();
  129 + return Ok(new { ImageExportList = lstImageExportReport, RecordCount = spRecordCount.Value });
127 130 }
128 131 catch (Exception ex)
129 132 {
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SubscriptionPriceController.cs
  View file @dad2616
... ... @@ -109,14 +109,14 @@ namespace AIAHTML5.ADMIN.API.Controllers
109 109 }
110 110 }
111 111  
112   - [Route("DeleteSubscriptionPrices")]
113   - [HttpPost]
114   - public HttpResponseMessage DeleteSubscriptionPrices(List<int> subscriptionPriceIds)
  112 + [Route("DeleteSubscriptionPrice")]
  113 + [HttpGet]
  114 + public HttpResponseMessage DeleteSubscriptionPrice(int subscriptionPriceId)
115 115 {
116 116 bool Status = false;
117 117 try
118 118 {
119   - Status = SubscriptionPriceModel.DeleteSubscriptionPrices(dbContext, subscriptionPriceIds);
  119 + Status = SubscriptionPriceModel.DeleteSubscriptionPrice(dbContext, subscriptionPriceId);
120 120 if (Status)
121 121 {
122 122 return Request.CreateResponse(HttpStatusCode.OK, Status.ToString());
... ... @@ -133,6 +133,23 @@ namespace AIAHTML5.ADMIN.API.Controllers
133 133 }
134 134 }
135 135  
  136 + [Route("CheckSubscriptionPlanForLicense")]
  137 + [HttpGet]
  138 + public HttpResponseMessage CheckSubscriptionPlanForLicense(int subscriptionPriceId)
  139 + {
  140 + bool Status = false;
  141 + try
  142 + {
  143 + Status = SubscriptionPriceModel.CheckSubscriptionPlanForLicense(dbContext, subscriptionPriceId);
  144 + return Request.CreateResponse(HttpStatusCode.OK, Status.ToString());
  145 + }
  146 + catch (Exception ex)
  147 + {
  148 + // Log exception code goes here
  149 + return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
  150 + }
  151 + }
  152 +
136 153 protected HttpResponseMessage ToJson(dynamic obj)
137 154 {
138 155 var response = Request.CreateResponse(HttpStatusCode.OK);
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs
  View file @dad2616
... ... @@ -138,5 +138,22 @@ namespace AIAHTML5.ADMIN.API.Controllers
138 138 return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
139 139 }
140 140 }
  141 +
  142 + [Route("CheckDuplicateLicenseUserGroup")]
  143 + [HttpGet]
  144 + public HttpResponseMessage CheckDuplicateLicenseUserGroup(int LicenseId, string Title)
  145 + {
  146 + bool Status = false;
  147 + try
  148 + {
  149 + Status = UserGroupModel.CheckDuplicateLicenseUserGroup(dbContext, LicenseId, Title);
  150 + return Request.CreateResponse(HttpStatusCode.OK, Status.ToString());
  151 + }
  152 + catch (Exception ex)
  153 + {
  154 + // Log exception code goes here
  155 + return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
  156 + }
  157 + }
141 158 }
142 159 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
  View file @dad2616
... ... @@ -1075,7 +1075,7 @@ namespace AIAHTML5.ADMIN.API.Entity
1075 1075 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetDiscountedPrice_Result>("GetDiscountedPrice", inDiscountCodeParameter, outReturnCode, outDiscountPercentage, outDiscountCodeId);
1076 1076 }
1077 1077  
1078   - public virtual ObjectResult<GetDiscountReport_Result> GetDiscountReport(string sStartDate, string sEndDate, Nullable<int> intDiscountID, string sAccoutNumber)
  1078 + public virtual ObjectResult<GetDiscountReport_Result> GetDiscountReport(string sStartDate, string sEndDate, Nullable<int> intDiscountID, string sAccoutNumber, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
1079 1079 {
1080 1080 var sStartDateParameter = sStartDate != null ?
1081 1081 new ObjectParameter("sStartDate", sStartDate) :
... ... @@ -1093,7 +1093,15 @@ namespace AIAHTML5.ADMIN.API.Entity
1093 1093 new ObjectParameter("sAccoutNumber", sAccoutNumber) :
1094 1094 new ObjectParameter("sAccoutNumber", typeof(string));
1095 1095  
1096   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetDiscountReport_Result>("GetDiscountReport", sStartDateParameter, sEndDateParameter, intDiscountIDParameter, sAccoutNumberParameter);
  1096 + var pageNoParameter = pageNo.HasValue ?
  1097 + new ObjectParameter("pageNo", pageNo) :
  1098 + new ObjectParameter("pageNo", typeof(int));
  1099 +
  1100 + var pageLengthParameter = pageLength.HasValue ?
  1101 + new ObjectParameter("pageLength", pageLength) :
  1102 + new ObjectParameter("pageLength", typeof(int));
  1103 +
  1104 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetDiscountReport_Result>("GetDiscountReport", sStartDateParameter, sEndDateParameter, intDiscountIDParameter, sAccoutNumberParameter, pageNoParameter, pageLengthParameter, recordCount);
1097 1105 }
1098 1106  
1099 1107 public virtual ObjectResult<getEditionData_Result> getEditionData()
... ... @@ -1176,7 +1184,7 @@ namespace AIAHTML5.ADMIN.API.Entity
1176 1184 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetExpiringLicenses_Result>("GetExpiringLicenses", sFromDateParameter, sToDateParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeIdParameter, iAccountTypeIdParameter, sZipParameter, iStateIdParameter, iCountryIdParameter, pageNoParameter, pageLengthParameter, recordCount);
1177 1185 }
1178 1186  
1179   - public virtual ObjectResult<GetExportedImageDetails_Result> GetExportedImageDetails(string sStartDate, string sEndDate, string sAccoutNumber)
  1187 + public virtual ObjectResult<GetExportedImageDetails_Result> GetExportedImageDetails(string sStartDate, string sEndDate, string sAccoutNumber, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
1180 1188 {
1181 1189 var sStartDateParameter = sStartDate != null ?
1182 1190 new ObjectParameter("sStartDate", sStartDate) :
... ... @@ -1190,7 +1198,15 @@ namespace AIAHTML5.ADMIN.API.Entity
1190 1198 new ObjectParameter("sAccoutNumber", sAccoutNumber) :
1191 1199 new ObjectParameter("sAccoutNumber", typeof(string));
1192 1200  
1193   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetExportedImageDetails_Result>("GetExportedImageDetails", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter);
  1201 + var pageNoParameter = pageNo.HasValue ?
  1202 + new ObjectParameter("pageNo", pageNo) :
  1203 + new ObjectParameter("pageNo", typeof(int));
  1204 +
  1205 + var pageLengthParameter = pageLength.HasValue ?
  1206 + new ObjectParameter("pageLength", pageLength) :
  1207 + new ObjectParameter("pageLength", typeof(int));
  1208 +
  1209 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetExportedImageDetails_Result>("GetExportedImageDetails", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, pageNoParameter, pageLengthParameter, recordCount);
1194 1210 }
1195 1211  
1196 1212 public virtual int GetImagePinData()
... ... @@ -1394,7 +1410,7 @@ namespace AIAHTML5.ADMIN.API.Entity
1394 1410 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetNetAdDetailReport_Result>("GetNetAdDetailReport", sFromDateParameter, sToDateParameter, sLicenseTypeParameter, sAccountTypeParameter, iStartPriceParameter, iEndPriceParameter);
1395 1411 }
1396 1412  
1397   - public virtual ObjectResult<GetNetAdSummaryReport_Result> GetNetAdSummaryReport(string sFromDate, string sToDate, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, Nullable<byte> iLicenseTypeId)
  1413 + 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)
1398 1414 {
1399 1415 var sFromDateParameter = sFromDate != null ?
1400 1416 new ObjectParameter("sFromDate", sFromDate) :
... ... @@ -1416,7 +1432,15 @@ namespace AIAHTML5.ADMIN.API.Entity
1416 1432 new ObjectParameter("iLicenseTypeId", iLicenseTypeId) :
1417 1433 new ObjectParameter("iLicenseTypeId", typeof(byte));
1418 1434  
1419   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetNetAdSummaryReport_Result>("GetNetAdSummaryReport", sFromDateParameter, sToDateParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeIdParameter);
  1435 + var pageNoParameter = pageNo.HasValue ?
  1436 + new ObjectParameter("pageNo", pageNo) :
  1437 + new ObjectParameter("pageNo", typeof(int));
  1438 +
  1439 + var pageLengthParameter = pageLength.HasValue ?
  1440 + new ObjectParameter("pageLength", pageLength) :
  1441 + new ObjectParameter("pageLength", typeof(int));
  1442 +
  1443 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetNetAdSummaryReport_Result>("GetNetAdSummaryReport", sFromDateParameter, sToDateParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeIdParameter, pageNoParameter, pageLengthParameter, recordCount);
1420 1444 }
1421 1445  
1422 1446 public virtual ObjectResult<GetProductFeatures_Result> GetProductFeatures(Nullable<int> editionId)
... ... @@ -1551,7 +1575,7 @@ namespace AIAHTML5.ADMIN.API.Entity
1551 1575 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSiteIpByAccountNumber_Result>("GetSiteIpByAccountNumber", accountNumnerParameter);
1552 1576 }
1553 1577  
1554   - public virtual ObjectResult<GetSiteLicenseUsageReport_Result> GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccoutNumber, Nullable<byte> iEditionId)
  1578 + public virtual ObjectResult<GetSiteLicenseUsageReport_Result> GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccoutNumber, Nullable<byte> iEditionId, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
1555 1579 {
1556 1580 var sFromDateParameter = sFromDate != null ?
1557 1581 new ObjectParameter("sFromDate", sFromDate) :
... ... @@ -1569,7 +1593,15 @@ namespace AIAHTML5.ADMIN.API.Entity
1569 1593 new ObjectParameter("iEditionId", iEditionId) :
1570 1594 new ObjectParameter("iEditionId", typeof(byte));
1571 1595  
1572   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSiteLicenseUsageReport_Result>("GetSiteLicenseUsageReport", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, iEditionIdParameter);
  1596 + var pageNoParameter = pageNo.HasValue ?
  1597 + new ObjectParameter("pageNo", pageNo) :
  1598 + new ObjectParameter("pageNo", typeof(int));
  1599 +
  1600 + var pageLengthParameter = pageLength.HasValue ?
  1601 + new ObjectParameter("pageLength", pageLength) :
  1602 + new ObjectParameter("pageLength", typeof(int));
  1603 +
  1604 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSiteLicenseUsageReport_Result>("GetSiteLicenseUsageReport", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, iEditionIdParameter, pageNoParameter, pageLengthParameter, recordCount);
1573 1605 }
1574 1606  
1575 1607 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
3748 3780  
3749 3781 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);
3750 3782 }
  3783 +
  3784 + public virtual int usp_CheckSubscriptionForLicense(Nullable<byte> id, ObjectParameter status)
  3785 + {
  3786 + var idParameter = id.HasValue ?
  3787 + new ObjectParameter("Id", id) :
  3788 + new ObjectParameter("Id", typeof(byte));
  3789 +
  3790 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_CheckSubscriptionForLicense", idParameter, status);
  3791 + }
  3792 +
  3793 + public virtual int usp_CheckDuplicateLicenseUserGroup(Nullable<int> licenseId, string title, ObjectParameter status)
  3794 + {
  3795 + var licenseIdParameter = licenseId.HasValue ?
  3796 + new ObjectParameter("LicenseId", licenseId) :
  3797 + new ObjectParameter("LicenseId", typeof(int));
  3798 +
  3799 + var titleParameter = title != null ?
  3800 + new ObjectParameter("Title", title) :
  3801 + new ObjectParameter("Title", typeof(string));
  3802 +
  3803 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_CheckDuplicateLicenseUserGroup", licenseIdParameter, titleParameter, status);
  3804 + }
3751 3805 }
3752 3806 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
  View file @dad2616
... ... @@ -377,6 +377,9 @@
377 377 <Parameter Name="sEndDate" Type="varchar" Mode="In" />
378 378 <Parameter Name="intDiscountID" Type="int" Mode="In" />
379 379 <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
  380 + <Parameter Name="pageNo" Type="int" Mode="In" />
  381 + <Parameter Name="pageLength" Type="int" Mode="In" />
  382 + <Parameter Name="recordCount" Type="int" Mode="InOut" />
380 383 </Function>
381 384 <Function Name="getEditionData" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo" />
382 385 <Function Name="GetEditionsBySiteAccount" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
... ... @@ -405,6 +408,9 @@
405 408 <Parameter Name="sStartDate" Type="varchar" Mode="In" />
406 409 <Parameter Name="sEndDate" Type="varchar" Mode="In" />
407 410 <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
  411 + <Parameter Name="pageNo" Type="int" Mode="In" />
  412 + <Parameter Name="pageLength" Type="int" Mode="In" />
  413 + <Parameter Name="recordCount" Type="int" Mode="InOut" />
408 414 </Function>
409 415 <Function Name="GetImagePinData" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo" />
410 416 <Function Name="GetIncorrectLoginAttempt" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
... ... @@ -474,6 +480,9 @@
474 480 <Parameter Name="iStartPrice" Type="numeric" Mode="In" />
475 481 <Parameter Name="iEndPrice" Type="numeric" Mode="In" />
476 482 <Parameter Name="iLicenseTypeId" Type="tinyint" Mode="In" />
  483 + <Parameter Name="pageNo" Type="int" Mode="In" />
  484 + <Parameter Name="pageLength" Type="int" Mode="In" />
  485 + <Parameter Name="recordCount" Type="int" Mode="InOut" />
477 486 </Function>
478 487 <Function Name="GetProductFeatures" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
479 488 <Parameter Name="EditionId" Type="int" Mode="In" />
... ... @@ -522,6 +531,9 @@
522 531 <Parameter Name="sToDate" Type="varchar" Mode="In" />
523 532 <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
524 533 <Parameter Name="iEditionId" Type="tinyint" Mode="In" />
  534 + <Parameter Name="pageNo" Type="int" Mode="In" />
  535 + <Parameter Name="pageLength" Type="int" Mode="In" />
  536 + <Parameter Name="recordCount" Type="int" Mode="InOut" />
525 537 </Function>
526 538 <Function Name="GetSubscribedLicenses" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
527 539 <Parameter Name="sFromDate" Type="varchar" Mode="In" />
... ... @@ -910,6 +922,15 @@
910 922 <Parameter Name="AccountNo" Type="varchar" Mode="In" />
911 923 <Parameter Name="Status" Type="bit" Mode="InOut" />
912 924 </Function>
  925 + <Function Name="usp_CheckDuplicateLicenseUserGroup" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
  926 + <Parameter Name="LicenseId" Type="int" Mode="In" />
  927 + <Parameter Name="Title" Type="varchar" Mode="In" />
  928 + <Parameter Name="Status" Type="bit" Mode="InOut" />
  929 + </Function>
  930 + <Function Name="usp_CheckSubscriptionForLicense" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
  931 + <Parameter Name="Id" Type="tinyint" Mode="In" />
  932 + <Parameter Name="Status" Type="bit" Mode="InOut" />
  933 + </Function>
913 934 <Function Name="usp_DB_TblRowCOUNT" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo" />
914 935 <Function Name="usp_DeleteLicenseUserGroup" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
915 936 <Parameter Name="UserGroupId" Type="int" Mode="In" />
... ... @@ -1489,6 +1510,9 @@
1489 1510 <Parameter Name="sEndDate" Mode="In" Type="String" />
1490 1511 <Parameter Name="intDiscountID" Mode="In" Type="Int32" />
1491 1512 <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
  1513 + <Parameter Name="pageNo" Mode="In" Type="Int32" />
  1514 + <Parameter Name="pageLength" Mode="In" Type="Int32" />
  1515 + <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
1492 1516 </FunctionImport>
1493 1517 <FunctionImport Name="getEditionData" ReturnType="Collection(AIADatabaseV5Model.getEditionData_Result)" />
1494 1518 <FunctionImport Name="GetEditionsBySiteAccount" ReturnType="Collection(AIADatabaseV5Model.GetEditionsBySiteAccount_Result)">
... ... @@ -1517,6 +1541,9 @@
1517 1541 <Parameter Name="sStartDate" Mode="In" Type="String" />
1518 1542 <Parameter Name="sEndDate" Mode="In" Type="String" />
1519 1543 <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
  1544 + <Parameter Name="pageNo" Mode="In" Type="Int32" />
  1545 + <Parameter Name="pageLength" Mode="In" Type="Int32" />
  1546 + <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
1520 1547 </FunctionImport>
1521 1548 <FunctionImport Name="GetImagePinData" />
1522 1549 <FunctionImport Name="GetIncorrectLoginAttempt" ReturnType="Collection(Int16)">
... ... @@ -1586,6 +1613,9 @@
1586 1613 <Parameter Name="iStartPrice" Mode="In" Type="Decimal" />
1587 1614 <Parameter Name="iEndPrice" Mode="In" Type="Decimal" />
1588 1615 <Parameter Name="iLicenseTypeId" Mode="In" Type="Byte" />
  1616 + <Parameter Name="pageNo" Mode="In" Type="Int32" />
  1617 + <Parameter Name="pageLength" Mode="In" Type="Int32" />
  1618 + <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
1589 1619 </FunctionImport>
1590 1620 <FunctionImport Name="GetProductFeatures" ReturnType="Collection(AIADatabaseV5Model.GetProductFeatures_Result)">
1591 1621 <Parameter Name="EditionId" Mode="In" Type="Int32" />
... ... @@ -1634,6 +1664,9 @@
1634 1664 <Parameter Name="sToDate" Mode="In" Type="String" />
1635 1665 <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
1636 1666 <Parameter Name="iEditionId" Mode="In" Type="Byte" />
  1667 + <Parameter Name="pageNo" Mode="In" Type="Int32" />
  1668 + <Parameter Name="pageLength" Mode="In" Type="Int32" />
  1669 + <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
1637 1670 </FunctionImport>
1638 1671 <FunctionImport Name="GetSubscribedLicenses" ReturnType="Collection(AIADatabaseV5Model.GetSubscribedLicenses_Result)">
1639 1672 <Parameter Name="sFromDate" Mode="In" Type="String" />
... ... @@ -2095,7 +2128,7 @@
2095 2128 <Parameter Name="SiteId" Mode="In" Type="Int32" />
2096 2129 </FunctionImport>
2097 2130 <FunctionImport Name="usp_GetSubscriptionPlans" ReturnType="Collection(AIADatabaseV5Model.usp_GetSubscriptionPlans_Result)">
2098   - <Parameter Name="iEditionId" Mode="In" Type="Byte" />
  2131 + <Parameter Name="iEditionId" Mode="In" Type="Byte" />
2099 2132 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2100 2133 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2101 2134 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2272,6 +2305,15 @@
2272 2305 <Parameter Name="sProductKey" Mode="In" Type="String" />
2273 2306 <Parameter Name="iNoofImages" Mode="In" Type="Int32" />
2274 2307 </FunctionImport>
  2308 + <FunctionImport Name="usp_CheckSubscriptionForLicense">
  2309 + <Parameter Name="Id" Mode="In" Type="Byte" />
  2310 + <Parameter Name="Status" Mode="InOut" Type="Boolean" />
  2311 + </FunctionImport>
  2312 + <FunctionImport Name="usp_CheckDuplicateLicenseUserGroup">
  2313 + <Parameter Name="LicenseId" Mode="In" Type="Int32" />
  2314 + <Parameter Name="Title" Mode="In" Type="String" />
  2315 + <Parameter Name="Status" Mode="InOut" Type="Boolean" />
  2316 + </FunctionImport>
2275 2317 </EntityContainer>
2276 2318 <ComplexType Name="DA_GetBaseLayer_Result">
2277 2319 <Property Type="Int32" Name="Id" Nullable="false" />
... ... @@ -2802,6 +2844,7 @@
2802 2844 <Property Type="Int32" Name="RenewSubscription" Nullable="true" />
2803 2845 <Property Type="Int32" Name="InActiveSubscription" Nullable="true" />
2804 2846 <Property Type="Int32" Name="NetAdSubscription" Nullable="true" />
  2847 + <Property Type="Int64" Name="RowNum" Nullable="true" />
2805 2848 </ComplexType>
2806 2849 <ComplexType Name="GetProductFeatures_Result">
2807 2850 <Property Type="Byte" Name="Id" Nullable="false" />
... ... @@ -2865,6 +2908,7 @@
2865 2908 <Property Type="String" Name="LicenseCreationDate" Nullable="true" MaxLength="30" />
2866 2909 <Property Type="Int32" Name="TotalLogins" Nullable="true" />
2867 2910 <Property Type="String" Name="LastLogin" Nullable="true" MaxLength="30" />
  2911 + <Property Type="Int64" Name="RowNum" Nullable="true" />
2868 2912 </ComplexType>
2869 2913 <ComplexType Name="GetSubscribedLicenses_Result">
2870 2914 <Property Type="Int64" Name="RowNum" Nullable="true" />
... ... @@ -4144,6 +4188,7 @@
4144 4188 <ScalarProperty Name="RenewSubscription" ColumnName="RenewSubscription" />
4145 4189 <ScalarProperty Name="InActiveSubscription" ColumnName="InActiveSubscription" />
4146 4190 <ScalarProperty Name="NetAdSubscription" ColumnName="NetAdSubscription" />
  4191 + <ScalarProperty Name="RowNum" ColumnName="RowNum" />
4147 4192 </ComplexTypeMapping>
4148 4193 </ResultMapping>
4149 4194 </FunctionImportMapping>
... ... @@ -4237,6 +4282,7 @@
4237 4282 <ScalarProperty Name="LicenseCreationDate" ColumnName="LicenseCreationDate" />
4238 4283 <ScalarProperty Name="TotalLogins" ColumnName="TotalLogins" />
4239 4284 <ScalarProperty Name="LastLogin" ColumnName="LastLogin" />
  4285 + <ScalarProperty Name="RowNum" ColumnName="RowNum" />
4240 4286 </ComplexTypeMapping>
4241 4287 </ResultMapping>
4242 4288 </FunctionImportMapping>
... ... @@ -4891,6 +4937,8 @@
4891 4937 </ComplexTypeMapping>
4892 4938 </ResultMapping>
4893 4939 </FunctionImportMapping>
  4940 + <FunctionImportMapping FunctionImportName="usp_CheckSubscriptionForLicense" FunctionName="AIADatabaseV5Model.Store.usp_CheckSubscriptionForLicense" />
  4941 + <FunctionImportMapping FunctionImportName="usp_CheckDuplicateLicenseUserGroup" FunctionName="AIADatabaseV5Model.Store.usp_CheckDuplicateLicenseUserGroup" />
4894 4942 </EntityContainerMapping>
4895 4943 </Mapping>
4896 4944 </edmx:Mappings>
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/GetNetAdSummaryReport_Result.cs
  View file @dad2616
... ... @@ -21,5 +21,6 @@ namespace AIAHTML5.ADMIN.API.Entity
21 21 public Nullable<int> RenewSubscription { get; set; }
22 22 public Nullable<int> InActiveSubscription { get; set; }
23 23 public Nullable<int> NetAdSubscription { get; set; }
  24 + public Nullable<long> RowNum { get; set; }
24 25 }
25 26 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/GetSiteLicenseUsageReport_Result.cs
  View file @dad2616
... ... @@ -20,5 +20,6 @@ namespace AIAHTML5.ADMIN.API.Entity
20 20 public string LicenseCreationDate { get; set; }
21 21 public Nullable<int> TotalLogins { get; set; }
22 22 public string LastLogin { get; set; }
  23 + public Nullable<long> RowNum { get; set; }
23 24 }
24 25 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/LicenseModel.cs
  View file @dad2616
... ... @@ -113,15 +113,12 @@ namespace AIAHTML5.ADMIN.API.Models
113 113 try
114 114 {
115 115 var result = dbContext.usp_GetAccountNumber(LicenseType).ToList();
116   - int i = 0;
117 116 if (result.Count > 0)
118 117 {
119 118 foreach (var item in result)
120 119 {
121 120 LicenseAccountObj = new Tuple<int, string>(item.Id, item.AccountNumber);
122 121 LicenseAccountList.Add(LicenseAccountObj);
123   - i++;
124   - if (i > 100) break;
125 122 }
126 123 }
127 124 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/SubscriptionPriceModel.cs
  View file @dad2616
... ... @@ -78,16 +78,26 @@ namespace AIAHTML5.ADMIN.API.Models
78 78 }
79 79 }
80 80  
81   - public static bool DeleteSubscriptionPrices(AIADatabaseV5Entities dbContext, List<int> subscriptionPriceIds)
  81 + public static bool DeleteSubscriptionPrice(AIADatabaseV5Entities dbContext, int subscriptionPriceId)
82 82 {
83 83 var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
84 84 try
85 85 {
86   - foreach (var item in subscriptionPriceIds)
87   - {
88   - dbContext.usp_DeleteSubscriptionPlan((byte?)item, spStatus);
89   - if (!(bool)spStatus.Value) break;
90   - }
  86 + dbContext.usp_DeleteSubscriptionPlan((byte?)subscriptionPriceId, spStatus);
  87 + return (bool)spStatus.Value;
  88 + }
  89 + catch (Exception ex)
  90 + {
  91 + return false;
  92 + }
  93 + }
  94 +
  95 + public static bool CheckSubscriptionPlanForLicense(AIADatabaseV5Entities dbContext, int subscriptionPriceId)
  96 + {
  97 + var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
  98 + try
  99 + {
  100 + dbContext.usp_CheckSubscriptionForLicense((byte?)subscriptionPriceId, spStatus);
91 101 return (bool)spStatus.Value;
92 102 }
93 103 catch (Exception ex)
... ... @@ -95,5 +105,6 @@ namespace AIAHTML5.ADMIN.API.Models
95 105 return false;
96 106 }
97 107 }
  108 +
98 109 }
99 110 }
100 111 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs
  View file @dad2616
... ... @@ -113,6 +113,19 @@ namespace AIAHTML5.ADMIN.API.Models
113 113 }
114 114 }
115 115  
  116 + public static bool CheckDuplicateLicenseUserGroup(AIADatabaseV5Entities dbContext, int LicenseId, string Title)
  117 + {
  118 + var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
  119 + try
  120 + {
  121 + dbContext.usp_CheckDuplicateLicenseUserGroup(LicenseId, Title, spStatus);
  122 + return (bool)spStatus.Value;
  123 + }
  124 + catch (Exception ex)
  125 + {
  126 + return false;
  127 + }
  128 + }
116 129 }
117 130  
118 131 }
119 132 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.component.ts
  View file @dad2616
... ... @@ -14,10 +14,14 @@ import { Router } from &#39;@angular/router&#39;;
14 14 })
15 15  
16 16 export class AppComponent implements OnInit {
17   -
  17 + DisplayName: string = "";
18 18 constructor(private userservice: UserService, private global: GlobalService, private router: Router) { }
19 19  
20   - ngOnInit(): void { }
  20 + ngOnInit(): void {
  21 +
  22 + this.DisplayName = this.global.DisplayName;
  23 + this.router.navigate(['/updateuserprofile']);
  24 + }
21 25 logout() {
22 26 localStorage.removeItem('loggedInUserDetails');
23 27 window.location.href = this.global.LiveURL;
... ...
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/app.module.ts
  View file @dad2616
... ... @@ -44,6 +44,7 @@ import { ConfirmService } from &#39;./Shared/Confirm/confirm.service&#39;;
44 44 import { ConfirmComponent } from "./Shared/Confirm/confirm.component"
45 45 import { BsDatepickerModule, ModalModule } from 'ngx-bootstrap';
46 46 import { BsModalService } from 'ngx-bootstrap/modal';
  47 +import { ScrollEventModule } from 'ngx-scroll-event';
47 48 import { ContenteditableModelDirective } from './shared/contenteditabledirective';
48 49 import { LoadingService } from './shared/loading.service';
49 50 import { PagerComponent } from './shared/Pager/pager.component';
... ... @@ -76,7 +77,7 @@ import { NumberOnlyDirective } from &#39;./shared/numberonlydirective&#39;;
76 77 ],
77 78 imports: [
78 79 BrowserModule, AppRoutingModule, HttpClientModule, FormsModule, ReactiveFormsModule, HttpModule, Ng2Bs3ModalModule,
79   - BsDatepickerModule.forRoot(), ModalModule.forRoot()//ModalModule.forRoot()
  80 + BsDatepickerModule.forRoot(), ModalModule.forRoot(), ScrollEventModule//ModalModule.forRoot()
80 81 // , AngularFireModule.initializeApp(firebaseConfig),
81 82 ],
82 83 providers: [GlobalService, ConfirmService, BsModalService, LoadingService, CsvService,
... ... @@ -89,8 +90,8 @@ import { NumberOnlyDirective } from &#39;./shared/numberonlydirective&#39;;
89 90 // useClass: MyInterceptor,
90 91 // multi: true
91 92 //}
92   - //{ provide: APP_BASE_HREF, useValue: '/Admin-UI' }
93   - { provide: APP_BASE_HREF, useValue: '/' }
  93 + { provide: APP_BASE_HREF, useValue: '/Admin' }
  94 + //{ provide: APP_BASE_HREF, useValue: '/' }
94 95  
95 96 ],
96 97 bootstrap: [AppComponent]
... ...
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.ts
  View file @dad2616
... ... @@ -40,6 +40,7 @@ NoRecord: string;
40 40 recordCount: number;
41 41 pageNo: number;
42 42 pageLength: number;
  43 +RecordDeleted: number[];
43 44  
44 45 constructor(private subscriptionPriceService: SubscriptionPriceService, private router: Router,
45 46 private fb: FormBuilder, private modalService: BsModalService, private global: GlobalService,
... ... @@ -62,11 +63,11 @@ pageLength: number;
62 63 });
63 64 $('#fixed_hdr2').fxdHdrCol({
64 65 fixedCols: 0,
65   - width: "80%",
  66 + width: "100%",
66 67 height: 300,
67 68 colModal: [
68 69 { width: 150, align: 'center' },
69   - { width: 400, align: 'center' },
  70 + { width: 490, align: 'center' },
70 71 { width: 200, align: 'Center' },
71 72 { width: 200, align: 'Center' },
72 73 { width: 200, align: 'Center' },
... ... @@ -145,7 +146,7 @@ pageLength: number;
145 146 // this.alerts = "<span>Subscription price save unsuccessfull</span>";
146 147 this._confirmService.activate("Subscription prices insert unsuccessfull", "alertMsg");
147 148 } else {
148   - this.modalAlerts = "<p>Subscription price saved successfully</p>";
  149 + this.modalAlerts = "<p>Subscriptions saved successfully</p>";
149 150 this.CancelAdd();
150 151 this.modalRef = this.modalService.show(template);
151 152 }
... ... @@ -156,7 +157,7 @@ pageLength: number;
156 157 //this.alerts = "<span>Subscription prices update unsuccessfull</span>\n";
157 158 this._confirmService.activate("Subscription prices update unsuccessfull", "alertMsg");
158 159 } else {
159   - this.modalAlerts = "<p>Subscription prices updated successfully</p>";
  160 + this.modalAlerts = "<p>Subscriptions updated successfully</p>";
160 161 this.modalRef = this.modalService.show(template);
161 162 }
162 163 }
... ... @@ -209,15 +210,64 @@ pageLength: number;
209 210 this.modalRef.hide();
210 211 console.log(this.checkedRecords);
211 212 this.alerts = '';
  213 + var deletedSubscriptions = '';
  214 + var unDeletedSubscriptions = '';
  215 + let cnt = 0;
212 216 if(this.alerts == ''){
213   - var obj = this.checkedRecords.filter(C => C > 0);
214   - return this.subscriptionPriceService.DeleteSubscriptionPrices(obj)
  217 + this.RecordDeleted = [];
  218 + this.checkedRecords.filter(C => C > 0).forEach(element => {
  219 + this.subscriptionPriceService.CheckSubscriptionPlanForLicense(element)
215 220 .subscribe(
216   - data => (this.AfterDeleteData(data, template)),
  221 + data => {
  222 + if (data == "True") {
  223 + cnt++;
  224 + unDeletedSubscriptions += this.subscriptionPrices.find(C => C.Id == element).Title + ", ";
  225 + if(cnt == this.checkedRecords.filter(C => C > 0).length)
  226 + {
  227 + this.modalAlerts = '';
  228 + if(deletedSubscriptions != ''){
  229 + this.modalAlerts = "<p>Subscription prices " + deletedSubscriptions.substr(0, deletedSubscriptions.length - 2) + " deleted successfully</p>";
  230 + }
  231 + if(unDeletedSubscriptions != ''){
  232 + this.modalAlerts += "<p>Subscription prices " + unDeletedSubscriptions.substr(0, unDeletedSubscriptions.length - 2) + " are already mapped to licenses and cannot be deleted.</p>";
  233 + }
  234 + this.modalRef = this.modalService.show(template);
  235 + this.SearchRecords(this.selectedEditionId);
  236 + }
  237 + }
  238 + else{
  239 + this.subscriptionPriceService.DeleteSubscriptionPrice(element)
  240 + .subscribe(
  241 + data => {
  242 + if (data == "True") {
  243 + cnt++;
  244 + deletedSubscriptions += this.subscriptionPrices.find(C => C.Id == element).Title + ", ";
  245 + }
  246 + if(cnt == this.checkedRecords.filter(C => C > 0).length)
  247 + {
  248 + this.modalAlerts = '';
  249 + if(deletedSubscriptions != ''){
  250 + this.modalAlerts = "<p>Subscription prices " + deletedSubscriptions.substr(0, deletedSubscriptions.length - 2) + " deleted successfully</p>";
  251 + }
  252 + if(unDeletedSubscriptions != ''){
  253 + this.modalAlerts += "<p>Subscription prices " + unDeletedSubscriptions.substr(0, unDeletedSubscriptions.length - 2) + " are already mapped to licenses and cannot be deleted.</p>";
  254 + }
  255 + this.modalRef = this.modalService.show(template);
  256 + this.SearchRecords(this.selectedEditionId);
  257 + }
  258 + },
  259 + error => {
  260 + this.error = <any>error;
  261 + this.alerts = "<span>" + this.error + "</span>";
  262 + })
  263 + }
  264 + },
217 265 error => {
218 266 this.error = <any>error;
219 267 this.alerts = "<span>" + this.error + "</span>";
220 268 });
  269 + });
  270 +
221 271 }
222 272 }
223 273  
... ...
400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.service.ts
  View file @dad2616
1 1 import { Injectable, Inject } from '@angular/core';
2 2 //import { HttpClient, HttpParams, HttpRequest} from "@angular/common/http";
3   -import { Http, Response, Headers, RequestOptions, HttpModule } from '@angular/http';
  3 +import { Http, Response, Headers, RequestOptions, RequestOptionsArgs, RequestMethod, HttpModule } from '@angular/http';
4 4 import 'rxjs/add/operator/map';
5 5 import 'rxjs/add/operator/catch';
6 6 import 'rxjs/add/observable/throw';
... ... @@ -15,7 +15,7 @@ export class SubscriptionPriceService {
15 15  
16 16  
17 17 GetSubscriptionPrices(obj: any) {
18   - return this.http.get(this.commonService.resourceBaseUrl + "SubscriptionPrice/GetSubscriptionPrices?editionId="
  18 + return this.http.get(this.commonService.resourceBaseUrl + "SubscriptionPrice/GetSubscriptionPrices?editionId="
19 19 + obj.editionId + "&pageNo=" + obj.pageNo + "&pageLength=" + obj.pageLength)
20 20 .map(this.extractData)
21 21 .catch((res: Response) => this.handleError(res));
... ... @@ -47,15 +47,22 @@ export class SubscriptionPriceService {
47 47 .catch((res: Response) => this.handleError(res));
48 48 }
49 49  
50   - DeleteSubscriptionPrices(obj: any) {
  50 + DeleteSubscriptionPrice(obj: any) {
51 51 //let options = new RequestOptions({ headers: this.headers });
52   - var subscriptionPriceIds = obj;
53   - console.log(subscriptionPriceIds);
54   - var headers = new Headers({
  52 + console.log(obj);
  53 + let subscriptionPriceId = obj;
  54 + let headers = new Headers({
55 55 'Content-Type': 'application/json'
56 56 });
57   - return this.http.post(this.commonService.resourceBaseUrl + "SubscriptionPrice/DeleteSubscriptionPrices",
58   - subscriptionPriceIds, {headers: headers})
  57 + return this.http.get(this.commonService.resourceBaseUrl + "SubscriptionPrice/DeleteSubscriptionPrice?subscriptionPriceId=" + subscriptionPriceId)
  58 + .map(this.extractData)
  59 + .catch((res: Response) => this.handleError(res));
  60 + }
  61 +
  62 + CheckSubscriptionPlanForLicense(obj: any) {
  63 + //let options = new RequestOptions({ headers: this.headers });
  64 + console.log(obj);
  65 + return this.http.get(this.commonService.resourceBaseUrl + "SubscriptionPrice/CheckSubscriptionPlanForLicense?subscriptionPriceId=" + obj)
59 66 .map(this.extractData)
60 67 .catch((res: Response) => this.handleError(res));
61 68 }
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql
  View file @dad2616
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql
  View file @dad2616
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql
  View file @dad2616
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql
  View file @dad2616
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/usp_CheckSubscriptionForLicense.sql 0 → 100644
  View file @dad2616
  1 +USE [AIADatabaseV5]
  2 +GO
  3 +/****** Object: StoredProcedure [dbo].[usp_CheckSubscriptionForLicense] Script Date: 2/1/2018 12:15:55 PM ******/
  4 +SET ANSI_NULLS ON
  5 +GO
  6 +SET QUOTED_IDENTIFIER ON
  7 +GO
  8 +
  9 +-- ====================================================
  10 +-- Author: Magic Software
  11 +-- Create date: 22-May-2018
  12 +-- Description: To check the licenses exist for a subscription plan
  13 +-- ====================================================
  14 +
  15 +if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[usp_CheckSubscriptionForLicense]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
  16 +drop procedure [dbo].[usp_CheckSubscriptionForLicense]
  17 +GO
  18 +
  19 +create PROCEDURE [dbo].[usp_CheckSubscriptionForLicense]
  20 + -- Add the parameters for the stored procedure here
  21 + @Id tinyint,
  22 + @Status bit out
  23 +AS
  24 +BEGIN
  25 + -- SET NOCOUNT ON added to prevent extra result sets from
  26 + -- interfering with SELECT statements.
  27 + SET NOCOUNT ON;
  28 +
  29 + set @Status = 0;
  30 + if(exists(select * from [LicenseSubscriptionDetail] where SubscriptionPlanId = @Id))
  31 + begin
  32 + set @Status = 1;
  33 + end
  34 +
  35 +END
  36 +
  37 +
  38 +GO
... ...