ADAM / AIAHTML5

Commit a7a8cc8b7381afcb723fc2d3c54b0467d2f23030

Authored by Birendra
1 parent 43208f42

add sorting on report tables

Inline Side-by-side
Showing 55 changed files with 1725 additions and 1139 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/CommonController.cs
  View file @a7a8cc8
... ... @@ -90,12 +90,12 @@ namespace AIAHTML5.ADMIN.API.Controllers
90 90 public IHttpActionResult GetDiscountCode()
91 91 {
92 92 dbContext.Configuration.ProxyCreationEnabled = false;
93   - List<DiscountCodeModel> lstDiscountCode1 = new List<DiscountCodeModel>();
  93 + List<usp_GetDiscountCodes_Result> lstDiscountCode1 = new List<usp_GetDiscountCodes_Result>();
94 94 string sStartDate = DateTime.MinValue.ToShortDateString();
95 95 string sEndDate = DateTime.MaxValue.ToShortDateString();
96 96 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
97   - var lstDiscountCode = dbContext.usp_GetDiscountCodes("", "", "", 1, 1, spRecordCount).ToList();
98   - lstDiscountCode1 = lstDiscountCode.Select(l => new DiscountCodeModel { Id = l.Id, DiscountCode = l.DiscountCode }).ToList();
  97 + var lstDiscountCode = dbContext.usp_GetDiscountCodes("", "", "","Id","asc", 1, 1, spRecordCount).ToList();
  98 + lstDiscountCode1 = lstDiscountCode.Select(l => new usp_GetDiscountCodes_Result { Id = l.Id, DiscountCode = l.DiscountCode }).ToList();
99 99 return Ok(lstDiscountCode1);
100 100 }
101 101  
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/DiscountCodeController.cs
  View file @a7a8cc8
... ... @@ -25,13 +25,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
25 25  
26 26 [Route("GetDiscountCodes")]
27 27 [HttpGet]
28   - public HttpResponseMessage GetDiscountCodes(string discountCode, DateTime startDate, DateTime endDate, int pageNo, int pageLength)
  28 + public HttpResponseMessage GetDiscountCodes(string discountCode, DateTime startDate, DateTime endDate, string sortColumn, string sortOrder, int pageNo, int pageLength)
29 29 {
30   - List<DiscountCodeModel> DiscountCodeList = new List<DiscountCodeModel>();
  30 + List<usp_GetDiscountCodes_Result> DiscountCodeList;
31 31 int recordCount = 0;
32 32 try
33 33 {
34   - DiscountCodeList = DiscountCodeModel.GetDiscountCodes(dbContext, discountCode, startDate, endDate, pageNo, pageLength, out recordCount);
  34 + DiscountCodeList = DiscountCodeModel.GetDiscountCodes(dbContext, discountCode, startDate, endDate, sortColumn, sortOrder, pageNo, pageLength, out recordCount);
35 35 return Request.CreateResponse(HttpStatusCode.OK, new { DiscountCodeList = DiscountCodeList, RecordCount = recordCount });
36 36 }
37 37 catch (Exception ex)
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/LicenseController.cs
  View file @a7a8cc8
... ... @@ -43,14 +43,14 @@ namespace AIAHTML5.ADMIN.API.Controllers
43 43 [HttpGet]
44 44 public HttpResponseMessage GetLicenses(string accountNumber, string licenseeFirstName, string licenseeLastName, byte licenseTypeId,
45 45 string institutionName, int stateId, int countryId, string emailId, DateTime subscriptionStartDate, DateTime subscriptionEndDate,
46   - bool isActive, int pageNo, int pageLength)
  46 + bool isActive, string sortColumn, string sortOrder, int pageNo, int pageLength)
47 47 {
48   - List<LicenseModel> LicenseList = new List<LicenseModel>();
  48 + List<usp_GetlicensesList_Result> LicenseList;
49 49 int recordCount = 0;
50 50 try
51 51 {
52 52 LicenseList = LicenseModel.GetLicenses(dbContext, accountNumber, licenseeFirstName, licenseeLastName, licenseTypeId, institutionName,
53   - stateId, countryId, emailId, subscriptionStartDate, subscriptionEndDate, isActive, pageNo, pageLength, out recordCount);
  53 + stateId, countryId, emailId, subscriptionStartDate, subscriptionEndDate, isActive, sortColumn, sortOrder, pageNo, pageLength, out recordCount);
54 54 return Request.CreateResponse(HttpStatusCode.OK, new { LicenseList = LicenseList, RecordCount = recordCount });
55 55 }
56 56 catch (Exception ex)
... ... @@ -236,13 +236,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
236 236  
237 237 [Route("LicenseSites")]
238 238 [HttpGet]
239   - public HttpResponseMessage GetLicenseSites(string AccountNo, int pageNo, int pageLength)
  239 + public HttpResponseMessage GetLicenseSites(string AccountNo, string sortColumn, string sortOrder, int pageNo, int pageLength)
240 240 {
241   - List<SiteModel> LicenseSiteList = new List<SiteModel>();
  241 + List<usp_GetSiteAccountSites_Result> LicenseSiteList;
242 242 int recordCount = 0;
243 243 try
244 244 {
245   - LicenseSiteList = LicenseModel.GetLicenseSites(dbContext, AccountNo, pageNo, pageLength, out recordCount);
  245 + LicenseSiteList = LicenseModel.GetLicenseSites(dbContext, AccountNo, sortColumn, sortOrder, pageNo, pageLength, out recordCount);
246 246 return Request.CreateResponse(HttpStatusCode.OK, new { LicenseSiteList = LicenseSiteList, RecordCount = recordCount });
247 247 }
248 248 catch (Exception ex)
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs
  View file @a7a8cc8
... ... @@ -22,21 +22,21 @@ namespace AIAHTML5.ADMIN.API.Controllers
22 22 AIADatabaseV5Entities dbContext = new AIADatabaseV5Entities();
23 23 [Route("GetUsageReport")]
24 24 [HttpGet]
25   - public IHttpActionResult GetUsageReport(string sFromDate, string sToDate, string sAccoutNumber, string sZip, int iState, int iCountry, int pageNo, int pageLength)
  25 + public IHttpActionResult GetUsageReport(string sFromDate, string sToDate, string sAccoutNumber, string sZip, int iState, int iCountry, string sortColumn, string sortOrder, int pageNo, int pageLength)
26 26 {
27 27  
28 28 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
29   - var lstUsageReport = dbContext.usp_GetUsageReport(sFromDate, sToDate, sAccoutNumber, sZip, iState, iCountry, pageNo, pageLength, spRecordCount).ToList();
  29 + var lstUsageReport = dbContext.usp_GetUsageReport(sFromDate, sToDate, sAccoutNumber, sZip, iState, iCountry, sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
30 30 return Ok(new { UserUsage = lstUsageReport, RecordCount = spRecordCount.Value });
31 31 //return Ok(lstUsageReport);
32 32 }
33 33  
34 34 [Route("GetCustomerSummeryReport")]
35 35 [HttpGet]
36   - public IHttpActionResult GetCustomerSummeryReport(string sAccoutNumber, string sLicenseeFullName, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, int iLicenseType, int iAccountType, string sZip, int iState, int iCountry, int pageNo, int pageLength)
  36 + public IHttpActionResult GetCustomerSummeryReport(string sAccoutNumber, string sLicenseeFullName, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, int iLicenseType, int iAccountType, string sZip, int iState, int iCountry, string sortColumn, string sortOrder, int pageNo, int pageLength)
37 37 {
38 38 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
39   - var lstCustomerSummeryReport = dbContext.usp_GetCustomerSummary(sAccoutNumber, sLicenseeFullName, iStartPrice, iEndPrice, (byte)iLicenseType, (byte)iAccountType, sZip, iState, iCountry, pageNo, pageLength, spRecordCount).ToList();
  39 + var lstCustomerSummeryReport = dbContext.usp_GetCustomerSummary(sAccoutNumber, sLicenseeFullName, iStartPrice, iEndPrice, (byte)iLicenseType, (byte)iAccountType, sZip, iState, iCountry, sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
40 40 return Ok(new { CustomerSummery = lstCustomerSummeryReport, RecordCount = spRecordCount.Value });
41 41 //return Ok(lstCustomerSummeryReport);
42 42 }
... ... @@ -121,13 +121,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
121 121  
122 122 [Route("GetImageExportReport")]
123 123 [HttpGet]
124   - public IHttpActionResult GetImageExportReport(string sFromDate, string sToDate, string sAccountNumber, int pageNo, int pageLength)
  124 + public IHttpActionResult GetImageExportReport(string sFromDate, string sToDate, string sAccountNumber, string sortColumn, string sortOrder, int pageNo, int pageLength)
125 125 {
126 126 try
127 127 {
128 128 if (sAccountNumber == null) sAccountNumber = string.Empty;
129 129 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
130   - var lstImageExportReport = dbContext.usp_GetExportedImageDetails(sFromDate, sToDate, sAccountNumber, pageNo, pageLength, spRecordCount).ToList();
  130 + var lstImageExportReport = dbContext.usp_GetExportedImageDetails(sFromDate, sToDate, sAccountNumber, sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
131 131 return Ok(new { ImageExportList = lstImageExportReport, RecordCount = spRecordCount.Value });
132 132 }
133 133 catch (Exception ex)
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/SubscriptionPriceController.cs
  View file @a7a8cc8
... ... @@ -25,13 +25,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
25 25  
26 26 [Route("GetSubscriptionPrices")]
27 27 [HttpGet]
28   - public HttpResponseMessage GetSubscriptionPrices(int editionId, int pageNo, int pageLength)
  28 + public HttpResponseMessage GetSubscriptionPrices(int editionId, string sortColumn, string sortOrder, int pageNo, int pageLength)
29 29 {
30   - List<SubscriptionPriceModel> SubscriptionPriceList = new List<SubscriptionPriceModel>();
  30 + List<usp_GetSubscriptionPlans_Result> SubscriptionPriceList;
31 31 int recordCount = 0;
32 32 try
33 33 {
34   - SubscriptionPriceList = SubscriptionPriceModel.GetSubscriptionPrices(dbContext, editionId, pageNo, pageLength, out recordCount);
  34 + SubscriptionPriceList = SubscriptionPriceModel.GetSubscriptionPrices(dbContext, editionId, sortColumn, sortOrder, pageNo, pageLength, out recordCount);
35 35 return Request.CreateResponse(HttpStatusCode.OK, new { SubscriptionPriceList = SubscriptionPriceList, RecordCount = recordCount });
36 36 }
37 37 catch (Exception ex)
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs
  View file @a7a8cc8
... ... @@ -186,7 +186,7 @@ namespace AIAHTML5.ADMIN.API.Controllers
186 186  
187 187 [Route("Users")]
188 188 [HttpGet]
189   - public IHttpActionResult UserList(string firstname, string lastname, string emailid, string accountnumber, string usertypeid, string accounttypeid, string userLoginStatus,
  189 + public IHttpActionResult UserList(string firstname, string lastname, string emailid, string accountnumber, string usertypeid, string accounttypeid, string userLoginStatus, string sortColumn, string sortOrder,
190 190 int pageNo, int pageLength, int iLoginUserType,string loggedIn="")
191 191 {
192 192 try
... ... @@ -198,16 +198,16 @@ namespace AIAHTML5.ADMIN.API.Controllers
198 198 dbContext.Configuration.ProxyCreationEnabled = false;
199 199 //var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
200 200 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
201   - //recordCount = (int)spRecordCount.Value;
202   - List<usp_GetUsersList_Result> Users = dbContext.usp_GetUsersList(firstname, lastname, emailid, accountnumber, UserTypeId, AccountTypeId, iLoginUserType, loginStatus, pageNo, pageLength, spRecordCount).ToList();
  201 + recordCount = (int)spRecordCount.Value;
  202 + List<usp_GetUsersList_Result> Users = dbContext.usp_GetUsersList(firstname, lastname, emailid, accountnumber, UserTypeId, AccountTypeId, iLoginUserType, loginStatus, sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
203 203 if (!string.IsNullOrEmpty(loggedIn))
204   - {
  204 + {
205 205 if (Users.Where(s => s.LoginId == loggedIn).Count() > 0)
206   - {
  206 + {
207 207 Users = Users.Where(s => s.LoginId != loggedIn).ToList();
208 208 spRecordCount.Value = (int)spRecordCount.Value - 1;
209 209 }
210   -
  210 +
211 211 }
212 212 return Ok(new { UserList = Users, RecordCount = spRecordCount.Value });
213 213 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserGroupController.cs
  View file @a7a8cc8
... ... @@ -24,13 +24,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
24 24  
25 25 [Route("LicenseUserGroups")]
26 26 [HttpGet]
27   - public HttpResponseMessage GetLicenseUserGroups(int? LicenseId, int pageNo, int pageLength)
  27 + public HttpResponseMessage GetLicenseUserGroups(int? LicenseId, string sortColumn, string sortOrder, int pageNo, int pageLength)
28 28 {
29   - List<UserGroupModel> UserGroupList = new List<UserGroupModel>();
  29 + List<usp_GetLicenseUserGroups_Result> UserGroupList;
30 30 int recordCount = 0;
31 31 try
32 32 {
33   - UserGroupList = UserGroupModel.GetLicenseUserGroups(dbContext, LicenseId, pageNo, pageLength, out recordCount);
  33 + UserGroupList = UserGroupModel.GetLicenseUserGroups(dbContext, LicenseId, sortColumn, sortOrder,pageNo, pageLength, out recordCount);
34 34 return Request.CreateResponse(HttpStatusCode.OK, new { UserGroupList = UserGroupList, RecordCount = recordCount });
35 35 }
36 36 catch (Exception ex)
... ... @@ -42,13 +42,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
42 42  
43 43 [Route("LicenseUserGroupUsers")]
44 44 [HttpGet]
45   - public HttpResponseMessage GetLicenseUserGroupUsers(int? LicenseId, int UserGroupId, bool AllUsers, int pageNo, int pageLength)
  45 + public HttpResponseMessage GetLicenseUserGroupUsers(int? LicenseId, int UserGroupId, bool AllUsers, string sortColumn, string sortOrder, int pageNo, int pageLength)
46 46 {
47   - List<UserModel> UserList = new List<UserModel>();
  47 + List<usp_GetLicenseUserGroupUsers_Result> UserList ;
48 48 int recordCount = 0;
49 49 try
50 50 {
51   - UserList = UserGroupModel.GetLicenseUserGroupUsers(dbContext, LicenseId, UserGroupId, AllUsers, pageNo, pageLength, out recordCount);
  51 + UserList = UserGroupModel.GetLicenseUserGroupUsers(dbContext, LicenseId, UserGroupId, AllUsers, sortColumn, sortOrder, pageNo, pageLength, out recordCount);
52 52 return Request.CreateResponse(HttpStatusCode.OK, new { UserList = UserList, RecordCount = recordCount });
53 53 }
54 54 catch (Exception ex)
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
  View file @a7a8cc8
... ... @@ -3095,7 +3095,7 @@ namespace AIAHTML5.ADMIN.API.Entity
3095 3095 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenses_Result>("usp_GetLicenses", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, sLicenseeFirstNameParameter, sLicenseeLastNameParameter, iLicenseTypeIdParameter, sInstituteNameParameter, sEmailParameter, iStateIdParameter, iCountryIdParameter, bisActiveParameter, pageNoParameter, pageLengthParameter, recordCount);
3096 3096 }
3097 3097  
3098   - public virtual ObjectResult<usp_GetlicensesList_Result> usp_GetlicensesList(string sStartDate, string sEndDate, string sAccoutNumber, string sLicenseeFirstName, string sLicenseeLastName, Nullable<byte> iLicenseTypeId, string sInstituteName, string sEmail, Nullable<int> iStateId, Nullable<int> iCountryId, Nullable<bool> bisActive, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  3098 + public virtual ObjectResult<usp_GetlicensesList_Result> usp_GetlicensesList(string sStartDate, string sEndDate, string sAccoutNumber, string sLicenseeFirstName, string sLicenseeLastName, Nullable<byte> iLicenseTypeId, string sInstituteName, string sEmail, Nullable<int> iStateId, Nullable<int> iCountryId, Nullable<bool> bisActive, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
3099 3099 {
3100 3100 var sStartDateParameter = sStartDate != null ?
3101 3101 new ObjectParameter("sStartDate", sStartDate) :
... ... @@ -3141,6 +3141,14 @@ namespace AIAHTML5.ADMIN.API.Entity
3141 3141 new ObjectParameter("bisActive", bisActive) :
3142 3142 new ObjectParameter("bisActive", typeof(bool));
3143 3143  
  3144 + var sortColumnParameter = sortColumn != null ?
  3145 + new ObjectParameter("sortColumn", sortColumn) :
  3146 + new ObjectParameter("sortColumn", typeof(string));
  3147 +
  3148 + var sortOrderParameter = sortOrder != null ?
  3149 + new ObjectParameter("sortOrder", sortOrder) :
  3150 + new ObjectParameter("sortOrder", typeof(string));
  3151 +
3144 3152 var pageNoParameter = pageNo.HasValue ?
3145 3153 new ObjectParameter("pageNo", pageNo) :
3146 3154 new ObjectParameter("pageNo", typeof(int));
... ... @@ -3149,7 +3157,7 @@ namespace AIAHTML5.ADMIN.API.Entity
3149 3157 new ObjectParameter("pageLength", pageLength) :
3150 3158 new ObjectParameter("pageLength", typeof(int));
3151 3159  
3152   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetlicensesList_Result>("usp_GetlicensesList", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, sLicenseeFirstNameParameter, sLicenseeLastNameParameter, iLicenseTypeIdParameter, sInstituteNameParameter, sEmailParameter, iStateIdParameter, iCountryIdParameter, bisActiveParameter, pageNoParameter, pageLengthParameter, recordCount);
  3160 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetlicensesList_Result>("usp_GetlicensesList", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, sLicenseeFirstNameParameter, sLicenseeLastNameParameter, iLicenseTypeIdParameter, sInstituteNameParameter, sEmailParameter, iStateIdParameter, iCountryIdParameter, bisActiveParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
3153 3161 }
3154 3162  
3155 3163 public virtual ObjectResult<usp_GetLicenseTypes_Result> usp_GetLicenseTypes()
... ... @@ -3157,12 +3165,20 @@ namespace AIAHTML5.ADMIN.API.Entity
3157 3165 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenseTypes_Result>("usp_GetLicenseTypes");
3158 3166 }
3159 3167  
3160   - public virtual ObjectResult<usp_GetLicenseUserGroups_Result> usp_GetLicenseUserGroups(Nullable<int> licenseId, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  3168 + public virtual ObjectResult<usp_GetLicenseUserGroups_Result> usp_GetLicenseUserGroups(Nullable<int> licenseId, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
3161 3169 {
3162 3170 var licenseIdParameter = licenseId.HasValue ?
3163 3171 new ObjectParameter("LicenseId", licenseId) :
3164 3172 new ObjectParameter("LicenseId", typeof(int));
3165 3173  
  3174 + var sortColumnParameter = sortColumn != null ?
  3175 + new ObjectParameter("sortColumn", sortColumn) :
  3176 + new ObjectParameter("sortColumn", typeof(string));
  3177 +
  3178 + var sortOrderParameter = sortOrder != null ?
  3179 + new ObjectParameter("sortOrder", sortOrder) :
  3180 + new ObjectParameter("sortOrder", typeof(string));
  3181 +
3166 3182 var pageNoParameter = pageNo.HasValue ?
3167 3183 new ObjectParameter("pageNo", pageNo) :
3168 3184 new ObjectParameter("pageNo", typeof(int));
... ... @@ -3171,7 +3187,7 @@ namespace AIAHTML5.ADMIN.API.Entity
3171 3187 new ObjectParameter("pageLength", pageLength) :
3172 3188 new ObjectParameter("pageLength", typeof(int));
3173 3189  
3174   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenseUserGroups_Result>("usp_GetLicenseUserGroups", licenseIdParameter, pageNoParameter, pageLengthParameter, recordCount);
  3190 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenseUserGroups_Result>("usp_GetLicenseUserGroups", licenseIdParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
3175 3191 }
3176 3192  
3177 3193 public virtual ObjectResult<usp_GetManageRights_Result> usp_GetManageRights(Nullable<int> userId, string roleName)
... ... @@ -3218,12 +3234,20 @@ namespace AIAHTML5.ADMIN.API.Entity
3218 3234 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSiteById_Result>("usp_GetSiteById", siteIdParameter);
3219 3235 }
3220 3236  
3221   - public virtual ObjectResult<usp_GetSubscriptionPlans_Result> usp_GetSubscriptionPlans(Nullable<byte> iEditionId, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  3237 + public virtual ObjectResult<usp_GetSubscriptionPlans_Result> usp_GetSubscriptionPlans(Nullable<byte> iEditionId, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
3222 3238 {
3223 3239 var iEditionIdParameter = iEditionId.HasValue ?
3224 3240 new ObjectParameter("iEditionId", iEditionId) :
3225 3241 new ObjectParameter("iEditionId", typeof(byte));
3226 3242  
  3243 + var sortColumnParameter = sortColumn != null ?
  3244 + new ObjectParameter("sortColumn", sortColumn) :
  3245 + new ObjectParameter("sortColumn", typeof(string));
  3246 +
  3247 + var sortOrderParameter = sortOrder != null ?
  3248 + new ObjectParameter("sortOrder", sortOrder) :
  3249 + new ObjectParameter("sortOrder", typeof(string));
  3250 +
3227 3251 var pageNoParameter = pageNo.HasValue ?
3228 3252 new ObjectParameter("pageNo", pageNo) :
3229 3253 new ObjectParameter("pageNo", typeof(int));
... ... @@ -3232,7 +3256,7 @@ namespace AIAHTML5.ADMIN.API.Entity
3232 3256 new ObjectParameter("pageLength", pageLength) :
3233 3257 new ObjectParameter("pageLength", typeof(int));
3234 3258  
3235   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSubscriptionPlans_Result>("usp_GetSubscriptionPlans", iEditionIdParameter, pageNoParameter, pageLengthParameter, recordCount);
  3259 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSubscriptionPlans_Result>("usp_GetSubscriptionPlans", iEditionIdParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
3236 3260 }
3237 3261  
3238 3262 public virtual ObjectResult<usp_GetUserType_Result> usp_GetUserType(Nullable<int> id)
... ... @@ -3638,7 +3662,7 @@ namespace AIAHTML5.ADMIN.API.Entity
3638 3662 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("uspInsertBulkRow");
3639 3663 }
3640 3664  
3641   - public virtual ObjectResult<usp_GetLicenseUserGroupUsers_Result> usp_GetLicenseUserGroupUsers(Nullable<int> licenseId, Nullable<int> groupId, Nullable<bool> allUsers, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  3665 + public virtual ObjectResult<usp_GetLicenseUserGroupUsers_Result> usp_GetLicenseUserGroupUsers(Nullable<int> licenseId, Nullable<int> groupId, Nullable<bool> allUsers, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
3642 3666 {
3643 3667 var licenseIdParameter = licenseId.HasValue ?
3644 3668 new ObjectParameter("licenseId", licenseId) :
... ... @@ -3652,6 +3676,14 @@ namespace AIAHTML5.ADMIN.API.Entity
3652 3676 new ObjectParameter("allUsers", allUsers) :
3653 3677 new ObjectParameter("allUsers", typeof(bool));
3654 3678  
  3679 + var sortColumnParameter = sortColumn != null ?
  3680 + new ObjectParameter("sortColumn", sortColumn) :
  3681 + new ObjectParameter("sortColumn", typeof(string));
  3682 +
  3683 + var sortOrderParameter = sortOrder != null ?
  3684 + new ObjectParameter("sortOrder", sortOrder) :
  3685 + new ObjectParameter("sortOrder", typeof(string));
  3686 +
3655 3687 var pageNoParameter = pageNo.HasValue ?
3656 3688 new ObjectParameter("pageNo", pageNo) :
3657 3689 new ObjectParameter("pageNo", typeof(int));
... ... @@ -3660,7 +3692,7 @@ namespace AIAHTML5.ADMIN.API.Entity
3660 3692 new ObjectParameter("pageLength", pageLength) :
3661 3693 new ObjectParameter("pageLength", typeof(int));
3662 3694  
3663   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenseUserGroupUsers_Result>("usp_GetLicenseUserGroupUsers", licenseIdParameter, groupIdParameter, allUsersParameter, pageNoParameter, pageLengthParameter, recordCount);
  3695 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenseUserGroupUsers_Result>("usp_GetLicenseUserGroupUsers", licenseIdParameter, groupIdParameter, allUsersParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
3664 3696 }
3665 3697  
3666 3698 public virtual ObjectResult<usp_InsertResellerLicenseAccount_Result> usp_InsertResellerLicenseAccount(string sLicenseeFname, string sLicenseeLname, Nullable<byte> iLicenseTypeId, Nullable<byte> iAccountTypeId, string sInstitutionName, string sAddress1, string sAddress2, string sCity, string sZip, Nullable<int> iStateId, Nullable<int> iCountryId, string sPhone, string sEmailId, Nullable<int> iTotalLogins, string sStartDate, string sEndDate, string sEditionList, Nullable<decimal> iTotalPrice, Nullable<int> iCreatorId, string sProductKey, Nullable<int> iNoofImages)
... ... @@ -3783,12 +3815,20 @@ namespace AIAHTML5.ADMIN.API.Entity
3783 3815 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSiteAccountAdmin_Result>("usp_GetSiteAccountAdmin", accountNumberParameter);
3784 3816 }
3785 3817  
3786   - public virtual ObjectResult<usp_GetSiteAccountSites_Result> usp_GetSiteAccountSites(string strAccountNumber, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  3818 + public virtual ObjectResult<usp_GetSiteAccountSites_Result> usp_GetSiteAccountSites(string strAccountNumber, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
3787 3819 {
3788 3820 var strAccountNumberParameter = strAccountNumber != null ?
3789 3821 new ObjectParameter("strAccountNumber", strAccountNumber) :
3790 3822 new ObjectParameter("strAccountNumber", typeof(string));
3791 3823  
  3824 + var sortColumnParameter = sortColumn != null ?
  3825 + new ObjectParameter("sortColumn", sortColumn) :
  3826 + new ObjectParameter("sortColumn", typeof(string));
  3827 +
  3828 + var sortOrderParameter = sortOrder != null ?
  3829 + new ObjectParameter("sortOrder", sortOrder) :
  3830 + new ObjectParameter("sortOrder", typeof(string));
  3831 +
3792 3832 var pageNoParameter = pageNo.HasValue ?
3793 3833 new ObjectParameter("pageNo", pageNo) :
3794 3834 new ObjectParameter("pageNo", typeof(int));
... ... @@ -3797,7 +3837,7 @@ namespace AIAHTML5.ADMIN.API.Entity
3797 3837 new ObjectParameter("pageLength", pageLength) :
3798 3838 new ObjectParameter("pageLength", typeof(int));
3799 3839  
3800   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSiteAccountSites_Result>("usp_GetSiteAccountSites", strAccountNumberParameter, pageNoParameter, pageLengthParameter, recordCount);
  3840 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSiteAccountSites_Result>("usp_GetSiteAccountSites", strAccountNumberParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
3801 3841 }
3802 3842  
3803 3843 public virtual ObjectResult<string> usp_DeleteLicense(Nullable<int> iLicenseId)
... ... @@ -3900,7 +3940,7 @@ namespace AIAHTML5.ADMIN.API.Entity
3900 3940 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetCancelledLicenses_Result>("usp_GetCancelledLicenses", sFromDateParameter, sToDateParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeIdParameter, iAccountTypeIdParameter, sZipParameter, iStateIdParameter, iCountryIdParameter, pageNoParameter, pageLengthParameter, recordCount);
3901 3941 }
3902 3942  
3903   - public virtual ObjectResult<usp_GetCustomerSummary_Result> usp_GetCustomerSummary(string sAccoutNumber, string sLicenseeFullName, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, Nullable<byte> iLicenseType, Nullable<byte> iAccountType, string sZip, Nullable<int> iState, Nullable<int> iCountry, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  3943 + public virtual ObjectResult<usp_GetCustomerSummary_Result> usp_GetCustomerSummary(string sAccoutNumber, string sLicenseeFullName, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, Nullable<byte> iLicenseType, Nullable<byte> iAccountType, string sZip, Nullable<int> iState, Nullable<int> iCountry, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
3904 3944 {
3905 3945 var sAccoutNumberParameter = sAccoutNumber != null ?
3906 3946 new ObjectParameter("sAccoutNumber", sAccoutNumber) :
... ... @@ -3938,6 +3978,14 @@ namespace AIAHTML5.ADMIN.API.Entity
3938 3978 new ObjectParameter("iCountry", iCountry) :
3939 3979 new ObjectParameter("iCountry", typeof(int));
3940 3980  
  3981 + var sortColumnParameter = sortColumn != null ?
  3982 + new ObjectParameter("sortColumn", sortColumn) :
  3983 + new ObjectParameter("sortColumn", typeof(string));
  3984 +
  3985 + var sortOrderParameter = sortOrder != null ?
  3986 + new ObjectParameter("sortOrder", sortOrder) :
  3987 + new ObjectParameter("sortOrder", typeof(string));
  3988 +
3941 3989 var pageNoParameter = pageNo.HasValue ?
3942 3990 new ObjectParameter("pageNo", pageNo) :
3943 3991 new ObjectParameter("pageNo", typeof(int));
... ... @@ -3946,10 +3994,10 @@ namespace AIAHTML5.ADMIN.API.Entity
3946 3994 new ObjectParameter("pageLength", pageLength) :
3947 3995 new ObjectParameter("pageLength", typeof(int));
3948 3996  
3949   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetCustomerSummary_Result>("usp_GetCustomerSummary", sAccoutNumberParameter, sLicenseeFullNameParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeParameter, iAccountTypeParameter, sZipParameter, iStateParameter, iCountryParameter, pageNoParameter, pageLengthParameter, recordCount);
  3997 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetCustomerSummary_Result>("usp_GetCustomerSummary", sAccoutNumberParameter, sLicenseeFullNameParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeParameter, iAccountTypeParameter, sZipParameter, iStateParameter, iCountryParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
3950 3998 }
3951 3999  
3952   - public virtual ObjectResult<usp_GetDiscountCodes_Result> usp_GetDiscountCodes(string sDiscountCode, string sStartDate, string sEndDate, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  4000 + public virtual ObjectResult<usp_GetDiscountCodes_Result> usp_GetDiscountCodes(string sDiscountCode, string sStartDate, string sEndDate, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
3953 4001 {
3954 4002 var sDiscountCodeParameter = sDiscountCode != null ?
3955 4003 new ObjectParameter("sDiscountCode", sDiscountCode) :
... ... @@ -3963,6 +4011,14 @@ namespace AIAHTML5.ADMIN.API.Entity
3963 4011 new ObjectParameter("sEndDate", sEndDate) :
3964 4012 new ObjectParameter("sEndDate", typeof(string));
3965 4013  
  4014 + var sortColumnParameter = sortColumn != null ?
  4015 + new ObjectParameter("sortColumn", sortColumn) :
  4016 + new ObjectParameter("sortColumn", typeof(string));
  4017 +
  4018 + var sortOrderParameter = sortOrder != null ?
  4019 + new ObjectParameter("sortOrder", sortOrder) :
  4020 + new ObjectParameter("sortOrder", typeof(string));
  4021 +
3966 4022 var pageNoParameter = pageNo.HasValue ?
3967 4023 new ObjectParameter("pageNo", pageNo) :
3968 4024 new ObjectParameter("pageNo", typeof(int));
... ... @@ -3971,7 +4027,7 @@ namespace AIAHTML5.ADMIN.API.Entity
3971 4027 new ObjectParameter("pageLength", pageLength) :
3972 4028 new ObjectParameter("pageLength", typeof(int));
3973 4029  
3974   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetDiscountCodes_Result>("usp_GetDiscountCodes", sDiscountCodeParameter, sStartDateParameter, sEndDateParameter, pageNoParameter, pageLengthParameter, recordCount);
  4030 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetDiscountCodes_Result>("usp_GetDiscountCodes", sDiscountCodeParameter, sStartDateParameter, sEndDateParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
3975 4031 }
3976 4032  
3977 4033 public virtual ObjectResult<usp_GetDiscountReport_Result> usp_GetDiscountReport(string sStartDate, string sEndDate, Nullable<int> intDiscountID, string sAccoutNumber, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
... ... @@ -4052,7 +4108,7 @@ namespace AIAHTML5.ADMIN.API.Entity
4052 4108 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetExpiringLicenses_Result>("usp_GetExpiringLicenses", sFromDateParameter, sToDateParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeIdParameter, iAccountTypeIdParameter, sZipParameter, iStateIdParameter, iCountryIdParameter, pageNoParameter, pageLengthParameter, recordCount);
4053 4109 }
4054 4110  
4055   - public virtual ObjectResult<usp_GetExportedImageDetails_Result> usp_GetExportedImageDetails(string sStartDate, string sEndDate, string sAccoutNumber, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  4111 + public virtual ObjectResult<usp_GetExportedImageDetails_Result> usp_GetExportedImageDetails(string sStartDate, string sEndDate, string sAccoutNumber, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
4056 4112 {
4057 4113 var sStartDateParameter = sStartDate != null ?
4058 4114 new ObjectParameter("sStartDate", sStartDate) :
... ... @@ -4066,6 +4122,14 @@ namespace AIAHTML5.ADMIN.API.Entity
4066 4122 new ObjectParameter("sAccoutNumber", sAccoutNumber) :
4067 4123 new ObjectParameter("sAccoutNumber", typeof(string));
4068 4124  
  4125 + var sortColumnParameter = sortColumn != null ?
  4126 + new ObjectParameter("sortColumn", sortColumn) :
  4127 + new ObjectParameter("sortColumn", typeof(string));
  4128 +
  4129 + var sortOrderParameter = sortOrder != null ?
  4130 + new ObjectParameter("sortOrder", sortOrder) :
  4131 + new ObjectParameter("sortOrder", typeof(string));
  4132 +
4069 4133 var pageNoParameter = pageNo.HasValue ?
4070 4134 new ObjectParameter("pageNo", pageNo) :
4071 4135 new ObjectParameter("pageNo", typeof(int));
... ... @@ -4074,7 +4138,7 @@ namespace AIAHTML5.ADMIN.API.Entity
4074 4138 new ObjectParameter("pageLength", pageLength) :
4075 4139 new ObjectParameter("pageLength", typeof(int));
4076 4140  
4077   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetExportedImageDetails_Result>("usp_GetExportedImageDetails", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, pageNoParameter, pageLengthParameter, recordCount);
  4141 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetExportedImageDetails_Result>("usp_GetExportedImageDetails", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
4078 4142 }
4079 4143  
4080 4144 public virtual ObjectResult<Nullable<short>> usp_GetIncorrectLoginAttempt(Nullable<int> iUserId)
... ... @@ -4341,7 +4405,7 @@ namespace AIAHTML5.ADMIN.API.Entity
4341 4405 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSubscribedLicenses_Result>("usp_GetSubscribedLicenses", sFromDateParameter, sToDateParameter, iStartPriceParameter, iEndPriceParameter, iLicenseTypeIdParameter, iAccountTypeIdParameter, sZipParameter, iStateIdParameter, iCountryIdParameter, pageNoParameter, pageLengthParameter, recordCount);
4342 4406 }
4343 4407  
4344   - public virtual ObjectResult<usp_GetUsageReport_Result> usp_GetUsageReport(string sFromDate, string sToDate, string sAccoutNumber, string sZip, Nullable<int> iState, Nullable<int> iCountry, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  4408 + public virtual ObjectResult<usp_GetUsageReport_Result> usp_GetUsageReport(string sFromDate, string sToDate, string sAccoutNumber, string sZip, Nullable<int> iState, Nullable<int> iCountry, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
4345 4409 {
4346 4410 var sFromDateParameter = sFromDate != null ?
4347 4411 new ObjectParameter("sFromDate", sFromDate) :
... ... @@ -4367,6 +4431,14 @@ namespace AIAHTML5.ADMIN.API.Entity
4367 4431 new ObjectParameter("iCountry", iCountry) :
4368 4432 new ObjectParameter("iCountry", typeof(int));
4369 4433  
  4434 + var sortColumnParameter = sortColumn != null ?
  4435 + new ObjectParameter("sortColumn", sortColumn) :
  4436 + new ObjectParameter("sortColumn", typeof(string));
  4437 +
  4438 + var sortOrderParameter = sortOrder != null ?
  4439 + new ObjectParameter("sortOrder", sortOrder) :
  4440 + new ObjectParameter("sortOrder", typeof(string));
  4441 +
4370 4442 var pageNoParameter = pageNo.HasValue ?
4371 4443 new ObjectParameter("pageNo", pageNo) :
4372 4444 new ObjectParameter("pageNo", typeof(int));
... ... @@ -4375,7 +4447,7 @@ namespace AIAHTML5.ADMIN.API.Entity
4375 4447 new ObjectParameter("pageLength", pageLength) :
4376 4448 new ObjectParameter("pageLength", typeof(int));
4377 4449  
4378   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetUsageReport_Result>("usp_GetUsageReport", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, sZipParameter, iStateParameter, iCountryParameter, pageNoParameter, pageLengthParameter, recordCount);
  4450 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetUsageReport_Result>("usp_GetUsageReport", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, sZipParameter, iStateParameter, iCountryParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
4379 4451 }
4380 4452  
4381 4453 public virtual ObjectResult<string> usp_GetUserList(string sFirstName, string sLastName, string sEmailId, string sAccoutNumber, Nullable<int> iUserTypeId, Nullable<int> iAccountTypeId, Nullable<int> iLoginUserType, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
... ... @@ -4419,7 +4491,7 @@ namespace AIAHTML5.ADMIN.API.Entity
4419 4491 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<string>("usp_GetUserList", sFirstNameParameter, sLastNameParameter, sEmailIdParameter, sAccoutNumberParameter, iUserTypeIdParameter, iAccountTypeIdParameter, iLoginUserTypeParameter, pageNoParameter, pageLengthParameter, recordCount);
4420 4492 }
4421 4493  
4422   - public virtual ObjectResult<usp_GetUsersList_Result> usp_GetUsersList(string sFirstName, string sLastName, string sEmailId, string sAccoutNumber, Nullable<int> iUserTypeId, Nullable<int> iAccountTypeId, Nullable<int> iLoginUserType, Nullable<bool> iLoginStatus, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  4494 + public virtual ObjectResult<usp_GetUsersList_Result> usp_GetUsersList(string sFirstName, string sLastName, string sEmailId, string sAccoutNumber, Nullable<int> iUserTypeId, Nullable<int> iAccountTypeId, Nullable<int> iLoginUserType, Nullable<bool> iLoginStatus, string sortColumn, string sortOrder, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
4423 4495 {
4424 4496 var sFirstNameParameter = sFirstName != null ?
4425 4497 new ObjectParameter("sFirstName", sFirstName) :
... ... @@ -4453,6 +4525,14 @@ namespace AIAHTML5.ADMIN.API.Entity
4453 4525 new ObjectParameter("iLoginStatus", iLoginStatus) :
4454 4526 new ObjectParameter("iLoginStatus", typeof(bool));
4455 4527  
  4528 + var sortColumnParameter = sortColumn != null ?
  4529 + new ObjectParameter("sortColumn", sortColumn) :
  4530 + new ObjectParameter("sortColumn", typeof(string));
  4531 +
  4532 + var sortOrderParameter = sortOrder != null ?
  4533 + new ObjectParameter("sortOrder", sortOrder) :
  4534 + new ObjectParameter("sortOrder", typeof(string));
  4535 +
4456 4536 var pageNoParameter = pageNo.HasValue ?
4457 4537 new ObjectParameter("pageNo", pageNo) :
4458 4538 new ObjectParameter("pageNo", typeof(int));
... ... @@ -4461,7 +4541,7 @@ namespace AIAHTML5.ADMIN.API.Entity
4461 4541 new ObjectParameter("pageLength", pageLength) :
4462 4542 new ObjectParameter("pageLength", typeof(int));
4463 4543  
4464   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetUsersList_Result>("usp_GetUsersList", sFirstNameParameter, sLastNameParameter, sEmailIdParameter, sAccoutNumberParameter, iUserTypeIdParameter, iAccountTypeIdParameter, iLoginUserTypeParameter, iLoginStatusParameter, pageNoParameter, pageLengthParameter, recordCount);
  4544 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetUsersList_Result>("usp_GetUsersList", sFirstNameParameter, sLastNameParameter, sEmailIdParameter, sAccoutNumberParameter, iUserTypeIdParameter, iAccountTypeIdParameter, iLoginUserTypeParameter, iLoginStatusParameter, sortColumnParameter, sortOrderParameter, pageNoParameter, pageLengthParameter, recordCount);
4465 4545 }
4466 4546  
4467 4547 public virtual ObjectResult<usp_GetUserTyeByAccountNumber_Result> usp_GetUserTyeByAccountNumber(Nullable<byte> iUserTypeId, Nullable<int> iLicenseId)
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
  View file @a7a8cc8
... ... @@ -644,10 +644,6 @@
644 644 <Function Name="InsertLoginDetail" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
645 645 <Parameter Name="iUserId" Type="int" Mode="In" />
646 646 </Function>
647   - <Function Name="InsertLoginDetail_1" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
648   - <Parameter Name="iUserId" Type="int" Mode="In" />
649   - <Parameter Name="CallFromURL" Type="nvarchar" Mode="In" />
650   - </Function>
651 647 <Function Name="InsertLoginDetailsInSessionManager" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
652 648 <Parameter Name="sSessionId" Type="varchar" Mode="In" />
653 649 <Parameter Name="iUserId" Type="int" Mode="In" />
... ... @@ -994,6 +990,8 @@
994 990 <Parameter Name="sZip" Type="varchar" Mode="In" />
995 991 <Parameter Name="iState" Type="int" Mode="In" />
996 992 <Parameter Name="iCountry" Type="int" Mode="In" />
  993 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  994 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
997 995 <Parameter Name="pageNo" Type="int" Mode="In" />
998 996 <Parameter Name="pageLength" Type="int" Mode="In" />
999 997 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -1002,6 +1000,8 @@
1002 1000 <Parameter Name="sDiscountCode" Type="varchar" Mode="In" />
1003 1001 <Parameter Name="sStartDate" Type="varchar" Mode="In" />
1004 1002 <Parameter Name="sEndDate" Type="varchar" Mode="In" />
  1003 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  1004 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
1005 1005 <Parameter Name="pageNo" Type="int" Mode="In" />
1006 1006 <Parameter Name="pageLength" Type="int" Mode="In" />
1007 1007 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -1034,6 +1034,8 @@
1034 1034 <Parameter Name="sStartDate" Type="varchar" Mode="In" />
1035 1035 <Parameter Name="sEndDate" Type="varchar" Mode="In" />
1036 1036 <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
  1037 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  1038 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
1037 1039 <Parameter Name="pageNo" Type="int" Mode="In" />
1038 1040 <Parameter Name="pageLength" Type="int" Mode="In" />
1039 1041 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -1082,6 +1084,8 @@
1082 1084 <Parameter Name="iStateId" Type="int" Mode="In" />
1083 1085 <Parameter Name="iCountryId" Type="int" Mode="In" />
1084 1086 <Parameter Name="bisActive" Type="bit" Mode="In" />
  1087 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  1088 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
1085 1089 <Parameter Name="pageNo" Type="int" Mode="In" />
1086 1090 <Parameter Name="pageLength" Type="int" Mode="In" />
1087 1091 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -1089,6 +1093,8 @@
1089 1093 <Function Name="usp_GetLicenseTypes" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo" />
1090 1094 <Function Name="usp_GetLicenseUserGroups" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
1091 1095 <Parameter Name="LicenseId" Type="int" Mode="In" />
  1096 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  1097 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
1092 1098 <Parameter Name="pageNo" Type="int" Mode="In" />
1093 1099 <Parameter Name="pageLength" Type="int" Mode="In" />
1094 1100 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -1097,6 +1103,8 @@
1097 1103 <Parameter Name="licenseId" Type="int" Mode="In" />
1098 1104 <Parameter Name="groupId" Type="int" Mode="In" />
1099 1105 <Parameter Name="allUsers" Type="bit" Mode="In" />
  1106 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  1107 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
1100 1108 <Parameter Name="pageNo" Type="int" Mode="In" />
1101 1109 <Parameter Name="pageLength" Type="int" Mode="In" />
1102 1110 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -1150,6 +1158,8 @@
1150 1158 </Function>
1151 1159 <Function Name="usp_GetSiteAccountSites" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
1152 1160 <Parameter Name="strAccountNumber" Type="varchar" Mode="In" />
  1161 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  1162 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
1153 1163 <Parameter Name="pageNo" Type="int" Mode="In" />
1154 1164 <Parameter Name="pageLength" Type="int" Mode="In" />
1155 1165 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -1198,6 +1208,8 @@
1198 1208 </Function>
1199 1209 <Function Name="usp_GetSubscriptionPlans" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
1200 1210 <Parameter Name="iEditionId" Type="tinyint" Mode="In" />
  1211 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  1212 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
1201 1213 <Parameter Name="pageNo" Type="int" Mode="In" />
1202 1214 <Parameter Name="pageLength" Type="int" Mode="In" />
1203 1215 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -1209,6 +1221,8 @@
1209 1221 <Parameter Name="sZip" Type="varchar" Mode="In" />
1210 1222 <Parameter Name="iState" Type="int" Mode="In" />
1211 1223 <Parameter Name="iCountry" Type="int" Mode="In" />
  1224 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  1225 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
1212 1226 <Parameter Name="pageNo" Type="int" Mode="In" />
1213 1227 <Parameter Name="pageLength" Type="int" Mode="In" />
1214 1228 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -1234,6 +1248,8 @@
1234 1248 <Parameter Name="iAccountTypeId" Type="int" Mode="In" />
1235 1249 <Parameter Name="iLoginUserType" Type="int" Mode="In" />
1236 1250 <Parameter Name="iLoginStatus" Type="bit" Mode="In" />
  1251 + <Parameter Name="sortColumn" Type="varchar" Mode="In" />
  1252 + <Parameter Name="sortOrder" Type="varchar" Mode="In" />
1237 1253 <Parameter Name="pageNo" Type="int" Mode="In" />
1238 1254 <Parameter Name="pageLength" Type="int" Mode="In" />
1239 1255 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -2460,6 +2476,8 @@
2460 2476 <Parameter Name="iStateId" Mode="In" Type="Int32" />
2461 2477 <Parameter Name="iCountryId" Mode="In" Type="Int32" />
2462 2478 <Parameter Name="bisActive" Mode="In" Type="Boolean" />
  2479 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2480 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2463 2481 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2464 2482 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2465 2483 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2467,6 +2485,8 @@
2467 2485 <FunctionImport Name="usp_GetLicenseTypes" ReturnType="Collection(AIADatabaseV5Model.usp_GetLicenseTypes_Result)" />
2468 2486 <FunctionImport Name="usp_GetLicenseUserGroups" ReturnType="Collection(AIADatabaseV5Model.usp_GetLicenseUserGroups_Result)">
2469 2487 <Parameter Name="LicenseId" Mode="In" Type="Int32" />
  2488 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2489 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2470 2490 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2471 2491 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2472 2492 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2487,6 +2507,8 @@
2487 2507 </FunctionImport>
2488 2508 <FunctionImport Name="usp_GetSubscriptionPlans" ReturnType="Collection(AIADatabaseV5Model.usp_GetSubscriptionPlans_Result)">
2489 2509 <Parameter Name="iEditionId" Mode="In" Type="Byte" />
  2510 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2511 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2490 2512 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2491 2513 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2492 2514 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2626,6 +2648,8 @@
2626 2648 <Parameter Name="licenseId" Mode="In" Type="Int32" />
2627 2649 <Parameter Name="groupId" Mode="In" Type="Int32" />
2628 2650 <Parameter Name="allUsers" Mode="In" Type="Boolean" />
  2651 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2652 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2629 2653 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2630 2654 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2631 2655 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2667,6 +2691,8 @@
2667 2691 </FunctionImport>
2668 2692 <FunctionImport Name="usp_GetSiteAccountSites" ReturnType="Collection(AIADatabaseV5Model.usp_GetSiteAccountSites_Result)">
2669 2693 <Parameter Name="strAccountNumber" Mode="In" Type="String" />
  2694 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2695 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2670 2696 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2671 2697 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2672 2698 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2709,6 +2735,8 @@
2709 2735 <Parameter Name="sZip" Mode="In" Type="String" />
2710 2736 <Parameter Name="iState" Mode="In" Type="Int32" />
2711 2737 <Parameter Name="iCountry" Mode="In" Type="Int32" />
  2738 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2739 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2712 2740 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2713 2741 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2714 2742 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2717,6 +2745,8 @@
2717 2745 <Parameter Name="sDiscountCode" Mode="In" Type="String" />
2718 2746 <Parameter Name="sStartDate" Mode="In" Type="String" />
2719 2747 <Parameter Name="sEndDate" Mode="In" Type="String" />
  2748 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2749 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2720 2750 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2721 2751 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2722 2752 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2748,6 +2778,8 @@
2748 2778 <Parameter Name="sStartDate" Mode="In" Type="String" />
2749 2779 <Parameter Name="sEndDate" Mode="In" Type="String" />
2750 2780 <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
  2781 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2782 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2751 2783 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2752 2784 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2753 2785 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2840,6 +2872,8 @@
2840 2872 <Parameter Name="sZip" Mode="In" Type="String" />
2841 2873 <Parameter Name="iState" Mode="In" Type="Int32" />
2842 2874 <Parameter Name="iCountry" Mode="In" Type="Int32" />
  2875 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2876 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2843 2877 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2844 2878 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2845 2879 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -2865,6 +2899,8 @@
2865 2899 <Parameter Name="iAccountTypeId" Mode="In" Type="Int32" />
2866 2900 <Parameter Name="iLoginUserType" Mode="In" Type="Int32" />
2867 2901 <Parameter Name="iLoginStatus" Mode="In" Type="Boolean" />
  2902 + <Parameter Name="sortColumn" Mode="In" Type="String" />
  2903 + <Parameter Name="sortOrder" Mode="In" Type="String" />
2868 2904 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2869 2905 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2870 2906 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ... @@ -3907,26 +3943,25 @@
3907 3943 </ComplexType>
3908 3944 <ComplexType Name="usp_GetlicensesList_Result">
3909 3945 <Property Type="Int32" Name="LicenseId" Nullable="false" />
3910   - <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="16" />
3911   - <Property Type="String" Name="LicenseType" Nullable="false" MaxLength="50" />
3912   - <Property Type="String" Name="AccountType" Nullable="false" MaxLength="50" />
3913   - <Property Type="String" Name="InstitutionName" Nullable="true" MaxLength="100" />
3914   - <Property Type="String" Name="LicenseState" Nullable="false" MaxLength="50" />
3915   - <Property Type="String" Name="LicenseCountry" Nullable="false" MaxLength="50" />
3916   - <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
  3946 + <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="50" />
  3947 + <Property Type="String" Name="LicenseType" Nullable="true" MaxLength="30" />
  3948 + <Property Type="String" Name="AccountType" Nullable="true" MaxLength="30" />
  3949 + <Property Type="String" Name="InstitutionName" Nullable="true" MaxLength="200" />
  3950 + <Property Type="String" Name="LicenseState" Nullable="true" MaxLength="50" />
  3951 + <Property Type="String" Name="LicenseCountry" Nullable="true" MaxLength="50" />
  3952 + <Property Type="String" Name="EmailId" Nullable="true" MaxLength="100" />
3917 3953 <Property Type="Int32" Name="CardNumber" Nullable="true" />
3918   - <Property Type="String" Name="ProductKey" Nullable="true" MaxLength="50" />
  3954 + <Property Type="String" Name="ProductKey" Nullable="true" MaxLength="100" />
3919 3955 <Property Type="String" Name="ClientAdmin" Nullable="true" />
3920   - <Property Type="String" Name="LicenseeName" Nullable="false" MaxLength="101" />
3921   - <Property Type="String" Name="ContactAddress" Nullable="false" MaxLength="252" />
3922   - <Property Type="String" Name="EntryDate" Nullable="true" MaxLength="30" />
3923   - <Property Type="String" Name="LicenseStatus" Nullable="false" MaxLength="8" />
3924   - <Property Type="String" Name="ModifyDate" Nullable="false" MaxLength="30" />
3925   - <Property Type="String" Name="StartDate" Nullable="true" MaxLength="30" />
3926   - <Property Type="String" Name="RenewDate" Nullable="false" MaxLength="30" />
3927   - <Property Type="String" Name="EndDate" Nullable="true" MaxLength="30" />
  3956 + <Property Type="String" Name="LicenseeName" Nullable="true" MaxLength="200" />
  3957 + <Property Type="String" Name="ContactAddress" Nullable="true" MaxLength="252" />
  3958 + <Property Type="DateTime" Name="EntryDate" Nullable="true" Precision="23" />
  3959 + <Property Type="String" Name="LicenseStatus" Nullable="true" MaxLength="20" />
  3960 + <Property Type="DateTime" Name="ModifyDate" Nullable="true" Precision="23" />
  3961 + <Property Type="DateTime" Name="StartDate" Nullable="true" Precision="23" />
  3962 + <Property Type="DateTime" Name="RenewDate" Nullable="true" Precision="23" />
  3963 + <Property Type="DateTime" Name="EndDate" Nullable="true" Precision="23" />
3928 3964 <Property Type="Int32" Name="NoofImages" Nullable="true" />
3929   - <Property Type="Int64" Name="RowNo" Nullable="true" />
3930 3965 </ComplexType>
3931 3966 <ComplexType Name="usp_GetLicenseTypes_Result">
3932 3967 <Property Type="Byte" Name="Id" Nullable="false" />
... ... @@ -3941,7 +3976,6 @@
3941 3976 <Property Type="DateTime" Name="ModifiedDate" Nullable="true" Precision="23" />
3942 3977 <Property Type="Boolean" Name="IsActive" Nullable="false" />
3943 3978 <Property Type="Int32" Name="TotalUsers" Nullable="true" />
3944   - <Property Type="Int64" Name="RowNo" Nullable="true" />
3945 3979 </ComplexType>
3946 3980 <ComplexType Name="usp_GetManageRights_Result">
3947 3981 <Property Type="Int32" Name="Id" Nullable="false" />
... ... @@ -3985,12 +4019,12 @@
3985 4019 <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
3986 4020 </ComplexType>
3987 4021 <ComplexType Name="usp_GetSubscriptionPlans_Result">
3988   - <Property Type="Decimal" Name="price" Nullable="true" Precision="14" Scale="2" />
3989   - <Property Type="String" Name="title" Nullable="false" MaxLength="50" />
3990   - <Property Type="Int16" Name="Id" Nullable="false" />
  4022 + <Property Type="Int32" Name="Id" Nullable="false" />
3991 4023 <Property Type="Byte" Name="EditionId" Nullable="false" />
3992 4024 <Property Type="Byte" Name="Duration" Nullable="false" />
3993 4025 <Property Type="Boolean" Name="IsActive" Nullable="false" />
  4026 + <Property Type="String" Name="Title" Nullable="false" MaxLength="100" />
  4027 + <Property Type="Decimal" Name="Price" Nullable="true" Precision="14" Scale="2" />
3994 4028 </ComplexType>
3995 4029 <ComplexType Name="usp_GetUserType_Result">
3996 4030 <Property Type="Byte" Name="Id" Nullable="false" />
... ... @@ -4057,14 +4091,13 @@
4057 4091 </ReferentialConstraint>
4058 4092 </Association>
4059 4093 <ComplexType Name="usp_GetLicenseUserGroupUsers_Result">
4060   - <Property Type="Int64" Name="RowNo" Nullable="true" />
4061 4094 <Property Type="Int32" Name="Id" Nullable="false" />
4062 4095 <Property Type="String" Name="FirstName" Nullable="true" MaxLength="100" />
4063 4096 <Property Type="String" Name="LastName" Nullable="true" MaxLength="100" />
4064 4097 <Property Type="String" Name="LoginId" Nullable="false" MaxLength="50" />
4065 4098 <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
4066   - <Property Type="String" Name="Title" Nullable="false" MaxLength="50" />
4067   - <Property Type="Int32" Name="InGroup" Nullable="false" />
  4099 + <Property Type="Boolean" Name="InGroup" Nullable="false" />
  4100 + <Property Type="String" Name="ProductEdition" Nullable="false" MaxLength="50" />
4068 4101 </ComplexType>
4069 4102 <ComplexType Name="usp_InsertResellerLicenseAccount_Result">
4070 4103 <Property Type="String" Name="SPStatus" Nullable="true" MaxLength="2" />
... ... @@ -4091,18 +4124,16 @@
4091 4124 </ComplexType>
4092 4125 <ComplexType Name="usp_GetSiteAccountSites_Result">
4093 4126 <Property Type="Int32" Name="Id" Nullable="false" />
4094   - <Property Type="String" Name="SiteIp" Nullable="true" MaxLength="2000" />
4095 4127 <Property Type="String" Name="Title" Nullable="true" MaxLength="100" />
4096   - <Property Type="String" Name="SiteIPTo" Nullable="false" MaxLength="100" />
4097   - <Property Type="String" Name="SiteMasterIPTo" Nullable="false" MaxLength="100" />
4098   - <Property Type="String" Name="CreationDate" Nullable="true" MaxLength="30" />
4099   - <Property Type="String" Name="ModifiedDate" Nullable="true" MaxLength="30" />
  4128 + <Property Type="DateTime" Name="CreationDate" Nullable="true" Precision="23" />
  4129 + <Property Type="DateTime" Name="ModifiedDate" Nullable="true" Precision="23" />
4100 4130 <Property Type="String" Name="InstituteName" Nullable="true" MaxLength="100" />
4101 4131 <Property Type="String" Name="Department" Nullable="true" MaxLength="50" />
4102   - <Property Type="Int32" Name="UserId" Nullable="false" />
4103   - <Property Type="String" Name="FirstName" Nullable="true" MaxLength="100" />
4104   - <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
4105   - </ComplexType>
  4132 + <Property Type="String" Name="Ip" Nullable="true" />
  4133 + <Property Type="String" Name="SiteIpTo" Nullable="true" MaxLength="100" />
  4134 + <Property Type="String" Name="SiteUserFirstName" Nullable="true" MaxLength="50" />
  4135 + <Property Type="String" Name="SiteUserEmailId" Nullable="true" MaxLength="50" />
  4136 + </ComplexType>
4106 4137 <ComplexType Name="usp_EC_GetAccountTypeList_Result">
4107 4138 <Property Type="Byte" Name="Id" Nullable="false" />
4108 4139 <Property Type="String" Name="Title" Nullable="false" MaxLength="50" />
... ... @@ -4148,31 +4179,30 @@
4148 4179 <Property Type="Int32" Name="CardNumber" Nullable="true" />
4149 4180 </ComplexType>
4150 4181 <ComplexType Name="usp_GetCustomerSummary_Result">
4151   - <Property Type="Int64" Name="Serial_No" Nullable="true" />
4152 4182 <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="50" />
4153   - <Property Type="String" Name="LicenseeName" Nullable="true" MaxLength="100" />
  4183 + <Property Type="String" Name="LicenseeName" Nullable="true" MaxLength="200" />
4154 4184 <Property Type="String" Name="LicenseType" Nullable="true" MaxLength="50" />
4155 4185 <Property Type="String" Name="AccountType" Nullable="true" MaxLength="50" />
4156 4186 <Property Type="String" Name="Edition" Nullable="true" MaxLength="200" />
4157 4187 <Property Type="String" Name="Email" Nullable="true" MaxLength="100" />
4158   - <Property Type="String" Name="StartDate" Nullable="true" MaxLength="30" />
4159   - <Property Type="String" Name="EndDate" Nullable="true" MaxLength="30" />
4160 4188 <Property Type="String" Name="LicenseStatus" Nullable="true" MaxLength="8" />
4161   - <Property Type="Decimal" Name="Price" Nullable="true" Precision="14" Scale="2" />
  4189 + <Property Type="Decimal" Name="Price" Nullable="true" Precision="19" />
4162 4190 <Property Type="String" Name="LicenseZip" Nullable="true" MaxLength="20" />
4163 4191 <Property Type="String" Name="LicenseState" Nullable="true" MaxLength="50" />
4164 4192 <Property Type="String" Name="LicenseCountry" Nullable="true" MaxLength="50" />
4165 4193 <Property Type="String" Name="InstitutionName" Nullable="true" MaxLength="100" />
4166   - <Property Type="String" Name="LicenseCreationDate" Nullable="true" MaxLength="30" />
4167   - <Property Type="Int32" Name="CardNumber" Nullable="false" />
4168   - </ComplexType>
  4194 + <Property Type="DateTime" Name="LicenseCreationDate" Nullable="true" Precision="23" />
  4195 + <Property Type="Int32" Name="CardNumber" Nullable="true" />
  4196 + <Property Type="DateTime" Name="StartDate" Nullable="true" Precision="23" />
  4197 + <Property Type="DateTime" Name="EndDate" Nullable="true" Precision="23" />
  4198 + </ComplexType>
4169 4199 <ComplexType Name="usp_GetDiscountCodes_Result">
4170 4200 <Property Type="Int32" Name="Id" Nullable="false" />
4171   - <Property Type="String" Name="DiscountCode" Nullable="true" MaxLength="255" />
  4201 + <Property Type="String" Name="DiscountCode" Nullable="true" MaxLength="256" />
4172 4202 <Property Type="Decimal" Name="Percentage" Nullable="false" Precision="5" Scale="2" />
4173   - <Property Type="String" Name="StartDate" Nullable="true" MaxLength="10" />
4174   - <Property Type="String" Name="EndDate" Nullable="true" MaxLength="10" />
4175   - <Property Type="String" Name="Status" Nullable="false" MaxLength="8" />
  4203 + <Property Type="DateTime" Name="StartDate" Nullable="false" Precision="23" />
  4204 + <Property Type="DateTime" Name="EndDate" Nullable="false" Precision="23" />
  4205 + <Property Type="Boolean" Name="IsActive" Nullable="false" />
4176 4206 </ComplexType>
4177 4207 <ComplexType Name="usp_GetDiscountReport_Result">
4178 4208 <Property Type="Int64" Name="RowNum" Nullable="true" />
... ... @@ -4199,16 +4229,14 @@
4199 4229 <Property Type="Int32" Name="CardNumber" Nullable="false" />
4200 4230 </ComplexType>
4201 4231 <ComplexType Name="usp_GetExportedImageDetails_Result">
4202   - <Property Type="Int64" Name="RowNum" Nullable="true" />
4203   - <Property Type="Int32" Name="LicenseId" Nullable="false" />
4204   - <Property Type="String" Name="ExportedDate" Nullable="true" MaxLength="30" />
4205   - <Property Type="String" Name="ImageName" Nullable="false" MaxLength="2000" />
4206   - <Property Type="String" Name="AccountNumber" Nullable="false" MaxLength="16" />
4207   - <Property Type="String" Name="OriginalFileName" Nullable="true" MaxLength="1000" />
4208   - <Property Type="String" Name="Title" Nullable="true" MaxLength="1000" />
4209   - <Property Type="String" Name="ModuleName" Nullable="true" MaxLength="1000" />
4210   - <Property Type="Int32" Name="ExportLimit" Nullable="false" />
4211   - <Property Type="String" Name="UserName" Nullable="true" MaxLength="201" />
  4232 + <Property Type="DateTime" Name="ExportedDate" Nullable="false" Precision="23" />
  4233 + <Property Type="String" Name="ImageName" Nullable="true" MaxLength="2000" />
  4234 + <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="100" />
  4235 + <Property Type="String" Name="OriginalFileName" Nullable="true" MaxLength="100" />
  4236 + <Property Type="String" Name="Title" Nullable="true" MaxLength="100" />
  4237 + <Property Type="String" Name="ModuleName" Nullable="true" MaxLength="100" />
  4238 + <Property Type="Int32" Name="ExportLimit" Nullable="true" />
  4239 + <Property Type="String" Name="UserName" Nullable="true" MaxLength="100" />
4212 4240 <Property Type="Int32" Name="imageCount" Nullable="true" />
4213 4241 </ComplexType>
4214 4242 <ComplexType Name="usp_GetLicenseByLicenseId_Result">
... ... @@ -4318,41 +4346,39 @@
4318 4346 <Property Type="Int32" Name="CardNumber" Nullable="false" />
4319 4347 </ComplexType>
4320 4348 <ComplexType Name="usp_GetUsageReport_Result">
4321   - <Property Type="Int64" Name="Serial_No" Nullable="true" />
4322 4349 <Property Type="String" Name="LoginId" Nullable="true" MaxLength="50" />
4323 4350 <Property Type="String" Name="FirstName" Nullable="true" MaxLength="100" />
4324 4351 <Property Type="String" Name="LastName" Nullable="true" MaxLength="100" />
4325   - <Property Type="String" Name="AccountNumber" Nullable="false" MaxLength="50" />
4326   - <Property Type="Int32" Name="CardNumber" Nullable="false" />
  4352 + <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="50" />
  4353 + <Property Type="Int32" Name="CardNumber" Nullable="true" />
4327 4354 <Property Type="String" Name="UserType" Nullable="true" MaxLength="50" />
4328   - <Property Type="String" Name="LicenseCreationDate" Nullable="true" MaxLength="30" />
  4355 + <Property Type="DateTime" Name="LicenseCreationDate" Nullable="true" Precision="23" />
4329 4356 <Property Type="String" Name="LicenseZip" Nullable="true" MaxLength="20" />
4330 4357 <Property Type="String" Name="LicenseState" Nullable="true" MaxLength="50" />
4331 4358 <Property Type="String" Name="LicenseCountry" Nullable="true" MaxLength="50" />
4332 4359 <Property Type="String" Name="InstitutionName" Nullable="true" MaxLength="100" />
4333 4360 <Property Type="Int32" Name="TotalLogins" Nullable="true" />
4334   - <Property Type="String" Name="LastLogin" Nullable="true" MaxLength="30" />
  4361 + <Property Type="DateTime" Name="LastLogin" Nullable="true" Precision="23" />
4335 4362 </ComplexType>
4336 4363 <ComplexType Name="usp_GetUsersList_Result">
4337   - <Property Type="Int64" Name="RowNum" Nullable="true" />
4338   - <Property Type="Int32" Name="Id" Nullable="true" />
  4364 + <Property Type="Int32" Name="Id" Nullable="false" />
4339 4365 <Property Type="String" Name="FirstName" Nullable="true" MaxLength="100" />
4340 4366 <Property Type="String" Name="LastName" Nullable="true" MaxLength="100" />
4341 4367 <Property Type="String" Name="LoginId" Nullable="true" MaxLength="50" />
4342 4368 <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
4343 4369 <Property Type="String" Name="UserTypeTitle" Nullable="true" MaxLength="50" />
4344 4370 <Property Type="String" Name="Password" Nullable="true" MaxLength="50" />
4345   - <Property Type="DateTime" Name="CreationDate" Nullable="true" Precision="23" />
4346   - <Property Type="DateTime" Name="ModifiedDate" Nullable="true" Precision="23" />
  4371 + <Property Type="DateTime" Name="CreationDate" Nullable="false" Precision="23" />
  4372 + <Property Type="DateTime" Name="ModifiedDate" Nullable="false" Precision="23" />
4347 4373 <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="50" />
4348 4374 <Property Type="String" Name="AccountTypeTitle" Nullable="true" MaxLength="50" />
4349 4375 <Property Type="String" Name="EditionType" Nullable="true" MaxLength="50" />
4350 4376 <Property Type="String" Name="UserStatus" Nullable="true" MaxLength="8" />
4351   - <Property Type="Int32" Name="UserTypeId" Nullable="true" />
4352   - <Property Type="Int32" Name="EditionTypeId" Nullable="true" />
4353   - <Property Type="Boolean" Name="LoginStatus" Nullable="true" />
  4377 + <Property Type="Int32" Name="UserTypeId" Nullable="false" />
  4378 + <Property Type="Int32" Name="EditionTypeId" Nullable="false" />
  4379 + <Property Type="Boolean" Name="LoginStatus" Nullable="false" />
4354 4380 <Property Type="String" Name="TotalLogin" Nullable="true" MaxLength="50" />
4355   - <Property Type="String" Name="LicenseStatus" Nullable="true" MaxLength="7" />
  4381 + <Property Type="String" Name="LicenseStatus" Nullable="true" MaxLength="50" />
4356 4382 </ComplexType>
4357 4383 <ComplexType Name="usp_GetUserTyeByAccountNumber_Result">
4358 4384 <Property Type="Byte" Name="Id" Nullable="true" />
... ... @@ -5530,7 +5556,6 @@
5530 5556 <FunctionImportMapping FunctionImportName="InsertIncorrectLoginAttempt" FunctionName="AIADatabaseV5Model.Store.InsertIncorrectLoginAttempt" />
5531 5557 <FunctionImportMapping FunctionImportName="InsertIncorrectLoginAttempts" FunctionName="AIADatabaseV5Model.Store.InsertIncorrectLoginAttempts" />
5532 5558 <FunctionImportMapping FunctionImportName="InsertLoginDetail" FunctionName="AIADatabaseV5Model.Store.InsertLoginDetail" />
5533   - <FunctionImportMapping FunctionImportName="InsertLoginDetail_1" FunctionName="AIADatabaseV5Model.Store.InsertLoginDetail_1" />
5534 5559 <FunctionImportMapping FunctionImportName="InsertLoginDetailsInSessionManager" FunctionName="AIADatabaseV5Model.Store.InsertLoginDetailsInSessionManager" />
5535 5560 <FunctionImportMapping FunctionImportName="InsertLoginErrorLog" FunctionName="AIADatabaseV5Model.Store.InsertLoginErrorLog" />
5536 5561 <FunctionImportMapping FunctionImportName="InsertNewDiscount" FunctionName="AIADatabaseV5Model.Store.InsertNewDiscount" />
... ... @@ -5749,7 +5774,6 @@
5749 5774 <ScalarProperty Name="RenewDate" ColumnName="RenewDate" />
5750 5775 <ScalarProperty Name="EndDate" ColumnName="EndDate" />
5751 5776 <ScalarProperty Name="NoofImages" ColumnName="NoofImages" />
5752   - <ScalarProperty Name="RowNo" ColumnName="RowNo" />
5753 5777 </ComplexTypeMapping>
5754 5778 </ResultMapping>
5755 5779 </FunctionImportMapping>
... ... @@ -5772,7 +5796,6 @@
5772 5796 <ScalarProperty Name="ModifiedDate" ColumnName="ModifiedDate" />
5773 5797 <ScalarProperty Name="IsActive" ColumnName="IsActive" />
5774 5798 <ScalarProperty Name="TotalUsers" ColumnName="TotalUsers" />
5775   - <ScalarProperty Name="RowNo" ColumnName="RowNo" />
5776 5799 </ComplexTypeMapping>
5777 5800 </ResultMapping>
5778 5801 </FunctionImportMapping>
... ... @@ -5836,12 +5859,12 @@
5836 5859 <FunctionImportMapping FunctionImportName="usp_GetSubscriptionPlans" FunctionName="AIADatabaseV5Model.Store.usp_GetSubscriptionPlans">
5837 5860 <ResultMapping>
5838 5861 <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetSubscriptionPlans_Result">
5839   - <ScalarProperty Name="price" ColumnName="price" />
5840   - <ScalarProperty Name="title" ColumnName="title" />
5841 5862 <ScalarProperty Name="Id" ColumnName="Id" />
5842 5863 <ScalarProperty Name="EditionId" ColumnName="EditionId" />
5843 5864 <ScalarProperty Name="Duration" ColumnName="Duration" />
5844 5865 <ScalarProperty Name="IsActive" ColumnName="IsActive" />
  5866 + <ScalarProperty Name="Title" ColumnName="Title" />
  5867 + <ScalarProperty Name="Price" ColumnName="Price" />
5845 5868 </ComplexTypeMapping>
5846 5869 </ResultMapping>
5847 5870 </FunctionImportMapping>
... ... @@ -5920,14 +5943,13 @@
5920 5943 <FunctionImportMapping FunctionImportName="usp_GetLicenseUserGroupUsers" FunctionName="AIADatabaseV5Model.Store.usp_GetLicenseUserGroupUsers">
5921 5944 <ResultMapping>
5922 5945 <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetLicenseUserGroupUsers_Result">
5923   - <ScalarProperty Name="RowNo" ColumnName="RowNo" />
5924 5946 <ScalarProperty Name="Id" ColumnName="Id" />
5925 5947 <ScalarProperty Name="FirstName" ColumnName="FirstName" />
5926 5948 <ScalarProperty Name="LastName" ColumnName="LastName" />
5927 5949 <ScalarProperty Name="LoginId" ColumnName="LoginId" />
5928 5950 <ScalarProperty Name="EmailId" ColumnName="EmailId" />
5929   - <ScalarProperty Name="Title" ColumnName="Title" />
5930 5951 <ScalarProperty Name="InGroup" ColumnName="InGroup" />
  5952 + <ScalarProperty Name="ProductEdition" ColumnName="ProductEdition" />
5931 5953 </ComplexTypeMapping>
5932 5954 </ResultMapping>
5933 5955 </FunctionImportMapping>
... ... @@ -5968,18 +5990,16 @@
5968 5990 <ResultMapping>
5969 5991 <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetSiteAccountSites_Result">
5970 5992 <ScalarProperty Name="Id" ColumnName="Id" />
5971   - <ScalarProperty Name="SiteIp" ColumnName="SiteIp" />
5972 5993 <ScalarProperty Name="Title" ColumnName="Title" />
5973   - <ScalarProperty Name="SiteIPTo" ColumnName="SiteIPTo" />
5974   - <ScalarProperty Name="SiteMasterIPTo" ColumnName="SiteMasterIPTo" />
5975 5994 <ScalarProperty Name="CreationDate" ColumnName="CreationDate" />
5976 5995 <ScalarProperty Name="ModifiedDate" ColumnName="ModifiedDate" />
5977 5996 <ScalarProperty Name="InstituteName" ColumnName="InstituteName" />
5978 5997 <ScalarProperty Name="Department" ColumnName="Department" />
5979   - <ScalarProperty Name="UserId" ColumnName="UserId" />
5980   - <ScalarProperty Name="FirstName" ColumnName="FirstName" />
5981   - <ScalarProperty Name="EmailId" ColumnName="EmailId" />
5982   - </ComplexTypeMapping>
  5998 + <ScalarProperty Name="Ip" ColumnName="Ip" />
  5999 + <ScalarProperty Name="SiteIpTo" ColumnName="SiteIpTo" />
  6000 + <ScalarProperty Name="SiteUserFirstName" ColumnName="SiteUserFirstName" />
  6001 + <ScalarProperty Name="SiteUserEmailId" ColumnName="SiteUserEmailId" />
  6002 + </ComplexTypeMapping>
5983 6003 </ResultMapping>
5984 6004 </FunctionImportMapping>
5985 6005 <FunctionImportMapping FunctionImportName="usp_DeleteLicense" FunctionName="AIADatabaseV5Model.Store.usp_DeleteLicense" />
... ... @@ -6058,15 +6078,12 @@
6058 6078 <FunctionImportMapping FunctionImportName="usp_GetCustomerSummary" FunctionName="AIADatabaseV5Model.Store.usp_GetCustomerSummary">
6059 6079 <ResultMapping>
6060 6080 <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetCustomerSummary_Result">
6061   - <ScalarProperty Name="Serial_No" ColumnName="Serial_No" />
6062 6081 <ScalarProperty Name="AccountNumber" ColumnName="AccountNumber" />
6063 6082 <ScalarProperty Name="LicenseeName" ColumnName="LicenseeName" />
6064 6083 <ScalarProperty Name="LicenseType" ColumnName="LicenseType" />
6065 6084 <ScalarProperty Name="AccountType" ColumnName="AccountType" />
6066 6085 <ScalarProperty Name="Edition" ColumnName="Edition" />
6067 6086 <ScalarProperty Name="Email" ColumnName="Email" />
6068   - <ScalarProperty Name="StartDate" ColumnName="StartDate" />
6069   - <ScalarProperty Name="EndDate" ColumnName="EndDate" />
6070 6087 <ScalarProperty Name="LicenseStatus" ColumnName="LicenseStatus" />
6071 6088 <ScalarProperty Name="Price" ColumnName="Price" />
6072 6089 <ScalarProperty Name="LicenseZip" ColumnName="LicenseZip" />
... ... @@ -6075,7 +6092,9 @@
6075 6092 <ScalarProperty Name="InstitutionName" ColumnName="InstitutionName" />
6076 6093 <ScalarProperty Name="LicenseCreationDate" ColumnName="LicenseCreationDate" />
6077 6094 <ScalarProperty Name="CardNumber" ColumnName="CardNumber" />
6078   - </ComplexTypeMapping>
  6095 + <ScalarProperty Name="StartDate" ColumnName="StartDate" />
  6096 + <ScalarProperty Name="EndDate" ColumnName="EndDate" />
  6097 + </ComplexTypeMapping>
6079 6098 </ResultMapping>
6080 6099 </FunctionImportMapping>
6081 6100 <FunctionImportMapping FunctionImportName="usp_GetDiscountCodes" FunctionName="AIADatabaseV5Model.Store.usp_GetDiscountCodes">
... ... @@ -6086,7 +6105,7 @@
6086 6105 <ScalarProperty Name="Percentage" ColumnName="Percentage" />
6087 6106 <ScalarProperty Name="StartDate" ColumnName="StartDate" />
6088 6107 <ScalarProperty Name="EndDate" ColumnName="EndDate" />
6089   - <ScalarProperty Name="Status" ColumnName="Status" />
  6108 + <ScalarProperty Name="IsActive" ColumnName="IsActive" />
6090 6109 </ComplexTypeMapping>
6091 6110 </ResultMapping>
6092 6111 </FunctionImportMapping>
... ... @@ -6125,8 +6144,6 @@
6125 6144 <FunctionImportMapping FunctionImportName="usp_GetExportedImageDetails" FunctionName="AIADatabaseV5Model.Store.usp_GetExportedImageDetails">
6126 6145 <ResultMapping>
6127 6146 <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetExportedImageDetails_Result">
6128   - <ScalarProperty Name="RowNum" ColumnName="RowNum" />
6129   - <ScalarProperty Name="LicenseId" ColumnName="LicenseId" />
6130 6147 <ScalarProperty Name="ExportedDate" ColumnName="ExportedDate" />
6131 6148 <ScalarProperty Name="ImageName" ColumnName="ImageName" />
6132 6149 <ScalarProperty Name="AccountNumber" ColumnName="AccountNumber" />
... ... @@ -6287,7 +6304,6 @@
6287 6304 <FunctionImportMapping FunctionImportName="usp_GetUsageReport" FunctionName="AIADatabaseV5Model.Store.usp_GetUsageReport">
6288 6305 <ResultMapping>
6289 6306 <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetUsageReport_Result">
6290   - <ScalarProperty Name="Serial_No" ColumnName="Serial_No" />
6291 6307 <ScalarProperty Name="LoginId" ColumnName="LoginId" />
6292 6308 <ScalarProperty Name="FirstName" ColumnName="FirstName" />
6293 6309 <ScalarProperty Name="LastName" ColumnName="LastName" />
... ... @@ -6308,7 +6324,6 @@
6308 6324 <FunctionImportMapping FunctionImportName="usp_GetUsersList" FunctionName="AIADatabaseV5Model.Store.usp_GetUsersList">
6309 6325 <ResultMapping>
6310 6326 <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetUsersList_Result">
6311   - <ScalarProperty Name="RowNum" ColumnName="RowNum" />
6312 6327 <ScalarProperty Name="Id" ColumnName="Id" />
6313 6328 <ScalarProperty Name="FirstName" ColumnName="FirstName" />
6314 6329 <ScalarProperty Name="LastName" ColumnName="LastName" />
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetCustomerSummary_Result.cs
  View file @a7a8cc8
... ... @@ -13,22 +13,21 @@ namespace AIAHTML5.ADMIN.API.Entity
13 13  
14 14 public partial class usp_GetCustomerSummary_Result
15 15 {
16   - public Nullable<long> Serial_No { get; set; }
17 16 public string AccountNumber { get; set; }
18 17 public string LicenseeName { get; set; }
19 18 public string LicenseType { get; set; }
20 19 public string AccountType { get; set; }
21 20 public string Edition { get; set; }
22 21 public string Email { get; set; }
23   - public string StartDate { get; set; }
24   - public string EndDate { get; set; }
25 22 public string LicenseStatus { get; set; }
26 23 public Nullable<decimal> Price { get; set; }
27 24 public string LicenseZip { get; set; }
28 25 public string LicenseState { get; set; }
29 26 public string LicenseCountry { get; set; }
30 27 public string InstitutionName { get; set; }
31   - public string LicenseCreationDate { get; set; }
32   - public int CardNumber { get; set; }
  28 + public Nullable<System.DateTime> LicenseCreationDate { get; set; }
  29 + public Nullable<int> CardNumber { get; set; }
  30 + public Nullable<System.DateTime> StartDate { get; set; }
  31 + public Nullable<System.DateTime> EndDate { get; set; }
33 32 }
34 33 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetDiscountCodes_Result.cs
  View file @a7a8cc8
... ... @@ -16,8 +16,8 @@ namespace AIAHTML5.ADMIN.API.Entity
16 16 public int Id { get; set; }
17 17 public string DiscountCode { get; set; }
18 18 public decimal Percentage { get; set; }
19   - public string StartDate { get; set; }
20   - public string EndDate { get; set; }
21   - public string Status { get; set; }
  19 + public System.DateTime StartDate { get; set; }
  20 + public System.DateTime EndDate { get; set; }
  21 + public bool IsActive { get; set; }
22 22 }
23 23 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetExportedImageDetails_Result.cs
  View file @a7a8cc8
... ... @@ -13,15 +13,13 @@ namespace AIAHTML5.ADMIN.API.Entity
13 13  
14 14 public partial class usp_GetExportedImageDetails_Result
15 15 {
16   - public Nullable<long> RowNum { get; set; }
17   - public int LicenseId { get; set; }
18   - public string ExportedDate { get; set; }
  16 + public System.DateTime ExportedDate { get; set; }
19 17 public string ImageName { get; set; }
20 18 public string AccountNumber { get; set; }
21 19 public string OriginalFileName { get; set; }
22 20 public string Title { get; set; }
23 21 public string ModuleName { get; set; }
24   - public int ExportLimit { get; set; }
  22 + public Nullable<int> ExportLimit { get; set; }
25 23 public string UserName { get; set; }
26 24 public Nullable<int> imageCount { get; set; }
27 25 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetLicenseUserGroupUsers_Result.cs
  View file @a7a8cc8
... ... @@ -13,13 +13,12 @@ namespace AIAHTML5.ADMIN.API.Entity
13 13  
14 14 public partial class usp_GetLicenseUserGroupUsers_Result
15 15 {
16   - public Nullable<long> RowNo { get; set; }
17 16 public int Id { get; set; }
18 17 public string FirstName { get; set; }
19 18 public string LastName { get; set; }
20 19 public string LoginId { get; set; }
21 20 public string EmailId { get; set; }
22   - public string Title { get; set; }
23   - public int InGroup { get; set; }
  21 + public bool InGroup { get; set; }
  22 + public string ProductEdition { get; set; }
24 23 }
25 24 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetLicenseUserGroups_Result.cs
  View file @a7a8cc8
... ... @@ -20,6 +20,5 @@ namespace AIAHTML5.ADMIN.API.Entity
20 20 public Nullable<System.DateTime> ModifiedDate { get; set; }
21 21 public bool IsActive { get; set; }
22 22 public Nullable<int> TotalUsers { get; set; }
23   - public Nullable<long> RowNo { get; set; }
24 23 }
25 24 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetSiteAccountSites_Result.cs
  View file @a7a8cc8
... ... @@ -14,16 +14,14 @@ namespace AIAHTML5.ADMIN.API.Entity
14 14 public partial class usp_GetSiteAccountSites_Result
15 15 {
16 16 public int Id { get; set; }
17   - public string SiteIp { get; set; }
18 17 public string Title { get; set; }
19   - public string SiteIPTo { get; set; }
20   - public string SiteMasterIPTo { get; set; }
21   - public string CreationDate { get; set; }
22   - public string ModifiedDate { get; set; }
  18 + public Nullable<System.DateTime> CreationDate { get; set; }
  19 + public Nullable<System.DateTime> ModifiedDate { get; set; }
23 20 public string InstituteName { get; set; }
24 21 public string Department { get; set; }
25   - public int UserId { get; set; }
26   - public string FirstName { get; set; }
27   - public string EmailId { get; set; }
  22 + public string Ip { get; set; }
  23 + public string SiteIpTo { get; set; }
  24 + public string SiteUserFirstName { get; set; }
  25 + public string SiteUserEmailId { get; set; }
28 26 }
29 27 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetSubscriptionPlans_Result.cs
  View file @a7a8cc8
... ... @@ -13,11 +13,11 @@ namespace AIAHTML5.ADMIN.API.Entity
13 13  
14 14 public partial class usp_GetSubscriptionPlans_Result
15 15 {
16   - public Nullable<decimal> price { get; set; }
17   - public string title { get; set; }
18   - public short Id { get; set; }
  16 + public int Id { get; set; }
19 17 public byte EditionId { get; set; }
20 18 public byte Duration { get; set; }
21 19 public bool IsActive { get; set; }
  20 + public string Title { get; set; }
  21 + public Nullable<decimal> Price { get; set; }
22 22 }
23 23 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetUsageReport_Result.cs
  View file @a7a8cc8
... ... @@ -13,19 +13,18 @@ namespace AIAHTML5.ADMIN.API.Entity
13 13  
14 14 public partial class usp_GetUsageReport_Result
15 15 {
16   - public Nullable<long> Serial_No { get; set; }
17 16 public string LoginId { get; set; }
18 17 public string FirstName { get; set; }
19 18 public string LastName { get; set; }
20 19 public string AccountNumber { get; set; }
21   - public int CardNumber { get; set; }
  20 + public Nullable<int> CardNumber { get; set; }
22 21 public string UserType { get; set; }
23   - public string LicenseCreationDate { get; set; }
  22 + public Nullable<System.DateTime> LicenseCreationDate { get; set; }
24 23 public string LicenseZip { get; set; }
25 24 public string LicenseState { get; set; }
26 25 public string LicenseCountry { get; set; }
27 26 public string InstitutionName { get; set; }
28 27 public Nullable<int> TotalLogins { get; set; }
29   - public string LastLogin { get; set; }
  28 + public Nullable<System.DateTime> LastLogin { get; set; }
30 29 }
31 30 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetUsersList_Result.cs
  View file @a7a8cc8
... ... @@ -13,23 +13,22 @@ namespace AIAHTML5.ADMIN.API.Entity
13 13  
14 14 public partial class usp_GetUsersList_Result
15 15 {
16   - public Nullable<long> RowNum { get; set; }
17   - public Nullable<int> Id { get; set; }
  16 + public int Id { get; set; }
18 17 public string FirstName { get; set; }
19 18 public string LastName { get; set; }
20 19 public string LoginId { get; set; }
21 20 public string EmailId { get; set; }
22 21 public string UserTypeTitle { get; set; }
23 22 public string Password { get; set; }
24   - public Nullable<System.DateTime> CreationDate { get; set; }
25   - public Nullable<System.DateTime> ModifiedDate { get; set; }
  23 + public System.DateTime CreationDate { get; set; }
  24 + public System.DateTime ModifiedDate { get; set; }
26 25 public string AccountNumber { get; set; }
27 26 public string AccountTypeTitle { get; set; }
28 27 public string EditionType { get; set; }
29 28 public string UserStatus { get; set; }
30   - public Nullable<int> UserTypeId { get; set; }
31   - public Nullable<int> EditionTypeId { get; set; }
32   - public Nullable<bool> LoginStatus { get; set; }
  29 + public int UserTypeId { get; set; }
  30 + public int EditionTypeId { get; set; }
  31 + public bool LoginStatus { get; set; }
33 32 public string TotalLogin { get; set; }
34 33 public string LicenseStatus { get; set; }
35 34 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetlicensesList_Result.cs
  View file @a7a8cc8
... ... @@ -26,13 +26,12 @@ namespace AIAHTML5.ADMIN.API.Entity
26 26 public string ClientAdmin { get; set; }
27 27 public string LicenseeName { get; set; }
28 28 public string ContactAddress { get; set; }
29   - public string EntryDate { get; set; }
  29 + public Nullable<System.DateTime> EntryDate { get; set; }
30 30 public string LicenseStatus { get; set; }
31   - public string ModifyDate { get; set; }
32   - public string StartDate { get; set; }
33   - public string RenewDate { get; set; }
34   - public string EndDate { get; set; }
  31 + public Nullable<System.DateTime> ModifyDate { get; set; }
  32 + public Nullable<System.DateTime> StartDate { get; set; }
  33 + public Nullable<System.DateTime> RenewDate { get; set; }
  34 + public Nullable<System.DateTime> EndDate { get; set; }
35 35 public Nullable<int> NoofImages { get; set; }
36   - public Nullable<long> RowNo { get; set; }
37 36 }
38 37 }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/DiscountCodeModel.cs
  View file @a7a8cc8
... ... @@ -15,29 +15,15 @@ namespace AIAHTML5.ADMIN.API.Models
15 15 public bool IsActive { get; set; }
16 16 public decimal Percentage { get; set; }
17 17  
18   - public static List<DiscountCodeModel> GetDiscountCodes(AIADatabaseV5Entities dbContext, string discountCode, DateTime startDate, DateTime endDate, int pageNo, int pageLength, out int recordCount)
  18 + public static List<usp_GetDiscountCodes_Result> GetDiscountCodes(AIADatabaseV5Entities dbContext, string discountCode, DateTime startDate, DateTime endDate, string sortColumn, string sortOrder, int pageNo, int pageLength, out int recordCount)
19 19 {
20   - List<DiscountCodeModel> DiscountCodeList = new List<DiscountCodeModel>();
21   - DiscountCodeModel DiscountCodeObj = new DiscountCodeModel();
  20 + List<usp_GetDiscountCodes_Result> DiscountCodeList = new List<usp_GetDiscountCodes_Result>();
22 21 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
23 22 recordCount = 0;
24 23 try
25 24 {
26   - var result = dbContext.usp_GetDiscountCodes(discountCode, startDate.ToString("MM/dd/yyyy"), endDate.ToString("MM/dd/yyyy"), pageNo, pageLength, spRecordCount).ToList();
27   - if (result.Count > 0)
28   - {
29   - foreach (var item in result)
30   - {
31   - DiscountCodeObj = new DiscountCodeModel();
32   - DiscountCodeObj.Id = item.Id;
33   - DiscountCodeObj.DiscountCode = item.DiscountCode;
34   - DiscountCodeObj.StartDate = DateTime.ParseExact(item.StartDate, "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
35   - DiscountCodeObj.EndDate = DateTime.ParseExact(item.EndDate, "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
36   - DiscountCodeObj.Percentage = item.Percentage;
37   - DiscountCodeObj.IsActive = (item.Status == "Active" ? true : false);
38   - DiscountCodeList.Add(DiscountCodeObj);
39   - }
40   - }
  25 + DiscountCodeList = dbContext.usp_GetDiscountCodes(discountCode, startDate.ToString("MM/dd/yyyy"), endDate.ToString("MM/dd/yyyy"), sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
  26 +
41 27 recordCount = (int)spRecordCount.Value;
42 28 }
43 29 catch (Exception ex) { }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/LicenseModel.cs
  View file @a7a8cc8
... ... @@ -47,6 +47,7 @@ namespace AIAHTML5.ADMIN.API.Models
47 47 public int? TotalLogins { get; set; }
48 48 public string EditionLogins { get; set; }
49 49 public decimal Price { get; set; }
  50 + public int? SiteUserId { get; set; }
50 51 public string LoginId { get; set; }
51 52 public string Password { get; set; }
52 53 public byte? SecurityQuestionId { get; set; }
... ... @@ -59,50 +60,23 @@ namespace AIAHTML5.ADMIN.API.Models
59 60 public byte? TestLicenseEditionId { get; set; }
60 61 public bool IsRenew { get; set; }
61 62  
62   - public static List<LicenseModel> GetLicenses(AIADatabaseV5Entities dbContext, string accountNumber, string licenseeFirstName,
  63 + public static List<usp_GetlicensesList_Result> GetLicenses(AIADatabaseV5Entities dbContext, string accountNumber, string licenseeFirstName,
63 64 string licenseeLastName, byte licenseTypeId, string institutionName, int stateId, int countryId, string emailId,
64   - DateTime subscriptionStartDate, DateTime subscriptionEndDate, bool isActive, int pageNo, int pageLength, out int recordCount)
  65 + DateTime subscriptionStartDate, DateTime subscriptionEndDate, bool isActive, string sortColumn, string sortOrder, int pageNo, int pageLength, out int recordCount)
65 66 {
66   - List<LicenseModel> LicenseList = new List<LicenseModel>();
67   - LicenseModel LicenseObj = new LicenseModel();
  67 + List<usp_GetlicensesList_Result> LicenseList=new List<usp_GetlicensesList_Result>();
68 68 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
69 69 recordCount = 0;
70 70 try
71 71 {
72   - var result = dbContext.usp_GetlicensesList(
  72 + LicenseList = dbContext.usp_GetlicensesList(
73 73 (subscriptionStartDate > DateTime.MinValue ? subscriptionStartDate.ToShortDateString() : "01/01/01"),
74 74 (subscriptionEndDate > DateTime.MinValue ? subscriptionEndDate.ToShortDateString() : "01/01/01"),
75 75 (accountNumber == null ? "" : accountNumber), (licenseeFirstName == null ? "" : licenseeFirstName),
76 76 (licenseeLastName == null ? "" : licenseeLastName), licenseTypeId, (institutionName == null ? "" : institutionName),
77   - (emailId == null ? "" : emailId), stateId, countryId, isActive, pageNo, pageLength, spRecordCount).ToList();
78   - if (result.Count > 0)
  77 + (emailId == null ? "" : emailId), stateId, countryId, isActive, sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
  78 + if (LicenseList.Count > 0)
79 79 {
80   - foreach (var item in result)
81   - {
82   - LicenseObj = new LicenseModel();
83   - LicenseObj.LicenseId = item.LicenseId;
84   - LicenseObj.AccountNumber = item.AccountNumber;
85   - LicenseObj.AccountTypeName = item.AccountType;
86   - LicenseObj.LicenseeName = item.LicenseeName;
87   - LicenseObj.LicenseState = item.LicenseState;
88   - LicenseObj.LicenseCountry = item.LicenseCountry;
89   - LicenseObj.Address = item.ContactAddress;
90   - LicenseObj.InstitutionName = item.InstitutionName;
91   - LicenseObj.LicenseTypeName = item.LicenseType;
92   - LicenseObj.EmailId = item.EmailId;
93   - LicenseObj.NoOfImages = item.NoofImages;
94   - LicenseObj.ClientAdmin = item.ClientAdmin;
95   - LicenseObj.CardNumber = item.CardNumber;
96   - LicenseObj.ProductKey = item.ProductKey;
97   - LicenseObj.SubscriptionStartDate = DateTime.ParseExact(item.StartDate, "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
98   - LicenseObj.SubscriptionEndDate = DateTime.ParseExact(item.EndDate, "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
99   - LicenseObj.EntryDate = DateTime.ParseExact(item.EntryDate, "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
100   - LicenseObj.RenewDate = DateTime.ParseExact((item.RenewDate == "" ? "01/01/0001" : item.RenewDate), "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
101   - LicenseObj.ModifyDate = DateTime.ParseExact((item.ModifyDate == "" ? "01/01/0001" : item.ModifyDate), "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
102   - LicenseObj.IsActive = (item.LicenseStatus == "Active" ? true : false);
103   - LicenseObj.LicStatus = item.LicenseStatus;
104   - LicenseList.Add(LicenseObj);
105   - }
106 80 recordCount = (int)spRecordCount.Value;
107 81 }
108 82 }
... ... @@ -162,6 +136,7 @@ namespace AIAHTML5.ADMIN.API.Models
162 136 LicenseObj.MasterSiteUrl = result[0].SiteUrl;
163 137 LicenseObj.SiteUrlTo = result[0].SitToUrl;
164 138 LicenseObj.SiteUrlFrom = result[0].SiteMasterUrl;
  139 + LicenseObj.SiteUserId = result[0].UserId;
165 140 LicenseObj.LoginId = result[0].Login;
166 141 LicenseObj.Password = result[0].Password;
167 142 LicenseObj.SecurityQuestionId = (byte?)result[0].SecurityQuestionId;
... ... @@ -177,38 +152,16 @@ namespace AIAHTML5.ADMIN.API.Models
177 152 return LicenseObj;
178 153 }
179 154  
180   - public static List<SiteModel> GetLicenseSites(AIADatabaseV5Entities dbContext, string AccountNo, int pageNo, int pageLength, out int recordCount)
  155 + public static List<usp_GetSiteAccountSites_Result> GetLicenseSites(AIADatabaseV5Entities dbContext, string AccountNo, string sortColumn, string sortOrder, int pageNo, int pageLength, out int recordCount)
181 156 {
182   - List<SiteModel> LicenseSiteList = new List<SiteModel>();
183   - SiteModel SiteModelObj = new SiteModel();
  157 + List<usp_GetSiteAccountSites_Result> LicenseSiteList = new List<usp_GetSiteAccountSites_Result>();
  158 +
184 159 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
185 160 recordCount = 0;
186 161 try
187 162 {
188   - var result = dbContext.usp_GetSiteAccountSites(AccountNo, pageNo, pageLength, spRecordCount).ToList();
189   - if (result.Count > 0)
190   - {
191   - foreach (var item in result)
192   - {
193   - SiteModelObj = new SiteModel();
194   - SiteModelObj.Id = item.Id;
195   - SiteModelObj.Ip = item.SiteIp;
196   - SiteModelObj.SiteIpTo = item.SiteIPTo;
197   - SiteModelObj.MasterIpTo = item.SiteMasterIPTo;
198   - SiteModelObj.InstituteName = item.InstituteName;
199   - SiteModelObj.Department = item.Department;
200   - SiteModelObj.SiteUserId = item.UserId;
201   - SiteModelObj.SiteUserEmailId = item.EmailId;
202   - SiteModelObj.SiteUserFirstName = item.FirstName;
203   - SiteModelObj.Title = item.Title;
204   - SiteModelObj.CreationDate = DateTime.ParseExact(item.CreationDate, "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
205   - if (!string.IsNullOrEmpty(item.ModifiedDate))
206   - {
207   - SiteModelObj.ModifiedDate = DateTime.ParseExact(item.ModifiedDate, "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
208   - }
209   - LicenseSiteList.Add(SiteModelObj);
210   - }
211   - }
  163 + LicenseSiteList = dbContext.usp_GetSiteAccountSites(AccountNo, sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
  164 +
212 165 recordCount = (int)spRecordCount.Value;
213 166 }
214 167 catch (Exception ex) { }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/SubscriptionPriceModel.cs
  View file @a7a8cc8
... ... @@ -15,29 +15,15 @@ namespace AIAHTML5.ADMIN.API.Models
15 15 public int EditionId { get; set; }
16 16 public bool IsActive { get; set; }
17 17  
18   - public static List<SubscriptionPriceModel> GetSubscriptionPrices(AIADatabaseV5Entities dbContext, int editionId, int pageNo, int pageLength, out int recordCount)
  18 + public static List<usp_GetSubscriptionPlans_Result> GetSubscriptionPrices(AIADatabaseV5Entities dbContext, int editionId, string sortColumn, string sortOrder, int pageNo, int pageLength, out int recordCount)
19 19 {
20   - List<SubscriptionPriceModel> SubscriptionPriceList = new List<SubscriptionPriceModel>();
21   - SubscriptionPriceModel SubscriptionPriceObj = new SubscriptionPriceModel();
  20 + List<usp_GetSubscriptionPlans_Result> SubscriptionPriceList = new List<usp_GetSubscriptionPlans_Result>();
22 21 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
23 22 recordCount = 0;
24 23 try
25 24 {
26   - var result = dbContext.usp_GetSubscriptionPlans((byte?)editionId, pageNo, pageLength, spRecordCount).ToList();
27   - if (result.Count > 0)
28   - {
29   - foreach (var item in result)
30   - {
31   - SubscriptionPriceObj = new SubscriptionPriceModel();
32   - SubscriptionPriceObj.Id = item.Id;
33   - SubscriptionPriceObj.Title = item.title;
34   - SubscriptionPriceObj.Price = item.price.Value;
35   - SubscriptionPriceObj.Duration = item.Duration;
36   - SubscriptionPriceObj.EditionId = item.EditionId;
37   - SubscriptionPriceObj.IsActive = item.IsActive;
38   - SubscriptionPriceList.Add(SubscriptionPriceObj);
39   - }
40   - }
  25 + SubscriptionPriceList = dbContext.usp_GetSubscriptionPlans((byte?)editionId, sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
  26 +
41 27 recordCount = (int)spRecordCount.Value;
42 28 }
43 29 catch (Exception ex) { }
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserGroupModel.cs
  View file @a7a8cc8
... ... @@ -16,54 +16,31 @@ namespace AIAHTML5.ADMIN.API.Models
16 16 public bool? IsActive { get; set; }
17 17 public int? TotalUsers { get; set; }
18 18  
19   - public static List<UserGroupModel> GetLicenseUserGroups(AIADatabaseV5Entities dbContext, int? LicenseId, int pageNo, int pageLength, out int recordCount)
  19 + public static List<usp_GetLicenseUserGroups_Result> GetLicenseUserGroups(AIADatabaseV5Entities dbContext, int? LicenseId, string sortColumn, string sortOrder, int pageNo, int pageLength, out int recordCount)
20 20 {
21   - List<UserGroupModel> UserGroupList = new List<UserGroupModel>();
22   - UserGroupModel UserGroupObj = new UserGroupModel();
  21 + List<usp_GetLicenseUserGroups_Result> UserGroupList = new List<usp_GetLicenseUserGroups_Result>();
  22 +
23 23 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
24 24 recordCount = 0;
25 25 try
26 26 {
27   - var result = dbContext.usp_GetLicenseUserGroups(LicenseId, pageNo, pageLength, spRecordCount).ToList();
28   - foreach (var item in result)
29   - {
30   - UserGroupObj = new UserGroupModel();
31   - UserGroupObj.Id = item.Id;
32   - UserGroupObj.LicenseId = item.LicenseId;
33   - UserGroupObj.Title = item.Title;
34   - UserGroupObj.IsActive = item.IsActive;
35   - UserGroupObj.ModifiedDate = item.ModifiedDate;
36   - UserGroupObj.CreationDate = item.CreationDate;
37   - UserGroupObj.TotalUsers = item.TotalUsers;
38   - UserGroupList.Add(UserGroupObj);
39   - }
  27 + UserGroupList = dbContext.usp_GetLicenseUserGroups(LicenseId, sortColumn, sortOrder, pageNo, pageLength, spRecordCount).ToList();
  28 +
40 29 recordCount = (int)spRecordCount.Value;
41 30 }
42 31 catch (Exception ex) { }
43 32 return UserGroupList;
44 33 }
45 34  
46   - public static List<UserModel> GetLicenseUserGroupUsers(AIADatabaseV5Entities dbContext, int? LicenseId, int UserGroupId, bool AllUsers, int pageNo, int pageLength, out int recordCount)
  35 + public static List<usp_GetLicenseUserGroupUsers_Result> GetLicenseUserGroupUsers(AIADatabaseV5Entities dbContext, int? LicenseId, int UserGroupId, bool AllUsers, string sortColumn, string sortOrder, int pageNo, int pageLength, out int recordCount)
47 36 {
48   - List<UserModel> UserList = new List<UserModel>();
  37 + List<usp_GetLicenseUserGroupUsers_Result> UserList = new List<usp_GetLicenseUserGroupUsers_Result>();
49 38 UserModel UserModelObj = new UserModel();
50 39 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
51 40 recordCount = 0;
52 41 try
53 42 {
54   - var result = dbContext.usp_GetLicenseUserGroupUsers(LicenseId, UserGroupId, AllUsers, pageNo, pageLength, spRecordCount).ToList();
55   - foreach (var item in result)
56   - {
57   - UserModelObj = new UserModel();
58   - UserModelObj.Id = item.Id;
59   - UserModelObj.FirstName = item.FirstName;
60   - UserModelObj.LastName = item.LastName;
61   - UserModelObj.LoginId = item.LoginId;
62   - UserModelObj.EmailId = item.EmailId;
63   - UserModelObj.ProductEdition = item.Title;
64   - UserModelObj.InGroup = item.InGroup;
65   - UserList.Add(UserModelObj);
66   - }
  43 + UserList = dbContext.usp_GetLicenseUserGroupUsers(LicenseId, UserGroupId, AllUsers, sortColumn, sortOrder,pageNo, pageLength, spRecordCount).ToList();
67 44 recordCount = (int)spRecordCount.Value;
68 45 }
69 46 catch (Exception ex) { }
... ...
400-SOURCECODE/Admin/src/app/app.component.ts
  View file @a7a8cc8
... ... @@ -104,7 +104,7 @@ export class AppComponent implements OnInit {
104 104 UserId: this.global.UserId,
105 105 UserType: this.global.UserTypeName
106 106 }).subscribe(x => {
107   - console.log(x); this.UserManageRightsList = x;
  107 + //console.log(x); this.UserManageRightsList = x;
108 108 this.objMenuGernal = this.obj[i].HeaderMenu;
109 109 //this.objMenuGernal = this.objMenu;
110 110 //this.objMenu='';
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/license.service.ts
  View file @a7a8cc8
... ... @@ -16,23 +16,28 @@ export class LicenseService{
16 16  
17 17 constructor(private http: Http, private commonService: GlobalService ) { }
18 18  
19   - GetLicenses(obj: any, pageNo: number, pageLength: number) {
20   - if(obj.subscriptionStartDate == ''){
  19 + GetLicenses(obj: any) {
  20 + if(obj.subscriptionStartDate == '' || obj.subscriptionStartDate == null){
21 21 obj.subscriptionStartDate = '1/1/1';
22 22 }
23   - if(obj.subscriptionEndDate == ''){
  23 + if(obj.subscriptionEndDate == '' || obj.subscriptionEndDate == null){
24 24 obj.subscriptionEndDate = '1/1/9999';
25 25 }
26   - obj.subscriptionStartDate = this.datePipe.transform(obj.subscriptionStartDate, 'MM/dd/yyyy');
27   - obj.subscriptionEndDate = this.datePipe.transform(obj.subscriptionEndDate, 'MM/dd/yyyy');
28   - return this.http.get(this.commonService.resourceBaseUrl + "License/Licenses?accountNumber=" + obj.accountNumber +
29   - "&licenseeFirstName=" + obj.licenseeFirstName + "&licenseeLastName=" + obj.licenseeLastName +
30   - "&licenseTypeId=" + obj.licenseTypeId + "&institutionName=" + obj.institutionName +
31   - "&stateId=" + obj.stateId + "&countryId=" + obj.countryId + "&emailId=" + obj.emailId +
32   - "&subscriptionStartDate=" + obj.subscriptionStartDate + "&subscriptionEndDate=" + obj.subscriptionEndDate +
33   - "&isActive=" + obj.isActive + "&pageNo=" + pageNo + "&pageLength=" + pageLength)
34   - .map(this.extractData)
35   - .catch((res: Response) => this.handleError(res));
  26 +
  27 + obj.subscriptionStartDate = this.datePipe.transform(obj.subscriptionStartDate, 'MM/dd/yyyy');
  28 + obj.subscriptionEndDate = this.datePipe.transform(obj.subscriptionEndDate, 'MM/dd/yyyy');
  29 + return this.http.get(this.commonService.resourceBaseUrl + "License/Licenses?accountNumber=" + obj.accountNumber +
  30 + "&licenseeFirstName=" + obj.licenseeFirstName + "&licenseeLastName=" + obj.licenseeLastName +
  31 + "&licenseTypeId=" + obj.licenseTypeId + "&institutionName=" + obj.institutionName +
  32 + "&stateId=" + obj.stateId + "&countryId=" + obj.countryId + "&emailId=" + obj.emailId +
  33 + "&subscriptionStartDate=" + obj.subscriptionStartDate + "&subscriptionEndDate=" + obj.subscriptionEndDate +
  34 + "&isActive=" + obj.isActive +
  35 + "&sortColumn=" + obj.sortColumn +
  36 + "&sortOrder=" + obj.sortOrder +
  37 + "&pageNo=" + obj.pageNo + "&pageLength=" + obj.pageLength)
  38 + .map(this.extractData)
  39 + .catch((res: Response) => this.handleError(res));
  40 +
36 41 }
37 42  
38 43 GetLicenseById(Id: number){
... ... @@ -96,11 +101,16 @@ export class LicenseService{
96 101 .map(this.extractData)
97 102 .catch((res: Response) => this.handleError(res));
98 103 }
99   -
100   - GetLicenseSites(accountNo: string, pageNo: number, pageLength: number) {
101   - return this.http.get(this.commonService.resourceBaseUrl + "License/LicenseSites?AccountNo=" + accountNo + "&pageNo=" + pageNo + "&pageLength=" + pageLength)
102   - .map(this.extractData)
103   - .catch((res: Response) => this.handleError(res));
  104 +
  105 + GetLicenseSites(obj: any) {
  106 + return this.http.get(this.commonService.resourceBaseUrl + "License/LicenseSites?AccountNo=" + obj.AccountNumber +
  107 + "&sortColumn=" + obj.sortColumn +
  108 + "&sortOrder=" + obj.sortOrder +
  109 + "&pageNo=" + obj.pageNo +
  110 + "&pageLength=" + obj.pageLength
  111 + )
  112 + .map(this.extractData)
  113 + .catch((res: Response) => this.handleError(res));
104 114 }
105 115  
106 116 GetLicenseSiteAdmin(accountNo: string) {
... ... @@ -367,7 +377,7 @@ export class LicenseService{
367 377  
368 378 DeleteSiteAccount(obj: any) {
369 379 return this.http.get(this.commonService.resourceBaseUrl + "Site/DeleteSiteAccount?SiteId=" +
370   - obj.Id + "&LicenseId=" + obj.LicenseId + "&UserId=" + obj.SiteUserId)
  380 + obj.siteId + "&LicenseId=" + obj.LicenseId + "&UserId=" + obj.SiteUserId)
371 381 .map(this.extractData)
372 382 .catch((res: Response) => this.handleError(res));
373 383 }
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/licensemodestysettings.component.ts
  View file @a7a8cc8
... ... @@ -100,7 +100,8 @@ export class LicenseModestySettings implements OnInit {
100 100 this.GetLicenseEditionModesty();
101 101 }
102 102 else {
103   - this.licenseService.GetLicenseSites(this.AccountNumber, 1, 1000)
  103 + //this service function also use in building level account
  104 + this.licenseService.GetLicenseSites({AccountNumber:this.AccountNumber,sortColumn:'Id',sortOrder:'asc',pageNo:1,pageLength:1000})
104 105 .subscribe(st => {
105 106 this.lstLicenseSites = st.LicenseSiteList;
106 107 if (this.lstLicenseSites.length == 0) {
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/searchlicense.component.html
  View file @a7a8cc8
... ... @@ -164,7 +164,6 @@
164 164 <label for="EmailID" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Email ID : </label>
165 165 <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
166 166 <input type="email" class="form-control input-sm" id="EmailID" formControlName="emailId" maxlength="50">
167   - <div *ngIf="searchLicenseFrm.controls.emailId.hasError('email') && searchLicenseFrm.controls.emailId.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Email is invalid</div>
168 167 </div>
169 168 </div>
170 169 </div>
... ... @@ -180,9 +179,7 @@
180 179 <span class="input-group-btn add-on">
181 180 <button class="btn btn-default" type="button" (click)="dp1.toggle()"><i class="fa fa-calendar icon-calendar"></i></button>
182 181 </span>
183   - </div>
184   - <!-- <span class="help-block">(mm/dd/yyyy)</span> -->
185   - <div *ngIf="dateStartInvalid && searchLicenseFrm.controls.subscriptionStartDate.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Subscription start date requires date in mm/dd/yyyy format</div>
  182 + </div>
186 183 </div>
187 184 </div>
188 185 </div>
... ... @@ -198,9 +195,7 @@
198 195 <span class="input-group-btn add-on">
199 196 <button class="btn btn-default" type="button" (click)="dp2.toggle()"><i class="fa fa-calendar icon-calendar"></i></button>
200 197 </span>
201   - </div>
202   - <!-- <span class="help-block">(mm/dd/yyyy)</span> -->
203   - <div *ngIf="dateEndInvalid && searchLicenseFrm.controls.subscriptionEndDate.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Subscription end date requires date in mm/dd/yyyy format</div>
  198 + </div>
204 199 </div>
205 200 </div>
206 201 </div>
... ... @@ -223,22 +218,22 @@
223 218 <tr>
224 219 <th id="AccountNumber">Account No.</th>
225 220 <th id="LicenseeName" >Licensee Name</th>
226   - <th id="LicenseTypeName">License Type</th>
227   - <th id="AccountTypeName">Account Type</th>
  221 + <th id="LicenseType">License Type</th>
  222 + <th id="AccountType">Account Type</th>
228 223 <th id="InstitutionName">Institution Name</th>
229   - <th id="Address">Address</th>
  224 + <th id="ContactAddress">Address</th>
230 225 <th id="LicenseState">State (Only U.S.)</th>
231 226 <th id="LicenseCountry">Country</th>
232 227 <th id="EmailId">Email ID</th>
233   - <th id="SubscriptionStartDate">Subscription Start Date</th>
234   - <th id="RenewDate">Subscription Renewal Date</th>
235   - <th id="SubscriptionEndDate">Subscription End Date</th>
236   - <th id="LicStatus">Status</th>
237   - <th id="EntryDate">Original Entry Date</th>
238   - <th id="ModifyDate">Last Modified Date</th>
239   - <th id="NoOfImages">No. of Export Images</th>
  228 + <th id="StartDate">Subs. Start Date</th>
  229 + <th id="RenewDate">Subs. Renewal Date</th>
  230 + <th id="EndDate">Subs. End Date</th>
  231 + <th id="LicenseStatus">Status</th>
  232 + <th id="EntryDate">Org. Entry Date</th>
  233 + <th id="ModifyDate">Modified Date</th>
  234 + <th id="NoofImages">Export Images</th>
240 235 <th id="ClientAdmin">Admin</th>
241   - <th id="CardNumber">Credit Card No.</th>
  236 + <th id="CardNumber">Card No.</th>
242 237 <th id="ProductKey">Product Key</th>
243 238 </tr>
244 239 </thead>
... ... @@ -249,33 +244,31 @@
249 244 </tr>
250 245 <tr class="ui-widget-content" *ngFor="let item of this.searchLicenseFrm.controls['licenses'].value; let i = index" (click)="SetClickedRow(i, item)"
251 246 [class.active]="i == selectedRow" [class.inactive]="i != selectedRow">
252   - <td style="text-align: center; width: 150px">
  247 + <td>
253 248 <input type="hidden" value="{{item.LicenseId}}"> {{item.AccountNumber}}
254 249 </td>
255   - <td style="text-align: center; width: 150px">{{item.LicenseeName}}</td>
256   - <td style="text-align: center; width: 150px">{{item.LicenseTypeName}}</td>
257   - <td style="text-align: center; width: 150px">{{item.AccountTypeName}}</td>
258   - <td style="text-align: center; width: 150px">{{item.InstitutionName}}</td>
259   - <td style="text-align: center; width: 150px">{{item.Address}}</td>
260   - <td style="text-align: center; width: 150px">{{item.LicenseState}}</td>
261   - <td style="text-align: center; width: 150px">{{item.LicenseCountry}}</td>
262   - <td style="text-align: center; width: 150px">{{item.EmailId}}</td>
263   - <td style="text-align: center; width: 200px">{{item.SubscriptionStartDate == '0001-01-01T00:00:00' ? '' : item.SubscriptionStartDate | date: 'MM/dd/yyyy'}}</td>
264   - <td style="text-align: center; width: 200px">{{item.RenewDate == '0001-01-01T00:00:00' ? '' : item.RenewDate | date: 'MM/dd/yyyy'}}</td>
265   - <td style="text-align: center; width: 200px">{{item.SubscriptionEndDate == '0001-01-01T00:00:00' ? '' : item.SubscriptionEndDate | date: 'MM/dd/yyyy'}}</td>
266   - <td style="text-align: center; width: 150px">
267   - <span *ngIf="item.LicStatus=='Active'" class="label label-success">Active</span>
268   - <span *ngIf="item.LicStatus=='Inactive'" class="label label-default">Inactive</span>
269   - <span *ngIf="item.LicStatus=='Expired'" class="label label-default">Expired</span>
270   - <!-- <span *ngIf="item.IsActive" class="label label-success">Active</span>
271   - <span *ngIf="!item.IsActive" class="label label-default">Inactive</span> -->
  250 + <td>{{item.LicenseeName}}</td>
  251 + <td>{{item.LicenseType}}</td>
  252 + <td>{{item.AccountType}}</td>
  253 + <td>{{item.InstitutionName}}</td>
  254 + <td>{{item.ContactAddress}}</td>
  255 + <td>{{item.LicenseState}}</td>
  256 + <td>{{item.LicenseCountry}}</td>
  257 + <td>{{item.EmailId}}</td>
  258 + <td>{{item.StartDate| date: 'MM/dd/yyyy'}}</td>
  259 + <td>{{item.RenewDate | date: 'MM/dd/yyyy'}}</td>
  260 + <td>{{item.EndDate | date: 'MM/dd/yyyy'}}</td>
  261 + <td>
  262 + <span *ngIf="item.LicenseStatus=='Active'" class="label label-success">Active</span>
  263 + <span *ngIf="item.LicenseStatus=='Inactive'" class="label label-default">Inactive</span>
  264 + <span *ngIf="item.LicenseStatus=='Expired'" class="label label-default">Expired</span>
272 265 </td>
273   - <td style="text-align: center; width: 200px">{{item.EntryDate == '0001-01-01T00:00:00' ? '' : item.EntryDate | date: 'MM/dd/yyyy'}}</td>
274   - <td style="text-align: center; width: 200px">{{item.ModifyDate == '0001-01-01T00:00:00' ? '' : item.ModifyDate | date: 'MM/dd/yyyy'}}</td>
275   - <td style="text-align: center; width: 200px">{{item.NoOfImages}}</td>
276   - <td style="text-align: center; width: 150px">{{item.ClientAdmin}}</td>
277   - <td style="text-align: center; width: 150px">{{item.CardNumber}}</td>
278   - <td style="text-align: center; width: 150px">{{item.ProductKey}}</td>
  266 + <td>{{item.EntryDate| date: 'MM/dd/yyyy'}}</td>
  267 + <td>{{item.ModifyDate| date: 'MM/dd/yyyy'}}</td>
  268 + <td>{{item.NoofImages}}</td>
  269 + <td>{{item.ClientAdmin}}</td>
  270 + <td>{{item.CardNumber}}</td>
  271 + <td>{{item.ProductKey}}</td>
279 272 </tr>
280 273 </tbody>
281 274 </table>
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/searchlicense.component.ts
  View file @a7a8cc8
... ... @@ -52,12 +52,46 @@ export class SearchLicense implements OnInit, AfterViewChecked {
52 52 returnFrom: boolean;
53 53 dateStartInvalid: boolean = false;
54 54 dateEndInvalid: boolean = false;
55   - tempSearchParams: any;
  55 + tempSearchParams: any = {
  56 + accountNumber:'',
  57 + licenseeFirstName:'',
  58 + licenseeLastName:'',
  59 + licenseTypeId:0,
  60 + institutionName:'',
  61 + stateId:0,
  62 + countryId:0,
  63 + subscriptionStartDate:'',
  64 + subscriptionEndDate:'',
  65 + isActive:true,
  66 + emailId:'',
  67 + sortColumn:'EntryDate',
  68 + sortOrder:'asc',
  69 + Id: 0,
  70 + row: -1,
  71 + pageNo: 1,
  72 + pageLength: 10
  73 + };
56 74 // Declare height and width variables
57 75 scrHeight:any;
58 76 scrWidth:any;
59   - fieldName:string;
60   - sortType:string;
  77 + SearchField:any={
  78 + accountNumber:'',
  79 + licenseeFirstName:'',
  80 + licenseeLastName:'',
  81 + licenseTypeId:0,
  82 + institutionName:'',
  83 + stateId:0,
  84 + countryId:0,
  85 + subscriptionStartDate:'',
  86 + subscriptionEndDate:'',
  87 + isActive:true,
  88 + emailId:'',
  89 + sortColumn:'EntryDate',
  90 + sortOrder:'asc',
  91 + pageNo:1,
  92 + pageLength:10
  93 + }
  94 +
61 95 @HostListener('window:resize', ['$event'])
62 96 getScreenSize(event?) {
63 97  
... ... @@ -69,8 +103,9 @@ export class SearchLicense implements OnInit, AfterViewChecked {
69 103 {
70 104 this.scrHeight = window.innerHeight-460;
71 105 }
72   -
73   - // $(".ft_container").css("height",this.scrHeight)
  106 + if(this.scrHeight<=300) this.scrHeight=300;
  107 +
  108 + $(".ft_container").css("height",this.scrHeight);
74 109 }
75 110 constructor(private licenseService: LicenseService, private router: Router,
76 111 private activeRoute: ActivatedRoute, private fb: FormBuilder,
... ... @@ -92,7 +127,7 @@ export class SearchLicense implements OnInit, AfterViewChecked {
92 127 institutionName: [''],
93 128 stateId: [0],
94 129 countryId: [0],
95   - emailId: ['', Validators.email],
  130 + emailId: [''],
96 131 subscriptionStartDate: [''],
97 132 subscriptionEndDate: [''],
98 133 isActive: [true],
... ... @@ -123,6 +158,44 @@ export class SearchLicense implements OnInit, AfterViewChecked {
123 158 this.selectedRow = +params['row'];
124 159 this.pageNo = params['pageNo'];
125 160 this.pageLength = params['pageLength'];
  161 +
  162 + var sortColumn=params['sortColumn'];
  163 + var sortOrder=params['sortOrder'];
  164 +
  165 + this.tempSearchParams.accountNumber=params['accountNumber'];
  166 + this.tempSearchParams.licenseeFirstName=params['licenseeFirstName'];
  167 + this.tempSearchParams.licenseeLastName=params['licenseeLastName'];
  168 + this.tempSearchParams.licenseTypeId=params['licenseTypeId'];
  169 + this.tempSearchParams.institutionName=params['institutionName'];
  170 + this.tempSearchParams.stateId=params['stateId'];
  171 + this.tempSearchParams.countryId=params['countryId'];
  172 + this.tempSearchParams.subscriptionStartDate=params['subscriptionStartDate'];
  173 + this.tempSearchParams.subscriptionEndDate=params['subscriptionEndDate'];
  174 + this.tempSearchParams.isActive=params['isActive'];
  175 + this.tempSearchParams.emailId=params['emailId'];
  176 + this.tempSearchParams.Id=this.selectedId;
  177 + this.tempSearchParams.row=this.selectedId;
  178 + this.tempSearchParams.sortColumn=sortColumn;
  179 + this.tempSearchParams.sortOrder=sortOrder;
  180 + this.tempSearchParams.pageNo=this.pageNo;
  181 + this.tempSearchParams.pageLength=this.pageLength;
  182 +
  183 + this.SearchField.accountNumber=params['accountNumber'];
  184 + this.SearchField.licenseeFirstName=params['licenseeFirstName'];
  185 + this.SearchField.licenseeLastName=params['licenseeLastName'];
  186 + this.SearchField.licenseTypeId=params['licenseTypeId'];
  187 + this.SearchField.institutionName=params['institutionName'];
  188 + this.SearchField.stateId=params['stateId'];
  189 + this.SearchField.countryId=params['countryId'];
  190 + this.SearchField.subscriptionStartDate=params['subscriptionStartDate'];
  191 + this.SearchField.subscriptionEndDate=params['subscriptionEndDate'];
  192 + this.SearchField.isActive=params['isActive'];
  193 + this.SearchField.emailId=params['emailId'];
  194 + this.SearchField.sortColumn=sortColumn;
  195 + this.SearchField.sortOrder=sortOrder;
  196 + this.SearchField.pageNo=this.pageNo;
  197 + this.SearchField.pageLength=this.pageLength;
  198 +
126 199 this.returnFrom = true;
127 200 }
128 201 else {
... ... @@ -141,8 +214,8 @@ export class SearchLicense implements OnInit, AfterViewChecked {
141 214 width: "100%",
142 215 height: this.scrHeight,
143 216 colModal: [
144   - { width: 150, align: 'center' },
145   - { width: 150, align: 'center' },
  217 + { width: 120, align: 'center' },
  218 + { width: 130, align: 'center' },
146 219 { width: 150, align: 'Center' },
147 220 { width: 150, align: 'Center' },
148 221 { width: 150, align: 'Center' },
... ... @@ -150,44 +223,43 @@ export class SearchLicense implements OnInit, AfterViewChecked {
150 223 { width: 150, align: 'Center' },
151 224 { width: 150, align: 'center' },
152 225 { width: 150, align: 'Center' },
153   - { width: 200, align: 'center' },
154   - { width: 200, align: 'center' },
155   - { width: 200, align: 'center' },
  226 + { width: 130, align: 'center' },
156 227 { width: 150, align: 'center' },
157   - { width: 200, align: 'center' },
158   - { width: 200, align: 'center' },
159   - { width: 200, align: 'Center' },
  228 + { width: 130, align: 'center' },
  229 + { width: 90, align: 'center' },
  230 + { width: 130, align: 'center' },
  231 + { width: 120, align: 'center' },
  232 + { width: 120, align: 'Center' },
160 233 { width: 150, align: 'Center' },
161   - { width: 150, align: 'center' },
162   - { width: 150, align: 'center' },
  234 + { width: 100, align: 'center' },
  235 + { width: 120, align: 'center' },
163 236 ],
164 237 sort: true
165 238 });
166   - if ($('fixed_table_rc').length > 0) {
167   - document.getElementById("fixed_table_rc").remove();
168   - var testScript = document.createElement("script");
169   - testScript.setAttribute("id", "fixed_table_rc");
170   - testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
171   - testScript.setAttribute("type", "text/javascript");
172   - document.body.appendChild(testScript);
173   - }
174 239  
175   - // $("#fixed_hdr2 thead tr th").unbind("click");
176   - // $(".ft_rwrapper table thead tr th").on("click",function(event){
177   -
178   - // this.fieldName=event.currentTarget.id;
179   - // var isAscSort = $(".ft_rwrapper table thead tr #"+this.fieldName).hasClass('fx_sort_asc');
180   - // $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
181   -
182   - // if (isAscSort) {
183   - // $(".ft_rwrapper table thead tr #"+this.fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
184   - // this.sortType="desc";
185   - // } else {
186   - // $(".ft_rwrapper table thead tr #"+this.fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
187   - // this.sortType="asc";
188   - // }
  240 + var thisObject=this;//class object
  241 + $(".ft_rwrapper table thead tr th").on("click",function(event){
  242 +
  243 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null)
  244 + {
  245 + var fieldName=event.currentTarget.id;
  246 + var sortType=''
  247 + var isAscSort = $(".ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  248 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  249 +
  250 + if (isAscSort) {
  251 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  252 + sortType="desc";
  253 + } else {
  254 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  255 + sortType="asc";
  256 + }
  257 +
  258 + thisObject.SortTableRecords(fieldName,sortType);
189 259  
190   - // });
  260 + }
  261 +
  262 + });
191 263  
192 264 }
193 265  
... ... @@ -205,6 +277,31 @@ export class SearchLicense implements OnInit, AfterViewChecked {
205 277 this.license = item;
206 278 this.tempSearchParams.Id = this.selectedId;
207 279 this.tempSearchParams.row = this.selectedRow;
  280 +
  281 + this.tempSearchParams.pageNo = this.pageNo;
  282 + this.tempSearchParams.pageLength = this.pageLength;
  283 +
  284 + this.tempSearchParams.sortColumn = this.SearchField.sortColumn;
  285 + this.tempSearchParams.sortOrder = this.SearchField.sortOrder;
  286 + }
  287 +
  288 + GetLicenseList() {
  289 +
  290 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  291 +
  292 + if (this.SearchField.sortOrder=='asc') {
  293 + $(".ft_rwrapper table thead tr #"+this.SearchField.sortColumn).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  294 + } else
  295 + {
  296 + $(".ft_rwrapper table thead tr #"+this.SearchField.sortColumn).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  297 + }
  298 +
  299 + this._loadingService.ShowLoading("global-loading");
  300 + this.licenseService.GetLicenses(this.SearchField)
  301 + .subscribe(x => { this.BindFormFields(x);
  302 +
  303 + }, error => this.error = error);
  304 +
208 305 }
209 306  
210 307 BindFormFields(data) {
... ... @@ -216,13 +313,12 @@ export class SearchLicense implements OnInit, AfterViewChecked {
216 313 this.license = this.searchLicenseFrm.controls['licenses'].value.find(C => C.LicenseId == this.selectedId);
217 314 }
218 315 if (this.licenses.length > 0) {
219   - this.NoRecord = '';
220   - this._loadingService.HideLoading("global-loading");
  316 + this.NoRecord = '';
221 317 }
222 318 if (this.licenses.length == 0) {
223 319 this.NoRecord = this.global.NoRecords;
224   - this._loadingService.HideLoading("global-loading");
225 320 }
  321 + this._loadingService.HideLoading("global-loading");
226 322 }
227 323  
228 324 DateChange(dateValue: any) {
... ... @@ -237,8 +333,14 @@ export class SearchLicense implements OnInit, AfterViewChecked {
237 333 this.dateStartInvalid = false;
238 334 }
239 335 }
240   - else {
241   - this.dateStartInvalid = false;
  336 + else
  337 + {
  338 + this.dateStartInvalid = false;
  339 + if(dateValue._bsValue=='Invalid Date')
  340 + {
  341 + this.dateStartInvalid = true;
  342 + }
  343 +
242 344 this.searchLicenseFrm.controls['subscriptionStartDate'].setValue(dateValue._bsValue);
243 345 }
244 346 }
... ... @@ -248,12 +350,18 @@ export class SearchLicense implements OnInit, AfterViewChecked {
248 350 if (dateValue._datepicker._elementRef.nativeElement.value != '') {
249 351 this.dateEndInvalid = true;
250 352 }
251   - else {
  353 + else
  354 + {
252 355 this.dateEndInvalid = false;
253 356 }
254 357 }
255   - else {
256   - this.dateEndInvalid = false;
  358 + else
  359 + {
  360 + this.dateEndInvalid = false;
  361 + if(dateValue._bsValue=='Invalid Date')
  362 + {
  363 + this.dateEndInvalid = true;
  364 + }
257 365 this.searchLicenseFrm.controls['subscriptionEndDate'].setValue(dateValue._bsValue);
258 366 }
259 367 }
... ... @@ -269,19 +377,36 @@ export class SearchLicense implements OnInit, AfterViewChecked {
269 377 }
270 378  
271 379 public SearchLicenses(evt: any) {
272   - if (this.alerts != '') return;
273 380 if (!this.returnFrom) {
274 381 this.selectedRow = -1;
275 382 this.selectedId = -1;
276 383 }
277 384 if (this.returnFrom) this.returnFrom = false;
278   - this._loadingService.ShowLoading("global-loading");
279 385 var tempArr = evt.split(',');
280 386 this.pageNo = parseInt(tempArr[0]);
281 387 this.pageLength = parseInt(tempArr[1]);
282   - this.licenseService.GetLicenses(this.searchLicenseFrm.value, this.pageNo, this.pageLength)
283   - .subscribe(x => { this.BindFormFields(x);
284   - this.tempSearchParams = {
  388 +
  389 + this.SearchField.pageNo=this.pageNo;
  390 + this.SearchField.pageLength=this.pageLength;
  391 +
  392 + this.GetLicenseList();
  393 +
  394 + }
  395 +
  396 + SortTableRecords(fieldName:string,sortType:string) {
  397 + this.selectedRow = -1;
  398 +
  399 + this.SearchField.sortColumn=fieldName;
  400 + this.SearchField.sortOrder=sortType;
  401 +
  402 + this.GetLicenseList();
  403 + }
  404 +
  405 + SearchRecords() {
  406 + this.selectedRow = -1;
  407 + this.pageNo=1;
  408 +
  409 + this.tempSearchParams = {
285 410 'accountNumber': this.searchLicenseFrm.controls['accountNumber'].value,
286 411 'licenseeFirstName': this.searchLicenseFrm.controls['licenseeFirstName'].value,
287 412 'licenseeLastName': this.searchLicenseFrm.controls['licenseeLastName'].value,
... ... @@ -297,14 +422,22 @@ export class SearchLicense implements OnInit, AfterViewChecked {
297 422 'row': this.selectedRow,
298 423 'pageNo': this.pageNo,
299 424 'pageLength': this.pageLength
300   - };
301   - this._loadingService.HideLoading("global-loading");
  425 + };
302 426  
303   - }, error => this.error = error);
304   - }
305   -
306   - SearchRecords() {
307   - this.SearchLicenses('1, ' + this.pageLength);
  427 + this.SearchField.accountNumber=this.searchLicenseFrm.controls['accountNumber'].value;
  428 + this.SearchField.licenseeFirstName=this.searchLicenseFrm.controls['licenseeFirstName'].value;
  429 + this.SearchField.licenseeLastName=this.searchLicenseFrm.controls['licenseeLastName'].value;
  430 + this.SearchField.licenseTypeId=this.searchLicenseFrm.controls['licenseTypeId'].value;
  431 + this.SearchField.institutionName=this.searchLicenseFrm.controls['institutionName'].value;
  432 + this.SearchField.stateId=this.searchLicenseFrm.controls['stateId'].value;
  433 + this.SearchField.countryId=this.searchLicenseFrm.controls['countryId'].value;
  434 + this.SearchField.subscriptionStartDate=this.searchLicenseFrm.controls['subscriptionStartDate'].value;
  435 + this.SearchField.subscriptionEndDate=this.searchLicenseFrm.controls['subscriptionEndDate'].value;
  436 + this.SearchField.isActive=this.searchLicenseFrm.controls['isActive'].value;
  437 + this.SearchField.emailId=this.searchLicenseFrm.controls['emailId'].value;
  438 + this.SearchField.pageNo=this.pageNo;
  439 +
  440 + this.GetLicenseList();
308 441 }
309 442  
310 443 GetLicenseType() {
... ... @@ -338,7 +471,7 @@ EditLicense() {
338 471 this._confirmService.activate("License deleted successfully.", "alertMsg");
339 472 // this.modalAlerts = "<p>License deleted successfully</p>";
340 473 //this.modalRef = this.modalService.show(template);
341   - this.SearchRecords();
  474 + this.GetLicenseList();
342 475 }
343 476 }
344 477  
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.html
  View file @a7a8cc8
... ... @@ -75,18 +75,18 @@
75 75 </div>
76 76  
77 77 <div class="well" [style.display]="(mode == 'Search') ? 'block' : 'none'">
78   - <table id="fixed_hdr2" class="table-hover">
  78 + <table id="fixed_hdr2" class="table-hover ui-widget-header sorttable">
79 79 <thead>
80 80 <tr>
81   - <th>Site Url</th>
82   - <th>Site Url To</th>
83   - <th>Account Name</th>
84   - <th>Institution Name</th>
85   - <th>Department Name</th>
86   - <th>Client Admin</th>
87   - <th>Client Admin Email ID</th>
88   - <th>Original Entry Date</th>
89   - <th>Last Modified Date</th>
  81 + <th id="Ip">Site Url</th>
  82 + <th id="SiteIpTo">Site Url To</th>
  83 + <th id="Title">Account Name</th>
  84 + <th id="InstituteName">Institution Name</th>
  85 + <th id="Department">Department Name</th>
  86 + <th id="SiteUserFirstName">Client Admin</th>
  87 + <th id="SiteUserEmailId">Client Admin Email ID</th>
  88 + <th id="CreationDate">Original Entry Date</th>
  89 + <th id="ModifiedDate">Last Modified Date</th>
90 90 </tr>
91 91 </thead>
92 92 <tbody>
... ...
400-SOURCECODE/Admin/src/app/components/LicenseEntity/sitelicenseaccount.component.ts
  View file @a7a8cc8
... ... @@ -49,6 +49,13 @@ export class SiteLicenseAccount implements OnInit {
49 49 // Declare height and width variables
50 50 scrHeight:any;
51 51 scrWidth:any;
  52 + SearchField:any={
  53 + AccountNumber:'',
  54 + sortColumn:'Id',
  55 + sortOrder:'asc',
  56 + pageNo:1,
  57 + pageLength:10
  58 + };
52 59 @HostListener('window:resize', ['$event'])
53 60 getScreenSize(event?) {
54 61  
... ... @@ -60,6 +67,9 @@ export class SiteLicenseAccount implements OnInit {
60 67 {
61 68 this.scrHeight = window.innerHeight-360;
62 69 }
  70 + if(this.scrHeight<=300) this.scrHeight=300;
  71 +
  72 + $(".ft_container").css("height",this.scrHeight);
63 73 }
64 74  
65 75 constructor(private licenseService: LicenseService,
... ... @@ -136,14 +146,14 @@ export class SiteLicenseAccount implements OnInit {
136 146 height: this.scrHeight,
137 147 colModal: [
138 148 { width: 200, align: 'center' },
139   - { width: 200, align: 'center' },
  149 + { width: 180, align: 'center' },
140 150 { width: 200, align: 'Center' },
141 151 { width: 200, align: 'Center' },
142 152 { width: 250, align: 'Center' },
143 153 { width: 200, align: 'Center' },
144 154 { width: 200, align: 'Center' },
145   - { width: 200, align: 'Center' },
146   - { width: 200, align: 'Center' },
  155 + { width: 180, align: 'Center' },
  156 + { width: 170, align: 'Center' },
147 157 ],
148 158 sort: true
149 159 });
... ... @@ -154,15 +164,30 @@ export class SiteLicenseAccount implements OnInit {
154 164 this.NoRecord = '';
155 165 this.recordCount = 0;
156 166 this.pagerComponent = new PagerComponent();
157   -
158   - if(document.getElementById("fixed_table_rc") != null){
159   - document.getElementById("fixed_table_rc").remove();
160   - var testScript = document.createElement("script");
161   - testScript.setAttribute("id", "fixed_table_rc");
162   - testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
163   - testScript.setAttribute("type", "text/javascript");
164   - document.body.appendChild(testScript);
165   - }
  167 +
  168 + var thisObject=this;//class object
  169 + $(".ft_rwrapper table thead tr th").on("click",function(event){
  170 +
  171 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null)
  172 + {
  173 + var fieldName=event.currentTarget.id;
  174 + var sortType=''
  175 + var isAscSort = $(".ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  176 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  177 +
  178 + if (isAscSort) {
  179 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  180 + sortType="desc";
  181 + } else {
  182 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  183 + sortType="asc";
  184 + }
  185 +
  186 + thisObject.SortTableRecords(fieldName,sortType);
  187 +
  188 + }
  189 +
  190 + });
166 191 }
167 192 public noWhitespaceValidator(control: FormControl) {
168 193 // new validation for intial whaite space
... ... @@ -241,7 +266,7 @@ export class SiteLicenseAccount implements OnInit {
241 266 public SetClickedRow(i: number, item: any) {
242 267 this.selectedRow = i;
243 268 this.selectedId = item['Id'];
244   - this.licenseSite = item;
  269 + this.licenseSite = [];
245 270 }
246 271  
247 272 BindFormFields(data){
... ... @@ -249,11 +274,11 @@ export class SiteLicenseAccount implements OnInit {
249 274 this.lstLicenseSites = data.LicenseSiteList;
250 275 if(this.recordCount > 0){
251 276 if(this.selectedRow > -1){
252   - this.selectedId = this.lstLicenseSites[this.selectedRow].siteId;
  277 + this.selectedId = this.lstLicenseSites[this.selectedRow].Id;
253 278 this.SetClickedRow(this.selectedRow, this.lstLicenseSites[this.selectedRow]);
254 279 }
255 280 }
256   - this.GetLicenseSiteAdmin();
  281 +
257 282 if (this.lstLicenseSites.length > 0) {
258 283 this.NoRecord = '';
259 284 this._loadingService.HideLoading("global-loading");
... ... @@ -277,6 +302,8 @@ export class SiteLicenseAccount implements OnInit {
277 302 });
278 303 });
279 304 this.lstClientAdmin = tempArr;
  305 + this._loadingService.HideLoading("global-loading");
  306 +
280 307 }
281 308  
282 309 GetLicenseAccounts() {
... ... @@ -367,19 +394,38 @@ export class SiteLicenseAccount implements OnInit {
367 394 }, error => this.error = <any>error);
368 395 }
369 396  
  397 + SortTableRecords(fieldName:string,sortType:string) {
  398 + this.selectedRow = -1;
  399 +
  400 + this.SearchField.sortColumn=fieldName;
  401 + this.SearchField.sortOrder=sortType;
  402 +
  403 + this.GetLicenseSitesList();
  404 + }
  405 +
370 406 GetLicenseSites(evt: any) {
371 407 if (this.alerts != '') return;
372 408 if(this.license.LicenseId == 0){
373 409 return;
374 410 }
375   - this._loadingService.ShowLoading("global-loading");
376 411 var tempArr = evt.split(',');
377 412 this.pageNo = parseInt(tempArr[0]);
378 413 this.pageLength = parseInt(tempArr[1]);
379   - this._loadingService.ShowLoading("global-loading");
380   - this.licenseService.GetLicenseSites(this.license.AccountNumber, this.pageNo, this.pageLength)
381   - .subscribe(x => { this.BindFormFields(x) }, error => this.error = error);
  414 + this.SearchField.pageNo=this.pageNo;
  415 + this.SearchField.pageLength=this.pageLength;
  416 +
  417 + this.GetLicenseSitesList();
  418 +
382 419 }
  420 +
  421 + GetLicenseSitesList()
  422 + {
  423 + this.SearchField.AccountNumber=this.license.AccountNumber;
  424 + this._loadingService.ShowLoading("global-loading");
  425 + this.licenseService.GetLicenseSites(this.SearchField)
  426 + .subscribe(x => { this.BindFormFields(x) }, error => this.error = error);
  427 + }
  428 +
383 429  
384 430 GetLicenseSiteAdmin() {
385 431 this.licenseService.GetLicenseSiteAdmin(this.license.AccountNumber)
... ... @@ -389,7 +435,10 @@ export class SiteLicenseAccount implements OnInit {
389 435 SearchRecords() {
390 436 this.selectedRow = -1;
391 437 this.selectedId = -1;
392   - this.GetLicenseSites('1, ' + this.pageLength);
  438 + this.pageNo=1;
  439 + this.SearchField.pageNo=this.pageNo;
  440 +
  441 + this.GetLicenseSitesList();
393 442 }
394 443  
395 444 GetEditions() {
... ... @@ -430,7 +479,8 @@ export class SiteLicenseAccount implements OnInit {
430 479 });
431 480 });
432 481 this.insertUpdateSiteLicenseFrm.setControl('editionLoginArr', this.fb.array(this.lstEditionLogins));
433   - this._loadingService.HideLoading("global-loading");
  482 +
  483 + this.GetLicenseSiteAdmin();
434 484 },
435 485 error => this.error = <any>error);
436 486 }
... ... @@ -441,8 +491,6 @@ export class SiteLicenseAccount implements OnInit {
441 491 this.alerts = "<span>Site account delete unsuccessfull</span>";
442 492 } else {
443 493 this._confirmService.activate("Site account deleted successfully.", "alertMsg");
444   - //this.modalAlerts = "<p>Site account deleted successfully</p>";
445   - //this.modalRef = this.modalService.show(template);
446 494 this.SearchRecords();
447 495 }
448 496 }
... ... @@ -452,11 +500,7 @@ export class SiteLicenseAccount implements OnInit {
452 500 this.alerts = "<span>License site save unsuccessfull.</span>";
453 501 } else {
454 502 this.mode = 'Edit';
455   - this.selectedId = data;
456   - this.GetSiteById();
457   - //this.modalAlerts = "<p>License site saved successfully.</p>";
458 503 this._confirmService.activate("License site saved successfully.", "alertMsg");
459   - // this.modalRef = this.modalService.show(template);
460 504 }
461 505 }
462 506  
... ... @@ -504,15 +548,20 @@ export class SiteLicenseAccount implements OnInit {
504 548 this.modalRef.hide();
505 549 this.alerts = '';
506 550 if(this.alerts == ''){
507   - var obj = this.licenseSite;
508   - obj.LicenseId = this.license.LicenseId;
509   - return this.licenseService.DeleteSiteAccount(obj)
  551 + if(this.selectedRow > -1){
  552 + var siteId = this.lstLicenseSites[this.selectedRow].Id;
  553 + var LicenseId = this.license.LicenseId;
  554 + var SiteUserId = this.license.SiteUserId;
  555 + return this.licenseService.DeleteSiteAccount({siteId:siteId,LicenseId:LicenseId,SiteUserId:SiteUserId})
510 556 .subscribe(
511 557 data => (this.AfterDeleteData(data, template)),
512 558 error => {
513 559 this.error = <any>error;
514 560 this.alerts = "<span>" + this.error + "</span>";
515 561 });
  562 +
  563 + }
  564 +
516 565 }
517 566 }
518 567  
... ... @@ -545,34 +594,22 @@ export class SiteLicenseAccount implements OnInit {
545 594 if (this.lstCountry.find(C => C.Id == this.license.CountryId).CountryName != "United States") {
546 595 this.license.StateId = this.lstState.find(C => C.StateName == "Other").Id;
547 596 this.insertUpdateSiteLicenseFrm.controls['stateId'].setValue(this.license.StateId);
548   - // this.insertUpdateSiteLicenseFrm.controls['phone'].clearValidators();
549   - // this.insertUpdateSiteLicenseFrm.controls['phone'].setValidators([Validators.required,this.noWhitespaceValidator]);
550 597 }
551 598 else {
552 599 this.license.StateId = 0;
553 600 this.insertUpdateSiteLicenseFrm.controls['stateId'].setValue(this.license.StateId);
554   - // this.insertUpdateSiteLicenseFrm.controls['phone'].clearValidators();
555   - // this.insertUpdateSiteLicenseFrm.controls['phone'].setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]);
556   - }
557   - // this.insertUpdateSiteLicenseFrm.controls['phone'].updateValueAndValidity();
  601 + }
558 602  
559 603 }
560 604 OnStateChange(element: any) {
561 605 this.license.StateId = parseInt(element.value);
562 606 if (this.lstState.find(C => C.Id == this.license.StateId).StateName != "Other") {
563 607 this.license.CountryId = this.lstCountry.find(C => C.CountryName == "United States").Id;
564   - this.insertUpdateSiteLicenseFrm.controls['countryId'].setValue(this.license.CountryId);
565   - // this.insertUpdateSiteLicenseFrm.controls['phone'].clearValidators();
566   - // this.insertUpdateSiteLicenseFrm.controls['phone'].setValidators([Validators.required, Validators.pattern('^([0-9]{3})-([0-9]{3})-([0-9]{4})$'),this.noWhitespaceValidator]);
567   - }
  608 + this.insertUpdateSiteLicenseFrm.controls['countryId'].setValue(this.license.CountryId);
  609 + }
568 610 else {
569 611 this.license.CountryId = 0;
570   - this.insertUpdateSiteLicenseFrm.controls['countryId'].setValue(this.license.CountryId);
571   - // this.insertUpdateSiteLicenseFrm.controls['phone'].clearValidators();
572   - // this.insertUpdateSiteLicenseFrm.controls['phone'].setValidators([Validators.required,this.noWhitespaceValidator]);
573 612 }
574   - // this.insertUpdateSiteLicenseFrm.controls['phone'].updateValueAndValidity();
575   -
576 613 }
577 614  
578 615 EditLicenseSite(){
... ... @@ -585,6 +622,6 @@ export class SiteLicenseAccount implements OnInit {
585 622 CancelAddEdit(){
586 623 this.mode = 'Search';
587 624 this.topPos = '2000px';
588   - this.GetLicenseSites(this.pageNo + ', ' + this.pageLength);
  625 + this.GetLicenseSitesList();
589 626 }
590 627 }
... ...
400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.component.html
  View file @a7a8cc8
... ... @@ -67,7 +67,6 @@
67 67 <button class="btn btn-default" type="button" (click)="dp1.toggle()"><i class="fa fa-calendar"></i></button>
68 68 </span>
69 69 </div>
70   - <!-- <span class="help-block">(mm/dd/yyyy)</span> -->
71 70 <div *ngIf="dateStartInvalid && manageDiscountCodeFrm.controls.searchStartDate.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Discount start date requires date in mm/dd/yyyy format</div>
72 71 </div>
73 72 </div>
... ... @@ -88,7 +87,6 @@
88 87 <button class="btn btn-default" type="button" (click)="dp2.toggle()"><i class="fa fa-calendar"></i></button>
89 88 </span>
90 89 </div>
91   - <!-- <span class="help-block">(mm/dd/yyyy)</span> -->
92 90 <div *ngIf="dateEndInvalid && manageDiscountCodeFrm.controls.searchEndDate.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Discount end date requires date in mm/dd/yyyy format</div>
93 91 </div>
94 92 </div>
... ... @@ -103,7 +101,7 @@
103 101 <label class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0 hidden-lg hidden-xs">&nbsp;</label>
104 102 </div>
105 103 <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
106   - <button (click)="SearchRecords()" type="button" class="btn btn-primary btn-sm" [disabled]="dateStartInvalid || dateEndInvalid || Searchalerts != ''"><i class="fa fa-search"></i> Search</button>
  104 + <button (click)="SearchRecords()" type="button" class="btn btn-primary btn-sm" [disabled]="!manageDiscountCodeFrm.valid || dateStartInvalid || dateEndInvalid || Searchalerts != ''"><i class="fa fa-search"></i> Search</button>
107 105 </div>
108 106 </div>
109 107 </div>
... ... @@ -113,14 +111,14 @@
113 111 </div>
114 112  
115 113 <div class="well">
116   - <table id="fixed_hdr2" class="table-hover">
  114 + <table id="fixed_hdr2" class="table-hover ui-widget-header sorttable">
117 115 <thead>
118 116 <tr>
119   - <th>Discount Code</th>
120   - <th>Percentage</th>
121   - <th>Discount Start Date</th>
122   - <th>Discount End Date</th>
123   - <th>Status</th>
  117 + <th id="DiscountCode">Discount Code</th>
  118 + <th id="Percentage">Percentage</th>
  119 + <th id="StartDate">Discount Start Date</th>
  120 + <th id="EndDate">Discount End Date</th>
  121 + <th id="IsActive">Status</th>
124 122 </tr>
125 123 </thead>
126 124 <tbody style="word-wrap: break-word; word-break: break-all">
... ...
400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.component.ts
  View file @a7a8cc8
... ... @@ -55,6 +55,15 @@ pageLength: number;
55 55 // Declare height and width variables
56 56 scrHeight:any;
57 57 scrWidth:any;
  58 + SearchField:any={
  59 + discountCode:'',
  60 + startDate:'',
  61 + endDate:'',
  62 + sortColumn:'Id',
  63 + sortOrder:'asc',
  64 + pageNo:1,
  65 + pageLength:10
  66 + }
58 67 @HostListener('window:resize', ['$event'])
59 68 getScreenSize(event?) {
60 69  
... ... @@ -66,6 +75,9 @@ getScreenSize(event?) {
66 75 {
67 76 this.scrHeight = window.innerHeight-350;
68 77 }
  78 + if(this.scrHeight<=360) this.scrHeight=360;
  79 +
  80 + $(".ft_container").css("height",this.scrHeight);
69 81 }
70 82  
71 83 constructor(private manageDiscountCodeService: ManageDiscountCodeService, private router: Router,
... ... @@ -91,7 +103,7 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
91 103 discountCode: [''],
92 104 startDate: ['', Validators.required],
93 105 endDate: ['', Validators.required],
94   - percentage: ['', [Validators.required, Validators.pattern('[0-9.]*')]],
  106 + percentage: ['', [Validators.required, Validators.pattern('[0-9.]*'),Validators.min(0),Validators.max(100)]],
95 107 isActive: ['true']
96 108 });
97 109 $('#fixed_hdr2').fxdHdrCol({
... ... @@ -114,15 +126,30 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
114 126 this.NoRecord = this.global.NoRecords;
115 127 this.recordCount = 0;
116 128 this.pagerComponent = new PagerComponent();
117   -
118   - if(document.getElementById("fixed_table_rc") != null){
119   - document.getElementById("fixed_table_rc").remove();
120   - var testScript = document.createElement("script");
121   - testScript.setAttribute("id", "fixed_table_rc");
122   - testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
123   - testScript.setAttribute("type", "text/javascript");
124   - document.body.appendChild(testScript);
125   - }
  129 +
  130 + var thisObject=this;//class object
  131 + $(".ft_rwrapper table thead tr th").on("click",function(event){
  132 +
  133 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null)
  134 + {
  135 + var fieldName=event.currentTarget.id;
  136 + var sortType=''
  137 + var isAscSort = $(".ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  138 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  139 +
  140 + if (isAscSort) {
  141 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  142 + sortType="desc";
  143 + } else {
  144 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  145 + sortType="asc";
  146 + }
  147 +
  148 + thisObject.SortTableRecords(fieldName,sortType);
  149 +
  150 + }
  151 +
  152 + });
126 153 }
127 154  
128 155 public SetClickedRow(i: number, item: any) {
... ... @@ -235,32 +262,43 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
235 262 }
236 263 }
237 264  
  265 + SortTableRecords(fieldName:string,sortType:string) {
  266 + this.selectedRow = -1;
  267 + this.SearchField.sortColumn=fieldName;
  268 + this.SearchField.sortOrder=sortType;
  269 +
  270 + this.GetDiscountCodeList();
  271 + }
  272 +
  273 + GetDiscountCodeList() {
  274 + this._loadingService.ShowLoading("global-loading");
  275 + this.manageDiscountCodeService.GetDiscountCodes(this.SearchField)
  276 + .subscribe(x => { this.BindFormFields(x) }, error => this.error = error);
  277 +
  278 + }
  279 +
238 280 public SearchDiscountCodes(evt: any) {
239   - if (this.global.ValidationMsg != '') {
240   - this.Searchalerts = this.global.ValidationMsg
241   - }
242   - if (this.alerts != '' && this.Searchalerts != '') return;
243   - this.global.compareTwoDates(this.manageDiscountCodeFrm.controls['searchEndDate'].value, this.manageDiscountCodeFrm.controls['searchStartDate'].value);
244   - this._loadingService.ShowLoading("global-loading");
  281 +
245 282 var tempArr = evt.split(',');
246 283 this.pageNo = parseInt(tempArr[0]);
247 284 this.pageLength = parseInt(tempArr[1]);
248   - this._loadingService.ShowLoading("global-loading");
249   - this.manageDiscountCodeService.GetDiscountCodes(
250   - {
251   - discountCode: this.manageDiscountCodeFrm.controls['searchDiscountCode'].value,
252   - startDate: this.datePipe.transform(this.manageDiscountCodeFrm.controls['searchStartDate'].value, 'MM/dd/yyyy'),
253   - endDate: this.datePipe.transform(this.manageDiscountCodeFrm.controls['searchEndDate'].value, 'MM/dd/yyyy'),
254   - pageNo: this.pageNo,
255   - pageLength: this.pageLength
256   - })
257   - .subscribe(x => { this.BindFormFields(x) }, error => this.error = error);
  285 + this.SearchField.pageNo=this.pageNo;
  286 + this.SearchField.pageLength=this.pageLength;
  287 +
  288 + this.GetDiscountCodeList();
  289 +
258 290 }
259 291  
260 292 SearchRecords() {
261   - this.selectedRow = -1;
262   - this.selectedId = -1;
263   - this.SearchDiscountCodes('1, ' + this.pageLength);
  293 + this.selectedRow = -1;
  294 + this.pageNo=1;
  295 + this.SearchField.discountCode=this.manageDiscountCodeFrm.controls['searchDiscountCode'].value;
  296 + this.SearchField.startDate=this.manageDiscountCodeFrm.controls['searchStartDate'].value;
  297 + this.SearchField.endDate=this.manageDiscountCodeFrm.controls['searchEndDate'].value;
  298 +
  299 + this.SearchField.pageNo=this.pageNo;
  300 +
  301 + this.GetDiscountCodeList();
264 302 }
265 303  
266 304 openModal(template: TemplateRef<any>) {
... ... @@ -276,11 +314,15 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
276 314 Date.parse(this.insertUpdateDiscountCodeFrm.controls['endDate'].value)){
277 315 this.alerts += '<span>Discount start date must be lower than discount end date</span>';
278 316 }
  317 + if (this.insertUpdateDiscountCodeFrm.valid && this.alerts == '') {
  318 + this._loadingService.ShowLoading("global-loading");
279 319 this.manageDiscountCodeService.GetDiscountCodes(
280 320 {
281 321 discountCode: this.insertUpdateDiscountCodeFrm.controls['discountCode'].value,
282   - startDate: this.datePipe.transform('1/1/1', 'MM/dd/yyyy'),
283   - endDate: this.datePipe.transform('1/1/9999', 'MM/dd/yyyy'),
  322 + startDate: '',
  323 + endDate: '',
  324 + sortColumn:'Id',
  325 + sortOrder:'asc',
284 326 pageNo: 1,
285 327 pageLength: 5
286 328 })
... ... @@ -290,6 +332,7 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
290 332 if(obj.discountId == 0){
291 333 if(x.RecordCount > 0){
292 334 this.alerts += '<span>Discount code already exists. Enter a different code.</span>';
  335 + this._loadingService.HideLoading("global-loading");
293 336 }
294 337 if(this.alerts == ''){
295 338 return this.manageDiscountCodeService.InsertDiscountCode(obj)
... ... @@ -301,6 +344,7 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
301 344 else{
302 345 if(x.RecordCount > 0 && obj.discountId != x.DiscountCodeList[0].Id){
303 346 this.alerts += '<span>Discount code already exists. Enter a different code.</span>';
  347 + this._loadingService.HideLoading("global-loading");
304 348 }
305 349 if(this.alerts == ''){
306 350 return this.manageDiscountCodeService.UpdateDiscountCode(obj)
... ... @@ -309,8 +353,12 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
309 353 error => this.error = <any>error);
310 354 }
311 355 }
  356 +
  357 +
312 358 }, error => this.error = error);
313   - }
  359 +
  360 + }
  361 + }
314 362  
315 363 AfterInsertData(data, template) {
316 364 if (data.Status == "false") {
... ... @@ -321,6 +369,7 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
321 369 //this.modalAlerts = "<p>Discount code saved successfully</p>";
322 370 //this.modalRef = this.modalService.show(template);
323 371 }
  372 + this._loadingService.HideLoading("global-loading");
324 373 }
325 374  
326 375 AfterUpdateData(data, template) {
... ... @@ -332,6 +381,7 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
332 381 //this.modalAlerts = "<p>Discount code updated successfully</p>";
333 382 //this.modalRef = this.modalService.show(template);
334 383 }
  384 + this._loadingService.HideLoading("global-loading");
335 385 }
336 386  
337 387 AddDiscountCode(){
... ... @@ -370,7 +420,7 @@ constructor(private manageDiscountCodeService: ManageDiscountCodeService, privat
370 420 this.Mode = 'Manage';
371 421 this.topPos = '2000px';
372 422 this.divClass = 'col-sm-12';
373   - this.SearchDiscountCodes(this.pageNo + ', ' + this.pageLength);
  423 + this.GetDiscountCodeList();;
374 424 }
375 425  
376 426 }
... ...
400-SOURCECODE/Admin/src/app/components/ManageDiscountCode/managediscountcode.service.ts
  View file @a7a8cc8
... ... @@ -5,11 +5,13 @@ import &#39;rxjs/add/operator/map&#39;;
5 5 import 'rxjs/add/operator/catch';
6 6 import 'rxjs/add/observable/throw';
7 7 import 'rxjs/add/operator/do';
  8 +import { DatePipe } from '@angular/common';
8 9 import { Observable } from 'rxjs/Observable';
9 10 import { GlobalService } from '../../shared/global';
10 11  
11 12 @Injectable()
12 13 export class ManageDiscountCodeService {
  14 + datePipe: DatePipe = new DatePipe('en-US');
13 15  
14 16 constructor(private http: Http, public commonService:GlobalService ) { }
15 17  
... ... @@ -20,8 +22,19 @@ export class ManageDiscountCodeService {
20 22 if (obj.endDate == '' || obj.endDate == null) {
21 23 obj.endDate = '1/1/9999';
22 24 }
  25 + obj.startDate = this.datePipe.transform(obj.startDate, 'MM/dd/yyyy');
  26 + obj.endDate = this.datePipe.transform(obj.endDate, 'MM/dd/yyyy');
  27 +
23 28 return this.http.get(this.commonService.resourceBaseUrl + "DiscountCode/GetDiscountCodes?discountCode="
24   - + obj.discountCode + "&startDate=" + obj.startDate + "&endDate=" + obj.endDate + "&pageNo=" + obj.pageNo + "&pageLength=" + obj.pageLength)
  29 + + obj.discountCode
  30 + + "&startDate=" + obj.startDate
  31 + + "&endDate=" + obj.endDate
  32 + + "&endDate=" + obj.endDate
  33 + + "&sortColumn=" + obj.sortColumn
  34 + + "&sortOrder=" + obj.sortOrder
  35 + + "&pageNo=" + obj.pageNo
  36 + + "&pageLength=" + obj.pageLength
  37 + )
25 38 .map(this.extractData)
26 39 .catch((res: Response) => this.handleError(res));
27 40 }
... ...
400-SOURCECODE/Admin/src/app/components/Reports/customersummaryreport.component.html
  View file @a7a8cc8
... ... @@ -120,27 +120,6 @@
120 120 <div class="col-sm-12">
121 121 <div class="form-group marginTop5 text-right">
122 122 <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="SearchRecords()"><i class="fa fa-file"></i> Generate Report</button>
123   - <!--modal-->
124   - <!--<div class="modal fade bs-example-modal-sm text-left" tabindex="-1" role="dialog" id="mymodal">
125   - <div class="modal-dialog modal-sm" role="document">
126   - <div class="modal-content">
127   - <div class="modal-header annotation-modal-header ui-draggable-handle">
128   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
129   - <h4 class="modal-title" id="">Alert</h4>
130   - </div>
131   - <div class="modal-body">
132   - <h5>Account number does not exist in the system.</h5>
133   - </div>
134   - <div class="modal-footer">
135   - <div class="row">
136   - <div class="col-sm-12"><button class="btn btn-primary btn-sm">Ok</button></div>
137   - </div>
138   - </div>
139   -
140   - </div>
141   - </div>
142   - </div>-->
143   - <!--modal-->
144 123 </div>
145 124 </div>
146 125  
... ... @@ -152,25 +131,25 @@
152 131 </div>
153 132  
154 133 <div class="well">
155   - <table id="fixed_hdr2" class="table-hover ">
  134 + <table id="fixed_hdr2" class="table-hover ui-widget-header sorttable">
156 135 <thead>
157 136 <tr>
158   - <th style="width: 150px">Account Number</th>
159   - <th style="width: 200px">Licensee Name</th>
160   - <th style="width: 150px">License Type</th>
161   - <th style="width: 150px">Account Type</th>
162   - <th style="width: 150px">Edition</th>
163   - <th style="width: 150px">Email ID</th>
164   - <th style="width: 150px">Status</th>
165   - <th style="width: 150px">Start Date</th>
166   - <th style="width: 150px">End Date</th>
167   - <th style="width: 150px">Price</th>
168   - <th style="width: 150px">Zip</th>
169   - <th style="width: 150px">State(only U.S.)</th>
170   - <th style="width: 150px">Country</th>
171   - <th style="width: 150px">Institution Name</th>
172   - <th style="width: 200px">Original Entry Date</th>
173   - <th style="width: 200px">Credit Card Number</th>
  137 + <th id="AccountNumber">Account Number</th>
  138 + <th id="LicenseeName">Licensee Name</th>
  139 + <th id="LicenseType">License Type</th>
  140 + <th id="AccountType">Account Type</th>
  141 + <th id="Edition">Edition</th>
  142 + <th id="Email">Email ID</th>
  143 + <th id="LicenseStatus">Status</th>
  144 + <th id="StartDate">Start Date</th>
  145 + <th id="EndDate">End Date</th>
  146 + <th id="Price">Price</th>
  147 + <th id="LicenseZip">Zip</th>
  148 + <th id="LicenseState">State</th>
  149 + <th id="LicenseCountry">Country</th>
  150 + <th id="InstitutionName">Institution Name</th>
  151 + <th id="LicenseCreationDate">Org. Entry Date</th>
  152 + <th id="CardNumber">Card Number</th>
174 153 </tr>
175 154 </thead>
176 155 <tbody>
... ... @@ -179,22 +158,22 @@
179 158 <td colspan="6"><b style="color: red;text-align: center; padding-left: 606px;"><span [innerHTML]="NoRecord"></span></b></td>
180 159 </tr>
181 160 <tr *ngFor="let csr of lstCustomerSummaryReport">
182   - <td style="width: 150px">{{csr.AccountNumber}}</td>
183   - <td style="width: 200px">{{csr.LicenseeName}}</td>
184   - <td style="width: 150px">{{csr.LicenseType}}</td>
185   - <td style="width: 150px">{{csr.AccountType}}</td>
186   - <td style="width: 150px">{{csr.Edition}}</td>
187   - <td style="width: 150px">{{csr.Email}}</td>
188   - <td style="width: 150px">{{csr.LicenseStatus}}</td>
189   - <td style="width: 150px">{{csr.StartDate}}</td>
190   - <td style="width: 150px">{{csr.EndDate}}</td>
191   - <td style="width: 150px">{{csr.Price | number:'1.2'}}</td>
192   - <td style="width: 150px">{{csr.LicenseZip}}</td>
193   - <td style="width: 150px">{{csr.LicenseState}}</td>
194   - <td style="width: 150px">{{csr.LicenseCountry}}</td>
195   - <td style="width: 150px">{{csr.InstitutionName}}</td>
196   - <td style="width: 200px">{{csr.LicenseCreationDate}}</td>
197   - <td style="width: 200px">{{csr.CardNumber}}</td>
  161 + <td>{{csr.AccountNumber}}</td>
  162 + <td>{{csr.LicenseeName}}</td>
  163 + <td>{{csr.LicenseType}}</td>
  164 + <td>{{csr.AccountType}}</td>
  165 + <td>{{csr.Edition}}</td>
  166 + <td>{{csr.Email}}</td>
  167 + <td>{{csr.LicenseStatus}}</td>
  168 + <td>{{csr.StartDate | date: 'MM/dd/yyyy'}}</td>
  169 + <td>{{csr.EndDate | date: 'MM/dd/yyyy'}}</td>
  170 + <td>{{csr.Price | number:'1.2'}}</td>
  171 + <td>{{csr.LicenseZip}}</td>
  172 + <td>{{csr.LicenseState}}</td>
  173 + <td>{{csr.LicenseCountry}}</td>
  174 + <td>{{csr.InstitutionName}}</td>
  175 + <td>{{csr.LicenseCreationDate | date: 'MM/dd/yyyy'}}</td>
  176 + <td>{{csr.CardNumber}}</td>
198 177 </tr>
199 178 </tbody>
200 179 </table>
... ...
400-SOURCECODE/Admin/src/app/components/Reports/customersummaryreport.component.ts
  View file @a7a8cc8
... ... @@ -32,11 +32,8 @@ export class CustomerSummaryReport implements OnInit, AfterViewChecked {
32 32 public lstAccountType: any;
33 33 CustomerSummaryReportForm: FormGroup;
34 34 CustomerSummaryReports: CustomerSummaryReports[];
35   - numberOfCustomerSummaryReport: number;
36   - limit: number;
37 35 page: number = 1;
38 36 error;
39   - CustomerSummaryReport = new CustomerSummaryReports();
40 37 modalAlerts: string;
41 38 divClass: string = '';
42 39 topPos: string = '2000px';
... ... @@ -56,8 +53,25 @@ export class CustomerSummaryReport implements OnInit, AfterViewChecked {
56 53 pageNo: number;
57 54 pageLength: number;
58 55 // Declare height and width variables
59   - scrHeight:any;
60   - scrWidth:any;
  56 + scrHeight:any;
  57 + scrWidth:any;
  58 + actualPageNo: number;
  59 + actualPageLength: number;
  60 + SearchField:any={
  61 + sLicenseeName:'',
  62 + sLicenseType:0,
  63 + sAccountNumber:'',
  64 + sAccountType:0,
  65 + sZip:'',
  66 + sSubscriptionStart:0,
  67 + sSubscriptionEnd:-1,
  68 + iState:0,
  69 + iCountry:0,
  70 + sortColumn:'AccountNumber',
  71 + sortOrder:'asc',
  72 + pageNo:1,
  73 + pageLength:10
  74 + };
61 75 @HostListener('window:resize', ['$event'])
62 76 getScreenSize(event?) {
63 77  
... ... @@ -69,6 +83,9 @@ export class CustomerSummaryReport implements OnInit, AfterViewChecked {
69 83 {
70 84 this.scrHeight = window.innerHeight-480;
71 85 }
  86 + if(this.scrHeight<=360) this.scrHeight=360;
  87 +
  88 + $(".ft_container").css("height",this.scrHeight);
72 89  
73 90 }
74 91 constructor(private router: Router, private reportservice: ReportService, private fb: FormBuilder,
... ... @@ -78,7 +95,6 @@ export class CustomerSummaryReport implements OnInit, AfterViewChecked {
78 95 this.ExportingStart = false;
79 96 this.buttonStatus = false;
80 97 this.NoRecord = this.global.NoRecords;
81   - let CustomerSummaryReport = new CustomerSummaryReports();
82 98 this.previousdate.setDate(this.previousdate.getDate());
83 99 this.CustomerSummaryReportForm = this.fb.group({
84 100 sLicenseeName: [''],
... ... @@ -87,7 +103,7 @@ export class CustomerSummaryReport implements OnInit, AfterViewChecked {
87 103 sAccountNumber: [''],
88 104 sAccountType: [0],
89 105 iState: [0],
90   - sSubscriptionStart: [0.00],
  106 + sSubscriptionStart: [''],
91 107 sSubscriptionEnd: [''],
92 108 iCountry: [0]
93 109 });
... ... @@ -106,37 +122,50 @@ export class CustomerSummaryReport implements OnInit, AfterViewChecked {
106 122 width: "100%",
107 123 height: this.scrHeight,
108 124 colModal: [
109   - { width: 150, align: 'center' },
  125 + { width: 140, align: 'center' },
110 126 { width: 200, align: 'center' },
111 127 { width: 150, align: 'Center' },
112 128 { width: 150, align: 'Center' },
113 129 { width: 150, align: 'Center' },
114   - { width: 150, align: 'Center' },
115   - { width: 150, align: 'Center' },
116   - { width: 150, align: 'center' },
117   - { width: 150, align: 'Center' },
118   - { width: 150, align: 'center' },
  130 + { width: 170, align: 'Center' },
  131 + { width: 100, align: 'Center' },
  132 + { width: 130, align: 'center' },
  133 + { width: 130, align: 'Center' },
  134 + { width: 110, align: 'center' },
  135 + { width: 100, align: 'center' },
  136 + { width: 120, align: 'center' },
  137 + { width: 130, align: 'center' },
119 138 { width: 150, align: 'center' },
120   - { width: 150, align: 'center' },
121   - { width: 150, align: 'center' },
122   - { width: 150, align: 'center' },
123   - { width: 200, align: 'center' },
124   - { width: 200, align: 'Center' },
125   - //{ width: 400, align: 'Center' },
126   - //{ width: 150, align: 'center' },
127   - //{ width: 110, align: 'center' },
  139 + { width: 130, align: 'center' },
  140 + { width: 110, align: 'Center' }
  141 +
128 142 ],
129 143 sort: true
130 144 });
131   - if(document.getElementById("fixed_table_rc") != null){
132   - document.getElementById("fixed_table_rc").remove();
133   - var testScript = document.createElement("script");
134   - testScript.setAttribute("id", "fixed_table_rc");
135   - testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
136   - testScript.setAttribute("type", "text/javascript");
137   - document.body.appendChild(testScript);
138   - }
139   -
  145 +
  146 + var thisObject=this;//class object
  147 + $(".ft_rwrapper table thead tr th").on("click",function(event){
  148 +
  149 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null)
  150 + {
  151 + var fieldName=event.currentTarget.id;
  152 + var sortType=''
  153 + var isAscSort = $(".ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  154 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  155 +
  156 + if (isAscSort) {
  157 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  158 + sortType="desc";
  159 + } else {
  160 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  161 + sortType="asc";
  162 + }
  163 +
  164 + thisObject.SortTableRecords(fieldName,sortType);
  165 +
  166 + }
  167 +
  168 + });
140 169 }
141 170 ngAfterViewChecked() {
142 171 $('#fixed_hdr2 thead').css('width', $('#fixed_hdr2 tbody tr:eq(0)').width());
... ... @@ -156,34 +185,75 @@ export class CustomerSummaryReport implements OnInit, AfterViewChecked {
156 185 this.reportservice.GetAccountType().subscribe(st => { this.lstAccountType = st; }, error => this.error = <any>error);
157 186 }
158 187  
  188 + SortTableRecords(fieldName:string,sortType:string) {
  189 + this.SearchField.sortColumn=fieldName;
  190 + this.SearchField.sortOrder=sortType;
  191 +
  192 + this.GetCustomerSummeryList();
  193 + }
  194 +
159 195 GetCustomerSummeryReport(evt: any) {
160   - this._loadingService.ShowLoading("global-loading");
161   - var tempArr = evt.split(',');
162   - this.pageNo = parseInt(tempArr[0]);
163   - var actulalength=this.pageLength;
  196 + this.actualPageNo = this.pageNo;
  197 + this.actualPageLength =this.pageLength;
  198 +
  199 + var tempArr = evt.split(',');
  200 + this.pageNo = parseInt(tempArr[0]);
164 201 this.pageLength = parseInt(tempArr[1]);
165 202  
166   - this.CustomerSummaryReport = this.CustomerSummaryReportForm.value;
167   - var obj = this.CustomerSummaryReport;
168   - if (this.ExportingStart) {
169   - this.reportservice.GetCustomerSummeryReport(obj, this.pageNo, this.pageLength).subscribe((CustomerSummaryReports: CustomerSummaryReports[]) => {
170   - //reset length after csvexport
171   - this.pageLength=actulalength;
172   - this.ExportService(CustomerSummaryReports); }, error => this.error = <any>error);
  203 + this.SearchField.pageNo=this.pageNo;
  204 + this.SearchField.pageLength=this.pageLength;
  205 +
  206 + this.GetCustomerSummeryList();
  207 + }
  208 +
  209 + GetCustomerSummeryList() {
  210 + this._loadingService.ShowLoading("global-loading");
  211 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  212 +
  213 + if (this.SearchField.sortOrder=='asc') {
  214 + $(".ft_rwrapper table thead tr #"+this.SearchField.sortColumn).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  215 + } else
  216 + {
  217 + $(".ft_rwrapper table thead tr #"+this.SearchField.sortColumn).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  218 + }
  219 +
  220 + if (this.ExportingStart) {
  221 + this.reportservice.GetCustomerSummeryReport(this.SearchField).subscribe((CustomerSummaryReports: CustomerSummaryReports[]) => {
  222 + //reset length after csvexport
  223 + this.pageNo = this.actualPageNo;
  224 + this.pageLength=this.actualPageLength;
  225 +
  226 + this.SearchField.pageNo=this.pageNo;
  227 + this.SearchField.pageLength=this.pageLength;
  228 + this.ExportService(CustomerSummaryReports); }, error => this.error = <any>error);
173 229 }
174 230 else {
175   - this.reportservice.GetCustomerSummeryReport(obj, this.pageNo, this.pageLength).subscribe((CustomerSummaryReports: CustomerSummaryReports[]) => { this.BindFormFields(CustomerSummaryReports); }, error => this.error = <any>error);
  231 + this.reportservice.GetCustomerSummeryReport(this.SearchField).subscribe((CustomerSummaryReports: CustomerSummaryReports[]) => { this.BindFormFields(CustomerSummaryReports); }, error => this.error = <any>error);
176 232 }
177   -
178   - }
  233 +
  234 + this.ExportingStart = false;
  235 + }
  236 +
179 237 SearchRecords() {
180 238 this.ExportingStart = false;
181   - this.GetCustomerSummeryReport('1, ' + this.pageLength);
  239 + this.pageNo=1;
  240 + this.SearchField.sLicenseeName=this.CustomerSummaryReportForm.controls['sLicenseeName'].value;
  241 + this.SearchField.sLicenseType=this.CustomerSummaryReportForm.controls['sLicenseType'].value;
  242 + this.SearchField.sAccountNumber=this.CustomerSummaryReportForm.controls['sAccountNumber'].value;
  243 + this.SearchField.sAccountType=this.CustomerSummaryReportForm.controls['sAccountType'].value;
  244 + this.SearchField.sZip=this.CustomerSummaryReportForm.controls['sZip'].value;
  245 + this.SearchField.sSubscriptionStart=this.CustomerSummaryReportForm.controls['sSubscriptionStart'].value;
  246 + this.SearchField.sSubscriptionEnd=this.CustomerSummaryReportForm.controls['sSubscriptionEnd'].value;
  247 + this.SearchField.iState=this.CustomerSummaryReportForm.controls['iState'].value;
  248 + this.SearchField.iCountry=this.CustomerSummaryReportForm.controls['iCountry'].value;
  249 + this.SearchField.pageNo=this.pageNo;
  250 +
  251 + this.GetCustomerSummeryList();
  252 +
182 253 }
183 254 BindFormFields(data) {
184 255 this.recordCount = data.RecordCount;
185 256 this.lstCustomerSummaryReport = data.CustomerSummery;
186   - this.numberOfCustomerSummaryReport = this.lstCustomerSummaryReport.length; this.limit = this.lstCustomerSummaryReport.length;
187 257 if (this.lstCustomerSummaryReport.length > 0) {
188 258 this.NoRecord = '';
189 259 this.buttonStatus = true;
... ... @@ -199,17 +269,19 @@ export class CustomerSummaryReport implements OnInit, AfterViewChecked {
199 269 if (this.buttonStatus) {
200 270 this.ExportingStart = true;
201 271 this.GetCustomerSummeryReport('1, ' + this.recordCount);
202   - this.ExportingStart = false;
203 272 }
204 273 }
205 274 ExportService(data: any) {
206   - for (let c = 0; c < this.global.RemoveColumns.length; c++) {
207   - for (let i = 0; i < data.CustomerSummery.length; i++) {
208   - delete data.CustomerSummery[i][this.global.RemoveColumns[c].toString()];
209   - }
210   - }
  275 + for (let i = 0; i < data.CustomerSummery.length; i++) {
  276 + data.CustomerSummery[i]['StartDate']= this.datePipe.transform(data.CustomerSummery[i]['StartDate'], 'MM/dd/yyyy');
  277 + data.CustomerSummery[i]['EndDate']= this.datePipe.transform(data.CustomerSummery[i]['EndDate'], 'MM/dd/yyyy');
  278 + data.CustomerSummery[i]['LicenseCreationDate']= this.datePipe.transform(data.CustomerSummery[i]['LicenseCreationDate'], 'MM/dd/yyyy');
  279 + }
  280 +
  281 + var reportname=+ this.date.getDay() + "-" + (this.date.getMonth()+1) + "-" + this.date.getSeconds()
  282 + this.global.ExportToCSV(data.CustomerSummery, "CustomerSummeryReport-"+reportname);
  283 +
211 284 this._loadingService.HideLoading("global-loading");
212   - this.global.ExportToCSV(data.CustomerSummery, "CustomerSummeryReport-" + this.date.getDay() + "-" + this.date.getMonth() + "-" + this.date.getSeconds())
213 285  
214 286 }
215 287 }
... ...
400-SOURCECODE/Admin/src/app/components/Reports/expiringsubscriptionreport.component.html
  View file @a7a8cc8
... ... @@ -141,27 +141,6 @@
141 141 <div class="col-sm-12">
142 142 <div class="form-group marginTop5 text-right">
143 143 <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="SearchRecords()"><i class="fa fa-file"></i> Generate Report</button>
144   - <!--modal-->
145   - <!--<div class="modal fade bs-example-modal-sm text-left" tabindex="-1" role="dialog" id="mymodal">
146   - <div class="modal-dialog modal-sm" role="document">
147   - <div class="modal-content">
148   - <div class="modal-header annotation-modal-header ui-draggable-handle">
149   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
150   - <h4 class="modal-title" id="">Alert</h4>
151   - </div>
152   - <div class="modal-body">
153   - <h5>Account number does not exist in the system.</h5>
154   - </div>
155   - <div class="modal-footer">
156   - <div class="row">
157   - <div class="col-sm-12"><button class="btn btn-primary btn-sm">Ok</button></div>
158   - </div>
159   - </div>
160   -
161   - </div>
162   - </div>
163   - </div>-->
164   - <!--modal-->
165 144 </div>
166 145 </div>
167 146  
... ... @@ -173,9 +152,6 @@
173 152 </div>
174 153  
175 154 <div class="well">
176   - <!--<ng2-smart-table [settings]="settings" [source]="source">
177   - <i class="fa fa-spinner fa-spin" style="font-size:24px"></i>
178   - </ng2-smart-table>-->
179 155 <table id="fixed_hdr2" class="table-hover ">
180 156 <thead>
181 157 <tr>
... ...
400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.html
  View file @a7a8cc8
... ... @@ -17,11 +17,11 @@
17 17 <div class="row">
18 18 <div class="col-sm-12">
19 19 <div class="form-group marginTop5">
20   - <label for="FromDate" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">From Date :</label>
  20 + <label for="sFromDate" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">From Date :</label>
21 21 <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
22   - <div id="datetimepicker2" class="input-group input-group-sm input-append date">
23   - <input type="text" class="form-control" formControlName="sFromDate" #dp1="bsDatepicker"
24   - bsDatepicker [(bsValue)]="bsValue1" [bsConfig]="bsConfig">
  22 + <div id="sFromDate" class="input-group input-group-sm input-append date">
  23 + <input type="text" class="form-control" formControlName="sFromDate" #dp1="bsDatepicker" placeholder="mm/dd/yyyy"
  24 + bsDatepicker [(bsValue)]="bsValue1" [bsConfig]="bsConfig" (bsValueChange)="FromDateChange(dp1)" (change)="FromDateChange(dp1)">
25 25 <span class="input-group-btn add-on">
26 26 <button class="btn btn-default" type="button" (click)="dp1.toggle()"><i class="fa fa-calendar"></i></button>
27 27 </span>
... ... @@ -37,11 +37,11 @@
37 37 <div class="row">
38 38 <div class="col-sm-12">
39 39 <div class="form-group marginTop5">
40   - <label for="ToDate" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">To Date :</label>
  40 + <label for="sToDate" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">To Date :</label>
41 41 <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
42   - <div id="datetimepicker2" class="input-group input-group-sm input-append date">
43   - <input type="text" class="form-control" formControlName="sToDate" #dp2="bsDatepicker"
44   - bsDatepicker [(bsValue)]="bsValue2" [bsConfig]="bsConfig">
  42 + <div id="sToDate" class="input-group input-group-sm input-append date">
  43 + <input type="text" class="form-control" formControlName="sToDate" #dp2="bsDatepicker" placeholder="mm/dd/yyyy"
  44 + bsDatepicker [(bsValue)]="bsValue2" [bsConfig]="bsConfig" (bsValueChange)="ToDateChange(dp2)" (change)="ToDateChange(dp2)">
45 45 <span class="input-group-btn add-on">
46 46 <button class="btn btn-default" type="button" (click)="dp2.toggle()"><i class="fa fa-calendar"></i></button>
47 47 </span>
... ... @@ -74,31 +74,29 @@
74 74 <label class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0 hidden-lg hidden-xs">&nbsp;</label>
75 75 </div>
76 76 <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
77   - <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="SearchRecords()"><i class="fa fa-file"></i> Generate Report</button>
  77 + <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="SearchRecords()" [disabled]="!ImageExportReportForm.valid || alerts != ''"><i class="fa fa-file"></i> Generate Report</button>
78 78 </div>
79 79 </div>
80 80 </div>
81 81 </div>
82 82  
83   -
84   -
85 83 </div><br />
86 84  
87 85 </div>
88 86  
89 87 <div class="well">
90   - <table id="fixed_hdr2" class="table-hover ">
  88 + <table id="fixed_hdr2" class="table-hover ui-widget-header sorttable">
91 89 <thead>
92 90 <tr>
93   - <th>Title</th>
94   - <th>Image Name</th>
95   - <th>Original Name</th>
96   - <th>Module</th>
97   - <th>Exported Date</th>
98   - <th>Account Number</th>
99   - <th>User Name</th>
100   - <th>Export Limit</th>
101   - <th>Number of export image</th>
  91 + <th id="Title">Title</th>
  92 + <th id="ImageName">Image Name</th>
  93 + <th id="OriginalFileName">Original Name</th>
  94 + <th id="ModuleName">Module</th>
  95 + <th id="ExportedDate">Exported Date</th>
  96 + <th id="AccountNumber">Account Number</th>
  97 + <th id="UserName">User Name</th>
  98 + <th id="ExportLimit">Export Limit</th>
  99 + <th id="imageCount">No. of export image</th>
102 100 </tr>
103 101 </thead>
104 102 <tbody>
... ...
400-SOURCECODE/Admin/src/app/components/Reports/imageexportreport.component.ts
  View file @a7a8cc8
... ... @@ -32,7 +32,6 @@ export class ImageExportReport implements OnInit {
32 32 limit: number;
33 33 page: number = 1;
34 34 error;
35   - imageexportreport = new ImageExportReports();
36 35 modalAlerts: string;
37 36 divClass: string = '';
38 37 topPos: string = '2000px';
... ... @@ -56,6 +55,17 @@ export class ImageExportReport implements OnInit {
56 55 // Declare height and width variables
57 56 scrHeight:any;
58 57 scrWidth:any;
  58 + actualPageNo: number;
  59 + actualPageLength: number;
  60 + SearchField:any={
  61 + sFromDate:new Date(),
  62 + sToDate:new Date(),
  63 + sAccountNumber:'',
  64 + sortColumn:'LicenseId',
  65 + sortOrder:'asc',
  66 + pageNo:1,
  67 + pageLength:10
  68 + };
59 69 @HostListener('window:resize', ['$event'])
60 70 getScreenSize(event?) {
61 71  
... ... @@ -67,6 +77,9 @@ export class ImageExportReport implements OnInit {
67 77 {
68 78 this.scrHeight = window.innerHeight-385;
69 79 }
  80 + if(this.scrHeight<=360) this.scrHeight=360;
  81 +
  82 + $(".ft_container").css("height",this.scrHeight);
70 83 }
71 84  
72 85 constructor(private router: Router, private reportservice: ReportService, private fb: FormBuilder,
... ... @@ -78,11 +91,10 @@ export class ImageExportReport implements OnInit {
78 91 this.ExportingStart = false;
79 92 this.bsConfig = Object.assign({}, { containerClass: 'theme-dark-blue' });
80 93 this.NoRecord = this.global.NoRecords;
81   - let imageexportreport = new ImageExportReports();
82 94 this.previousdate.setDate(this.previousdate.getDate());
83 95 this.ImageExportReportForm = this.fb.group({
84   - sFromDate: [this.previousdate],
85   - sToDate: [this.date],
  96 + sFromDate: [this.previousdate,[Validators.required]],
  97 + sToDate: [this.date,[Validators.required]],
86 98 sAccountNumber: ['']
87 99 });
88 100 this.alerts = '';
... ... @@ -109,53 +121,107 @@ export class ImageExportReport implements OnInit {
109 121 this.NoRecord = this.global.NoRecords;
110 122 this.recordCount = 0;
111 123 this.pagerComponent = new PagerComponent();
112   -
113   - if(document.getElementById("fixed_table_rc") != null){
114   - document.getElementById("fixed_table_rc").remove();
115   - var testScript = document.createElement("script");
116   - testScript.setAttribute("id", "fixed_table_rc");
117   - testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
118   - testScript.setAttribute("type", "text/javascript");
119   - document.body.appendChild(testScript);
120   - }
  124 +
  125 + var thisObject=this;//class object
  126 + $(".ft_rwrapper table thead tr th").on("click",function(event){
  127 +
  128 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null)
  129 + {
  130 + var fieldName=event.currentTarget.id;
  131 + var sortType=''
  132 + var isAscSort = $(".ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  133 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  134 +
  135 + if (isAscSort) {
  136 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  137 + sortType="desc";
  138 + } else {
  139 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  140 + sortType="asc";
  141 + }
  142 +
  143 + thisObject.SortTableRecords(fieldName,sortType);
  144 +
  145 + }
  146 +
  147 + });
121 148 }
122 149  
  150 +
  151 + FromDateChange(dateValue: any){
  152 + this.alerts = '';
  153 + this.global.compareTwoDates(this.ImageExportReportForm.controls['sToDate'].value, dateValue._bsValue);
  154 + if (this.global.ValidationMsg != '') {
  155 + this.alerts = this.global.ValidationMsg;
  156 + }
  157 + }
  158 + ToDateChange(dateValue: any){
  159 + this.alerts = '';
  160 + this.global.compareTwoDates(dateValue._bsValue, this.ImageExportReportForm.controls['sFromDate'].value);
  161 + if (this.global.ValidationMsg != '') {
  162 + this.alerts = this.global.ValidationMsg;
  163 + }
  164 + }
  165 +
  166 +
  167 + SortTableRecords(fieldName:string,sortType:string) {
  168 + this.SearchField.sortColumn=fieldName;
  169 + this.SearchField.sortOrder=sortType;
  170 +
  171 + this.GetImageExportReportList();
  172 + }
  173 +
123 174 GetImageExportReport(evt: any) {
124   - var tempArr = evt.split(',');
  175 + this.actualPageNo = this.pageNo;
  176 + this.actualPageLength =this.pageLength;
  177 +
  178 + var tempArr = evt.split(',');
125 179 this.pageNo = parseInt(tempArr[0]);
126   - var actulalength=this.pageLength;
127 180 this.pageLength = parseInt(tempArr[1]);
128   - this.alerts = '';
129   - this.global.compareTwoDates(this.ImageExportReportForm.controls['sToDate'].value, this.ImageExportReportForm.controls['sFromDate'].value);
130   - if (this.global.ValidationMsg != '') {
131   - this.alerts = this.global.ValidationMsg
132   - }
133   - if (this.alerts == '') {
134   - this._loadingService.ShowLoading("global-loading");
135   - this.imageexportreport = this.ImageExportReportForm.value;
136   - var obj = this.imageexportreport;
137   - if (this.ExportingStart) {
138   - this.reportservice.GetImageExportReport(obj, this.pageNo, this.pageLength).subscribe((ImageExportReports: ImageExportReports[]) => {
139   - //reset length after csvexport
140   - this.pageLength=actulalength;
141   - this.ExportService(ImageExportReports); }, error => this.error = <any>error);
142   - }
143   - else {
144   - this.reportservice.GetImageExportReport(obj, this.pageNo, this.pageLength).subscribe((ImageExportReports: ImageExportReports[]) => { this.BindFormFields(ImageExportReports); }, error => this.error = <any>error);
145   - }
146   - }
  181 +
  182 + this.SearchField.pageNo=this.pageNo;
  183 + this.SearchField.pageLength=this.pageLength;
  184 +
  185 + this.GetImageExportReportList();
  186 +
  187 + }
  188 +
  189 + GetImageExportReportList() {
  190 + this._loadingService.ShowLoading("global-loading");
  191 +
  192 + if (this.ExportingStart) {
  193 + this.reportservice.GetImageExportReport(this.SearchField).subscribe((ImageExportReports: ImageExportReports[]) => {
  194 + //reset length after csvexport
  195 + this.pageNo = this.actualPageNo;
  196 + this.pageLength=this.actualPageLength;
  197 +
  198 + this.SearchField.pageNo=this.pageNo;
  199 + this.SearchField.pageLength=this.pageLength;
  200 +
  201 + this.ExportService(ImageExportReports); }, error => this.error = <any>error);
  202 + }
  203 + else {
  204 + this.reportservice.GetImageExportReport(this.SearchField).subscribe((ImageExportReports: ImageExportReports[]) => { this.BindFormFields(ImageExportReports); }, error => this.error = <any>error);
  205 + }
  206 +
  207 + this.ExportingStart = false;
147 208 }
148 209  
  210 +
149 211 SearchRecords() {
150   - this.ExportingStart = false;
151   - this.GetImageExportReport('1, ' + this.pageLength);
  212 + this.ExportingStart = false;
  213 + this.pageNo=1;
  214 + this.SearchField.sFromDate=this.ImageExportReportForm.controls['sFromDate'].value;
  215 + this.SearchField.sToDate=this.ImageExportReportForm.controls['sToDate'].value;
  216 + this.SearchField.sAccountNumber=this.ImageExportReportForm.controls['sAccountNumber'].value;
  217 + this.SearchField.pageNo=this.pageNo;
  218 +
  219 + this.GetImageExportReportList();
152 220 }
153 221  
154 222 BindFormFields(data) {
155 223 this.recordCount = data.RecordCount;
156   - this.lstImageExportReport = data.ImageExportList;
157   - //this.numberOfImageExportReport = this.lstImageExportReport.length;
158   - //this.limit = this.lstImageExportReport.length;
  224 + this.lstImageExportReport = data.ImageExportList;
159 225 if (this.lstImageExportReport.length > 0) {
160 226 this.NoRecord = '';
161 227 this.buttonStatus = true;
... ... @@ -171,20 +237,20 @@ export class ImageExportReport implements OnInit {
171 237 ExportEvent() {
172 238 if (this.buttonStatus) {
173 239 this.ExportingStart = true;
174   - this.GetImageExportReport('1, ' + this.recordCount);
175   - this.ExportingStart = false;
  240 + this.GetImageExportReport('1, ' + this.recordCount);
176 241 }
177 242 }
178 243  
179   - ExportService(data: any) {
180   - for (let c = 0; c < this.global.RemoveColumns.length; c++) {
181   - for (let i = 0; i < data.ImageExportList.length; i++) {
182   - delete data.ImageExportList[i][this.global.RemoveColumns[c].toString()];
183   - }
184   - }
185   - this._loadingService.HideLoading("global-loading");
186   - this.global.ExportToCSV(data.ImageExportList, "ImageExportReport-" + this.date.getDay() + "-" + this.date.getMonth() + "-" + this.date.getSeconds())
187   -
  244 + ExportService(data: any) {
  245 + for (let i = 0; i < data.ImageExportList.length; i++) {
  246 + data.ImageExportList[i]['ExportedDate']= this.datePipe.transform(data.ImageExportList[i]['ExportedDate'], 'MM/dd/yyyy');
  247 + }
  248 +
  249 + var reportname=+ this.date.getDay() + "-" + (this.date.getMonth()+1) + "-" + this.date.getSeconds()
  250 + this.global.ExportToCSV(data.ImageExportList, "UsageReport-"+reportname);
  251 +
  252 + this._loadingService.HideLoading("global-loading");
  253 +
188 254 }
189 255  
190 256 }
... ...
400-SOURCECODE/Admin/src/app/components/Reports/report.service.ts
  View file @a7a8cc8
... ... @@ -53,11 +53,11 @@ export class ReportService {
53 53 .catch((res: Response) => this.handleError(res));
54 54 }
55 55  
56   - GetUsageReport(obj: any, pageNo: number, pageLength: number) {
57   - if (obj.sFromDate == '') {
  56 + GetUsageReport(obj: any) {
  57 + if (obj.sFromDate == '' || obj.sFromDate == null) {
58 58 obj.sFromDate = '1/1/1';
59 59 }
60   - if (obj.sToDate == '') {
  60 + if (obj.sToDate == '' || obj.sToDate == null) {
61 61 obj.sToDate = '1/1/9999';
62 62 }
63 63 obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
... ... @@ -69,14 +69,16 @@ export class ReportService {
69 69 "&sZip=" + obj.sZip +
70 70 "&iState=" + obj.iState +
71 71 "&iCountry=" + obj.iCountry +
72   - "&pageNo=" + pageNo +
73   - "&pageLength=" + pageLength)
  72 + "&sortColumn=" + obj.sortColumn +
  73 + "&sortOrder=" + obj.sortOrder +
  74 + "&pageNo=" + obj.pageNo +
  75 + "&pageLength=" + obj.pageLength)
74 76 .map(this.extractData)
75 77 .catch((res: Response) => this.handleError(res));
76 78 }
77 79  
78 80  
79   - GetCustomerSummeryReport(obj: any, pageNo: number, pageLength: number) {
  81 + GetCustomerSummeryReport(obj: any) {
80 82 if (obj.sSubscriptionStart == undefined || obj.sSubscriptionStart === '')
81 83 obj.sSubscriptionStart = -1;
82 84 if (obj.sSubscriptionEnd == undefined || obj.sSubscriptionEnd === '')
... ... @@ -91,8 +93,10 @@ export class ReportService {
91 93 "&sZip=" + obj.sZip +
92 94 "&iState=" + obj.iState +
93 95 "&iCountry=" + obj.iCountry +
94   - "&pageNo=" + pageNo +
95   - "&pageLength=" + pageLength)
  96 + "&sortColumn=" + obj.sortColumn +
  97 + "&sortOrder=" + obj.sortOrder +
  98 + "&pageNo=" + obj.pageNo +
  99 + "&pageLength=" + obj.pageLength)
96 100 .map(this.extractData)
97 101 .catch((res: Response) => this.handleError(res));
98 102 }
... ... @@ -261,11 +265,11 @@ export class ReportService {
261 265 }
262 266  
263 267  
264   - GetImageExportReport(obj: any, pageNo: number, pageLength: number) {
265   - if (obj.sFromDate == '') {
  268 + GetImageExportReport(obj: any) {
  269 + if (obj.sFromDate == '' || obj.sFromDate == null) {
266 270 obj.sFromDate = '1/1/1';
267 271 }
268   - if (obj.sToDate == '') {
  272 + if (obj.sToDate == '' || obj.sToDate == null) {
269 273 obj.sToDate = '1/1/9999';
270 274 }
271 275 obj.sFromDate = this.datePipe.transform(obj.sFromDate, 'MM/dd/yyyy');
... ... @@ -277,8 +281,10 @@ export class ReportService {
277 281 return this.http.get(this.commonService.resourceBaseUrl + "Report/GetImageExportReport?sFromDate=" + obj.sFromDate +
278 282 "&sToDate=" + obj.sToDate +
279 283 "&sAccountNumber=" + obj.sAccountNumber +
280   - "&pageNo=" + pageNo +
281   - "&pageLength=" + pageLength)
  284 + "&sortColumn=" + obj.sortColumn +
  285 + "&sortOrder=" + obj.sortOrder +
  286 + "&pageNo=" + obj.pageNo +
  287 + "&pageLength=" + obj.pageLength)
282 288 .map(this.extractData)
283 289 .catch((res: Response) => this.handleError(res));
284 290 }
... ...
400-SOURCECODE/Admin/src/app/components/Reports/reportdatamodel.ts
  View file @a7a8cc8
... ... @@ -12,7 +12,7 @@ export class UsageReports {
12 12 LicenseZip: string;
13 13 LicenseCountry: string;
14 14 TotalLogins: number;
15   - LastLoginDate: string;
  15 + LastLogin: string;
16 16 }
17 17  
18 18 export class CustomerSummaryReports {
... ... @@ -110,14 +110,13 @@ export class DiscountCodeReports {
110 110 }
111 111  
112 112 export class ImageExportReports {
113   - LicenseId: number;
114   - ExportedDate: string;
  113 + Title: string;
115 114 ImageName: string;
  115 + OriginalFileName: string;
  116 + ModuleName: string;
  117 + ExportedDate: string;
116 118 AccountNumber: string;
117   - OriginalFileName: string;
118   - Title: string;
119   - ModuleName: string;
120   - UserName: string;
  119 + UserName: string;
121 120 ExportLimit: string;
122 121 imageCount: number;
123 122  
... ...
400-SOURCECODE/Admin/src/app/components/Reports/subscriptionreport.component.html
  View file @a7a8cc8
... ... @@ -135,27 +135,6 @@
135 135 <div class="col-sm-12">
136 136 <div class="form-group marginTop5 text-right">
137 137 <button class="btn btn-primary btn-sm" data-toggle="modal" data-target="#mymodal" (click)="SearchRecords()"><i class="fa fa-file"></i> Generate Report</button>
138   - <!--modal-->
139   - <!--<div class="modal fade bs-example-modal-sm text-left" tabindex="-1" role="dialog" id="mymodal">
140   - <div class="modal-dialog modal-sm" role="document">
141   - <div class="modal-content">
142   - <div class="modal-header annotation-modal-header ui-draggable-handle">
143   - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
144   - <h4 class="modal-title" id="">Alert</h4>
145   - </div>
146   - <div class="modal-body">
147   - <h5>Account number does not exist in the system.</h5>
148   - </div>
149   - <div class="modal-footer">
150   - <div class="row">
151   - <div class="col-sm-12"><button class="btn btn-primary btn-sm">Ok</button></div>
152   - </div>
153   - </div>
154   -
155   - </div>
156   - </div>
157   - </div>-->
158   - <!--modal-->
159 138 </div>
160 139 </div>
161 140  
... ...
400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.html
  View file @a7a8cc8
... ... @@ -22,11 +22,12 @@
22 22 <div class="row">
23 23 <div class="col-sm-12">
24 24 <div class="form-group marginTop5">
25   - <label for="FirstDate" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">From Date :</label>
  25 + <label for="sFromDate" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">From Date :</label>
26 26 <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
27   - <div id="datetimepicker2" class="input-group input-group-sm input-append date">
28   - <input type="text" class="form-control" formControlName="sFromDate" #dp1="bsDatepicker"
29   - bsDatepicker [(bsValue)]="bsValue1" [bsConfig]="bsConfig">
  27 + <div id="sFromDate" class="input-group input-group-sm input-append date">
  28 + <input type="text" class="form-control" formControlName="sFromDate"
  29 + #dp1="bsDatepicker" bsDatepicker [(bsValue)]="bsValue1" (bsValueChange)="FromDateChange(dp1)" (change)="FromDateChange(dp1)"
  30 + [bsConfig]="bsConfig" placeholder="mm/dd/yyyy">
30 31 <span class="input-group-btn add-on">
31 32 <button class="btn btn-default" type="button" (click)="dp1.toggle()"><i class="fa fa-calendar"></i></button>
32 33 </span>
... ... @@ -38,11 +39,12 @@
38 39  
39 40 <div class="col-sm-12">
40 41 <div class="form-group marginTop5">
41   - <label for="ToDate" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">To Date :</label>
  42 + <label for="sToDate" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">To Date :</label>
42 43 <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
43   - <div id="datetimepicker2" class="input-group input-group-sm input-append date">
44   - <input type="text" class="form-control" [bsConfig]="bsConfig" formControlName="sToDate" #dp2="bsDatepicker"
45   - bsDatepicker [(bsValue)]="bsValue2">
  44 + <div id="sToDate" class="input-group input-group-sm input-append date">
  45 + <input type="text" class="form-control" formControlName="sToDate"
  46 + #dp2="bsDatepicker" bsDatepicker [(bsValue)]="bsValue2" (bsValueChange)="ToDateChange(dp2)" (change)="ToDateChange(dp2)"
  47 + [bsConfig]="bsConfig" placeholder="mm/dd/yyyy">
46 48 <span class="input-group-btn add-on">
47 49 <button class="btn btn-default" type="button" (click)="dp2.toggle()"><i class="fa fa-calendar"></i></button>
48 50 </span>
... ... @@ -106,7 +108,7 @@
106 108  
107 109 <div class="col-sm-12">
108 110 <div class="form-group marginTop5 text-right">
109   - <button class="btn btn-primary btn-sm" data-toggle="modal" (click)="SearchRecords()"><i class="fa fa-file"></i> Generate Report</button>
  111 + <button class="btn btn-primary btn-sm" data-toggle="modal" (click)="SearchRecords()" [disabled]="!UsageReportForm.valid || alerts != ''"><i class="fa fa-file"></i> Generate Report</button>
110 112 <!--modal-->
111 113 <div class="modal fade bs-example-modal-sm text-left" tabindex="-1" role="dialog" id="mymodal">
112 114 <div class="modal-dialog modal-sm" role="document">
... ... @@ -124,10 +126,9 @@
124 126 </div>
125 127 </div>
126 128  
127   - </div><!-- /.modal-content -->
128   - </div><!-- /.modal-dialog -->
129   - </div><!-- /.modal -->
130   - <!--modal-->
  129 + </div>
  130 + </div>
  131 + </div>
131 132 </div>
132 133 </div>
133 134 </div>
... ... @@ -139,49 +140,46 @@
139 140 </div>
140 141  
141 142 <div class="well">
142   - <!--<ng2-smart-table [settings]="settings" [source]="data">
143   - <i class="fa fa-spinner fa-spin" style="font-size:24px"></i>
144   - </ng2-smart-table>-->
145   - <table id="fixed_hdr2" class="table-hover ">
146   - <thead>
147   - <tr>
148   - <th>User Name</th>
149   - <th>First Name</th>
150   - <th>Last Name</th>
151   - <th>Account Number</th>
152   - <th>Institution Name</th>
153   - <th>Credit Card Number</th>
154   - <th>User Type</th>
155   - <th>Zip</th>
156   - <th>State(only U.S.)</th>
157   - <th>Country</th>
158   - <th>Total Login</th>
159   - <th>Original Entry Date</th>
160   - <th>Last Login Date</th>
161   - </tr>
162   - </thead>
163   - <tbody>
164   - <tr *ngIf="NoRecord !== ''">
  143 + <table id="fixed_hdr2" class="table-hover ui-widget-header sorttable">
  144 + <thead>
  145 + <tr>
  146 + <th id="LoginId">User Name</th>
  147 + <th id="FirstName">First Name</th>
  148 + <th id="LastName">Last Name</th>
  149 + <th id="AccountNumber">Account Number</th>
  150 + <th id="InstitutionName">Institution Name</th>
  151 + <th id="CardNumber">Card Number</th>
  152 + <th id="UserType">User Type</th>
  153 + <th id="LicenseZip">Zip</th>
  154 + <th id="LicenseState">State(only U.S.)</th>
  155 + <th id="LicenseCountry">Country</th>
  156 + <th id="TotalLogins">Total Login</th>
  157 + <th id="LicenseCreationDate">Org. Entry Date</th>
  158 + <th id="LastLogin">Last Login Date</th>
  159 + </tr>
  160 + </thead>
  161 + <tbody>
  162 + <tr *ngIf="NoRecord !== ''">
165 163  
166   - <td colspan="6"><b style="color: red;text-align: center; padding-left: 606px;"><span [innerHTML]="NoRecord"></span></b></td>
167   - </tr>
168   - <tr *ngFor="let usage of lstUserUsageReport">
169   - <td>{{usage.LoginId}}</td>
170   - <td>{{usage.FirstName}}</td>
171   - <td>{{usage.LastName}}</td>
172   - <td>{{usage.AccountNumber}}</td>
173   - <td>{{usage.InstitutionName}}</td>
174   - <td>{{usage.CardNumber}}</td>
175   - <td>{{usage.UserType}}</td>
176   - <td>{{usage.LicenseZip}}</td>
177   - <td>{{usage.LicenseState}}</td>
178   - <td>{{usage.LicenseCountry}}</td>
179   - <td>{{usage.TotalLogins}}</td>
180   - <td>{{usage.LicenseCreationDate}}</td>
181   - <td>{{usage.LastLogin}}</td>
182   - </tr>
183   - </tbody>
184   - </table>
  164 + <td colspan="6"><b style="color: red;text-align: center; padding-left: 606px;"><span [innerHTML]="NoRecord"></span></b></td>
  165 + </tr>
  166 + <tr *ngFor="let usage of lstUserUsageReport">
  167 + <td>{{usage.LoginId}}</td>
  168 + <td>{{usage.FirstName}}</td>
  169 + <td>{{usage.LastName}}</td>
  170 + <td>{{usage.AccountNumber}}</td>
  171 + <td>{{usage.InstitutionName}}</td>
  172 + <td>{{usage.CardNumber}}</td>
  173 + <td>{{usage.UserType}}</td>
  174 + <td>{{usage.LicenseZip}}</td>
  175 + <td>{{usage.LicenseState}}</td>
  176 + <td>{{usage.LicenseCountry}}</td>
  177 + <td>{{usage.TotalLogins}}</td>
  178 + <td>{{usage.LicenseCreationDate | date: 'MM/dd/yyyy'}}</td>
  179 + <td>{{usage.LastLogin | date: 'MM/dd/yyyy'}}</td>
  180 + </tr>
  181 + </tbody>
  182 + </table>
185 183 <admin-pager [recordCount]="recordCount" [pageNo]="pageNo" [pageLength]="pageLength" (pagerEvent)="GetUsageReport($event)"></admin-pager>
186 184 <div class="row">
187 185 <div class="col-sm-12 marginTop20 text-center">
... ...
400-SOURCECODE/Admin/src/app/components/Reports/usagereport.component.ts
  View file @a7a8cc8
... ... @@ -37,7 +37,6 @@ export class UsageReport implements OnInit, AfterViewChecked {
37 37 limit: number;
38 38 page: number = 1;
39 39 error;
40   - usagereport = new UsageReports();
41 40 modalAlerts: string;
42 41 divClass: string = '';
43 42 topPos: string = '2000px';
... ... @@ -58,76 +57,20 @@ export class UsageReport implements OnInit, AfterViewChecked {
58 57 recordCount: number;
59 58 pageNo: number;
60 59 pageLength: number;
  60 + actualPageNo: number;
  61 + actualPageLength: number;
61 62 DisableAccountNumberControl: boolean;
62   - //Smart Table Setting
63   - settings = {
64   - actions: { add: false, edit: false, delete: false },
65   - pager: {
66   - display: true,
67   - perPage: 50
68   - },
69   - attr: {
70   - class: 'table table-condensed table-bordered table-striped table-hover'
71   - },
72   - columns: {
73   - LoginId: {
74   - title: 'User Name',
75   - width: '140px',
76   - },
77   - FirstName: {
78   - title: 'First Name',
79   - width: '140px'
80   - },
81   - LastName: {
82   - title: 'Last Name',
83   - width: '140px'
84   - },
85   - AccountNumber: {
86   - title: 'Account Number',
87   - width: '140px'
88   - },
89   - InstitutionName: {
90   - title: 'Institution Name',
91   - width: '140px'
92   - },
93   - CardNumber: {
94   - title: 'Credit Card Number',
95   - width: '140px'
96   - }
97   - ,
98   - UserType: {
99   - title: 'User Type',
100   - width: '140px'
101   - },
102   - Zip: {
103   - title: 'Zip',
104   - width: '140px'
105   - },
106   - LicenseState: {
107   - title: 'State(only U.S.)',
108   - width: '140px'
109   - }
110   - ,
111   - LicenseCountry: {
112   - title: 'Country',
113   - width: '140px'
114   - }
115   - ,
116   - TotalLogins: {
117   - title: 'Total Login',
118   - width: '140px'
119   - },
120   - LicenseCreationDate: {
121   - title: 'Original Entry Date',
122   - width: '140px'
123   - },
124   - LastLogin: {
125   - title: 'Last Login Date',
126   - width: '140px'
127   - }
128   -
129   -
130   - }
  63 + SearchField:any={
  64 + sFromDate:new Date(),
  65 + sToDate:new Date(),
  66 + sAccountNumber:'',
  67 + sZip:'',
  68 + iState:0,
  69 + iCountry:0,
  70 + sortColumn:'AccountNumber',
  71 + sortOrder:'asc',
  72 + pageNo:1,
  73 + pageLength:10
131 74 };
132 75  
133 76 // Declare height and width variables
... ... @@ -144,6 +87,9 @@ export class UsageReport implements OnInit, AfterViewChecked {
144 87 {
145 88 this.scrHeight = window.innerHeight-440;
146 89 }
  90 + if(this.scrHeight<=360) this.scrHeight=360;
  91 +
  92 + $(".ft_container").css("height",this.scrHeight);
147 93 }
148 94  
149 95 constructor(private router: Router, private reportservice: ReportService, private fb: FormBuilder,
... ... @@ -156,11 +102,10 @@ export class UsageReport implements OnInit, AfterViewChecked {
156 102 this.buttonStatus = false;
157 103 this.bsConfig = Object.assign({}, { containerClass: 'theme-dark-blue' });
158 104 this.NoRecord = this.global.NoRecords;
159   - let usagereport = new UsageReports();
160 105 this.previousdate.setDate(this.previousdate.getDate());
161 106 this.UsageReportForm = this.fb.group({
162   - sFromDate: [this.previousdate],
163   - sToDate: [this.date],
  107 + sFromDate: [this.previousdate,[Validators.required]],
  108 + sToDate: [this.date,[Validators.required]],
164 109 sAccountNumber: [''],
165 110 sZip: [''],
166 111 iState: [0],
... ... @@ -178,75 +123,140 @@ export class UsageReport implements OnInit, AfterViewChecked {
178 123 this.pageNo = 0;
179 124 this.pageLength = 10;
180 125 this.pagerComponent = new PagerComponent();
181   - this.GetUsageReport('1, ' + this.pageLength);
  126 +
182 127 $('#fixed_hdr2').fxdHdrCol({
183 128 fixedCols: 0,
184 129 width: "100%",
185 130 height: this.scrHeight,
186 131 colModal: [
187   - { width: 150, align: 'center' },
188   - { width: 150, align: 'center' },
189   - { width: 150, align: 'Center' },
190   - { width: 150, align: 'Center' },
191   - { width: 300, align: 'Center' },
192   - { width: 150, align: 'Center' },
  132 + { width: 140, align: 'center' },
  133 + { width: 140, align: 'center' },
  134 + { width: 140, align: 'Center' },
  135 + { width: 140, align: 'Center' },
  136 + { width: 200, align: 'Center' },
  137 + { width: 120, align: 'Center' },
193 138 { width: 130, align: 'Center' },
194   - { width: 120, align: 'center' },
  139 + { width: 90, align: 'center' },
195 140 { width: 150, align: 'Center' },
196 141 { width: 140, align: 'center' },
197 142 { width: 100, align: 'center' },
198   - { width: 150, align: 'center' },
199   - { width: 120, align: 'center' },
200   - // { width: 150, align: 'center' },
201   - // { width: 150, align: 'center' },
202   - // { width: 180, align: 'Center' },
203   - // { width: 400, align: 'Center' },
204   - // { width: 150, align: 'center' },
205   - // { width: 110, align: 'center' },
  143 + { width: 130, align: 'center' },
  144 + { width: 130, align: 'center' },
  145 +
206 146 ],
207 147 sort: true
208 148 });
209   - if(document.getElementById("fixed_table_rc") != null){
210   - document.getElementById("fixed_table_rc").remove();
211   - var testScript = document.createElement("script");
212   - testScript.setAttribute("id", "fixed_table_rc");
213   - testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
214   - testScript.setAttribute("type", "text/javascript");
215   - document.body.appendChild(testScript);
216   - }
  149 +
  150 + var thisObject=this;//class object
  151 + $(".ft_rwrapper table thead tr th").on("click",function(event){
  152 +
  153 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null)
  154 + {
  155 + var fieldName=event.currentTarget.id;
  156 + var sortType=''
  157 + var isAscSort = $(".ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  158 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  159 +
  160 + if (isAscSort) {
  161 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  162 + sortType="desc";
  163 + } else {
  164 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  165 + sortType="asc";
  166 + }
  167 +
  168 + thisObject.SortTableRecords(fieldName,sortType);
  169 +
  170 + }
  171 +
  172 + });
217 173  
218 174 }
219 175  
220   - GetUsageReport(evt: any) {
221   - var tempArr = evt.split(',');
222   - this.pageNo = parseInt(tempArr[0]);
223   - var actulalength=this.pageLength;
224   - this.pageLength = parseInt(tempArr[1]);
225   - this.alerts = '';
226   - this.global.compareTwoDates(this.UsageReportForm.controls['sToDate'].value, this.UsageReportForm.controls['sFromDate'].value);
  176 +
  177 + FromDateChange(dateValue: any){
  178 + this.alerts = '';
  179 + this.global.compareTwoDates(this.UsageReportForm.controls['sToDate'].value, dateValue._bsValue);
227 180 if (this.global.ValidationMsg != '') {
228   - this.alerts = this.global.ValidationMsg
229   - }
230   - if (this.alerts == '') {
231   - this._loadingService.ShowLoading("global-loading");
232   - this.usagereport = this.UsageReportForm.value;
233   - var obj = this.usagereport;
234   - if (this.ExportingStart) {
235   - this.reportservice.GetUsageReport(obj,this.pageNo, this.pageLength).subscribe((UsageReports: UsageReports[]) => {
236   - //reset length after csvexport
237   - this.pageLength=actulalength;
238   - this.ExportService(UsageReports); }, error => this.error = <any>error);
239   - }
240   - else {
241   - this.reportservice.GetUsageReport(obj, this.pageNo, this.pageLength).subscribe((UsageReports: UsageReports[]) => { this.BindFormFields(UsageReports); }, error => this.error = <any>error);
242   - }
243   -
244   - }
  181 + this.alerts = this.global.ValidationMsg;
  182 + }
  183 + }
  184 + ToDateChange(dateValue: any){
  185 + this.alerts = '';
  186 + this.global.compareTwoDates(dateValue._bsValue, this.UsageReportForm.controls['sFromDate'].value);
  187 + if (this.global.ValidationMsg != '') {
  188 + this.alerts = this.global.ValidationMsg;
  189 + }
  190 + }
  191 +
  192 + SortTableRecords(fieldName:string,sortType:string) {
  193 + this.SearchField.sortColumn=fieldName;
  194 + this.SearchField.sortOrder=sortType;
  195 +
  196 + this.GetUsageReportList();
  197 + }
  198 +
  199 + GetUsageReport(evt: any) {
  200 + this.actualPageNo = this.pageNo;
  201 + this.actualPageLength =this.pageLength;
  202 +
  203 + var tempArr = evt.split(',');
  204 + this.pageNo = parseInt(tempArr[0]);
  205 + this.pageLength = parseInt(tempArr[1]);
  206 +
  207 + this.SearchField.pageNo=this.pageNo;
  208 + this.SearchField.pageLength=this.pageLength;
  209 +
  210 + this.GetUsageReportList();
  211 +
245 212 }
246   - SearchRecords() {
  213 +
  214 + GetUsageReportList() {
  215 + this._loadingService.ShowLoading("global-loading");
  216 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  217 +
  218 + if (this.SearchField.sortOrder=='asc') {
  219 + $(".ft_rwrapper table thead tr #"+this.SearchField.sortColumn).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  220 + } else
  221 + {
  222 + $(".ft_rwrapper table thead tr #"+this.SearchField.sortColumn).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  223 + }
  224 +
  225 + if (this.ExportingStart) {
  226 + this.reportservice.GetUsageReport(this.SearchField).subscribe((UsageReports: UsageReports[]) => {
  227 + //reset length after csvexport
  228 + this.pageNo = this.actualPageNo;
  229 + this.pageLength=this.actualPageLength;
  230 +
  231 + this.SearchField.pageNo=this.pageNo;
  232 + this.SearchField.pageLength=this.pageLength;
  233 +
  234 + this.ExportService(UsageReports); }, error => this.error = <any>error);
  235 + }
  236 + else {
  237 + this.reportservice.GetUsageReport(this.SearchField).subscribe((UsageReports: UsageReports[]) => { this.BindFormFields(UsageReports); }, error => this.error = <any>error);
  238 + }
  239 +
  240 + this.ExportingStart = false;
  241 + }
  242 +
  243 +
  244 + SearchRecords() {
247 245 this.ExportingStart = false;
248   - this.GetUsageReport('1, ' + this.pageLength);
  246 + this.pageNo=1;
  247 + this.SearchField.sFromDate=this.UsageReportForm.controls['sFromDate'].value;
  248 + this.SearchField.sToDate=this.UsageReportForm.controls['sToDate'].value;
  249 + this.SearchField.sAccountNumber=this.UsageReportForm.controls['sAccountNumber'].value;
  250 + this.SearchField.sZip=this.UsageReportForm.controls['sZip'].value;
  251 + this.SearchField.iState=this.UsageReportForm.controls['iState'].value;
  252 + this.SearchField.iCountry=this.UsageReportForm.controls['iCountry'].value;
  253 +
  254 + this.SearchField.pageNo=this.pageNo;
  255 +
  256 + this.GetUsageReportList();
  257 +
249 258 }
  259 +
250 260 GetCountry() {
251 261 this.reportservice.GetCountry().subscribe(y => { this.lstCountry = y; }, error => this.error = <any>error);
252 262 }
... ... @@ -275,16 +285,18 @@ export class UsageReport implements OnInit, AfterViewChecked {
275 285 if (this.buttonStatus) {
276 286 this.ExportingStart = true;
277 287 this.GetUsageReport('1,' + this.recordCount);
278   - this.ExportingStart = false;
279 288 }
280 289 }
281 290 ExportService(data: any) {
282   - for (let c = 0; c < this.global.RemoveColumns.length; c++) {
283   - for (let i = 0; i < data.UserUsage.length; i++) {
284   - delete data.UserUsage[i][this.global.RemoveColumns[c].toString()];
285   - }
286   - }
  291 + for (let i = 0; i < data.UserUsage.length; i++) {
  292 + data.UserUsage[i]['LicenseCreationDate']= this.datePipe.transform(data.UserUsage[i]['LicenseCreationDate'], 'MM/dd/yyyy');
  293 + data.UserUsage[i]['LastLogin']= this.datePipe.transform(data.UserUsage[i]['LastLogin'], 'MM/dd/yyyy');
  294 + }
  295 +
  296 + var reportname=+ this.date.getDay() + "-" + (this.date.getMonth()+1) + "-" + this.date.getSeconds()
  297 + this.global.ExportToCSV(data.UserUsage, "UsageReport-"+reportname);
  298 +
287 299 this._loadingService.HideLoading("global-loading");
288   - this.global.ExportToCSV(data.UserUsage, "UsageReport-" + this.date.getDay() + "-" + this.date.getMonth() + "-" + this.date.getSeconds())
  300 +
289 301 }
290 302 }
... ...
400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.component.html
  View file @a7a8cc8
... ... @@ -70,14 +70,14 @@
70 70 <div role="tabpanel" class="tab-pane active" id="higher-edu">
71 71 <div class="table-responsive blue">
72 72 <!--<table class="table table-condensed table-bordered margin-btm0 table-striped table-hover">-->
73   - <table id="fixed_hdr2" class="table-hover ">
  73 + <table id="fixed_hdr2" class="table-hover ui-widget-header sorttable">
74 74 <thead>
75 75 <tr>
76   - <th>Select</th>
77   - <th>Subscription Type</th>
78   - <th>Duration(in Month)</th>
79   - <th>Price</th>
80   - <th>Active</th>
  76 + <th id="unknown">Select</th>
  77 + <th id="Title">Subscription Type</th>
  78 + <th id="Duration">Duration(in Month)</th>
  79 + <th id="Price">Price</th>
  80 + <th id="IsActive">Active</th>
81 81 </tr>
82 82 </thead>
83 83 <tbody>
... ...
400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.component.ts
  View file @a7a8cc8
... ... @@ -44,6 +44,13 @@ RecordDeleted: number[];
44 44 // Declare height and width variables
45 45 scrHeight:any;
46 46 scrWidth:any;
  47 + SearchField:any={
  48 + editionId:1,
  49 + sortColumn:'Id',
  50 + sortOrder:'asc',
  51 + pageNo:1,
  52 + pageLength:10
  53 + }
47 54 @HostListener('window:resize', ['$event'])
48 55 getScreenSize(event?) {
49 56  
... ... @@ -55,6 +62,9 @@ getScreenSize(event?) {
55 62 {
56 63 this.scrHeight = window.innerHeight-330;
57 64 }
  65 + if(this.scrHeight<=360) this.scrHeight=360;
  66 +
  67 + $(".ft_container").css("height",this.scrHeight);
58 68 }
59 69  
60 70 constructor(private subscriptionPriceService: SubscriptionPriceService, private router: Router,
... ... @@ -97,15 +107,41 @@ getScreenSize(event?) {
97 107 this.recordCount = 0;
98 108 this.pagerComponent = new PagerComponent();
99 109  
100   - if(document.getElementById("fixed_table_rc") != null){
101   - document.getElementById("fixed_table_rc").remove();
102   - var testScript = document.createElement("script");
103   - testScript.setAttribute("id", "fixed_table_rc");
104   - testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
105   - testScript.setAttribute("type", "text/javascript");
106   - document.body.appendChild(testScript);
107   - }
  110 + // if(document.getElementById("fixed_table_rc") != null){
  111 + // document.getElementById("fixed_table_rc").remove();
  112 + // var testScript = document.createElement("script");
  113 + // testScript.setAttribute("id", "fixed_table_rc");
  114 + // testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
  115 + // testScript.setAttribute("type", "text/javascript");
  116 + // document.body.appendChild(testScript);
  117 + // }
  118 +
  119 + var thisObject=this;//class object
  120 + $(".ft_rwrapper table thead tr th").on("click",function(event){
  121 +
  122 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null && event.currentTarget.id!="unknown")
  123 + {
  124 + var fieldName=event.currentTarget.id;
  125 + var sortType=''
  126 + var isAscSort = $(".ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  127 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  128 + $(".ft_rwrapper table thead tr #unknown").removeClass('fx_sort_bg');
  129 +
  130 + if (isAscSort) {
  131 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  132 + sortType="desc";
  133 + } else {
  134 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  135 + sortType="asc";
  136 + }
  137 +
  138 + thisObject.SortTableRecords(fieldName,sortType);
  139 +
  140 + }
  141 +
  142 + });
108 143 }
  144 +
109 145 public noWhitespaceValidator(control: FormControl) {
110 146 // new validation for intial whaite space
111 147 //****Birendra *****/
... ... @@ -134,29 +170,40 @@ getScreenSize(event?) {
134 170  
135 171 }
136 172  
  173 + SortTableRecords(fieldName:string,sortType:string) {
  174 + this.SearchField.sortColumn=fieldName;
  175 + this.SearchField.sortOrder=sortType;
  176 +
  177 + this.GetPriceList();
  178 + }
  179 +
137 180 public SearchSubscriptionPrices(evt: any) {
138   - if (this.global.ValidationMsg != '') {
139   - this.alerts = this.global.ValidationMsg
140   - }
141   - if (this.alerts != '') return;
142   - this._loadingService.ShowLoading("global-loading");
143 181 var tempArr = evt.split(',');
144 182 this.pageNo = parseInt(tempArr[0]);
145 183 this.pageLength = parseInt(tempArr[1]);
146   - this._loadingService.ShowLoading("global-loading");
147   - this.subscriptionPriceService.GetSubscriptionPrices(
148   - {
149   - editionId: this.selectedEditionId,
150   - pageNo: this.pageNo,
151   - pageLength: this.pageLength
152   - })
153   - .subscribe(x => { this.BindFormFields(x) }, error => this.error = error);
  184 + this.SearchField.pageNo=this.pageNo;
  185 + this.SearchField.pageLength=this.pageLength;
  186 +
  187 + this.GetPriceList();
  188 +
154 189 }
155 190  
156 191 SearchRecords(searchEditionId: number) {
157   - this.selectedEditionId = searchEditionId;
158   - this.SearchSubscriptionPrices('1, ' + this.pageLength);
  192 + this.selectedEditionId = searchEditionId;
  193 + this.pageNo=1;
  194 + this.SearchField.editionId=this.selectedEditionId;
  195 + this.SearchField.pageNo=this.pageNo;
  196 +
  197 + this.GetPriceList();
159 198 }
  199 +
  200 + GetPriceList() {
  201 + this._loadingService.ShowLoading("global-loading");
  202 + $(".ft_rwrapper table thead tr #unknown").removeClass('fx_sort_bg');
  203 + this.subscriptionPriceService.GetSubscriptionPrices(this.SearchField)
  204 + .subscribe(x => { this.BindFormFields(x) }, error => this.error = error);
  205 +
  206 + }
160 207  
161 208 openModal(template: TemplateRef<any>) {
162 209 if(this.checkedRecords.filter(C => C > 0).length == 0) return;
... ... @@ -174,7 +221,6 @@ getScreenSize(event?) {
174 221  
175 222 AfterDeleteData(data, template) {
176 223 if (data.Status == "false") {
177   - //this.alerts = "<span>Subscription prices delete unsuccessfull</span>";
178 224 this._confirmService.activate("Subscription prices delete unsuccessfull", "alertMsg");
179 225 } else {
180 226 this.modalAlerts = "<p>Subscription prices deleted successfully</p>";
... ... @@ -185,29 +231,26 @@ getScreenSize(event?) {
185 231  
186 232 AfterInsertData(data, template) {
187 233 if (data.Status == "false") {
188   - // this.alerts = "<span>Subscription price save unsuccessfull</span>";
189 234 this.modalAlerts = "<p>Subscription insert unsuccessfull</p>";
190 235 this.modalRef = this.modalService.show(template);
191   - // this._confirmService.activate("Subscription insert unsuccessfull", "alertMsg");
  236 + this._loadingService.HideLoading("global-loading");
192 237 } else {
193 238 this._confirmService.activate("Subscription saved successfull", "alertMsg");
194   - //this.modalAlerts = "<p>Subscriptions saved successfully</p>";
195 239 this.CancelAdd();
196   - //this.modalRef = this.modalService.show(template);
  240 +
197 241 }
  242 +
198 243 }
199 244  
200 245 AfterUpdateData(data, template) {
201 246 if (data.Status == "false") {
202 247 this.modalAlerts = "<p>Subscription prices update unsuccessfull</p>";
203 248 this.modalRef = this.modalService.show(template);
204   - //this.alerts = "<span>Subscription prices update unsuccessfull</span>\n";
205   - //this._confirmService.activate("Subscription prices update unsuccessfull", "alertMsg");
  249 +
206 250 } else {
207 251 this._confirmService.activate("Subscriptions updated successfully", "alertMsg");
208   - //this.modalAlerts = "<p>Subscriptions updated successfully</p>";
209   - //this.modalRef = this.modalService.show(template);
210 252 }
  253 + this._loadingService.HideLoading("global-loading");
211 254 }
212 255  
213 256 BindFormFields(data){
... ... @@ -229,10 +272,12 @@ getScreenSize(event?) {
229 272 console.log(this.subscriptionPriceFrm.value);
230 273 this.alerts = '';
231 274 if(this.alerts == ''){
  275 + this._loadingService.ShowLoading("global-loading");
232 276 var obj = this.subscriptionPriceFrm.controls['subscriptionPrices'].value;
233 277 this.subscriptionPriceService.UpdateSubscriptionPrices(obj).subscribe(
234 278 data => (this.AfterUpdateData(data, template)),
235 279 error => {
  280 + this._loadingService.HideLoading("global-loading");
236 281 this.error = <any>error;
237 282 this.alerts = "<span>" + this.error + "</span>";
238 283 });
... ... @@ -243,6 +288,7 @@ getScreenSize(event?) {
243 288 console.log(this.insertSubscriptionPriceFrm.value);
244 289 this.alerts = '';
245 290 if(this.alerts == ''){
  291 + this._loadingService.ShowLoading("global-loading");
246 292 var obj = this.insertSubscriptionPriceFrm.value;
247 293 return this.subscriptionPriceService.InsertSubscriptionPrice(obj)
248 294 .subscribe(
... ... @@ -262,6 +308,7 @@ getScreenSize(event?) {
262 308 var unDeletedSubscriptions = '';
263 309 let cnt = 0;
264 310 if(this.alerts == ''){
  311 + this._loadingService.ShowLoading("global-loading");
265 312 this.RecordDeleted = [];
266 313 this.checkedRecords.filter(C => C > 0).forEach(element => {
267 314 this.subscriptionPriceService.CheckSubscriptionPlanForLicense(element)
... ...
400-SOURCECODE/Admin/src/app/components/SubscriptionPrice/subscriptionprice.service.ts
  View file @a7a8cc8
... ... @@ -16,7 +16,12 @@ export class SubscriptionPriceService {
16 16  
17 17 GetSubscriptionPrices(obj: any) {
18 18 return this.http.get(this.commonService.resourceBaseUrl + "SubscriptionPrice/GetSubscriptionPrices?editionId="
19   - + obj.editionId + "&pageNo=" + obj.pageNo + "&pageLength=" + obj.pageLength)
  19 + + obj.editionId
  20 + + "&sortColumn=" + obj.sortColumn
  21 + + "&sortOrder=" + obj.sortOrder
  22 + + "&pageNo=" + obj.pageNo
  23 + + "&pageLength=" + obj.pageLength
  24 + )
20 25 .map(this.extractData)
21 26 .catch((res: Response) => this.handleError(res));
22 27 }
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/datamodel.ts
  View file @a7a8cc8
... ... @@ -71,6 +71,7 @@ export class License {
71 71 MasterSiteUrl: string;
72 72 SiteUrlFrom: string;
73 73 SiteUrlTo: string;
  74 + SiteUserId: number;
74 75 LoginId: string;
75 76 Password: string;
76 77 SecurityQuestionId: number;
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/user.service.ts
  View file @a7a8cc8
... ... @@ -57,7 +57,7 @@ export class UserService {
57 57 //////////Manage UserLogin Status///////////
58 58 ManageUserLoginStatus(obj: any) {
59 59 var jsonData = { 'userId': obj.userId, 'tagName': obj.tagName,'SessionId': obj.SessionId,'isSiteUser': obj.isSiteUser,'isAdmin': obj.isAdmin };
60   - console.log(obj);
  60 + //console.log(obj);
61 61 var headers = new Headers({
62 62 'Content-Type': 'application/json'
63 63 });
... ... @@ -93,7 +93,7 @@ export class UserService {
93 93 .map(this.extractData)
94 94 .catch((res: Response) => this.handleError(res));
95 95 }
96   - GetUserList(obj: any, pageNo: number, pageLength: number) {
  96 + GetUserList(obj: any) {
97 97 return this.http.get(this.commonService.resourceBaseUrl + "User/Users?firstname=" + obj.FirstName +
98 98 "&lastname=" + obj.LastName +
99 99 "&emailid=" + obj.EmailId +
... ... @@ -101,8 +101,10 @@ export class UserService {
101 101 "&usertypeid=" + obj.UserTypeId +
102 102 "&accounttypeid=" + obj.AccountTypeId +
103 103 "&userLoginStatus=" + obj.LoginStatus +
104   - "&pageNo=" + pageNo +
105   - "&pageLength=" + pageLength +
  104 + "&sortColumn=" + obj.sortColumn +
  105 + "&sortOrder=" + obj.sortOrder +
  106 + "&pageNo=" + obj.pageNo +
  107 + "&pageLength=" + obj.pageLength +
106 108 "&iLoginUserType=" + this.commonService.UserType +
107 109 "&loggedIn="+this.commonService.LoginId)
108 110  
... ... @@ -213,16 +215,28 @@ export class UserService {
213 215 /// End///////
214 216  
215 217 //// User Group////////
216   - GetLicenseUserGroups(licensId: number, pageNo: number, pageLength: number) {
217   - return this.http.get(this.commonService.resourceBaseUrl + "UserGroup/LicenseUserGroups?LicenseId=" + licensId + "&pageNo=" + pageNo + "&pageLength=" + pageLength)
218   - .map(this.extractData)
219   - .catch((res: Response) => this.handleError(res));
  218 + GetLicenseUserGroups(obj: any) {
  219 + return this.http.get(this.commonService.resourceBaseUrl + "UserGroup/LicenseUserGroups?LicenseId=" + obj.LicenseId +
  220 + "&sortColumn=" + obj.sortColumn +
  221 + "&sortOrder=" + obj.sortOrder +
  222 + "&pageNo=" + obj.pageNo +
  223 + "&pageLength=" + obj.pageLength
  224 + )
  225 + .map(this.extractData)
  226 + .catch((res: Response) => this.handleError(res));
220 227 }
221 228  
222   - GetLicenseUserGroupUsers(licensId: number, UserGroupId: number, allUsers: boolean, pageNo: number, pageLength: number) {
223   - return this.http.get(this.commonService.resourceBaseUrl + "UserGroup/LicenseUserGroupUsers?LicenseId=" + licensId + "&UserGroupId=" + UserGroupId + "&AllUsers=" + allUsers + "&pageNo=" + pageNo + "&pageLength=" + pageLength)
224   - .map(this.extractData)
225   - .catch((res: Response) => this.handleError(res));
  229 + GetLicenseUserGroupUsers(obj: any) {
  230 + return this.http.get(this.commonService.resourceBaseUrl + "UserGroup/LicenseUserGroupUsers?LicenseId=" + obj.LicenseId +
  231 + "&UserGroupId=" + obj.selectedId +
  232 + "&AllUsers=" + obj.AllUsers +
  233 + "&sortColumn=" + obj.sortColumn +
  234 + "&sortOrder=" + obj.sortOrder +
  235 + "&pageNo=" + obj.pageNo +
  236 + "&pageLength=" + obj.pageLength
  237 + )
  238 + .map(this.extractData)
  239 + .catch((res: Response) => this.handleError(res));
226 240 }
227 241 InsertUpdateLicenseUserGroup(obj: any) {
228 242 //let options = new RequestOptions({ headers: this.headers });
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/usergroup.component.html
  View file @a7a8cc8
... ... @@ -94,14 +94,14 @@
94 94 </div>
95 95  
96 96 <div class="well">
97   - <div class="table-responsive blue">
98   - <table id="tblLicenseUserGroups" class="table table-condensed table-bordered margin-btm0 table-striped table-hover table-fixed">
  97 + <div class="groupName">
  98 + <table id="fixed_hdr2" class="table-hover ui-widget-header sorttable">
99 99 <thead>
100 100 <tr>
101   - <th>Group Name</th>
102   - <th>Number of User(s)</th>
103   - <th>Created Date</th>
104   - <th>Last Modified Date</th>
  101 + <th id="Title">Group Name</th>
  102 + <th id="TotalUsers">Number of User(s)</th>
  103 + <th id="CreationDate">Created Date</th>
  104 + <th id="ModifiedDate">Last Modified Date</th>
105 105 </tr>
106 106 </thead>
107 107 <tbody>
... ... @@ -151,7 +151,7 @@
151 151 <label for="GroupName" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Group Name :</label>
152 152 </div>
153 153 <div class="col-sm-12 col-lg-6 padd-left0">
154   - <input type="text" class="form-control input-sm" formControlName="userGroupName" id="GroupName" maxlength="100">
  154 + <input type="text" class="form-control input-sm" formControlName="userGroupName" id="GroupName" [attr.disabled]="(mode == 'View')? '':null" maxlength="100">
155 155 <div *ngIf="!updateUserGroupFrm.controls.userGroupName.valid && updateUserGroupFrm.controls.userGroupName.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">User group name is required</div>
156 156 </div>
157 157 </div>
... ... @@ -162,16 +162,16 @@
162 162  
163 163 <div class="well">
164 164  
165   - <div class="table-responsive blue table-fixT">
166   - <table id="tblUserGroupUsers" class="table table-condensed table-bordered margin-btm0 table-striped table-fixed">
  165 + <div class="groupList">
  166 + <table id="fixed_hdr3" class="table-hover ui-widget-header sorttable ">
167 167 <thead>
168 168 <tr>
169   - <th *ngIf="(mode == 'Edit')" style="width: 80px">Select</th>
170   - <th style="width:150px">First Name</th>
171   - <th style="width:150px">Last Name</th>
172   - <th style="width:150px">User ID</th>
173   - <th style="width:150px">Email ID</th>
174   - <th style="width:150px">Product Edition</th>
  169 + <th id="InGroup">Select</th>
  170 + <th id="FirstName">First Name</th>
  171 + <th id="LastName">Last Name</th>
  172 + <th id="LoginId">User ID</th>
  173 + <th id="EmailId">Email ID</th>
  174 + <th id="ProductEdition">Product Edition</th>
175 175 </tr>
176 176 </thead>
177 177 <tbody style="word-wrap: break-word; word-break: break-all">
... ... @@ -179,15 +179,15 @@
179 179 <td colspan="6" style="color: red;text-align: center;"><b><span [innerHTML]="NoRecord"></span></b></td>
180 180 </tr>
181 181 <tr *ngFor="let item of lstLicenseUserGroupUsers; let i = index">
182   - <td *ngIf="(mode == 'Edit')" style="width: 80px">
  182 + <td *ngIf="(mode == 'Edit')">
183 183 <input type="hidden" value="{{item.Id}}">
184 184 <input type="checkbox" (change)="onChange(i, item.Id, $event.target.checked)" [checked]="item.InGroup">
185 185 </td>
186   - <td style="width:150px">{{item.FirstName}}</td>
187   - <td style="width:150px">{{item.LastName}}</td>
188   - <td style="width:150px">{{item.UserId}}</td>
189   - <td style="width:150px">{{item.EmailId}}</td>
190   - <td style="width:150px">{{item.ProductEdition}}</td>
  186 + <td>{{item.FirstName}}</td>
  187 + <td>{{item.LastName}}</td>
  188 + <td>{{item.LoginId}}</td>
  189 + <td>{{item.EmailId}}</td>
  190 + <td>{{item.ProductEdition}}</td>
191 191 </tr>
192 192 </tbody>
193 193 </table>
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/usergroup.component.ts
  View file @a7a8cc8
1   -import { Component, OnInit, AfterViewInit, AfterViewChecked, Input, Output, EventEmitter, Pipe, PipeTransform, TemplateRef, ViewChild } from '@angular/core';
  1 +import { Component, OnInit, AfterViewInit, AfterViewChecked, Input, Output, EventEmitter, Pipe, PipeTransform, TemplateRef, ViewChild,HostListener } from '@angular/core';
2 2 import { UserService } from './user.service';
3 3 import { Router, ActivatedRoute } from '@angular/router';
4 4 import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
... ... @@ -50,10 +50,46 @@ export class UserGroup implements OnInit, AfterViewChecked {
50 50 pageLengthUser: number;
51 51 loopIdx: number;
52 52 userGroupName: string;
53   -
  53 + scrHeight:any;
  54 + scrWidth:any;
  55 + SearchField:any={
  56 + LicenseId:0,
  57 + sortColumn:'Id',
  58 + sortOrder:'asc',
  59 + pageNo:1,
  60 + pageLength:10
  61 + };
  62 + SearchUserField:any={
  63 + LicenseId:0,
  64 + selectedId:0,
  65 + AllUsers:false,
  66 + sortColumn:'Id',
  67 + sortOrder:'asc',
  68 + pageNo:1,
  69 + pageLength:10
  70 + };
  71 + @HostListener('window:resize', ['$event'])
  72 + getScreenSize(event?) {
  73 +
  74 + var $ua = navigator.userAgent;
  75 + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  76 + this.scrHeight = window.innerHeight-500;
  77 + }
  78 + else
  79 + {
  80 + this.scrHeight = window.innerHeight-420;
  81 +
  82 + }
  83 +
  84 + if(this.scrHeight<=360) this.scrHeight=360;
  85 +
  86 + $(".ft_container").css("height",this.scrHeight);
  87 + }
54 88 constructor(private userService: UserService, private router: Router,
55 89 private activeRoute: ActivatedRoute, private fb: FormBuilder, private modalService: BsModalService,
56   - private _confirmService: ConfirmService, public global: GlobalService, private _loadingService: LoadingService) { }
  90 + private _confirmService: ConfirmService, public global: GlobalService, private _loadingService: LoadingService) {
  91 + this.getScreenSize();
  92 + }
57 93  
58 94 ngOnInit(): void {
59 95 this._loadingService.ShowLoading("global-loading");
... ... @@ -67,7 +103,6 @@ export class UserGroup implements OnInit, AfterViewChecked {
67 103 this.loopIdx = 0;
68 104 this.userGroupName = '';
69 105 this.NoRecord = this.global.NoRecords;
70   - this._loadingService.ShowLoading("global-loading");
71 106 this.recordCount = 0;
72 107 this.pageNo = 1;
73 108 this.pageLength = 10;
... ... @@ -97,9 +132,83 @@ export class UserGroup implements OnInit, AfterViewChecked {
97 132 $('#accountSelect')
98 133 .on('change', (e, args) => {
99 134 var selectedValue = Number(args.selected);
100   - //var selectedText= $(".chosen-single span" ).text();
101 135 this.AccountNumberChanged(selectedValue);
102 136 });
  137 +
  138 + jQuery('#fixed_hdr2').fxdHdrCol({
  139 + fixedCols: 0,
  140 + width: "100%",
  141 + height: this.scrHeight,
  142 + colModal: [
  143 + { width: 500, align: 'center' },
  144 + { width: 400, align: 'center' },
  145 + { width: 400, align: 'Center' },
  146 + { width: 400, align: 'Center' },
  147 + ],
  148 + sort: true
  149 + });
  150 +
  151 + jQuery('#fixed_hdr3').fxdHdrCol({
  152 + fixedCols: 0,
  153 + width: "100%",
  154 + height: this.scrHeight,
  155 + colModal: [
  156 + { width: 100, align: 'center' },
  157 + { width: 300, align: 'center' },
  158 + { width: 300, align: 'Center' },
  159 + { width: 300, align: 'Center' },
  160 + { width: 400, align: 'Center' },
  161 + { width: 300, align: 'Center' },
  162 + ],
  163 + sort: true
  164 + });
  165 +
  166 + var thisObject=this;//class object
  167 + jQuery(".groupName .ft_container .ft_rel_container .ft_rwrapper table thead tr th").on("click",function(event){
  168 +
  169 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null)
  170 + {
  171 + var fieldName=event.currentTarget.id;
  172 + var sortType=''
  173 + var isAscSort = jQuery(".groupName .ft_container .ft_rel_container .ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  174 + jQuery(".groupName .ft_container .ft_rel_container .ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  175 +
  176 + if (isAscSort) {
  177 + jQuery(".groupName .ft_container .ft_rel_container .ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  178 + sortType="desc";
  179 + } else {
  180 + jQuery(".groupName .ft_container .ft_rel_container .ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  181 + sortType="asc";
  182 + }
  183 +
  184 + thisObject.SortTableRecords(fieldName,sortType);
  185 +
  186 + }
  187 +
  188 + });
  189 +
  190 + jQuery(".groupList .ft_container .ft_rel_container .ft_rwrapper table thead tr th").on("click",function(event){
  191 +
  192 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null)
  193 + {
  194 + var fieldName=event.currentTarget.id;
  195 + var sortType=''
  196 + var isAscSort = jQuery(".groupList .ft_container .ft_rel_container .ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  197 + jQuery(".groupList .ft_container .ft_rel_container .ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  198 +
  199 + if (isAscSort) {
  200 + jQuery(".groupList .ft_container .ft_rel_container .ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  201 + sortType="desc";
  202 + } else {
  203 + jQuery(".groupList .ft_container .ft_rel_container .ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  204 + sortType="asc";
  205 + }
  206 +
  207 + thisObject.SortTableUserRecords(fieldName,sortType);
  208 +
  209 + }
  210 +
  211 + });
103 212  
104 213 }
105 214  
... ... @@ -175,19 +284,51 @@ export class UserGroup implements OnInit, AfterViewChecked {
175 284 }, error => this.error = <any>error);
176 285 }
177 286  
  287 + SortTableRecords(fieldName:string,sortType:string) {
  288 + this.selectedRow = -1;
  289 + this.SearchField.sortColumn=fieldName;
  290 + this.SearchField.sortOrder=sortType;
  291 +
  292 + this.LicenseUserGroupList();
  293 + }
  294 +
178 295 GetLicenseUserGroups(evt: any) {
179 296 this.alerts = '';
180   - this._loadingService.ShowLoading("global-loading");
  297 + this.selectedRow = -1;
181 298 var tempArr = evt.split(',');
182 299 this.pageNo = parseInt(tempArr[0]);
183 300 this.pageLength = parseInt(tempArr[1]);
184   - this.userService.GetLicenseUserGroups(this.license.LicenseId, this.pageNo, this.pageLength)
185   - .subscribe(st => { this.BindFormFields(st); }, error => this.error = <any>error);
  301 + this.SearchField.pageNo=this.pageNo;
  302 + this.SearchField.pageLength=this.pageLength;
  303 + this.LicenseUserGroupList();
  304 +
186 305 }
187 306  
188 307 SearchRecords() {
189   - this.GetLicenseUserGroups('1, ' + this.pageLength);
  308 + this.selectedRow = -1;
  309 + this.pageNo=1;
  310 + this.SearchField.pageNo=this.pageNo;
  311 + this.LicenseUserGroupList();
  312 + }
  313 +
  314 + LicenseUserGroupList() {
  315 + if(this.license.LicenseId>0)
  316 + {
  317 +
  318 + this._loadingService.ShowLoading("global-loading");
  319 + this.SearchField.LicenseId=this.license.LicenseId;
  320 + this.userService.GetLicenseUserGroups(this.SearchField)
  321 + .subscribe(st => { this.BindFormFields(st); }, error => this.error = <any>error);
  322 + }
  323 +
190 324 }
  325 +
  326 + SortTableUserRecords(fieldName:string,sortType:string) {
  327 + this.SearchUserField.sortColumn=fieldName;
  328 + this.SearchUserField.sortOrder=sortType;
  329 +
  330 + this.LicenseUserGroupUserList();
  331 + }
191 332  
192 333 GetLicenseUserGroupUsers(evt: any) {
193 334 this.alerts = '';
... ... @@ -195,16 +336,41 @@ export class UserGroup implements OnInit, AfterViewChecked {
195 336 var tempArr = evt.split(',');
196 337 this.pageNoUser = parseInt(tempArr[0]);
197 338 this.pageLengthUser = parseInt(tempArr[1]);
198   - var AllUsers = false;
199   - if (this.mode == 'Edit') {
200   - AllUsers = true;
201   - }
202   - this.userService.GetLicenseUserGroupUsers(this.license.LicenseId, this.selectedId, AllUsers, this.pageNoUser, this.pageLengthUser)
203   - .subscribe(st => { this.BindUserFormFields(st); }, error => this.error = <any>error);
  339 + this.SearchUserField.pageNo=this.pageNoUser;
  340 + this.SearchUserField.pageLength=this.pageLengthUser;
  341 + this.LicenseUserGroupUserList();
  342 +
  343 + }
  344 +
  345 + LicenseUserGroupUserList() {
  346 +
  347 + if(this.license.LicenseId>0)
  348 + {
  349 +
  350 + this._loadingService.ShowLoading("global-loading");
  351 + this.SearchUserField.AllUsers=false;
  352 + if (this.mode == 'Edit') {
  353 + this.SearchUserField.AllUsers=true;
  354 + }
  355 + this.SearchUserField.LicenseId=this.license.LicenseId;
  356 + this.SearchUserField.selectedId=this.selectedId;
  357 +
  358 + this.userService.GetLicenseUserGroupUsers(this.SearchUserField)
  359 + .subscribe(st => { this.BindUserFormFields(st); }, error => this.error = <any>error);
  360 + }
  361 +
204 362 }
  363 +
205 364  
206 365 SearchUserRecords() {
207   - this.GetLicenseUserGroupUsers('1, ' + this.pageLengthUser);
  366 + this.pageNoUser=1;
  367 + this.pageLengthUser = 10;
  368 + this.SearchUserField.pageNo=this.pageNoUser;
  369 + this.SearchUserField.pageLength=this.pageLengthUser;
  370 + this.SearchUserField.sortColumn='Id';
  371 + this.SearchUserField.sortOrder='asc';
  372 + jQuery(".groupList .ft_container .ft_rel_container .ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  373 + this.LicenseUserGroupUserList();
208 374 }
209 375  
210 376 AccountNumberChanged(LicenseId: number) {
... ... @@ -222,8 +388,6 @@ export class UserGroup implements OnInit, AfterViewChecked {
222 388 this.alerts = "<span>License user group delete unsuccessfull</span>";
223 389 } else {
224 390 this._confirmService.activate("License user group deleted successfully.", "alertMsg");
225   - // this.modalAlerts = "<p>License user group deleted successfully</p>";
226   - //this.modalRef = this.modalService.show(template);
227 391 this.selectedRow = -1;
228 392 this.selectedId = -1;
229 393 this.SearchRecords();
... ... @@ -361,32 +525,32 @@ export class UserGroup implements OnInit, AfterViewChecked {
361 525 }
362 526  
363 527 EditLicenseUserGroup() {
364   - jQuery('.ft_r thead tr th:eq(0)').show();
  528 + jQuery('.groupList .ft_container .ft_rel_container .ft_rwrapper table thead tr th:eq(0)').show();
  529 + jQuery('#fixed_hdr3 thead tr th:eq(0)').show();
365 530 this.mode = 'Edit';
366 531 this.modalTitle = 'Edit User Group';
367 532 this.topPos = '100px';
368 533 this.alerts = '';
369 534 this.updateUserGroupFrm.controls['userGroupName'].setValue(this.licenseUserGroup.Title);
370 535 this.recordCountUser = 0;
371   - this.pageNoUser = 1;
372   - this.pageLengthUser = 10;
  536 + this.lstLicenseUserGroupUsers=[];
373 537 this.SearchUserRecords();
374 538 }
375 539  
376 540 ngAfterViewChecked() {
377   - jQuery('#tblUserGroupUsers thead').css('width', jQuery('#tblUserGroupUsers tbody tr:eq(0)').width());
  541 + jQuery('#fixed_hdr3 thead').css('width', jQuery('#fixed_hdr3 tbody tr:eq(0)').width());
378 542 }
379 543  
380 544 ViewLicenseUserGroup() {
381   - jQuery('.ft_r thead tr th:eq(0)').hide();
  545 + jQuery('.groupList .ft_container .ft_rel_container .ft_rwrapper table thead tr th:eq(0)').hide();
  546 + jQuery('#fixed_hdr3 thead tr th:eq(0)').hide();
382 547 this.mode = 'View';
383 548 this.modalTitle = 'View User Group';
384 549 this.topPos = '100px';
385 550 this.alerts = '';
386 551 this.updateUserGroupFrm.controls['userGroupName'].setValue(this.licenseUserGroup.Title);
387 552 this.recordCountUser = 0;
388   - this.pageNoUser = 1;
389   - this.pageLengthUser = 10;
  553 + this.lstLicenseUserGroupUsers=[];
390 554 this.SearchUserRecords();
391 555 }
392 556  
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html
  View file @a7a8cc8
... ... @@ -157,7 +157,7 @@
157 157 <td>
158 158 <span *ngIf="UserEntity.LicenseStatus=='Active'" class="label label-success">Active</span>
159 159 <span *ngIf="UserEntity.LicenseStatus=='Expired'" class="label label-default">Expired</span>
160   - <span *ngIf="UserEntity.LicenseStatus=='null'" class="label label-default"></span>
  160 + <span *ngIf="UserEntity.LicenseStatus=='Inactive'" class="label label-default">Inactive</span>
161 161 </td>
162 162 <td style="padding-right: 0px;">
163 163 <span *ngIf="UserEntity.LoginStatus==true" class="label label-success">Logged-In, Active Session: {{UserEntity.TotalLogin}}</span>
... ... @@ -165,8 +165,6 @@
165 165 </td>
166 166 </tr>
167 167  
168   -
169   -
170 168 </tbody>
171 169 </table>
172 170 <admin-pager [recordCount]="recordCount" [pageNo]="pageNo" [pageLength]="pageLength" (pagerEvent)="SearchUserList($event)"></admin-pager>
... ...
400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
  View file @a7a8cc8
... ... @@ -70,6 +70,21 @@ export class UsersList implements OnInit, AfterViewChecked {
70 70 // Declare height and width variables
71 71 scrHeight:any;
72 72 scrWidth:any;
  73 +
  74 + SearchField:any={
  75 + FirstName:'',
  76 + LastName:'',
  77 + EmailId:'',
  78 + AccountNumber:'',
  79 + UserTypeId:0,
  80 + AccountTypeId:0,
  81 + LoginStatus:false,
  82 + sortColumn:'Id',
  83 + sortOrder:'asc',
  84 + pageNo:1,
  85 + pageLength:10
  86 + }
  87 +
73 88 @HostListener('window:resize', ['$event'])
74 89 getScreenSize(event?) {
75 90  
... ... @@ -83,7 +98,9 @@ export class UsersList implements OnInit, AfterViewChecked {
83 98  
84 99 }
85 100  
86   - // $(".ft_container").css("height",this.scrHeight);
  101 + if(this.scrHeight<=300) this.scrHeight=300;
  102 +
  103 + $(".ft_container").css("height",this.scrHeight);
87 104 }
88 105 constructor(private _loadingService: LoadingService,private userservice: UserService, private router: Router, private fb: FormBuilder, private http: Http,
89 106 private _confirmService: ConfirmService, public global:GlobalService
... ... @@ -174,30 +191,38 @@ export class UsersList implements OnInit, AfterViewChecked {
174 191 sort: true
175 192 });
176 193  
177   - if(document.getElementById("fixed_table_rc") != null){
178   - document.getElementById("fixed_table_rc").remove();
179   - var testScript = document.createElement("script");
180   - testScript.setAttribute("id", "fixed_table_rc");
181   - testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
182   - testScript.setAttribute("type", "text/javascript");
183   - document.body.appendChild(testScript);
184   - }
  194 + // if(document.getElementById("fixed_table_rc") != null){
  195 + // document.getElementById("fixed_table_rc").remove();
  196 + // var testScript = document.createElement("script");
  197 + // testScript.setAttribute("id", "fixed_table_rc");
  198 + // testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
  199 + // testScript.setAttribute("type", "text/javascript");
  200 + // document.body.appendChild(testScript);
  201 + // }
185 202  
186   - // $(".ft_rwrapper table thead tr th").on("click",function(event){
187   -
188   - // this.fieldName=event.currentTarget.id;
189   - // var isAscSort = $(".ft_rwrapper table thead tr #"+this.fieldName).hasClass('fx_sort_asc');
190   - // $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
191   -
192   - // if (isAscSort) {
193   - // $(".ft_rwrapper table thead tr #"+this.fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
194   - // this.sortType="desc";
195   - // } else {
196   - // $(".ft_rwrapper table thead tr #"+this.fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
197   - // this.sortType="asc";
198   - // }
  203 + var thisObject=this;//class object
  204 + $(".ft_rwrapper table thead tr th").on("click",function(event){
  205 +
  206 + if(event.currentTarget.id!=undefined && event.currentTarget.id!="" && event.currentTarget.id!=null)
  207 + {
  208 + var fieldName=event.currentTarget.id;
  209 + var sortType=''
  210 + var isAscSort = $(".ft_rwrapper table thead tr #"+fieldName).hasClass('fx_sort_asc');
  211 + $(".ft_rwrapper table thead tr th").removeClass('fx_sort_asc fx_sort_desc');
  212 +
  213 + if (isAscSort) {
  214 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_desc').removeClass('fx_sort_asc');
  215 + sortType="desc";
  216 + } else {
  217 + $(".ft_rwrapper table thead tr #"+fieldName).addClass('fx_sort_asc').removeClass('fx_sort_desc');
  218 + sortType="asc";
  219 + }
  220 +
  221 + thisObject.SortTableRecords(fieldName,sortType);
199 222  
200   - // });
  223 + }
  224 +
  225 + });
201 226  
202 227  
203 228 }
... ... @@ -280,9 +305,6 @@ export class UsersList implements OnInit, AfterViewChecked {
280 305 GetAccountType() {
281 306 this.userservice.GetAccountType().subscribe(x => { this.AccountTypeList = x; }, error => this.error = <any>error);
282 307 }
283   - GetUserList() {
284   - //this.userservice.GetUserList().subscribe(x => { this.UserList = x; }, error => this.error = <any>error);
285   - }
286 308 GetUserRights() {
287 309 this.userservice.GetManageUserRights({
288 310 UserId: this.managerightFrm.controls['id'].value,
... ... @@ -296,56 +318,76 @@ export class UsersList implements OnInit, AfterViewChecked {
296 318 SearchUserList(evt: any)
297 319 {
298 320 this.NoRecord = '';
299   - this._loadingService.ShowLoading("global-loading");
300 321 var tempArr = evt.split(',');
301 322 this.pageNo = parseInt(tempArr[0]);
302 323 this.pageLength = parseInt(tempArr[1]);
303   - var UserFilterControl = this.Users.value;
  324 + this.selectedRow = -1;
  325 + this.EditbuttonStatus=undefined;
  326 + this.logoutUserSession=undefined;
  327 + this.buttonStatus = null;
  328 + this.SearchField.pageNo=this.pageNo;
  329 + this.SearchField.pageLength=this.pageLength;
  330 +
  331 + this.GetUserList();
  332 +
  333 + }
304 334  
305   - this.userservice.GetUserList(
306   - {
307   - FirstName: this.Users.controls['FirstName'].value,
308   - LastName: this.Users.controls['LastName'].value,
309   - EmailId: this.Users.controls['EmailId'].value,
310   - AccountNumber: this.Users.controls['AccountNumber'].value,
311   - UserTypeId: (this.Users.controls['UserTypeId'].value != null && this.Users.controls['UserTypeId'].value !='' ? this.Users.controls['UserTypeId'].value:0),
312   - AccountTypeId: (this.Users.controls['AccountTypeId'].value != null && this.Users.controls['AccountTypeId'].value != ''? this.Users.controls['AccountTypeId'].value : 0),
313   - LoginStatus: this.Users.controls['LoginStatus'].value,
314   - },this.pageNo, this.pageLength
315   - )
316   - .subscribe(x => { this.BindFormFields(x) }, error => this.error = <any>error);
317   -
  335 + SortTableRecords(fieldName:string,sortType:string) {
  336 + this.EditbuttonStatus=undefined;
  337 + this.logoutUserSession=undefined;
  338 + this.buttonStatus = null;
  339 + this.selectedRow = -1;
  340 +
  341 + this.SearchField.sortColumn=fieldName;
  342 + this.SearchField.sortOrder=sortType;
  343 +
  344 + this.GetUserList();
318 345 }
  346 +
319 347 SearchRecords() {
320 348 this.EditbuttonStatus=undefined;
321 349 this.logoutUserSession=undefined;
322 350 this.buttonStatus = null;
323 351 this.selectedRow = -1;
324   - this.SearchUserList('1, ' + this.pageLength);
  352 + this.pageNo=1;
  353 + this.SearchField.FirstName=this.Users.controls['FirstName'].value;
  354 + this.SearchField.LastName=this.Users.controls['LastName'].value;
  355 + this.SearchField.EmailId=this.Users.controls['EmailId'].value;
  356 + this.SearchField.AccountNumber=this.Users.controls['AccountNumber'].value;
  357 + this.SearchField.UserTypeId=(this.Users.controls['UserTypeId'].value != null && this.Users.controls['UserTypeId'].value !='' ? this.Users.controls['UserTypeId'].value:0);
  358 + this.SearchField.AccountTypeId=(this.Users.controls['AccountTypeId'].value != null && this.Users.controls['AccountTypeId'].value != ''? this.Users.controls['AccountTypeId'].value : 0);
  359 + this.SearchField.LoginStatus=this.Users.controls['LoginStatus'].value;
  360 + this.SearchField.pageNo=this.pageNo;
  361 +
  362 + this.GetUserList();
  363 + }
  364 +
  365 + GetUserList() {
  366 + this._loadingService.ShowLoading("global-loading");
  367 + this.userservice.GetUserList(this.SearchField)
  368 + .subscribe(x => { this.BindFormFields(x) }, error => this.error = <any>error);
  369 +
325 370 }
  371 +
  372 +
326 373 BindFormFields(data) {
327 374 this.recordCount = data.RecordCount;
328 375 this.UserList = data.UserList;
329 376 if (this.UserList.length > 0) {
330 377 this.NoRecord = '';
331   - this._loadingService.HideLoading("global-loading");
332 378 }
333 379 if (this.UserList.length == 0) {
334   - this.NoRecord = this.global.NoRecords;
335   - this._loadingService.HideLoading("global-loading");
  380 + this.NoRecord = this.global.NoRecords;
336 381 }
  382 + this._loadingService.HideLoading("global-loading");
337 383 }
338 384 CancelEditUser() {
339   - $("#searchform").css("display","block");
340   - this.SearchUserList(this.pageNo +','+ this.pageLength);
  385 + $("#searchform").css("display","block");
341 386 this.Mode = 'Manage';
342 387 this.modalTitle = 'LIST USER';
343 388 this.topPos = '2000px';
344 389 this.divClass = '';
345   - this.selectedRow = -1;
346   - this.EditbuttonStatus=undefined;
347   - this.buttonStatus=undefined;
348   - this.logoutUserSession=undefined;
  390 + this.GetUserList();
349 391 }
350 392 EditUser() {
351 393 if (this.EditbuttonStatus) {
... ... @@ -422,7 +464,7 @@ export class UsersList implements OnInit, AfterViewChecked {
422 464 this.logoutUserSession=undefined;
423 465 this.buttonStatus = null;
424 466 this.selectedRow = -1;
425   - this.SearchUserList(this.pageNo +','+ this.pageLength);
  467 + this.GetUserList();
426 468  
427 469 },error => console.log(error));
428 470 }
... ...
400-SOURCECODE/Admin/src/app/shared/global.ts
  View file @a7a8cc8
... ... @@ -147,12 +147,20 @@ export class GlobalService {
147 147  
148 148 if (fromdate ==null ||fromdate =='Invalid Date') {
149 149 this.ValidationMsg = 'From date is Invalid.'
  150 + if(fromdate ==null)
  151 + {
  152 + this.ValidationMsg = 'From date is Required.'
  153 + }
150 154 }
151 155 else if (todate ==null ||todate =='Invalid Date') {
152   - this.ValidationMsg = 'To date is Invalid.'
  156 + this.ValidationMsg = 'To date is Invalid.'
  157 + if(todate ==null)
  158 + {
  159 + this.ValidationMsg = 'To date is Required.'
  160 + }
153 161 }
154   - else if (new Date(todate) < new Date(fromdate)) {
155   - this.ValidationMsg = 'The To date must be greater than the From date.'
  162 + else if (Date.parse(todate) < Date.parse(fromdate)) {
  163 + this.ValidationMsg = "'To date' must be greater than or equal to 'From date'."
156 164 }
157 165 else {
158 166 this.ValidationMsg = '';
... ...
400-SOURCECODE/Admin/src/assets/scripts/fixed_table_rc.js
  View file @a7a8cc8
... ... @@ -214,26 +214,26 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
214 214  
215 215 $('table', lc.ft_container).addClass('sorttable');
216 216  
217   - sorttable.makeSortable(this);
  217 + // sorttable.makeSortable(this);
218 218  
219   - var $sortableTh = $('.fx_sort_bg', lc.ft_rel_container);
  219 + // var $sortableTh = $('.fx_sort_bg', lc.ft_rel_container);
220 220  
221   - $sortableTh.click (function () {
222   - var $this = $(this);
223   - var isAscSort = $this.hasClass('fx_sort_asc');
  221 + // $sortableTh.click (function () {
  222 + // var $this = $(this);
  223 + // var isAscSort = $this.hasClass('fx_sort_asc');
224 224  
225   - $sortableTh.removeClass('fx_sort_asc fx_sort_desc');
  225 + // $sortableTh.removeClass('fx_sort_asc fx_sort_desc');
226 226  
227   - if (isAscSort) {
228   - $this.addClass('fx_sort_desc').removeClass('fx_sort_asc');
229   - } else {
230   - $this.addClass('fx_sort_asc').removeClass('fx_sort_desc');
231   - }
  227 + // if (isAscSort) {
  228 + // $this.addClass('fx_sort_desc').removeClass('fx_sort_asc');
  229 + // } else {
  230 + // $this.addClass('fx_sort_asc').removeClass('fx_sort_desc');
  231 + // }
232 232  
233   - var idx = $(this).index();
  233 + // var idx = $(this).index();
234 234  
235   - sorttable.innerSortFunction.apply(lc.ft_wrapper.find('th').get(idx), []);
236   - });
  235 + // sorttable.innerSortFunction.apply(lc.ft_wrapper.find('th').get(idx), []);
  236 + // });
237 237 }
238 238  
239 239 });
... ...
400-SOURCECODE/Admin/src/assets/styles/fixed_table_rc.css
  View file @a7a8cc8
1 1 .ft_container {border: 1px solid #ddd;}
2 2 .ft_container table { border-width: 0px; border-collapse: collapse; margin: 0; outline-style: none; font-size: 0.9em; background-color: #fff; }
3 3  
4   -.ft_container table tr th { font-weight: bold; background: #7166b7; color: #fff; }
  4 +.ft_container table tr th { font-weight: bold; background: #0095da; color: #fff; }
5 5  
6 6 .ft_container table thead { -moz-user-select: none;-webkit-user-select: none;}
7 7 .ft_container table tr th,
... ...