diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj b/400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj index ebb6f8f..371d0d6 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj @@ -156,6 +156,7 @@ + diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/App_Start/WebApiConfig.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/App_Start/WebApiConfig.cs index 164815d..2a536d3 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/App_Start/WebApiConfig.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/App_Start/WebApiConfig.cs @@ -17,7 +17,8 @@ namespace AIAHTML5.ADMIN.API .Remove(GlobalConfiguration.Configuration.Formatters.XmlFormatter); // Configure cross domain access - config.EnableCors(); + var cors = new EnableCorsAttribute("http://localhost:4200, http://localhost:91", "*", "*"); + config.EnableCors(cors); // Web API routes config.MapHttpAttributeRoutes(); diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/AccountController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/AccountController.cs index 6126f36..11b42df 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/AccountController.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/AccountController.cs @@ -16,7 +16,6 @@ using AIAHTML5.ADMIN.API.Entity; namespace AIAHTML5.ADMIN.API.Controllers { - [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")] [RoutePrefix("Account")] public class AccountController : ApiController { diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/CommonController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/CommonController.cs index b432ee4..0dd1e47 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/CommonController.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/CommonController.cs @@ -17,7 +17,6 @@ using AIAHTML5.ADMIN.API.Entity; namespace AIAHTML5.ADMIN.API.Controllers { - [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")] [RoutePrefix("Common")] public class CommonController : ApiController { @@ -74,6 +73,46 @@ namespace AIAHTML5.ADMIN.API.Controllers } } + [Route("GetEdition")] + [HttpGet] + public IHttpActionResult GetEdition() + { + dbContext.Configuration.ProxyCreationEnabled = false; + List lstEdition1 = new List(); + var lstEdition = dbContext.Editions.Where(e => e.IsActive == true).OrderBy(e => e.Priority).ToList(); + lstEdition1 = lstEdition.Select(l => new Edition { Id = l.Id, Title = l.Title }).ToList(); + //lstCountry1.Insert(0, new Country { Id = 0, CountryName = "All" }); + return Ok(lstEdition1); + } + [Route("GetDiscountCode")] + [HttpGet] + public IHttpActionResult GetDiscountCode() + { + dbContext.Configuration.ProxyCreationEnabled = false; + List lstDiscountCode1 = new List(); + string sStartDate = DateTime.MinValue.ToShortDateString(); + string sEndDate = DateTime.MaxValue.ToShortDateString(); + var lstDiscountCode = dbContext.GetDiscountCodes("", "", "").ToList(); + lstDiscountCode1 = lstDiscountCode.Select(l => new DiscountCodeModel { Id = l.Id, DiscountCode = l.DiscountCode }).ToList(); + return Ok(lstDiscountCode1); + } + + [Route("GetAccountType")] + [HttpGet] + public IHttpActionResult GetAccountType() + { + List AccountTypeList = new List(); + //try + //{ + AccountTypeList = AccountTypeModel.GetAccountTypes(dbContext); + return Ok(AccountTypeList); + //} + //catch (Exception ex) + //{ + // // Log exception code goes here + // //return ex.Message; + //} + } protected HttpResponseMessage ToJson(dynamic obj) { var response = Request.CreateResponse(HttpStatusCode.OK); diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/DiscountCodeController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/DiscountCodeController.cs index 721a25b..00e1db7 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/DiscountCodeController.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/DiscountCodeController.cs @@ -17,7 +17,6 @@ using AIAHTML5.ADMIN.API.Entity; namespace AIAHTML5.ADMIN.API.Controllers { - [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")] [RoutePrefix("DiscountCode")] public class DiscountCodeController : ApiController { diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/EditionController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/EditionController.cs index c5aba05..68bfd82 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/EditionController.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/EditionController.cs @@ -16,7 +16,6 @@ using AIAHTML5.ADMIN.API.Entity; namespace AIAHTML5.ADMIN.API.Controllers { - [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")] [RoutePrefix("Edition")] public class EditionController : ApiController { diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/LicenseController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/LicenseController.cs index 0d4ef17..915d327 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/LicenseController.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/LicenseController.cs @@ -16,7 +16,6 @@ using AIAHTML5.ADMIN.API.Entity; namespace AIAHTML5.ADMIN.API.Controllers { - [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")] [RoutePrefix("License")] public class LicenseController : ApiController { diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs new file mode 100644 index 0000000..7a66f68 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs @@ -0,0 +1,126 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using AIAHTML5.ADMIN.API.Models; +using System.Web.Http.Cors; +using System.Web.Cors; +using AIAHTML5.Server.Constants; +using log4net; +using System.Text; +using AIAHTML5.ADMIN.API.Entity; +namespace AIAHTML5.ADMIN.API.Controllers +{ + [RoutePrefix("Report")] + public class ReportController : ApiController + { + AIADatabaseV5Entities dbContext = new AIADatabaseV5Entities(); + [Route("GetUsageReport")] + [HttpGet] + public IHttpActionResult GetUsageReport(string sFromDate, string sToDate, string sAccoutNumber, string sZip, int iState, int iCountry) + { + var lstUsageReport = dbContext.GetUsageReport(sFromDate, sToDate, sAccoutNumber, sZip, iState, iCountry).ToList(); + return Ok(lstUsageReport); + } + + [Route("GetCustomerSummeryReport")] + [HttpGet] + public IHttpActionResult GetCustomerSummeryReport(string sAccoutNumber, string sLicenseeFullName, Nullable iStartPrice, Nullable iEndPrice, int iLicenseType, int iAccountType, string sZip, int iState, int iCountry) + { + var lstCustomerSummeryReport = dbContext.GetCustomerSummary(sAccoutNumber, sLicenseeFullName, iStartPrice, iEndPrice, (byte)iLicenseType, (byte)iAccountType, sZip, iState, iCountry).ToList(); + return Ok(lstCustomerSummeryReport); + } + + + [Route("GetExpiringSubscriptionReport")] + [HttpGet] + public IHttpActionResult GetExpiringSubscriptionReport(string sFromDate, string sToDate, decimal iStartPrice, decimal iEndPrice, int iLicenseTypeId, int iAccountTypeId, string sZip, int iStateId, int iCountryId) + { + var lstExpiringSubscriptionReport = dbContext.GetExpiringLicenses(sFromDate, sToDate, iStartPrice, iEndPrice, (byte)iLicenseTypeId, (byte)iAccountTypeId, sZip, iStateId, iCountryId).ToList(); + return Ok(lstExpiringSubscriptionReport); + } + + [Route("GetSubscriptionReport")] + [HttpGet] + public IHttpActionResult GetSubscriptionReport(string sFromDate, string sToDate, decimal icStartPrice, decimal icEndPrice, int iLicenseTypeId, int iAccountTypeId, string sZip, int iStateId, int iCountryId) + { + + var lstExpiringSubscriptionReport = dbContext.GetSubscribedLicenses(sFromDate, sToDate, icStartPrice, icEndPrice, (byte)iLicenseTypeId, (byte)iAccountTypeId, sZip, iStateId, iCountryId).ToList(); + return Ok(lstExpiringSubscriptionReport); + } + [Route("GetSubscriptionCancellationReport")] + [HttpGet] + public IHttpActionResult GetSubscriptionCancellationReport(string sFromDate, string sToDate, decimal icStartPrice, decimal icEndPrice, int iLicenseTypeId, int iAccountTypeId, string sZip, int iStateId, int iCountryId) + { + + var lstExpiringSubscriptionReport = dbContext.GetCancelledLicenses(sFromDate, sToDate, icStartPrice, icEndPrice, (byte)iLicenseTypeId, (byte)iAccountTypeId, sZip, iStateId, iCountryId).ToList(); + return Ok(lstExpiringSubscriptionReport); + } + + [Route("GetNetAdSummaryReport")] + [HttpGet] + public IHttpActionResult GetNetAdSummaryReport(string sFromDate, string sToDate, decimal iStartPrice, decimal iEndPrice, int iLicenseTypeId) + { + try + { + var lstNetAdSummaryReport = dbContext.GetNetAdSummaryReport(sFromDate, sToDate, iStartPrice, iEndPrice, (byte)iLicenseTypeId).ToList(); + return Ok(lstNetAdSummaryReport); + } + catch (Exception ex) + { + return Ok(ex.Message.ToString()); + } + } + + [Route("GetSiteLicenseUsageReport")] + [HttpGet] + public IHttpActionResult GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccountNumber, int iEdition) + { + try + { + var lstSiteLicenseUsageReport = dbContext.GetSiteLicenseUsageReport(sFromDate, sToDate, sAccountNumber, (byte)iEdition).ToList(); + return Ok(lstSiteLicenseUsageReport); + } + catch (Exception ex) + { + return Ok(ex.Message.ToString()); + } + } + + [Route("GetDiscountReport")] + [HttpGet] + public IHttpActionResult GetDiscountReport(string sFromDate, string sToDate, int iDiscountCode, string sAccountNumber) + { + try + { + var lstDiscountReport = dbContext.GetDiscountReport(sFromDate, sToDate, iDiscountCode, sAccountNumber).ToList(); + return Ok(lstDiscountReport); + } + catch (Exception ex) + { + return Ok(ex.Message.ToString()); + } + } + + [Route("GetImageExportReport")] + [HttpGet] + public IHttpActionResult GetImageExportReport(string sFromDate, string sToDate, string sAccountNumber) + { + try + { + if (sAccountNumber == null) + sAccountNumber = string.Empty; + var lstImageExportReport = dbContext.GetExportedImageDetails(sFromDate, sToDate, sAccountNumber).ToList(); + return Ok(lstImageExportReport); + } + catch (Exception ex) + { + return Ok(ex.Message.ToString()); + } + } + } +} \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SiteController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SiteController.cs index 666c108..8e6cbac 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SiteController.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SiteController.cs @@ -16,7 +16,6 @@ using AIAHTML5.ADMIN.API.Entity; namespace AIAHTML5.ADMIN.API.Controllers { - [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")] [RoutePrefix("Site")] public class SiteController : ApiController { diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SubscriptionPriceController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SubscriptionPriceController.cs index 7a63fc9..89c6348 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SubscriptionPriceController.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SubscriptionPriceController.cs @@ -17,7 +17,6 @@ using AIAHTML5.ADMIN.API.Entity; namespace AIAHTML5.ADMIN.API.Controllers { - [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")] [RoutePrefix("SubscriptionPrice")] public class SubscriptionPriceController : ApiController { diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs index a6421ff..34ff2f9 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs @@ -16,7 +16,6 @@ using AIAHTML5.ADMIN.API.Entity; namespace AIAHTML5.ADMIN.API.Controllers { - [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")] [RoutePrefix("User")] public class UserController : ApiController { diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs index c4c2cd5..d7e6768 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs @@ -16,7 +16,6 @@ using AIAHTML5.ADMIN.API.Entity; namespace AIAHTML5.ADMIN.API.Controllers { - [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")] [RoutePrefix("UserGroup")] public class UserGroupController : ApiController { diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/DiscountCodeModel.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/DiscountCodeModel.cs index a677a03..3611937 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/DiscountCodeModel.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/DiscountCodeModel.cs @@ -21,7 +21,7 @@ namespace AIAHTML5.ADMIN.API.Models DiscountCodeModel DiscountCodeObj = new DiscountCodeModel(); try { - var result = dbContext.GetDiscountCodes(discountCode, startDate.ToString(), endDate.ToString()).ToList(); + var result = dbContext.GetDiscountCodes(discountCode, startDate.ToString("MM/dd/yyyy"), endDate.ToString("MM/dd/yyyy")).ToList(); if (result.Count > 0) { foreach (var item in result) diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/SharedModel.cs b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/SharedModel.cs index ec8fb92..9369bd8 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/SharedModel.cs +++ b/400-SOURCECODE/AIAHTML5.ADMIN.API/Models/SharedModel.cs @@ -7,6 +7,10 @@ namespace AIAHTML5.ADMIN.API.Models { public class AccountTypeModel { + public int Id { get; set; } + public string Title { get; set; } + public bool isActive { get; set; } + public static List GetAccountTypeList(AIADatabaseV5Entities dbContext, int Id) { var accountTypeEntity = dbContext.usp_GetAccountTypeList(Id).ToList(); @@ -14,5 +18,27 @@ namespace AIAHTML5.ADMIN.API.Models //AccountTypelist.Insert(0, new AccountType { Id = 0, Title = "All" }); return AccountTypelist; } + + public static List GetAccountTypes(AIADatabaseV5Entities dbContext) + { + List AccountTypeList = new List(); + AccountTypeModel AccountTypeModelObj = new AccountTypeModel(); + try + { + var result = dbContext.EC_GetAccountTypeList().ToList(); + if (result.Count > 0) + { + foreach (var item in result) + { + AccountTypeModelObj = new AccountTypeModel(); + AccountTypeModelObj.Id = item.Id; + AccountTypeModelObj.Title = item.Title; + AccountTypeList.Add(AccountTypeModelObj); + } + } + } + catch (Exception ex) { } + return AccountTypeList; + } } } \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts index d03df4b..5dfb0a8 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/ManageDiscountCode/managediscountcode.component.ts @@ -1,20 +1,23 @@ -import { Component, OnInit, AfterViewInit, Input, Output, EventEmitter, Pipe, PipeTransform, TemplateRef } from '@angular/core'; +import { Component, OnInit, AfterViewInit, AfterViewChecked, Input, Output, EventEmitter, Pipe, PipeTransform, TemplateRef } from '@angular/core'; import { ManageDiscountCodeService } from './managediscountcode.service'; import { Router } from '@angular/router'; import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { DiscountCode } from '../UserEntity/datamodel'; -import { BsDatepickerModule } from 'ngx-bootstrap'; +import { BsDatepickerModule, BsDatepickerConfig } from 'ngx-bootstrap'; import { Http, Response } from '@angular/http'; import { DatePipe } from '@angular/common'; import { BsModalService } from 'ngx-bootstrap/modal'; import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service'; import { ConfirmService } from '../../Shared/Confirm/confirm.service'; +import { GlobalService } from '../../Shared/global'; + +declare var $:any; @Component({ templateUrl: './managediscountcode.component.html' }) -export class ManageDiscountCode implements OnInit { +export class ManageDiscountCode implements OnInit, AfterViewChecked { Mode: string = 'Manage'; discountCode: DiscountCode; @@ -23,10 +26,11 @@ manageDiscountCodeFrm: FormGroup; insertUpdateDiscountCodeFrm: FormGroup; error: any; alerts: string; +alertmsg: string; modalAlerts: string; divClass: string = ''; topPos: string = '2000px'; -selectedRow: number = 0; +selectedRow: number = -1; datePipe: DatePipe = new DatePipe('en-US'); bsValue1: Date = new Date(); bsValue2: Date = new Date(); @@ -34,13 +38,25 @@ bsValue3: Date = new Date(); bsValue4: Date = new Date(); selectedId: number = 0; modalRef: BsModalRef; +minDate = new Date(1110, 11, 1); +maxDate = new Date(9999, 11, 31); +bsConfig: Partial; +NoRecord: string; +dateStartInvalid: boolean = false; +dateEndInvalid: boolean = false; +dateStartInvalid1: boolean = false; +dateEndInvalid1: boolean = false; -constructor(private manageDiscountCodeService: ManageDiscountCodeService, private router: Router, private _confirmService: ConfirmService, private fb: FormBuilder, private modalService: BsModalService) { } +constructor(private manageDiscountCodeService: ManageDiscountCodeService, private router: Router, + private _confirmService: ConfirmService, private fb: FormBuilder, private global: GlobalService, + private modalService: BsModalService) { } ngOnInit(): void { + this.bsConfig = Object.assign({}, { containerClass: 'theme-dark-blue' }); this.divClass = 'col-sm-12'; this.discountCode = new DiscountCode(); this.alerts = ''; + this.alertmsg = ''; this.manageDiscountCodeFrm = this.fb.group({ searchDiscountCode: [''], searchStartDate: [''], @@ -64,12 +80,98 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat this.discountCode = item; } + DateChange(dateValue: any){ + this.alerts = ''; + this.alertmsg = ''; + + if(this.manageDiscountCodeFrm.dirty) { + if(dateValue._datepicker._elementRef.nativeElement.id == 'searchStartDate'){ + if(dateValue._bsValue == null) { + if(dateValue._datepicker._elementRef.nativeElement.value != ''){ + this.dateStartInvalid = true; + } + else{ + this.dateStartInvalid = false; + } + } + else{ + this.dateStartInvalid = false; + this.manageDiscountCodeFrm.controls['searchStartDate'].setValue(dateValue._bsValue); + } + } + + if(dateValue._datepicker._elementRef.nativeElement.id == 'searchEndDate'){ + if(dateValue._bsValue == null) { + if(dateValue._datepicker._elementRef.nativeElement.value != ''){ + this.dateEndInvalid = true; + } + else{ + this.dateEndInvalid = false; + } + } + else{ + this.dateEndInvalid = false; + this.manageDiscountCodeFrm.controls['searchEndDate'].setValue(dateValue._bsValue); + } + } + + if(!this.dateStartInvalid && !this.dateEndInvalid){ + if(Date.parse(this.manageDiscountCodeFrm.controls['searchStartDate'].value) > + Date.parse(this.manageDiscountCodeFrm.controls['searchEndDate'].value)){ + this.alertmsg = 'Search start date must be less than the search end date
'; + } + } + } + + if(this.insertUpdateDiscountCodeFrm.dirty) { + if(dateValue._datepicker._elementRef.nativeElement.id == 'startDate'){ + if(dateValue._bsValue == null) { + if(dateValue._datepicker._elementRef.nativeElement.value != ''){ + this.insertUpdateDiscountCodeFrm.controls['startDate'].setValue(dateValue._datepicker._elementRef.nativeElement.value); + this.dateStartInvalid1 = true; + } + else{ + this.dateStartInvalid1 = false; + } + } + else{ + this.dateStartInvalid1 = false; + this.insertUpdateDiscountCodeFrm.controls['startDate'].setValue(dateValue._bsValue); + } + } + + if(dateValue._datepicker._elementRef.nativeElement.id == 'endDate'){ + if(dateValue._bsValue == null) { + if(dateValue._datepicker._elementRef.nativeElement.value != ''){ + this.insertUpdateDiscountCodeFrm.controls['endDate'].setValue(dateValue._datepicker._elementRef.nativeElement.value); + this.dateEndInvalid1 = true; + } + else{ + this.dateEndInvalid1 = false; + } + } + else{ + this.dateEndInvalid1 = false; + this.insertUpdateDiscountCodeFrm.controls['endDate'].setValue(dateValue._bsValue); + } + } + + if(!this.dateStartInvalid1 && !this.dateEndInvalid1){ + if(Date.parse(this.insertUpdateDiscountCodeFrm.controls['startDate'].value) > + Date.parse(this.insertUpdateDiscountCodeFrm.controls['endDate'].value)){ + this.alerts = 'Discount start date must be less than the discount end date
'; + } + } + } + + } + public SearchDiscountCodes() { this.manageDiscountCodeService.GetDiscountCodes( { discountCode: this.manageDiscountCodeFrm.controls['searchDiscountCode'].value, - startDate: this.manageDiscountCodeFrm.controls['searchStartDate'].value, - endDate: this.manageDiscountCodeFrm.controls['searchEndDate'].value + startDate: this.datePipe.transform(this.manageDiscountCodeFrm.controls['searchStartDate'].value, 'MM/dd/yyyy'), + endDate: this.datePipe.transform(this.manageDiscountCodeFrm.controls['searchEndDate'].value, 'MM/dd/yyyy'), }) .subscribe(x => { this.BindFormFields(x) }, error => this.error = error); } @@ -125,10 +227,16 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat } BindFormFields(data){ - this.selectedRow = 0; this.discountCodes = data; + if(this.discountCodes.length == 0){ + this.NoRecord = this.global.NoRecords; + } this.discountCode = this.discountCodes[0]; this.manageDiscountCodeFrm.setControl('discountCodes', this.fb.array(this.discountCodes)); + if(this.selectedRow > -1){ + this.selectedRow = this.discountCodes.findIndex(C => C.Id == this.selectedId); + this.SetClickedRow(this.selectedRow, this.discountCodes[this.selectedRow]); + } } AddDiscountCode(){ @@ -168,7 +276,14 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat this.topPos = '2000px'; this.divClass = 'col-sm-12'; this.SearchDiscountCodes(); - this.selectedRow = this.discountCodes.findIndex(C => C.Id == this.selectedId); - this.SetClickedRow(this.selectedRow, this.manageDiscountCodeFrm.controls['discountCodes'].value.find(C => C.Id == this.selectedId)); + } + + SearchRecords(){ + this.selectedRow = -1; + this.SearchDiscountCodes(); + } + + ngAfterViewChecked(){ + $('#tblDiscountCodes thead').css('width', $('#tblDiscountCodes tbody tr:eq(0)').width()); } } diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.html b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.html index ee9e64c..0b38faf 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.html +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.html @@ -1,7 +1,7 @@
-
-

Subscription Price

+
+

{{Mode}} Subscription Price

@@ -99,9 +99,9 @@
- + - +
diff --git a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.ts b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.ts index 303e6f6..285b423 100644 --- a/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.ts +++ b/400-SOURCECODE/AIAHTML5.ADMIN.Web/src/app/components/SubscriptionPrice/subscriptionprice.component.ts @@ -96,6 +96,7 @@ constructor(private subscriptionPriceService: SubscriptionPriceService, private this._confirmService.activate("Subscription prices insert unsuccessfull", "alertMsg"); } else { this.modalAlerts = "

Subscription price saved successfully

"; + this.CancelAdd(); this.modalRef = this.modalService.show(template); } }