Merge code

Gagandeep
1 parent e9497eda
Showing 29 changed files with 777 additions and 1445 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/AIAHTML5.ADMIN.API.csproj
400-SOURCECODE/AIAHTML5.ADMIN.API/App_Start/WebApiConfig.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/LicenseController.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/UserController.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/GetSearchUserList_Result.cs → 400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/GetSearchUserList1_Result.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/GetSearchUsers_Result.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/GetUsageReport_Result.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetLicenses_Result.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/usp_GetlicensesList_Result.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/DiscountCodeModel.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/LicenseModel.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Models/UserModel.cs
400-SOURCECODE/AIAHTML5.ADMIN.API/Web.config
500-DBDump/AIA-StoredProcedures/dbo.GetSearchUsers.sql
500-DBDump/AIA-StoredProcedures/dbo.GetUsageReport.StoredProcedure.sql
500-DBDump/AIA-StoredProcedures/dbo.usp_GetUserType.sql
500-DBDump/AIA-StoredProcedures/dbo.usp_GetlicensesList.sql
@@ -513,7 +513,10 @@
     <Compile Include="Entity\GetSearchTerms_Result.cs">
       <DependentUpon>AIADBEntity.tt</DependentUpon>
     </Compile>
-    <Compile Include="Entity\GetSearchUserList_Result.cs">
+    <Compile Include="Entity\GetSearchUserList1_Result.cs">
+      <DependentUpon>AIADBEntity.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Entity\GetSearchUsers_Result.cs">
       <DependentUpon>AIADBEntity.tt</DependentUpon>
     </Compile>
     <Compile Include="Entity\GetSiteAccoutDetail_Result.cs">
@@ -726,7 +729,10 @@
     <Compile Include="Entity\usp_GetLicenseModestySettings_Result.cs">
       <DependentUpon>AIADBEntity.tt</DependentUpon>
     </Compile>
-    <Compile Include="Entity\usp_GetLicenses_Result.cs">
+    <Compile Include="Entity\usp_GetlicensesList_Result.cs">
+      <DependentUpon>AIADBEntity.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Entity\usp_Getlicenses_Result.cs">
       <DependentUpon>AIADBEntity.tt</DependentUpon>
     </Compile>
     <Compile Include="Entity\usp_GetLicenseTypes_Result.cs">
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Linq;
 using System.Web.Http;
 using System.Web.Http.Cors;
@@ -15,9 +16,14 @@ namespace AIAHTML5.ADMIN.API
                 = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
             GlobalConfiguration.Configuration.Formatters
                 .Remove(GlobalConfiguration.Configuration.Formatters.XmlFormatter);
-
+            string Enablecors = ConfigurationManager.AppSettings["Enablecors"];
+            if (Enablecors == "false")
+            {
+                EnableCorsAttribute cors = new EnableCorsAttribute("http://localhost:4200", "*", "GET,POST");
+                config.EnableCors(cors);
+            }
             // Configure cross domain access
-            config.EnableCors();
+            
             // Web API routes
             config.MapHttpAttributeRoutes();
@@ -43,14 +43,15 @@ namespace AIAHTML5.ADMIN.API.Controllers
         [HttpGet]
         public HttpResponseMessage GetLicenses(string accountNumber, string licenseeFirstName, string licenseeLastName, byte licenseTypeId,
             string institutionName, int stateId, int countryId, string emailId, DateTime subscriptionStartDate, DateTime subscriptionEndDate,
-            bool isActive)
+            bool isActive, int pageNo, int pageLength)
         {
             List<LicenseModel> LicenseList = new List<LicenseModel>();
+            int recordCount = 0;
             try
             {
                 LicenseList = LicenseModel.GetLicenses(dbContext, accountNumber, licenseeFirstName, licenseeLastName, licenseTypeId, institutionName,
-                    stateId, countryId, emailId, subscriptionStartDate, subscriptionEndDate, isActive);
-                return Request.CreateResponse(HttpStatusCode.OK, LicenseList);
+                    stateId, countryId, emailId, subscriptionStartDate, subscriptionEndDate, isActive, pageNo, pageLength, out recordCount);
+                return Request.CreateResponse(HttpStatusCode.OK, new { LicenseList = LicenseList, RecordCount = recordCount });
             }
             catch (Exception ex)
             {
@@ -59,6 +60,7 @@ namespace AIAHTML5.ADMIN.API.Controllers
             }
         }
+
         [Route("InsertLicense")]
         [HttpPost]
         public HttpResponseMessage InsertLicense(JObject jsonData)
@@ -22,10 +22,13 @@ namespace AIAHTML5.ADMIN.API.Controllers
         AIADatabaseV5Entities dbContext = new AIADatabaseV5Entities();
         [Route("GetUsageReport")]
         [HttpGet]
-        public IHttpActionResult GetUsageReport(string sFromDate, string sToDate, string sAccoutNumber, string sZip, int iState, int iCountry)
+        public IHttpActionResult GetUsageReport(string sFromDate, string sToDate, string sAccoutNumber, string sZip, int iState, int iCountry, int pageNo, int pageLength)
         {
-            var lstUsageReport = dbContext.GetUsageReport(sFromDate, sToDate, sAccoutNumber, sZip, iState, iCountry).ToList();
-            return Ok(lstUsageReport);
+            
+            var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
+            var lstUsageReport = dbContext.GetUsageReport(sFromDate, sToDate, sAccoutNumber, sZip, iState, iCountry,pageNo, pageLength, spRecordCount).ToList();
+            return Ok(new { UserUsage = lstUsageReport, RecordCount = spRecordCount.Value });
+            //return Ok(lstUsageReport);
         }
         [Route("GetCustomerSummeryReport")]
@@ -39,7 +42,7 @@ namespace AIAHTML5.ADMIN.API.Controllers
         [Route("GetExpiringSubscriptionReport")]
         [HttpGet]
-        public IHttpActionResult GetExpiringSubscriptionReport(string sFromDate, string sToDate, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, int iLicenseTypeId, int iAccountTypeId, string sZip, int iStateId, int iCountryId)
+        public IHttpActionResult GetExpiringSubscriptionReport(string sFromDate, string sToDate, decimal iStartPrice, decimal iEndPrice, int iLicenseTypeId, int iAccountTypeId, string sZip, int iStateId, int iCountryId)
         {
             var lstExpiringSubscriptionReport = dbContext.GetExpiringLicenses(sFromDate, sToDate, iStartPrice, iEndPrice, (byte)iLicenseTypeId, (byte)iAccountTypeId, sZip, iStateId, iCountryId).ToList();
             return Ok(lstExpiringSubscriptionReport);
@@ -142,15 +142,27 @@ namespace AIAHTML5.ADMIN.API.Controllers
         [Route("Users")]
         [HttpGet]
-        public IHttpActionResult UserList(string firstname, string lastname, string emailid, string accountnumber, string usertypeid, string accounttypeid)
+        public IHttpActionResult UserList(string firstname, string lastname, string emailid, string accountnumber, string usertypeid, string accounttypeid,
+            int pageNo, int pageLength)
         {
-            int UserTypeId = (!string.IsNullOrEmpty(usertypeid) ? Convert.ToInt32(usertypeid) : 0);
-            int AccountTypeId = (!string.IsNullOrEmpty(accounttypeid) ? Convert.ToInt32(accounttypeid) : 0);
-            dbContext.Configuration.ProxyCreationEnabled = false;
-            List<usp_GetSearchUserList_Result> Users = dbContext.usp_GetSearchUserList(firstname, lastname, emailid, accountnumber, UserTypeId, AccountTypeId, 1).ToList();
-            return Ok(Users);
+            try
+            {
+                int UserTypeId = (!string.IsNullOrEmpty(usertypeid) ? Convert.ToInt32(usertypeid) : 0);
+                int AccountTypeId = (!string.IsNullOrEmpty(accounttypeid) ? Convert.ToInt32(accounttypeid) : 0);
+                int recordCount = 0;
+                dbContext.Configuration.ProxyCreationEnabled = false;
+                //var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
+                var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
+                //recordCount = (int)spRecordCount.Value;
+                List<GetSearchUsers_Result> Users = dbContext.GetSearchUsers(firstname, lastname, emailid, accountnumber, UserTypeId, AccountTypeId, 1,
+                    pageNo, pageLength, spRecordCount).ToList();
+                return Ok(new { UserList = Users, RecordCount = spRecordCount.Value });
+            }
+            catch(Exception ex)
+            {
+                return BadRequest();
+            }
         }
-
         [Route("UpdateUser")]
         [HttpPost]
         public HttpResponseMessage UpdateUser(JObject jsonUserData)
@@ -1466,7 +1466,7 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSearchTerms_Result>("GetSearchTerms");
         }
-        public virtual ObjectResult<GetSearchUserList_Result> GetSearchUserList(string sFirstName, string sLastName, string sEmailId, string sAccoutNumber, Nullable<int> iUserTypeId, Nullable<int> iAccountTypeId, Nullable<int> iLoginUserType)
+        public virtual int GetSearchUserList(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)
         {
             var sFirstNameParameter = sFirstName != null ?
                 new ObjectParameter("sFirstName", sFirstName) :
@@ -1496,7 +1496,15 @@ namespace AIAHTML5.ADMIN.API.Entity
                 new ObjectParameter("iLoginUserType", iLoginUserType) :
                 new ObjectParameter("iLoginUserType", typeof(int));
-            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSearchUserList_Result>("GetSearchUserList", sFirstNameParameter, sLastNameParameter, sEmailIdParameter, sAccoutNumberParameter, iUserTypeIdParameter, iAccountTypeIdParameter, iLoginUserTypeParameter);
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("GetSearchUserList", sFirstNameParameter, sLastNameParameter, sEmailIdParameter, sAccoutNumberParameter, iUserTypeIdParameter, iAccountTypeIdParameter, iLoginUserTypeParameter, pageNoParameter, pageLengthParameter, recordCount);
         }
         public virtual ObjectResult<GetSiteAccoutDetail_Result> GetSiteAccoutDetail(string strAccountNumber)
@@ -1630,7 +1638,7 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<Nullable<int>>("GetTotalLoginsByLicenseEditionId", licenseEditionIdParameter);
         }
-        public virtual ObjectResult<GetUsageReport_Result> GetUsageReport(string sFromDate, string sToDate, string sAccoutNumber, string sZip, Nullable<int> iState, Nullable<int> iCountry)
+        public virtual ObjectResult<GetUsageReport_Result> GetUsageReport(string sFromDate, string sToDate, string sAccoutNumber, string sZip, Nullable<int> iState, Nullable<int> iCountry, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
         {
             var sFromDateParameter = sFromDate != null ?
                 new ObjectParameter("sFromDate", sFromDate) :
@@ -1656,7 +1664,15 @@ namespace AIAHTML5.ADMIN.API.Entity
                 new ObjectParameter("iCountry", iCountry) :
                 new ObjectParameter("iCountry", typeof(int));
-            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetUsageReport_Result>("GetUsageReport", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, sZipParameter, iStateParameter, iCountryParameter);
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetUsageReport_Result>("GetUsageReport", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, sZipParameter, iStateParameter, iCountryParameter, pageNoParameter, pageLengthParameter, recordCount);
         }
         public virtual ObjectResult<GetUsageReport_OLD_PROC_Result> GetUsageReport_OLD_PROC(string sFromDate, string sToDate, string sAccoutNumber, string sZip, Nullable<int> iState, Nullable<int> iCountry)
@@ -3159,55 +3175,6 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenseById_Result>("usp_GetLicenseById", idParameter);
         }
-        public virtual ObjectResult<usp_GetLicenses_Result> usp_GetLicenses(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)
-        {
-            var sStartDateParameter = sStartDate != null ?
-                new ObjectParameter("sStartDate", sStartDate) :
-                new ObjectParameter("sStartDate", typeof(string));
-    
-            var sEndDateParameter = sEndDate != null ?
-                new ObjectParameter("sEndDate", sEndDate) :
-                new ObjectParameter("sEndDate", typeof(string));
-    
-            var sAccoutNumberParameter = sAccoutNumber != null ?
-                new ObjectParameter("sAccoutNumber", sAccoutNumber) :
-                new ObjectParameter("sAccoutNumber", typeof(string));
-    
-            var sLicenseeFirstNameParameter = sLicenseeFirstName != null ?
-                new ObjectParameter("sLicenseeFirstName", sLicenseeFirstName) :
-                new ObjectParameter("sLicenseeFirstName", typeof(string));
-    
-            var sLicenseeLastNameParameter = sLicenseeLastName != null ?
-                new ObjectParameter("sLicenseeLastName", sLicenseeLastName) :
-                new ObjectParameter("sLicenseeLastName", typeof(string));
-    
-            var iLicenseTypeIdParameter = iLicenseTypeId.HasValue ?
-                new ObjectParameter("iLicenseTypeId", iLicenseTypeId) :
-                new ObjectParameter("iLicenseTypeId", typeof(byte));
-    
-            var sInstituteNameParameter = sInstituteName != null ?
-                new ObjectParameter("sInstituteName", sInstituteName) :
-                new ObjectParameter("sInstituteName", typeof(string));
-    
-            var sEmailParameter = sEmail != null ?
-                new ObjectParameter("sEmail", sEmail) :
-                new ObjectParameter("sEmail", typeof(string));
-    
-            var iStateIdParameter = iStateId.HasValue ?
-                new ObjectParameter("iStateId", iStateId) :
-                new ObjectParameter("iStateId", typeof(int));
-    
-            var iCountryIdParameter = iCountryId.HasValue ?
-                new ObjectParameter("iCountryId", iCountryId) :
-                new ObjectParameter("iCountryId", typeof(int));
-    
-            var bisActiveParameter = bisActive.HasValue ?
-                new ObjectParameter("bisActive", bisActive) :
-                new ObjectParameter("bisActive", typeof(bool));
-    
-            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenses_Result>("usp_GetLicenses", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, sLicenseeFirstNameParameter, sLicenseeLastNameParameter, iLicenseTypeIdParameter, sInstituteNameParameter, sEmailParameter, iStateIdParameter, iCountryIdParameter, bisActiveParameter);
-        }
-    
         public virtual ObjectResult<usp_GetLicenseTypes_Result> usp_GetLicenseTypes()
         {
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetLicenseTypes_Result>("usp_GetLicenseTypes");
@@ -3530,5 +3497,201 @@ namespace AIAHTML5.ADMIN.API.Entity
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("usp_UpdateLicenseUserGroupUsers", userGroupIdParameter, userIdsParameter, status);
         }
+    
+        public virtual ObjectResult<usp_Getlicenses_Result> usp_Getlicenses(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)
+        {
+            var sStartDateParameter = sStartDate != null ?
+                new ObjectParameter("sStartDate", sStartDate) :
+                new ObjectParameter("sStartDate", typeof(string));
+    
+            var sEndDateParameter = sEndDate != null ?
+                new ObjectParameter("sEndDate", sEndDate) :
+                new ObjectParameter("sEndDate", typeof(string));
+    
+            var sAccoutNumberParameter = sAccoutNumber != null ?
+                new ObjectParameter("sAccoutNumber", sAccoutNumber) :
+                new ObjectParameter("sAccoutNumber", typeof(string));
+    
+            var sLicenseeFirstNameParameter = sLicenseeFirstName != null ?
+                new ObjectParameter("sLicenseeFirstName", sLicenseeFirstName) :
+                new ObjectParameter("sLicenseeFirstName", typeof(string));
+    
+            var sLicenseeLastNameParameter = sLicenseeLastName != null ?
+                new ObjectParameter("sLicenseeLastName", sLicenseeLastName) :
+                new ObjectParameter("sLicenseeLastName", typeof(string));
+    
+            var iLicenseTypeIdParameter = iLicenseTypeId.HasValue ?
+                new ObjectParameter("iLicenseTypeId", iLicenseTypeId) :
+                new ObjectParameter("iLicenseTypeId", typeof(byte));
+    
+            var sInstituteNameParameter = sInstituteName != null ?
+                new ObjectParameter("sInstituteName", sInstituteName) :
+                new ObjectParameter("sInstituteName", typeof(string));
+    
+            var sEmailParameter = sEmail != null ?
+                new ObjectParameter("sEmail", sEmail) :
+                new ObjectParameter("sEmail", typeof(string));
+    
+            var iStateIdParameter = iStateId.HasValue ?
+                new ObjectParameter("iStateId", iStateId) :
+                new ObjectParameter("iStateId", typeof(int));
+    
+            var iCountryIdParameter = iCountryId.HasValue ?
+                new ObjectParameter("iCountryId", iCountryId) :
+                new ObjectParameter("iCountryId", typeof(int));
+    
+            var bisActiveParameter = bisActive.HasValue ?
+                new ObjectParameter("bisActive", bisActive) :
+                new ObjectParameter("bisActive", typeof(bool));
+    
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_Getlicenses_Result>("usp_Getlicenses", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, sLicenseeFirstNameParameter, sLicenseeLastNameParameter, iLicenseTypeIdParameter, sInstituteNameParameter, sEmailParameter, iStateIdParameter, iCountryIdParameter, bisActiveParameter, pageNoParameter, pageLengthParameter, recordCount);
+        }
+    
+        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)
+        {
+            var sStartDateParameter = sStartDate != null ?
+                new ObjectParameter("sStartDate", sStartDate) :
+                new ObjectParameter("sStartDate", typeof(string));
+    
+            var sEndDateParameter = sEndDate != null ?
+                new ObjectParameter("sEndDate", sEndDate) :
+                new ObjectParameter("sEndDate", typeof(string));
+    
+            var sAccoutNumberParameter = sAccoutNumber != null ?
+                new ObjectParameter("sAccoutNumber", sAccoutNumber) :
+                new ObjectParameter("sAccoutNumber", typeof(string));
+    
+            var sLicenseeFirstNameParameter = sLicenseeFirstName != null ?
+                new ObjectParameter("sLicenseeFirstName", sLicenseeFirstName) :
+                new ObjectParameter("sLicenseeFirstName", typeof(string));
+    
+            var sLicenseeLastNameParameter = sLicenseeLastName != null ?
+                new ObjectParameter("sLicenseeLastName", sLicenseeLastName) :
+                new ObjectParameter("sLicenseeLastName", typeof(string));
+    
+            var iLicenseTypeIdParameter = iLicenseTypeId.HasValue ?
+                new ObjectParameter("iLicenseTypeId", iLicenseTypeId) :
+                new ObjectParameter("iLicenseTypeId", typeof(byte));
+    
+            var sInstituteNameParameter = sInstituteName != null ?
+                new ObjectParameter("sInstituteName", sInstituteName) :
+                new ObjectParameter("sInstituteName", typeof(string));
+    
+            var sEmailParameter = sEmail != null ?
+                new ObjectParameter("sEmail", sEmail) :
+                new ObjectParameter("sEmail", typeof(string));
+    
+            var iStateIdParameter = iStateId.HasValue ?
+                new ObjectParameter("iStateId", iStateId) :
+                new ObjectParameter("iStateId", typeof(int));
+    
+            var iCountryIdParameter = iCountryId.HasValue ?
+                new ObjectParameter("iCountryId", iCountryId) :
+                new ObjectParameter("iCountryId", typeof(int));
+    
+            var bisActiveParameter = bisActive.HasValue ?
+                new ObjectParameter("bisActive", bisActive) :
+                new ObjectParameter("bisActive", typeof(bool));
+    
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetlicensesList_Result>("usp_GetlicensesList", sStartDateParameter, sEndDateParameter, sAccoutNumberParameter, sLicenseeFirstNameParameter, sLicenseeLastNameParameter, iLicenseTypeIdParameter, sInstituteNameParameter, sEmailParameter, iStateIdParameter, iCountryIdParameter, bisActiveParameter, pageNoParameter, pageLengthParameter, recordCount);
+        }
+    
+        public virtual ObjectResult<GetSearchUserList1_Result> GetSearchUserList1(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)
+        {
+            var sFirstNameParameter = sFirstName != null ?
+                new ObjectParameter("sFirstName", sFirstName) :
+                new ObjectParameter("sFirstName", typeof(string));
+    
+            var sLastNameParameter = sLastName != null ?
+                new ObjectParameter("sLastName", sLastName) :
+                new ObjectParameter("sLastName", typeof(string));
+    
+            var sEmailIdParameter = sEmailId != null ?
+                new ObjectParameter("sEmailId", sEmailId) :
+                new ObjectParameter("sEmailId", typeof(string));
+    
+            var sAccoutNumberParameter = sAccoutNumber != null ?
+                new ObjectParameter("sAccoutNumber", sAccoutNumber) :
+                new ObjectParameter("sAccoutNumber", typeof(string));
+    
+            var iUserTypeIdParameter = iUserTypeId.HasValue ?
+                new ObjectParameter("iUserTypeId", iUserTypeId) :
+                new ObjectParameter("iUserTypeId", typeof(int));
+    
+            var iAccountTypeIdParameter = iAccountTypeId.HasValue ?
+                new ObjectParameter("iAccountTypeId", iAccountTypeId) :
+                new ObjectParameter("iAccountTypeId", typeof(int));
+    
+            var iLoginUserTypeParameter = iLoginUserType.HasValue ?
+                new ObjectParameter("iLoginUserType", iLoginUserType) :
+                new ObjectParameter("iLoginUserType", typeof(int));
+    
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSearchUserList1_Result>("GetSearchUserList1", sFirstNameParameter, sLastNameParameter, sEmailIdParameter, sAccoutNumberParameter, iUserTypeIdParameter, iAccountTypeIdParameter, iLoginUserTypeParameter, pageNoParameter, pageLengthParameter, recordCount);
+        }
+    
+        public virtual ObjectResult<GetSearchUsers_Result> GetSearchUsers(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)
+        {
+            var sFirstNameParameter = sFirstName != null ?
+                new ObjectParameter("sFirstName", sFirstName) :
+                new ObjectParameter("sFirstName", typeof(string));
+    
+            var sLastNameParameter = sLastName != null ?
+                new ObjectParameter("sLastName", sLastName) :
+                new ObjectParameter("sLastName", typeof(string));
+    
+            var sEmailIdParameter = sEmailId != null ?
+                new ObjectParameter("sEmailId", sEmailId) :
+                new ObjectParameter("sEmailId", typeof(string));
+    
+            var sAccoutNumberParameter = sAccoutNumber != null ?
+                new ObjectParameter("sAccoutNumber", sAccoutNumber) :
+                new ObjectParameter("sAccoutNumber", typeof(string));
+    
+            var iUserTypeIdParameter = iUserTypeId.HasValue ?
+                new ObjectParameter("iUserTypeId", iUserTypeId) :
+                new ObjectParameter("iUserTypeId", typeof(int));
+    
+            var iAccountTypeIdParameter = iAccountTypeId.HasValue ?
+                new ObjectParameter("iAccountTypeId", iAccountTypeId) :
+                new ObjectParameter("iAccountTypeId", typeof(int));
+    
+            var iLoginUserTypeParameter = iLoginUserType.HasValue ?
+                new ObjectParameter("iLoginUserType", iLoginUserType) :
+                new ObjectParameter("iLoginUserType", typeof(int));
+    
+            var pageNoParameter = pageNo.HasValue ?
+                new ObjectParameter("pageNo", pageNo) :
+                new ObjectParameter("pageNo", typeof(int));
+    
+            var pageLengthParameter = pageLength.HasValue ?
+                new ObjectParameter("pageLength", pageLength) :
+                new ObjectParameter("pageLength", typeof(int));
+    
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<GetSearchUsers_Result>("GetSearchUsers", sFirstNameParameter, sLastNameParameter, sEmailIdParameter, sAccoutNumberParameter, iUserTypeIdParameter, iAccountTypeIdParameter, iLoginUserTypeParameter, pageNoParameter, pageLengthParameter, recordCount);
+        }
     }
 }
@@ -2178,9 +2178,6 @@ warning 6002: The table/view &#39;AIADatabaseV5.dbo.VocabTermNumberToSystemMap&#39; does
           <Parameter Name="sLicenseAccount" Type="varchar" Mode="In" />
           <Parameter Name="iEditionId" Type="int" Mode="In" />
         </Function>
-        <Function Name="GetLicenseIdByUserId" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
-          <Parameter Name="iUserId" Type="int" Mode="In" />
-        </Function>
         <Function Name="GetLicenseIdEditionIdByUserId" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
           <Parameter Name="iUserId" Type="int" Mode="In" />
         </Function>
@@ -2228,6 +2225,21 @@ warning 6002: The table/view &#39;AIADatabaseV5.dbo.VocabTermNumberToSystemMap&#39; does
           <Parameter Name="iUserTypeId" Type="int" Mode="In" />
           <Parameter Name="iAccountTypeId" Type="int" Mode="In" />
           <Parameter Name="iLoginUserType" Type="int" Mode="In" />
+          <Parameter Name="pageNo" Type="int" Mode="In" />
+          <Parameter Name="pageLength" Type="int" Mode="In" />
+          <Parameter Name="recordCount" Type="int" Mode="InOut" />
+        </Function>
+        <Function Name="GetSearchUsers" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
+          <Parameter Name="sFirstName" Type="varchar" Mode="In" />
+          <Parameter Name="sLastName" Type="varchar" Mode="In" />
+          <Parameter Name="sEmailId" Type="varchar" Mode="In" />
+          <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
+          <Parameter Name="iUserTypeId" Type="int" Mode="In" />
+          <Parameter Name="iAccountTypeId" Type="int" Mode="In" />
+          <Parameter Name="iLoginUserType" Type="int" Mode="In" />
+          <Parameter Name="pageNo" Type="int" Mode="In" />
+          <Parameter Name="pageLength" Type="int" Mode="In" />
+          <Parameter Name="recordCount" Type="int" Mode="InOut" />
         </Function>
         <Function Name="GetSiteAccoutDetail" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
           <Parameter Name="strAccountNumber" Type="varchar" Mode="In" />
@@ -2273,6 +2285,9 @@ warning 6002: The table/view &#39;AIADatabaseV5.dbo.VocabTermNumberToSystemMap&#39; does
           <Parameter Name="sZip" Type="varchar" Mode="In" />
           <Parameter Name="iState" Type="int" Mode="In" />
           <Parameter Name="iCountry" Type="int" Mode="In" />
+          <Parameter Name="pageNo" Type="int" Mode="In" />
+          <Parameter Name="pageLength" Type="int" Mode="In" />
+          <Parameter Name="recordCount" Type="int" Mode="InOut" />
         </Function>
         <Function Name="GetUsageReport_OLD_PROC" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
           <Parameter Name="sFromDate" Type="varchar" Mode="In" />
@@ -2644,7 +2659,7 @@ warning 6002: The table/view &#39;AIADatabaseV5.dbo.VocabTermNumberToSystemMap&#39; does
           <Parameter Name="iLicenseId" Type="int" Mode="In" />
           <Parameter Name="iBuildingLevelId" Type="int" Mode="In" />
         </Function>
-        <Function Name="usp_GetLicenses" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
+        <Function Name="usp_GetlicensesList" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
           <Parameter Name="sStartDate" Type="varchar" Mode="In" />
           <Parameter Name="sEndDate" Type="varchar" Mode="In" />
           <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
@@ -2656,6 +2671,9 @@ warning 6002: The table/view &#39;AIADatabaseV5.dbo.VocabTermNumberToSystemMap&#39; does
           <Parameter Name="iStateId" Type="int" Mode="In" />
           <Parameter Name="iCountryId" Type="int" Mode="In" />
           <Parameter Name="bisActive" Type="bit" Mode="In" />
+          <Parameter Name="pageNo" Type="int" Mode="In" />
+          <Parameter Name="pageLength" Type="int" Mode="In" />
+          <Parameter Name="recordCount" Type="int" Mode="InOut" />
         </Function>
         <Function Name="usp_GetLicenseTypes" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo" />
         <Function Name="usp_GetLicenseUserGroups" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
@@ -2668,15 +2686,6 @@ warning 6002: The table/view &#39;AIADatabaseV5.dbo.VocabTermNumberToSystemMap&#39; does
         <Function Name="usp_GetProductEditionByLicense" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
           <Parameter Name="iLicenseId" Type="int" Mode="In" />
         </Function>
-        <Function Name="usp_GetSearchUserList" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
-          <Parameter Name="sFirstName" Type="varchar" Mode="In" />
-          <Parameter Name="sLastName" Type="varchar" Mode="In" />
-          <Parameter Name="sEmailId" Type="varchar" Mode="In" />
-          <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
-          <Parameter Name="iUserTypeId" Type="int" Mode="In" />
-          <Parameter Name="iAccountTypeId" Type="int" Mode="In" />
-          <Parameter Name="iLoginUserType" Type="int" Mode="In" />
-        </Function>
         <Function Name="usp_GetSiteAccountEditions" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
           <Parameter Name="SiteId" Type="int" Mode="In" />
           <Parameter Name="LicenseId" Type="int" Mode="In" />
@@ -5843,7 +5852,7 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
           </FunctionImport>
           <FunctionImport Name="GetSearchDetails" ReturnType="Collection(AIADatabaseV5Model.GetSearchDetails_Result)" />
           <FunctionImport Name="GetSearchTerms" ReturnType="Collection(AIADatabaseV5Model.GetSearchTerms_Result)" />
-          <FunctionImport Name="GetSearchUserList" ReturnType="Collection(AIADatabaseV5Model.GetSearchUserList_Result)">
+          <FunctionImport Name="GetSearchUserList">
             <Parameter Name="sFirstName" Mode="In" Type="String" />
             <Parameter Name="sLastName" Mode="In" Type="String" />
             <Parameter Name="sEmailId" Mode="In" Type="String" />
@@ -5851,6 +5860,9 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
             <Parameter Name="iUserTypeId" Mode="In" Type="Int32" />
             <Parameter Name="iAccountTypeId" Mode="In" Type="Int32" />
             <Parameter Name="iLoginUserType" Mode="In" Type="Int32" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
           </FunctionImport>
           <FunctionImport Name="GetSiteAccoutDetail" ReturnType="Collection(AIADatabaseV5Model.GetSiteAccoutDetail_Result)">
           <Parameter Name="strAccountNumber" Mode="In" Type="String" />
@@ -5896,6 +5908,9 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
             <Parameter Name="sZip" Mode="In" Type="String" />
             <Parameter Name="iState" Mode="In" Type="Int32" />
             <Parameter Name="iCountry" Mode="In" Type="Int32" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
           </FunctionImport>
           <FunctionImport Name="GetUsageReport_OLD_PROC" ReturnType="Collection(AIADatabaseV5Model.GetUsageReport_OLD_PROC_Result)">
             <Parameter Name="sFromDate" Mode="In" Type="String" />
@@ -6324,19 +6339,6 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
           <FunctionImport Name="usp_GetLicenseById" ReturnType="Collection(AIADatabaseV5Model.usp_GetLicenseById_Result)">
           <Parameter Name="Id" Mode="In" Type="Int32" />
           </FunctionImport>
-          <FunctionImport Name="usp_GetLicenses" ReturnType="Collection(AIADatabaseV5Model.usp_GetLicenses_Result)">
-            <Parameter Name="sStartDate" Mode="In" Type="String" />
-            <Parameter Name="sEndDate" Mode="In" Type="String" />
-            <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
-            <Parameter Name="sLicenseeFirstName" Mode="In" Type="String" />
-            <Parameter Name="sLicenseeLastName" Mode="In" Type="String" />
-            <Parameter Name="iLicenseTypeId" Mode="In" Type="Byte" />
-            <Parameter Name="sInstituteName" Mode="In" Type="String" />
-            <Parameter Name="sEmail" Mode="In" Type="String" />
-            <Parameter Name="iStateId" Mode="In" Type="Int32" />
-            <Parameter Name="iCountryId" Mode="In" Type="Int32" />
-            <Parameter Name="bisActive" Mode="In" Type="Boolean" />
-          </FunctionImport>
           <FunctionImport Name="usp_GetLicenseTypes" ReturnType="Collection(AIADatabaseV5Model.usp_GetLicenseTypes_Result)" />
           <FunctionImport Name="usp_GetManageRights" ReturnType="Collection(AIADatabaseV5Model.usp_GetManageRights_Result)">
             <Parameter Name="UserId" Mode="In" Type="Int32" />
@@ -6421,7 +6423,7 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
             <Parameter Name="Status" Mode="InOut" Type="Boolean" />
           </FunctionImport>
           <FunctionImport Name="usp_GetLicenseUserGroups" ReturnType="Collection(AIADatabaseV5Model.usp_GetLicenseUserGroups_Result)">
-            <Parameter Name="LicenseId" Mode="In" Type="Int32" />
+          <Parameter Name="LicenseId" Mode="In" Type="Int32" />
           </FunctionImport>
           <FunctionImport Name="usp_InsertUpdateLicenseUserGroup">
             <Parameter Name="Id" Mode="In" Type="Int32" />
@@ -6437,6 +6439,62 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
             <Parameter Name="UserIds" Mode="In" Type="String" />
             <Parameter Name="Status" Mode="InOut" Type="Boolean" />
           </FunctionImport>
+          <FunctionImport Name="usp_Getlicenses" ReturnType="Collection(AIADatabaseV5Model.usp_Getlicenses_Result)">
+            <Parameter Name="sStartDate" Mode="In" Type="String" />
+            <Parameter Name="sEndDate" Mode="In" Type="String" />
+            <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
+            <Parameter Name="sLicenseeFirstName" Mode="In" Type="String" />
+            <Parameter Name="sLicenseeLastName" Mode="In" Type="String" />
+            <Parameter Name="iLicenseTypeId" Mode="In" Type="Byte" />
+            <Parameter Name="sInstituteName" Mode="In" Type="String" />
+            <Parameter Name="sEmail" Mode="In" Type="String" />
+            <Parameter Name="iStateId" Mode="In" Type="Int32" />
+            <Parameter Name="iCountryId" Mode="In" Type="Int32" />
+            <Parameter Name="bisActive" Mode="In" Type="Boolean" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
+          </FunctionImport>
+          <FunctionImport Name="usp_GetlicensesList" ReturnType="Collection(AIADatabaseV5Model.usp_GetlicensesList_Result)">
+            <Parameter Name="sStartDate" Mode="In" Type="String" />
+            <Parameter Name="sEndDate" Mode="In" Type="String" />
+            <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
+            <Parameter Name="sLicenseeFirstName" Mode="In" Type="String" />
+            <Parameter Name="sLicenseeLastName" Mode="In" Type="String" />
+            <Parameter Name="iLicenseTypeId" Mode="In" Type="Byte" />
+            <Parameter Name="sInstituteName" Mode="In" Type="String" />
+            <Parameter Name="sEmail" Mode="In" Type="String" />
+            <Parameter Name="iStateId" Mode="In" Type="Int32" />
+            <Parameter Name="iCountryId" Mode="In" Type="Int32" />
+            <Parameter Name="bisActive" Mode="In" Type="Boolean" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
+          </FunctionImport>
+          <FunctionImport Name="GetSearchUserList1" ReturnType="Collection(AIADatabaseV5Model.GetSearchUserList1_Result)">
+            <Parameter Name="sFirstName" Mode="In" Type="String" />
+            <Parameter Name="sLastName" Mode="In" Type="String" />
+            <Parameter Name="sEmailId" Mode="In" Type="String" />
+            <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
+            <Parameter Name="iUserTypeId" Mode="In" Type="Int32" />
+            <Parameter Name="iAccountTypeId" Mode="In" Type="Int32" />
+            <Parameter Name="iLoginUserType" Mode="In" Type="Int32" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
+          </FunctionImport>
+          <FunctionImport Name="GetSearchUsers" ReturnType="Collection(AIADatabaseV5Model.GetSearchUsers_Result)">
+            <Parameter Name="sFirstName" Mode="In" Type="String" />
+            <Parameter Name="sLastName" Mode="In" Type="String" />
+            <Parameter Name="sEmailId" Mode="In" Type="String" />
+            <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
+            <Parameter Name="iUserTypeId" Mode="In" Type="Int32" />
+            <Parameter Name="iAccountTypeId" Mode="In" Type="Int32" />
+            <Parameter Name="iLoginUserType" Mode="In" Type="Int32" />
+            <Parameter Name="pageNo" Mode="In" Type="Int32" />
+            <Parameter Name="pageLength" Mode="In" Type="Int32" />
+            <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
+          </FunctionImport>
         </EntityContainer>
         <ComplexType Name="DA_GetBaseLayer_Result">
           <Property Type="Int32" Name="Id" Nullable="false" />
@@ -6972,23 +7030,6 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
           <Property Type="Int32" Name="PhraseId" Nullable="false" />
           <Property Type="Int32" Name="LexiconId" Nullable="true" />
         </ComplexType>
-        <ComplexType Name="GetSearchUserList_Result">
-          <Property Type="Int32" Name="Id" Nullable="true" />
-          <Property Type="String" Name="FirstName" Nullable="true" MaxLength="100" />
-          <Property Type="String" Name="LastName" Nullable="true" MaxLength="100" />
-          <Property Type="String" Name="LoginId" Nullable="true" MaxLength="50" />
-          <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
-          <Property Type="String" Name="UserTypeTitle" Nullable="true" MaxLength="50" />
-          <Property Type="String" Name="Password" Nullable="true" MaxLength="50" />
-          <Property Type="DateTime" Name="CreationDate" Nullable="true" Precision="23" />
-          <Property Type="DateTime" Name="ModifiedDate" Nullable="true" Precision="23" />
-          <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="50" />
-          <Property Type="String" Name="AccountTypeTitle" Nullable="true" MaxLength="50" />
-          <Property Type="String" Name="EditionType" Nullable="true" MaxLength="50" />
-          <Property Type="String" Name="UserStatus" Nullable="true" MaxLength="8" />
-          <Property Type="Int32" Name="UserTypeId" Nullable="true" />
-          <Property Type="Int32" Name="EditionTypeId" Nullable="true" />
-        </ComplexType>
         <ComplexType Name="GetSiteAccoutDetail_Result">
           <Property Type="Int32" Name="Id" Nullable="false" />
           <Property Type="String" Name="SiteIp" Nullable="true" MaxLength="2000" />
@@ -7071,6 +7112,7 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
           <Property Type="String" Name="InstitutionName" Nullable="true" MaxLength="100" />
           <Property Type="Int32" Name="TotalLogins" Nullable="true" />
           <Property Type="String" Name="LastLogin" Nullable="true" MaxLength="30" />
+          <Property Type="Int64" Name="RowNum" Nullable="true" />
         </ComplexType>
         <ComplexType Name="GetUsageReport_OLD_PROC_Result">
           <Property Type="String" Name="LoginId" Nullable="true" MaxLength="50" />
@@ -7323,28 +7365,6 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
           <Property Type="DateTime" Name="RenewalDate" Nullable="true" Precision="23" />
           <Property Type="Boolean" Name="IsActive" Nullable="false" />
         </ComplexType>
-        <ComplexType Name="usp_GetLicenses_Result">
-          <Property Type="Int32" Name="LicenseId" Nullable="false" />
-          <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="16" />
-          <Property Type="String" Name="LicenseType" Nullable="false" MaxLength="50" />
-          <Property Type="String" Name="AccountType" Nullable="false" MaxLength="50" />
-          <Property Type="String" Name="InstitutionName" Nullable="true" MaxLength="100" />
-          <Property Type="String" Name="LicenseState" Nullable="false" MaxLength="50" />
-          <Property Type="String" Name="LicenseCountry" Nullable="false" MaxLength="50" />
-          <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
-          <Property Type="Int32" Name="CardNumber" Nullable="true" />
-          <Property Type="String" Name="ProductKey" Nullable="true" MaxLength="50" />
-          <Property Type="String" Name="ClientAdmin" Nullable="true" />
-          <Property Type="String" Name="LicenseeName" Nullable="false" MaxLength="101" />
-          <Property Type="String" Name="ContactAddress" Nullable="false" MaxLength="252" />
-          <Property Type="String" Name="EntryDate" Nullable="true" MaxLength="30" />
-          <Property Type="String" Name="LicenseStatus" Nullable="false" MaxLength="8" />
-          <Property Type="String" Name="ModifyDate" Nullable="false" MaxLength="30" />
-          <Property Type="String" Name="StartDate" Nullable="true" MaxLength="30" />
-          <Property Type="String" Name="RenewDate" Nullable="false" MaxLength="30" />
-          <Property Type="String" Name="EndDate" Nullable="true" MaxLength="30" />
-          <Property Type="Int32" Name="NoofImages" Nullable="true" />
-        </ComplexType>
         <ComplexType Name="usp_GetLicenseTypes_Result">
           <Property Type="Byte" Name="Id" Nullable="false" />
           <Property Type="String" Name="Title" Nullable="false" MaxLength="50" />
@@ -7399,6 +7419,85 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
           <Property Type="Boolean" Name="IsActive" Nullable="false" />
           <Property Type="Int32" Name="TotalUsers" Nullable="true" />
         </ComplexType>
+        <ComplexType Name="usp_Getlicenses_Result">
+          <Property Type="Int32" Name="LicenseId" Nullable="false" />
+          <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="16" />
+          <Property Type="String" Name="LicenseType" Nullable="false" MaxLength="50" />
+          <Property Type="String" Name="AccountType" Nullable="false" MaxLength="50" />
+          <Property Type="String" Name="InstitutionName" Nullable="true" MaxLength="100" />
+          <Property Type="String" Name="LicenseState" Nullable="false" MaxLength="50" />
+          <Property Type="String" Name="LicenseCountry" Nullable="false" MaxLength="50" />
+          <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
+          <Property Type="Int32" Name="CardNumber" Nullable="true" />
+          <Property Type="String" Name="ProductKey" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="ClientAdmin" Nullable="true" />
+          <Property Type="String" Name="LicenseeName" Nullable="false" MaxLength="101" />
+          <Property Type="String" Name="ContactAddress" Nullable="false" MaxLength="252" />
+          <Property Type="String" Name="EntryDate" Nullable="true" MaxLength="30" />
+          <Property Type="String" Name="LicenseStatus" Nullable="false" MaxLength="8" />
+          <Property Type="String" Name="ModifyDate" Nullable="false" MaxLength="30" />
+          <Property Type="String" Name="StartDate" Nullable="true" MaxLength="30" />
+          <Property Type="String" Name="RenewDate" Nullable="false" MaxLength="30" />
+          <Property Type="String" Name="EndDate" Nullable="true" MaxLength="30" />
+          <Property Type="Int32" Name="NoofImages" Nullable="true" />
+        </ComplexType>
+        <ComplexType Name="usp_GetlicensesList_Result">
+          <Property Type="Int32" Name="LicenseId" Nullable="false" />
+          <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="16" />
+          <Property Type="String" Name="LicenseType" Nullable="false" MaxLength="50" />
+          <Property Type="String" Name="AccountType" Nullable="false" MaxLength="50" />
+          <Property Type="String" Name="InstitutionName" Nullable="true" MaxLength="100" />
+          <Property Type="String" Name="LicenseState" Nullable="false" MaxLength="50" />
+          <Property Type="String" Name="LicenseCountry" Nullable="false" MaxLength="50" />
+          <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
+          <Property Type="Int32" Name="CardNumber" Nullable="true" />
+          <Property Type="String" Name="ProductKey" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="ClientAdmin" Nullable="true" />
+          <Property Type="String" Name="LicenseeName" Nullable="false" MaxLength="101" />
+          <Property Type="String" Name="ContactAddress" Nullable="false" MaxLength="252" />
+          <Property Type="String" Name="EntryDate" Nullable="true" MaxLength="30" />
+          <Property Type="String" Name="LicenseStatus" Nullable="false" MaxLength="8" />
+          <Property Type="String" Name="ModifyDate" Nullable="false" MaxLength="30" />
+          <Property Type="String" Name="StartDate" Nullable="true" MaxLength="30" />
+          <Property Type="String" Name="RenewDate" Nullable="false" MaxLength="30" />
+          <Property Type="String" Name="EndDate" Nullable="true" MaxLength="30" />
+          <Property Type="Int32" Name="NoofImages" Nullable="true" />
+        </ComplexType>
+        <ComplexType Name="GetSearchUserList1_Result">
+          <Property Type="Int32" Name="Id" Nullable="true" />
+          <Property Type="String" Name="FirstName" Nullable="true" MaxLength="100" />
+          <Property Type="String" Name="LastName" Nullable="true" MaxLength="100" />
+          <Property Type="String" Name="LoginId" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="UserTypeTitle" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="Password" Nullable="true" MaxLength="50" />
+          <Property Type="DateTime" Name="CreationDate" Nullable="true" Precision="23" />
+          <Property Type="DateTime" Name="ModifiedDate" Nullable="true" Precision="23" />
+          <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="AccountTypeTitle" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="EditionType" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="UserStatus" Nullable="true" MaxLength="8" />
+          <Property Type="Int32" Name="UserTypeId" Nullable="true" />
+          <Property Type="Int32" Name="EditionTypeId" Nullable="true" />
+        </ComplexType>
+        <ComplexType Name="GetSearchUsers_Result">
+        <Property Type="Int64" Name="RowNum" Nullable="true" />
+          <Property Type="Int32" Name="Id" Nullable="true" />
+          <Property Type="String" Name="FirstName" Nullable="true" MaxLength="100" />
+          <Property Type="String" Name="LastName" Nullable="true" MaxLength="100" />
+          <Property Type="String" Name="LoginId" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="EmailId" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="UserTypeTitle" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="Password" Nullable="true" MaxLength="50" />
+          <Property Type="DateTime" Name="CreationDate" Nullable="true" Precision="23" />
+          <Property Type="DateTime" Name="ModifiedDate" Nullable="true" Precision="23" />
+          <Property Type="String" Name="AccountNumber" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="AccountTypeTitle" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="EditionType" Nullable="true" MaxLength="50" />
+          <Property Type="String" Name="UserStatus" Nullable="true" MaxLength="8" />
+          <Property Type="Int32" Name="UserTypeId" Nullable="true" />
+          <Property Type="Int32" Name="EditionTypeId" Nullable="true" />
+        </ComplexType>
       </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -9192,7 +9291,6 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
               </ComplexTypeMapping>
             </ResultMapping>
           </FunctionImportMapping>
-          <FunctionImportMapping FunctionImportName="GetLicenseIdByUserId" FunctionName="AIADatabaseV5Model.Store.GetLicenseIdByUserId" />
           <FunctionImportMapping FunctionImportName="GetLicenseIdEditionIdByUserId" FunctionName="AIADatabaseV5Model.Store.GetLicenseIdEditionIdByUserId">
             <ResultMapping>
               <ComplexTypeMapping TypeName="AIADatabaseV5Model.GetLicenseIdEditionIdByUserId_Result">
@@ -9287,27 +9385,6 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
               </ComplexTypeMapping>
             </ResultMapping>
           </FunctionImportMapping>
-          <FunctionImportMapping FunctionImportName="GetSearchUserList" FunctionName="AIADatabaseV5Model.Store.GetSearchUserList">
-            <ResultMapping>
-              <ComplexTypeMapping TypeName="AIADatabaseV5Model.GetSearchUserList_Result">
-                <ScalarProperty Name="Id" ColumnName="Id" />
-                <ScalarProperty Name="FirstName" ColumnName="FirstName" />
-                <ScalarProperty Name="LastName" ColumnName="LastName" />
-                <ScalarProperty Name="LoginId" ColumnName="LoginId" />
-                <ScalarProperty Name="EmailId" ColumnName="EmailId" />
-                <ScalarProperty Name="UserTypeTitle" ColumnName="UserTypeTitle" />
-                <ScalarProperty Name="Password" ColumnName="Password" />
-                <ScalarProperty Name="CreationDate" ColumnName="CreationDate" />
-                <ScalarProperty Name="ModifiedDate" ColumnName="ModifiedDate" />
-                <ScalarProperty Name="AccountNumber" ColumnName="AccountNumber" />
-                <ScalarProperty Name="AccountTypeTitle" ColumnName="AccountTypeTitle" />
-                <ScalarProperty Name="EditionType" ColumnName="EditionType" />
-                <ScalarProperty Name="UserStatus" ColumnName="UserStatus" />
-                <ScalarProperty Name="UserTypeId" ColumnName="UserTypeId" />
-                <ScalarProperty Name="EditionTypeId" ColumnName="EditionTypeId" />
-              </ComplexTypeMapping>
-            </ResultMapping>
-          </FunctionImportMapping>
           <FunctionImportMapping FunctionImportName="GetSiteAccoutDetail" FunctionName="AIADatabaseV5Model.Store.GetSiteAccoutDetail">
             <ResultMapping>
               <ComplexTypeMapping TypeName="AIADatabaseV5Model.GetSiteAccoutDetail_Result">
@@ -9427,6 +9504,7 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
                 <ScalarProperty Name="InstitutionName" ColumnName="InstitutionName" />
                 <ScalarProperty Name="TotalLogins" ColumnName="TotalLogins" />
                 <ScalarProperty Name="LastLogin" ColumnName="LastLogin" />
+                <ScalarProperty Name="RowNum" ColumnName="RowNum" />
               </ComplexTypeMapping>
             </ResultMapping>
           </FunctionImportMapping>
@@ -9740,30 +9818,6 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
           <FunctionImportMapping FunctionImportName="usp_UpdateSubscriptionPlan" FunctionName="AIADatabaseV5Model.Store.usp_UpdateSubscriptionPlan" />
           <FunctionImportMapping FunctionImportName="usp_InsertAIAUser" FunctionName="AIADatabaseV5Model.Store.usp_InsertAIAUser" />
           <FunctionImportMapping FunctionImportName="usp_UpdateblockedUser" FunctionName="AIADatabaseV5Model.Store.usp_UpdateblockedUser" />
-          <FunctionImportMapping FunctionImportName="usp_GetSearchUserList" FunctionName="AIADatabaseV5Model.Store.usp_GetSearchUserList">
-            <ResultMapping>
-              <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetSearchUserList_Result">
-                <ScalarProperty Name="Id" ColumnName="Id" />
-                <ScalarProperty Name="FirstName" ColumnName="FirstName" />
-                <ScalarProperty Name="LastName" ColumnName="LastName" />
-                <ScalarProperty Name="LoginId" ColumnName="LoginId" />
-                <ScalarProperty Name="EmailId" ColumnName="EmailId" />
-                <ScalarProperty Name="UserTypeTitle" ColumnName="UserTypeTitle" />
-                <ScalarProperty Name="Password" ColumnName="Password" />
-                <ScalarProperty Name="CreationDate" ColumnName="CreationDate" />
-                <ScalarProperty Name="ModifiedDate" ColumnName="ModifiedDate" />
-                <ScalarProperty Name="AccountNumber" ColumnName="AccountNumber" />
-                <ScalarProperty Name="AccountTypeTitle" ColumnName="AccountTypeTitle" />
-                <ScalarProperty Name="EditionType" ColumnName="EditionType" />
-                <ScalarProperty Name="UserStatus" ColumnName="UserStatus" />
-                <ScalarProperty Name="UserTypeId" ColumnName="UserTypeId" />
-                <ScalarProperty Name="EditionTypeId" ColumnName="EditionTypeId" />
-                <ScalarProperty Name="Createdby" ColumnName="Createdby" />
-                <ScalarProperty Name="Modifiedby" ColumnName="Modifiedby" />
-                <ScalarProperty Name="DeactivationDate" ColumnName="DeactivationDate" />
-              </ComplexTypeMapping>
-            </ResultMapping>
-          </FunctionImportMapping>
           <FunctionImportMapping FunctionImportName="usp_UpdateAIAUser" FunctionName="AIADatabaseV5Model.Store.usp_UpdateAIAUser" />
           <FunctionImportMapping FunctionImportName="usp_GetEditions" FunctionName="AIADatabaseV5Model.Store.usp_GetEditions">
             <ResultMapping>
@@ -9814,32 +9868,6 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
               </ComplexTypeMapping>
             </ResultMapping>
           </FunctionImportMapping>
-          <FunctionImportMapping FunctionImportName="usp_GetLicenses" FunctionName="AIADatabaseV5Model.Store.usp_GetLicenses">
-            <ResultMapping>
-              <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetLicenses_Result">
-                <ScalarProperty Name="LicenseId" ColumnName="LicenseId" />
-                <ScalarProperty Name="AccountNumber" ColumnName="AccountNumber" />
-                <ScalarProperty Name="LicenseType" ColumnName="LicenseType" />
-                <ScalarProperty Name="AccountType" ColumnName="AccountType" />
-                <ScalarProperty Name="InstitutionName" ColumnName="InstitutionName" />
-                <ScalarProperty Name="LicenseState" ColumnName="LicenseState" />
-                <ScalarProperty Name="LicenseCountry" ColumnName="LicenseCountry" />
-                <ScalarProperty Name="EmailId" ColumnName="EmailId" />
-                <ScalarProperty Name="CardNumber" ColumnName="CardNumber" />
-                <ScalarProperty Name="ProductKey" ColumnName="ProductKey" />
-                <ScalarProperty Name="ClientAdmin" ColumnName="ClientAdmin" />
-                <ScalarProperty Name="LicenseeName" ColumnName="LicenseeName" />
-                <ScalarProperty Name="ContactAddress" ColumnName="ContactAddress" />
-                <ScalarProperty Name="EntryDate" ColumnName="EntryDate" />
-                <ScalarProperty Name="LicenseStatus" ColumnName="LicenseStatus" />
-                <ScalarProperty Name="ModifyDate" ColumnName="ModifyDate" />
-                <ScalarProperty Name="StartDate" ColumnName="StartDate" />
-                <ScalarProperty Name="RenewDate" ColumnName="RenewDate" />
-                <ScalarProperty Name="EndDate" ColumnName="EndDate" />
-                <ScalarProperty Name="NoofImages" ColumnName="NoofImages" />
-              </ComplexTypeMapping>
-            </ResultMapping>
-          </FunctionImportMapping>
           <FunctionImportMapping FunctionImportName="usp_GetLicenseTypes" FunctionName="AIADatabaseV5Model.Store.usp_GetLicenseTypes">
             <ResultMapping>
               <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetLicenseTypes_Result">
@@ -9927,6 +9955,75 @@ FROM [dbo].[VocabTermNumberToSystemMap] AS [VocabTermNumberToSystemMap]&lt;/Definin
           </FunctionImportMapping>
           <FunctionImportMapping FunctionImportName="usp_InsertUpdateLicenseUserGroup" FunctionName="AIADatabaseV5Model.Store.usp_InsertUpdateLicenseUserGroup" />
           <FunctionImportMapping FunctionImportName="usp_UpdateLicenseUserGroupUsers" FunctionName="AIADatabaseV5Model.Store.usp_UpdateLicenseUserGroupUsers" />
+          <FunctionImportMapping FunctionImportName="usp_GetlicensesList" FunctionName="AIADatabaseV5Model.Store.usp_GetlicensesList">
+            <ResultMapping>
+              <ComplexTypeMapping TypeName="AIADatabaseV5Model.usp_GetlicensesList_Result">
+                <ScalarProperty Name="LicenseId" ColumnName="LicenseId" />
+                <ScalarProperty Name="AccountNumber" ColumnName="AccountNumber" />
+                <ScalarProperty Name="LicenseType" ColumnName="LicenseType" />
+                <ScalarProperty Name="AccountType" ColumnName="AccountType" />
+                <ScalarProperty Name="InstitutionName" ColumnName="InstitutionName" />
+                <ScalarProperty Name="LicenseState" ColumnName="LicenseState" />
+                <ScalarProperty Name="LicenseCountry" ColumnName="LicenseCountry" />
+                <ScalarProperty Name="EmailId" ColumnName="EmailId" />
+                <ScalarProperty Name="CardNumber" ColumnName="CardNumber" />
+                <ScalarProperty Name="ProductKey" ColumnName="ProductKey" />
+                <ScalarProperty Name="ClientAdmin" ColumnName="ClientAdmin" />
+                <ScalarProperty Name="LicenseeName" ColumnName="LicenseeName" />
+                <ScalarProperty Name="ContactAddress" ColumnName="ContactAddress" />
+                <ScalarProperty Name="EntryDate" ColumnName="EntryDate" />
+                <ScalarProperty Name="LicenseStatus" ColumnName="LicenseStatus" />
+                <ScalarProperty Name="ModifyDate" ColumnName="ModifyDate" />
+                <ScalarProperty Name="StartDate" ColumnName="StartDate" />
+                <ScalarProperty Name="RenewDate" ColumnName="RenewDate" />
+                <ScalarProperty Name="EndDate" ColumnName="EndDate" />
+                <ScalarProperty Name="NoofImages" ColumnName="NoofImages" />
+              </ComplexTypeMapping>
+            </ResultMapping>
+          </FunctionImportMapping>
+          <FunctionImportMapping FunctionImportName="GetSearchUserList1" FunctionName="AIADatabaseV5Model.Store.GetSearchUserList">
+            <ResultMapping>
+              <ComplexTypeMapping TypeName="AIADatabaseV5Model.GetSearchUserList1_Result">
+                <ScalarProperty Name="Id" ColumnName="Id" />
+                <ScalarProperty Name="FirstName" ColumnName="FirstName" />
+                <ScalarProperty Name="LastName" ColumnName="LastName" />
+                <ScalarProperty Name="LoginId" ColumnName="LoginId" />
+                <ScalarProperty Name="EmailId" ColumnName="EmailId" />
+                <ScalarProperty Name="UserTypeTitle" ColumnName="UserTypeTitle" />
+                <ScalarProperty Name="Password" ColumnName="Password" />
+                <ScalarProperty Name="CreationDate" ColumnName="CreationDate" />
+                <ScalarProperty Name="ModifiedDate" ColumnName="ModifiedDate" />
+                <ScalarProperty Name="AccountNumber" ColumnName="AccountNumber" />
+                <ScalarProperty Name="AccountTypeTitle" ColumnName="AccountTypeTitle" />
+                <ScalarProperty Name="EditionType" ColumnName="EditionType" />
+                <ScalarProperty Name="UserStatus" ColumnName="UserStatus" />
+                <ScalarProperty Name="UserTypeId" ColumnName="UserTypeId" />
+                <ScalarProperty Name="EditionTypeId" ColumnName="EditionTypeId" />
+              </ComplexTypeMapping>
+            </ResultMapping>
+          </FunctionImportMapping>
+          <FunctionImportMapping FunctionImportName="GetSearchUsers" FunctionName="AIADatabaseV5Model.Store.GetSearchUsers">
+            <ResultMapping>
+              <ComplexTypeMapping TypeName="AIADatabaseV5Model.GetSearchUsers_Result">
+              <ScalarProperty Name="RowNum" ColumnName="RowNum" />
+                <ScalarProperty Name="Id" ColumnName="Id" />
+                <ScalarProperty Name="FirstName" ColumnName="FirstName" />
+                <ScalarProperty Name="LastName" ColumnName="LastName" />
+                <ScalarProperty Name="LoginId" ColumnName="LoginId" />
+                <ScalarProperty Name="EmailId" ColumnName="EmailId" />
+                <ScalarProperty Name="UserTypeTitle" ColumnName="UserTypeTitle" />
+                <ScalarProperty Name="Password" ColumnName="Password" />
+                <ScalarProperty Name="CreationDate" ColumnName="CreationDate" />
+                <ScalarProperty Name="ModifiedDate" ColumnName="ModifiedDate" />
+                <ScalarProperty Name="AccountNumber" ColumnName="AccountNumber" />
+                <ScalarProperty Name="AccountTypeTitle" ColumnName="AccountTypeTitle" />
+                <ScalarProperty Name="EditionType" ColumnName="EditionType" />
+                <ScalarProperty Name="UserStatus" ColumnName="UserStatus" />
+                <ScalarProperty Name="UserTypeId" ColumnName="UserTypeId" />
+                <ScalarProperty Name="EditionTypeId" ColumnName="EditionTypeId" />
+              </ComplexTypeMapping>
+            </ResultMapping>
+          </FunctionImportMapping>
         </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>
@@ -11,7 +11,7 @@ namespace AIAHTML5.ADMIN.API.Entity
 {
     using System;
-    public partial class GetSearchUserList_Result
+    public partial class GetSearchUserList1_Result
     {
         public Nullable<int> Id { get; set; }
         public string FirstName { get; set; }
+//------------------------------------------------------------------------------
+// <auto-generated>
+//    This code was generated from a template.
+//
+//    Manual changes to this file may cause unexpected behavior in your application.
+//    Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace AIAHTML5.ADMIN.API.Entity
+{
+    using System;
+    
+    public partial class GetSearchUsers_Result
+    {
+        public Nullable<long> RowNum { get; set; }
+        public Nullable<int> Id { get; set; }
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public string LoginId { get; set; }
+        public string EmailId { get; set; }
+        public string UserTypeTitle { get; set; }
+        public string Password { get; set; }
+        public Nullable<System.DateTime> CreationDate { get; set; }
+        public Nullable<System.DateTime> ModifiedDate { get; set; }
+        public string AccountNumber { get; set; }
+        public string AccountTypeTitle { get; set; }
+        public string EditionType { get; set; }
+        public string UserStatus { get; set; }
+        public Nullable<int> UserTypeId { get; set; }
+        public Nullable<int> EditionTypeId { get; set; }
+    }
+}
@@ -26,5 +26,6 @@ namespace AIAHTML5.ADMIN.API.Entity
         public string InstitutionName { get; set; }
         public Nullable<int> TotalLogins { get; set; }
         public string LastLogin { get; set; }
+        public Nullable<long> RowNum { get; set; }
     }
 }
@@ -11,7 +11,7 @@ namespace AIAHTML5.ADMIN.API.Entity
 {
     using System;
-    public partial class usp_GetLicenses_Result
+    public partial class usp_Getlicenses_Result
     {
         public int LicenseId { get; set; }
         public string AccountNumber { get; set; }
+//------------------------------------------------------------------------------
+// <auto-generated>
+//    This code was generated from a template.
+//
+//    Manual changes to this file may cause unexpected behavior in your application.
+//    Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace AIAHTML5.ADMIN.API.Entity
+{
+    using System;
+    
+    public partial class usp_GetlicensesList_Result
+    {
+        public int LicenseId { get; set; }
+        public string AccountNumber { get; set; }
+        public string LicenseType { get; set; }
+        public string AccountType { get; set; }
+        public string InstitutionName { get; set; }
+        public string LicenseState { get; set; }
+        public string LicenseCountry { get; set; }
+        public string EmailId { get; set; }
+        public Nullable<int> CardNumber { get; set; }
+        public string ProductKey { get; set; }
+        public string ClientAdmin { get; set; }
+        public string LicenseeName { get; set; }
+        public string ContactAddress { get; set; }
+        public string EntryDate { get; set; }
+        public string LicenseStatus { get; set; }
+        public string ModifyDate { get; set; }
+        public string StartDate { get; set; }
+        public string RenewDate { get; set; }
+        public string EndDate { get; set; }
+        public Nullable<int> NoofImages { get; set; }
+    }
+}
@@ -21,7 +21,7 @@ namespace AIAHTML5.ADMIN.API.Models
             DiscountCodeModel DiscountCodeObj = new DiscountCodeModel();
             try
             {
-                var result = dbContext.GetDiscountCodes(discountCode, startDate.ToString(), endDate.ToString()).ToList();
+                var result = dbContext.GetDiscountCodes(discountCode, startDate.ToString("MM/dd/yyyy"), endDate.ToString("MM/dd/yyyy")).ToList();
                 if (result.Count > 0)
                 {
                     foreach (var item in result)
@@ -57,20 +57,21 @@ namespace AIAHTML5.ADMIN.API.Models
         public bool IsRenew { get; set; }
         public static List<LicenseModel> GetLicenses(AIADatabaseV5Entities dbContext, string accountNumber, string licenseeFirstName,
-            string licenseeLastName, byte licenseTypeId, string institutionName, int stateId, int countryId, string emailId,
-            DateTime subscriptionStartDate, DateTime subscriptionEndDate, bool isActive)
+              string licenseeLastName, byte licenseTypeId, string institutionName, int stateId, int countryId, string emailId,
+              DateTime subscriptionStartDate, DateTime subscriptionEndDate, bool isActive, int pageNo, int pageLength, out int recordCount)
         {
             List<LicenseModel> LicenseList = new List<LicenseModel>();
             LicenseModel LicenseObj = new LicenseModel();
-            int i = 0;
+            var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
+            recordCount = 0;
             try
             {
-                var result = dbContext.usp_GetLicenses(
+                var result = dbContext.usp_GetlicensesList(
                     (subscriptionStartDate > DateTime.MinValue ? subscriptionStartDate.ToShortDateString() : "01/01/01"),
                     (subscriptionEndDate > DateTime.MinValue ? subscriptionEndDate.ToShortDateString() : "01/01/01"),
                     (accountNumber == null ? "" : accountNumber), (licenseeFirstName == null ? "" : licenseeFirstName),
                     (licenseeLastName == null ? "" : licenseeLastName), licenseTypeId, (institutionName == null ? "" : institutionName),
-                    (emailId == null ? "" : emailId), stateId, countryId, isActive).ToList();
+                    (emailId == null ? "" : emailId), stateId, countryId, isActive, pageNo, pageLength, spRecordCount).ToList();
                 if (result.Count > 0)
                 {
                     foreach (var item in result)
@@ -97,9 +98,8 @@ namespace AIAHTML5.ADMIN.API.Models
                         LicenseObj.ModifyDate = DateTime.ParseExact((item.ModifyDate == "" ? "01/01/0001" : item.ModifyDate), "MM/dd/yyyy", System.Globalization.CultureInfo.CurrentCulture);
                         LicenseObj.IsActive = (item.LicenseStatus == "Active" ? true : false);
                         LicenseList.Add(LicenseObj);
-                        i++;
-                        if (i >= 100) break;
                     }
+                    recordCount = (int)spRecordCount.Value;
                 }
             }
             catch (Exception ex) { }
@@ -161,5 +161,6 @@ namespace AIAHTML5.ADMIN.API.Models
                 return false;
             }
         }
+
     }
 }
 \ No newline at end of file
@@ -12,6 +12,7 @@
     <add key="webpages:Enabled" value="false" />
     <add key="ClientValidationEnabled" value="true" />
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+    <add key="Enablecors" value="false"/>
   </appSettings>
   <system.web>
     <compilation debug="true" targetFramework="4.5" />
+
+if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[GetSearchUsers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+drop procedure [dbo].[GetLicenseIdByUserId]
+GO
+alter PROCEDURE [dbo].[GetSearchUsers]--'','','','',0,0,0,1,10,0  
+ -- Add the parameters for the stored procedure here  
+ @sFirstName varchar(100) = '', @sLastName varchar(100) = '', @sEmailId varchar(100) = '',   
+ @sAccoutNumber varchar(100) ='', @iUserTypeId int, @iAccountTypeId int, @iLoginUserType int,
+ @pageNo int, @pageLength int, @recordCount int out  
+AS  
+BEGIN  
+ IF 1=0 BEGIN  
+  SET FMTONLY OFF  
+ END  
+   
+ DECLARE @SQL NVARCHAR(MAX)  
+ -- create a temporary table to store the desired results of user on the basis of parameter  
+ CREATE TABLE #UserResult  
+ ( 
+  RowNums int IDENTITY PRIMARY KEY, 
+  Id INT,  
+  FirstName VARCHAR(100),  
+  LastName VARCHAR(100),  
+  LoginId VARCHAR(50),  
+  EmailId VARCHAR(50),  
+  UserTypeTitle VARCHAR(50),  
+  Password VARCHAR(50),  
+  CreationDate DATETIME,  
+  ModifiedDate DATETIME,  
+  AccountNumber VARCHAR(50) DEFAULT '',  
+  AccountTypeTitle VARCHAR(50) DEFAULT '',  
+  EditionType VARCHAR(50) DEFAULT '',  
+  UserStatus VARCHAR(8),  
+  UserTypeId INT,  
+  EditionTypeId INT DEFAULT ''  
+ )  
+ /*SET @sFirstName = REPLACE(@sFirstName,' ',' OR ')  
+ SET @sLastName = REPLACE(@sLastName,' ',' OR ')*/  
+ SET @SQL = ''  
+ IF LEN(@sAccoutNumber) > 0 OR @iAccountTypeId > 0  
+ BEGIN  
+  -- fetch account number, state, zip, country of the license to which the user is belonged    
+   
+  SET @SQL = 'INSERT INTO #UserResult (Id, FirstName, LastName, LoginId, EmailId, UserTypeTitle, Password, CreationDate,  
+   ModifiedDate, AccountNumber, AccountTypeTitle, EditionType, UserStatus, UserTypeId, EditionTypeId)  
+   SELECT  AIAUser.Id, ISNULL(AIAUser.FirstName,''''), ISNULL(AIAUser.LastName,''''), AIAUser.LoginId, ISNULL(AIAUser.EmailId,'''') as EmailId,  
+   UserType.Title as UserTypeTitle, AIAUser.Password, AIAUser.CreationDate, ISNULL(AIAUser.ModifiedDate,'''') as ModifiedDate,   
+   ISNULL(License.AccountNumber,'''') as AccountNumber, ISNULL(AccountType.Title,'''') as AccountTypeTitle,  
+   ISNULL(Edition.Title,'''') as EditionType,   
+   (CASE AIAUser.IsActive WHEN 1 THEN ''Active'' ELSE ''Inactive'' END) as UserStatus,   
+   UserType.Id as UserTypeId, ISNULL(Edition.Id,'''') as EditionTypeId  
+   FROM AIAUser   
+   INNER JOIN UserType ON UserType.Id = AIAUser.UserTypeId  
+   INNER JOIN AIAUserToLicenseEdition ON AIAUser.Id = AIAUserToLicenseEdition.UserId  
+   INNER JOIN LicenseToEdition ON AIAUserToLicenseEdition.LicenseEditionId = LicenseToEdition.Id  
+   INNER JOIN License ON LicenseToEdition.LicenseId = License.Id  
+   INNER JOIN AccountType ON AccountType.Id = License.AccountTypeId  
+   INNER JOIN Edition ON Edition.Id = LicenseToEdition.EditionId  
+      WHERE  
+   License.IsActive = 1  
+   AND UserType.Priority >' +CONVERT(VARCHAR(20),@iLoginUserType)  
+  
+  IF LEN(@sAccoutNumber)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND License.AccountNumber = '''+@sAccoutNumber+''''  
+  END  
+  IF @iAccountTypeId > 0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND License.AccountTypeId = '''+CONVERT(VARCHAR(20),@iAccountTypeId)+''''  
+  END  
+  IF LEN(@sFirstName)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND (AIAUser.FirstName LIKE ''%'+@sFirstName+'%'')' --CONTAINS(AIAUser.FirstName, '''+@sFirstName+''')'  
+  END  
+  IF LEN(@sLastName)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND (AIAUser.LastName LIKE ''%'+@sLastName+'%'')'--CONTAINS(AIAUser.LastName, '''+@sLastName+''')'  
+  END  
+  IF LEN(@sEmailId)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND AIAUser.EmailId = '''+@sEmailId+''''  
+  END  
+  IF @iUserTypeId>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND AIAUser.UserTypeId = '''+CONVERT(VARCHAR(20),@iUserTypeId)+''''  
+  END  
+   -- select @SQL
+  EXEC SP_EXECUTESQL @SQL  
+     
+ END  
+ ELSE  
+ BEGIN  
+  
+  SET @SQL = 'INSERT INTO #UserResult (Id, FirstName, LastName, LoginId, EmailId, UserTypeTitle, Password, CreationDate,  
+   ModifiedDate, UserStatus, UserTypeId)   
+   SELECT AIAUser.Id, ISNULL(AIAUser.FirstName,''''), ISNULL(AIAUser.LastName,''''),   
+   AIAUser.LoginId, ISNULL(AIAUser.EmailId,''''), UserType.Title, AIAUser.Password, AIAUser.CreationDate,   
+   ISNULL(AIAUser.ModifiedDate,''''), (CASE AIAUser.IsActive WHEN 1 THEN ''Active'' ELSE ''Inactive'' END),   
+   UserType.Id   
+   FROM AIAUser   
+   INNER JOIN UserType ON UserType.Id = AIAUser.UserTypeId  
+   WHERE UserType.Title in (''General Admin'')'  
+    
+  IF LEN(@sFirstName)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND (AIAUser.FirstName LIKE ''%'+@sFirstName+'%'')'--CONTAINS(AIAUser.FirstName, '''+@sFirstName+''')'  
+  END  
+  IF LEN(@sLastName)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND (AIAUser.LastName LIKE ''%'+@sLastName+'%'')'--CONTAINS(AIAUser.LastName, '''+@sLastName+''')'  
+  END  
+  IF LEN(@sEmailId)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND AIAUser.EmailId = '''+@sEmailId+''''
+  END  
+  IF @iUserTypeId>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND AIAUser.UserTypeId = '''+CONVERT(VARCHAR(20),@iUserTypeId)+''''  
+  END  
+  -- select  @SQL
+  EXEC SP_EXECUTESQL @SQL  
+    
+  -- fetch account number, state, zip, country of the license to which the user is belonged  
+  SET @SQL = 'INSERT INTO #UserResult (Id, FirstName, LastName, LoginId, EmailId, UserTypeTitle, Password, CreationDate,  
+   ModifiedDate, AccountNumber, AccountTypeTitle, EditionType, UserStatus, UserTypeId, EditionTypeId)   
+   SELECT  AIAUser.Id, ISNULL(AIAUser.FirstName,''''), ISNULL(AIAUser.LastName,''''), AIAUser.LoginId, ISNULL(AIAUser.EmailId,''''),   
+   UserType.Title, AIAUser.Password, AIAUser.CreationDate, ISNULL(AIAUser.ModifiedDate,''''),   
+   License.AccountNumber, AccountType.Title, Edition.Title,   
+   (CASE AIAUser.IsActive WHEN 1 THEN ''Active'' ELSE ''Inactive'' END), UserType.Id, Edition.Id  
+   FROM AIAUser   
+   INNER JOIN UserType ON UserType.Id = AIAUser.UserTypeId  
+   INNER JOIN AIAUserToLicenseEdition ON AIAUser.Id = AIAUserToLicenseEdition.UserId  
+   INNER JOIN LicenseToEdition ON AIAUserToLicenseEdition.LicenseEditionId = LicenseToEdition.Id  
+   INNER JOIN License ON LicenseToEdition.LicenseId = License.Id  
+   INNER JOIN AccountType ON AccountType.Id = License.AccountTypeId  
+   INNER JOIN Edition ON Edition.Id = LicenseToEdition.EditionId  
+         WHERE   
+   UserType.Title NOT IN (''Super Admin'',''General Admin'')  
+   AND License.IsActive = 1'  
+     
+  IF LEN(@sAccoutNumber)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND License.AccountNumber = '''+@sAccoutNumber+''''  
+  END  
+  IF @iAccountTypeId > 0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND License.AccountTypeId = '''+CONVERT(VARCHAR(20),@iAccountTypeId)+''''  
+  END  
+  IF LEN(@sFirstName)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND (AIAUser.FirstName LIKE ''%'+@sFirstName+'%'')'--CONTAINS(AIAUser.FirstName, '''+@sFirstName+''')'  
+  END  
+  IF LEN(@sLastName)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND (AIAUser.LastName LIKE ''%'+@sLastName+'%'')'--CONTAINS(AIAUser.LastName, '''+@sLastName+''')'  
+  END  
+  IF LEN(@sEmailId)>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND AIAUser.EmailId = '''+@sEmailId+''''  
+  END  
+  IF @iUserTypeId>0  
+  BEGIN  
+   SET @SQL = @SQL + ' AND AIAUser.UserTypeId = '''+CONVERT(VARCHAR(20),@iUserTypeId)+''''  
+  END  
+  --select @SQL
+  EXEC SP_EXECUTESQL @SQL  
+  
+ END  
+ -- Selecting the desired result from temporary table
+ Select  RowNum,Id, FirstName, LastName,LoginId, EmailId,UserTypeTitle, Password, CreationDate,  
+  ModifiedDate, AccountNumber, AccountTypeTitle, EditionType, UserStatus, UserTypeId,EditionTypeId
+   from (  
+ SELECT   ROW_NUMBER() OVER (ORDER BY Id) AS RowNum ,Id, FirstName, LastName, LoginId, EmailId, UserTypeTitle, Password, CreationDate,  
+  ModifiedDate, AccountNumber, AccountTypeTitle, EditionType, UserStatus, UserTypeId, EditionTypeId FROM #UserResult) as usr
+ WHERE RowNum > @pageLength * (@pageNo - 1) AND 	RowNum <= @pageLength * @pageNo   order by Id --RowNum BETWEEN @pageNo AND (@pageNo - 1) * @pageLength
+--SELECT  RowNum, Id, FirstName, LastName, LoginId, EmailId, UserTypeTitle, Password, CreationDate,  
+--  ModifiedDate, AccountNumber, AccountTypeTitle, EditionType, UserStatus, UserTypeId, EditionTypeId FROM #UserResult
+--  where RowNum > (@pageLength * (@pageNo - 1)) AND (RowNo <= (@pageLength * @pageNo))   order by RowNum
+ -- order by Id
+ -- order by Id OFFSET ((@pageNo - 1) * @pageLength) ROWS	FETCH NEXT @pageLength ROWS ONLY;
+
+
+
+  --Calculate total number of records
+  select @recordCount = count(ResultTable.Id) from (SELECT Id, FirstName, LastName, LoginId, EmailId, UserTypeTitle, Password, CreationDate,  
+  ModifiedDate, AccountNumber, AccountTypeTitle, EditionType, UserStatus, UserTypeId, EditionTypeId FROM #UserResult) as ResultTable;
+
+ -- Dropping the temporary table  
+  DROP TABLE #UserResult   
+END  
+
 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetUsageReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetUsageReport.StoredProcedure.sql differ
-
-SET QUOTED_IDENTIFIER ON 
-GO
-SET ANSI_NULLS ON 
-GO
-
-if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[usp_GetUserType]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
-drop procedure [dbo].[usp_GetUserType]
-GO
-
-
--- =============================================    
--- Author:  magic    
--- Create date: 7/4/2009    
--- Description: Fetch AccountType List    
--- =============================================    
-CREATE PROCEDURE [dbo].[usp_GetUserType]     
+   
+alter PROCEDURE [dbo].[usp_GetUserType]      
  -- Add the parameters for the stored procedure here    
  @id int  
 AS    
@@ -31,18 +16,11 @@ BEGIN
    else   
    begin  
    select Id,Title    
-  from UserType where IsActive=1   
+  from UserType where IsActive=1 and Id > 1
+ORDER BY Priority  
    end  
 END    
-GO
-SET QUOTED_IDENTIFIER OFF 
-GO
-SET ANSI_NULLS ON 
-GO
-    
-    
-    
 \ No newline at end of file
 Binary files /dev/null and b/500-DBDump/AIA-StoredProcedures/dbo.usp_GetlicensesList.sql differ
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using AIAHTML5.ADMIN.API.Models;
-using System.Web.Http.Cors;
-using System.Web.Cors;
-using AIAHTML5.Server.Constants;
-using log4net;
-using System.Text;
-using AIAHTML5.ADMIN.API.Entity;
-
-namespace AIAHTML5.ADMIN.API.Controllers
-{
-    [EnableCors(origins: "http://localhost:4200", headers: "*", methods: "*")]
-    [RoutePrefix("UserGroup")]
-    public class UserGroupController : ApiController
-    {
-        AIADatabaseV5Entities dbContext = new AIADatabaseV5Entities();
-
-        [Route("LicenseUserGroups")]
-        [HttpGet]
-        public HttpResponseMessage GetLicenseUserGroups(int LicenseId)
-        {
-            List<UserGroupModel> UserGroupList = new List<UserGroupModel>();
-            try
-            {
-                UserGroupList = UserGroupModel.GetLicenseUserGroups(dbContext, LicenseId);
-                return Request.CreateResponse(HttpStatusCode.OK, UserGroupList);
-            }
-            catch (Exception ex)
-            {
-                // Log exception code goes here  
-                return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
-            }
-        }
-
-        [Route("LicenseUserGroupUsers")]
-        [HttpGet]
-        public HttpResponseMessage GetLicenseUserGroupUsers(int LicenseId, int UserGroupId)
-        {
-            List<UserModel> UserList = new List<UserModel>();
-            try
-            {
-                UserList = UserGroupModel.GetLicenseUserGroupUsers(dbContext, LicenseId, UserGroupId);
-                return Request.CreateResponse(HttpStatusCode.OK, UserList);
-            }
-            catch (Exception ex)
-            {
-                // Log exception code goes here  
-                return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
-            }
-        }
-
-        [Route("InsertUpdateLicenseUserGroup")]
-        [HttpPost]
-        public HttpResponseMessage InsertUpdateLicenseUserGroup(JObject jsonData)
-        {
-            bool Status = false;
-            UserGroupModel UserGroupEntity = new UserGroupModel();
-            UserGroupEntity.Id = jsonData["id"].Value<int>();
-            UserGroupEntity.LicenseId = jsonData["licenseId"].Value<int>();
-            UserGroupEntity.Title = jsonData["title"].Value<string>();
-            UserGroupEntity.IsActive = jsonData["isActive"].Value<bool>();
-            UserGroupEntity.CreationDate = jsonData["creationDate"].Value<DateTime>();
-            UserGroupEntity.ModifiedDate = jsonData["modifiedDate"].Value<DateTime>();            
-            try
-            {
-                Status = UserGroupModel.InsertUpdateLicenseUserGroup(dbContext, UserGroupEntity);
-                if (Status)
-                {
-                    return Request.CreateResponse(HttpStatusCode.OK, Status.ToString());
-                }
-                else
-                {
-                    return Request.CreateErrorResponse(HttpStatusCode.BadRequest, Status.ToString());
-                }
-            }
-            catch (Exception ex)
-            {
-                // Log exception code goes here  
-                return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
-            }
-        }
-
-        [Route("UpdateLicenseUserGroupUsers")]
-        [HttpPost]
-        public HttpResponseMessage UpdateLicenseUserGroupUsers(JObject jsonData)
-        {
-            bool Status = false;
-            int UserGroupId = jsonData["userGroupId"].Value<int>();
-            string UserIds = jsonData["userIds"].Value<string>();
-            try
-            {
-                Status = UserGroupModel.UpdateLicenseUserGroupUsers(dbContext, UserGroupId, UserIds);
-                if (Status)
-                {
-                    return Request.CreateResponse(HttpStatusCode.OK, Status.ToString());
-                }
-                else
-                {
-                    return Request.CreateErrorResponse(HttpStatusCode.BadRequest, Status.ToString());
-                }
-            }
-            catch (Exception ex)
-            {
-                // Log exception code goes here  
-                return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
-            }
-        }
-
-        [Route("DeleteLicenseUserGroup")]
-        [HttpGet]
-        public HttpResponseMessage DeleteLicenseUserGroup(int UserGroupId)
-        {
-            bool Status = false;
-            try
-            {
-                Status = UserGroupModel.DeleteLicenseUserGroup(dbContext, UserGroupId);
-                if (Status)
-                {
-                    return Request.CreateResponse(HttpStatusCode.OK, Status.ToString());
-                }
-                else
-                {
-                    return Request.CreateErrorResponse(HttpStatusCode.BadRequest, Status.ToString());
-                }
-            }
-            catch (Exception ex)
-            {
-                // Log exception code goes here  
-                return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
-            }
-        }
-    }
-}
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using AIAHTML5.ADMIN.API.Entity;
-
-namespace AIAHTML5.ADMIN.API.Models
-{
-    public class UserGroupModel
-    {
-        public int Id { get; set; }
-        public int LicenseId { get; set; }
-        public string Title { get; set; }
-        public DateTime? CreationDate { get; set; }
-        public DateTime? ModifiedDate { get; set; }
-        public bool? IsActive { get; set; }
-        public int? TotalUsers { get; set; }
-
-        public static List<UserGroupModel> GetLicenseUserGroups(AIADatabaseV5Entities dbContext, int LicenseId)
-        {
-            List<UserGroupModel> UserGroupList = new List<UserGroupModel>();
-            UserGroupModel UserGroupObj = new UserGroupModel();
-            try
-            {
-                var result = dbContext.usp_GetLicenseUserGroups(LicenseId).ToList();
-                foreach (var item in result)
-                {
-                    UserGroupObj = new UserGroupModel();
-                    UserGroupObj.Id = item.Id;
-                    UserGroupObj.LicenseId = item.LicenseId;
-                    UserGroupObj.Title = item.Title;
-                    UserGroupObj.IsActive = item.IsActive;
-                    UserGroupObj.ModifiedDate = item.ModifiedDate;
-                    UserGroupObj.CreationDate = item.CreationDate;
-                    UserGroupObj.TotalUsers = item.TotalUsers;
-                    UserGroupList.Add(UserGroupObj);
-                }
-            }
-            catch (Exception ex) { }
-            return UserGroupList;
-        }
-
-        public static List<UserModel> GetLicenseUserGroupUsers(AIADatabaseV5Entities dbContext, int LicenseId, int UserGroupId)
-        {
-            List<UserModel> UserList = new List<UserModel>();
-            UserModel UserModelObj = new UserModel();
-            try
-            {
-                var result = dbContext.GetAllUserWithGroup(LicenseId, UserGroupId).ToList();
-                foreach (var item in result)
-                {
-                    UserModelObj = new UserModel();
-                    UserModelObj.Id = item.Id;
-                    UserModelObj.FirstName = item.FirstName;
-                    UserModelObj.LastName = item.LastName;
-                    UserModelObj.LoginId = item.LoginId;
-                    UserModelObj.EmailId = item.EmailId;
-                    UserModelObj.ProductEdition = item.Title;
-                    UserModelObj.InGroup = item.InGroup;
-                    UserList.Add(UserModelObj);
-                }
-            }
-            catch (Exception ex) { }
-            return UserList;
-        }
-
-        public static bool InsertUpdateLicenseUserGroup(AIADatabaseV5Entities dbContext, UserGroupModel UserGroupEntity)
-        {
-            var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
-            try
-            {
-                dbContext.usp_InsertUpdateLicenseUserGroup(UserGroupEntity.Id, UserGroupEntity.LicenseId, UserGroupEntity.Title, 
-                    UserGroupEntity.CreationDate, UserGroupEntity.ModifiedDate, UserGroupEntity.IsActive, spStatus);
-                return (bool)spStatus.Value;
-            }
-            catch (Exception ex)
-            {
-                return false;
-            }
-        }
-
-        public static bool UpdateLicenseUserGroupUsers(AIADatabaseV5Entities dbContext, int UserGroupId, string UserIds)
-        {
-            var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
-            try
-            {
-                dbContext.usp_UpdateLicenseUserGroupUsers(UserGroupId, UserIds, spStatus);
-                return (bool)spStatus.Value;
-            }
-            catch (Exception ex)
-            {
-                return false;
-            }
-        }
-
-        public static bool DeleteLicenseUserGroup(AIADatabaseV5Entities dbContext, int UserGroupId)
-        {
-            var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
-            try
-            {
-                dbContext.usp_DeleteLicenseUserGroup(UserGroupId, spStatus);
-                return (bool)spStatus.Value;
-            }
-            catch (Exception ex)
-            {
-                return false;
-            }
-        }
-
-    }
-
-}
 \ No newline at end of file
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using AIAHTML5.ADMIN.API.Entity;
-
-namespace AIAHTML5.ADMIN.API.Models
-{
-    public class UserModel
-    {
-        public int Id { get; set; }
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-        public string EmailId { get; set; }
-        public string LoginId { get; set; }
-        public string NewLoginId { get; set; }
-        public string Password { get; set; }
-        public int SecurityQuestionId { get; set; }
-        public string SecurityAnswer { get; set; }
-        public int CreatorId { get; set; }
-        public DateTime CreationDate { get; set; }
-        public DateTime DeactivationDate { get; set; }
-        public int ModifierId { get; set; }
-        public DateTime ModifiedDate { get; set; }
-        public int UserTypeId { get; set; }
-        public bool IsActive { get; set; }
-        public string ProductEdition { get; set; }
-        public int InGroup { get; set; }
-
-        public static bool UpdateUserProfile(AIADatabaseV5Entities dbContext, int intUserID, string strFirstName, string strLastName, string strEmailID)
-        {
-            var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
-            try
-            {
-                dbContext.UpdateUserProfile(intUserID, strFirstName, strLastName, strEmailID, spStatus);
-                if (spStatus.Value.ToString() == "1")
-                {
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            catch (Exception ex)
-            {
-                return false;
-            }
-        }
-        public static bool UpdateUserPassword(AIADatabaseV5Entities dbContext, int intUserID, string newPassword)
-        {
-            var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
-            try
-            {
-                dbContext.UpdateAiaUserPassword(intUserID, newPassword, spStatus);
-                return (bool)spStatus.Value;
-            }
-            catch (Exception ex)
-            {
-                return false;
-            }
-        }
-        public static string UpdateUserId(AIADatabaseV5Entities dbContext, int id, string userId, string oldUserId)
-        {
-            var spStatus = new System.Data.Objects.ObjectParameter("Status", 0);
-            try
-            {
-                dbContext.usp_UpdateUserId(id, userId, oldUserId, spStatus);
-                if (spStatus.Value.ToString() == "1")
-                {
-                    // return "success";
-                    return "1";
-                }
-                else if (spStatus.Value.ToString() == "2")
-                {
-                    return "2";
-                    //  return "Already Exist Userid";
-                }
-                else
-                {
-                    return "fail";
-                }
-            }
-            catch (Exception ex)
-            {
-                return ex.Message;
-            }
-        }
-    }
-}
 \ No newline at end of file
-//user.service.ts
-
-  GetLicenseUserGroups(licensId: number) {
-    return this.http.get(this.commonService.resourceBaseUrl + "UserGroup/LicenseUserGroups?LicenseId=" + licensId) 
-      .map(this.extractData)
-      .catch((res: Response) => this.handleError(res));
-  }
-
-  GetLicenseUserGroupUsers(licensId: number, UserGroupId: number) {
-    return this.http.get(this.commonService.resourceBaseUrl + "UserGroup/LicenseUserGroupUsers?LicenseId=" + licensId + "&UserGroupId=" + UserGroupId) 
-      .map(this.extractData)
-      .catch((res: Response) => this.handleError(res));
-  }
-
-  InsertUpdateLicenseUserGroup(obj: any) {    
-    //let options = new RequestOptions({ headers: this.headers });
-    var jsonData = {'id': obj.id, 'licenseId': obj.licenseId, 'creationDate': obj.creationDate, 'modifiedDate': obj.modifiedDate, 'title': obj.title, 'isActive': obj.isActive };
-    var headers = new Headers({
-      'Content-Type': 'application/json'
-    });
-    return this.http.post(this.commonService.resourceBaseUrl + "UserGroup/InsertUpdateLicenseUserGroup",  
-    JSON.stringify(jsonData), {headers: headers})
-      .map(this.extractData)
-      .catch((res: Response) => this.handleError(res));
-  }
-
-  UpdateLicenseUserGroupUsers(userGroupId: number, userIds: string) {    
-    //let options = new RequestOptions({ headers: this.headers });
-    var jsonData = {'userGroupId': userGroupId, 'userIds': userIds };
-    var headers = new Headers({
-      'Content-Type': 'application/json'
-    });
-    return this.http.post(this.commonService.resourceBaseUrl + "UserGroup/UpdateLicenseUserGroupUsers",  
-    JSON.stringify(jsonData), {headers: headers})
-      .map(this.extractData)
-      .catch((res: Response) => this.handleError(res));
-  }
-
-  DeleteLicenseUserGroup(userGroupId: number) {    
-    return this.http.get(this.commonService.resourceBaseUrl + "UserGroup/DeleteLicenseUserGroup?UserGroupId=" + userGroupId) 
-    .map(this.extractData)
-    .catch((res: Response) => this.handleError(res));
-}
-
-
-//app.routing.module
-
-import { UserGroup } from './components/UserEntity/usergroup.component';
-
-
-  { path: 'usergroup', component: UserGroup }
-
-
-//app.module.ts
-
-import { UserGroup } from './components/UserEntity/usergroup.component';
-
-UserGroup
-
-//app.component.html
-
-            <li><a [routerLink]="['usergroup']">User Group</a></li>
-<!-- main-heading -->
-<div class="row">
-
-	<div class="col-sm-12 pageHeading" style="margin-left: 15px;">
-		<h4>{{mode}} User Group</h4>
-	</div>
-
-	<ng-template #template>
-		<div class="modal-header">
-			<h4 class="modal-title pull-left">Delete</h4>
-			<button type="button" class="close pull-right" aria-label="Close" (click)="modalRef.hide()">
-          <span aria-hidden="true">&times;</span>
-        </button>
-		</div>
-		<div class="modal-body">
-			<p>Do you want to delete the selected user group?</p>
-		</div>
-		<div class="modal-footer">
-			<button type="button" class="btn btn-primary btn-sm" (click)="DeleteLicenseUserGroup(templatesuccess)">Yes</button>
-			<button type="button" class="btn btn-primary btn-sm" (click)="modalRef.hide()">No</button>
-		</div>
-	</ng-template>
-
-	<ng-template #templatesuccess>
-		<div class="modal-header">
-			<h4 class="modal-title pull-left">Confirmation</h4>
-			<button type="button" class="close pull-right" aria-label="Close" (click)="modalRef.hide()">
-          <span aria-hidden="true">&times;</span>
-        </button>
-		</div>
-		<div class="modal-body" [innerHTML]="modalAlerts">
-		</div>
-		<div class="modal-footer">
-		</div>
-	</ng-template>
-
-	<div class="col-sm-12">
-
-		<div class="container-fluid main-full">
-			<div class="row" [style.visibility]="(mode == 'Search') ? 'visible' : 'hidden'">
-				<div class="well no-margin-btm">
-					<div class="row">
-						<div class="form-group" *ngIf="alerts != ''">
-							<div class="col-xs-12">
-								<div class="alert alert-danger" [innerHTML]="alerts">
-								</div>
-							</div>
-						</div>
-						<div class="col-lg-4 col-sm-4">
-							<div class="row">
-								<div class="col-sm-12">
-									<div class="form-group marginTop5">
-										<label for="AccountNumber" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Account Number :</label>
-										<div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
-											<select #accountvalue class="form-control input-sm " id="AccountNumber" (change)="AccountNumberChanged($event.target.value)">
-												<option value="0">Select</option>
-												<option *ngFor="let item of lstAccountNumbers;" value="{{item.Id}}">{{item.AccountNumber}}</option>
-										</select>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="col-lg-4 col-sm-4 padd-right0">
-							<div class="row">
-								<div class="col-sm-12">
-									<div class="form-group marginTop5">
-										<label for="New Group" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">New Group :</label>
-									</div>
-									<div class="col-sm-12 col-lg-6 padd-left0">
-										<input type="text" #title class="form-control input-sm" id="new-group" maxlength="100">
-									</div>
-								</div>
-							</div>
-						</div>
-
-						<div class="col-lg-4 col-sm-4">
-							<div class="row">
-								<div class="col-sm-2 padd-left0">
-									<div class="form-group marginTop5">
-										<label for="New Group" class="col-sm-12 col-md-1 paddTop7 padd-left0 padd-right0 hidden-xs">&nbsp;</label>
-									</div>
-									<div class="col-sm-12 col-lg-2 padd-left0 padd-right0 mar-left6 mobile_1">
-										<button class="btn btn-primary btn-sm" type="button" (click)="InsertLicenseUserGroup(title.value, templatesuccess)"
-										 [disabled]="accountvalue.value==0"><i class="fa fa-plus-circle"></i> Add</button>
-									</div>
-								</div>
-							</div>
-						</div>
-
-					</div>
-
-				</div>
-
-				<div class="well">
-					<div class="table-responsive blue">
-						<table id="tblLicenseUserGroups" class="table table-condensed table-bordered margin-btm0 table-striped table-hover table-fixed">
-							<thead>
-								<tr>
-									<th>Group Name</th>
-									<th>Number of User(s)</th>
-									<th>Created Date</th>
-									<th>Last Modified Date</th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr *ngFor="let item of lstLicenseUserGroups; let i = index;" (click)="SetClickedRow(i, item)" [class.active]="i == selectedRow"
-								 [class.inactive]="i != selectedRow">
-									<td>
-										<input type="hidden" value={{item.Id}}/> {{item.Title}}
-									</td>
-									<td>{{item.TotalUsers}}</td>
-									<td>{{item.CreationDate | date: 'MM/dd/yyyy'}}</td>
-									<td>{{item.ModifiedDate | date: 'MM/dd/yyyy'}}</td>
-								</tr>
-							</tbody>
-						</table>
-					</div>
-
-					<div class="row">
-						<div class="col-sm-12 marginTop20 text-center">
-							<button class="btn btn-primary btn-sm" (click)="ViewLicenseUserGroup()"><i class="fa fa-eye"></i>  View</button>
-							<button class="btn btn-primary btn-sm" (click)="EditLicenseUserGroup()"><i class="fa fa-edit"></i> Edit</button>
-							<button class="btn btn-primary btn-sm" (click)="openModal(template)"><i class="fa fa-trash"></i> Remove</button>
-						</div>
-					</div>
-
-				</div>
-			</div>
-
-			<form class="row" style="position: absolute; z-index: 100;" [style.top]="topPos" [style.visibility]="(mode == 'View' || mode == 'Edit') ? 'visible' : 'hidden'"
-			 [formGroup]="updateUserGroupFrm" (submit)="UpdateLicenseUserGroup(templatesuccess)">
-				
-			 	<div class="well no-margin-btm">
-					<div class="row">
-						<div class="form-group" *ngIf="alerts != ''">
-							<div class="col-xs-12">
-								<div class="alert alert-danger" [innerHTML]="alerts">
-								</div>
-							</div>
-						</div>
-						<div class="col-lg-4 col-sm-4 padd-right0">
-							<div class="row">
-								<div class="col-sm-12">
-									<div class="form-group marginTop5">
-										<label for="GroupName" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Group Name :</label>
-									</div>
-									<div class="col-sm-12 col-lg-6 padd-left0">
-										<input type="text" class="form-control input-sm" formControlName="userGroupName" id="GroupName" maxlength="100">
-										<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>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				<div class="well">
-
-					<div class="table-responsive blue">
-
-						<table id="fixed_hdr2" class="table-hover">
-							<thead>
-								<tr>
-									<th [style.display]="(mode == 'Edit') ? 'block' : 'none'">Select</th>
-									<th>First Name</th>
-									<th>Last Name</th>
-									<th>User ID</th>
-									<th>Email ID</th>
-									<th>Product Edition</th>
-								</tr>
-							</thead>
-							<tbody>
-								<tr *ngFor="let item of lstLicenseUserGroupUsers; let i = index">
-									<td [style.display]="(mode == 'Edit') ? 'block' : 'none'">
-										<input type="hidden" value="{{item.Id}}">
-										<input type="checkbox" (change)="onChange(i, item.Id, $event.target.checked)" [checked]="item.InGroup">
-									</td>
-									<td>{{item.FirstName}}</td>
-									<td>{{item.LastName}}</td>
-									<td>{{item.UserId}}</td>
-									<td>{{item.EmailId}}</td>
-									<td>{{item.ProductEdition}}</td>
-								</tr>
-							</tbody>
-						</table>
-
-					</div>
-
-					<div class="row">
-						<div class="col-sm-12 marginTop20 text-center">
-							<button class="btn btn-primary btn-sm" type="submit" [disabled]="!updateUserGroupFrm.valid" [style.visibility]="(mode == 'Edit') ? 'visible' : 'hidden'"><i class="fa fa-plus-circle"></i> Update</button>
-							<button class="btn btn-primary btn-sm" type="button" (click)="CancelAddEdit()"><i class="fa fa-times-circle"></i> Cancel</button>
-						</div>
-					</div>
-
-				</div>
-
-			</form>
-
-		</div>
-	</div>
-</div>
-<!-- main-heading -->
 \ No newline at end of file
-import { Component, OnInit, AfterViewInit, Input, Output, EventEmitter, Pipe, PipeTransform, TemplateRef } from '@angular/core';
-import { UserService } from './user.service';
-import { Router, ActivatedRoute } from '@angular/router';
-import { FormControl, FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { License } from '../UserEntity/datamodel';
-import { BsDatepickerModule } from 'ngx-bootstrap';
-import { Http, Response } from '@angular/http';
-import { DatePipe } from '@angular/common';
-import { BsModalService } from 'ngx-bootstrap/modal';
-import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service';
-
-declare var $:any;
-
-@Component({
-    templateUrl: './usergroup.component.html' 
-})
-
-export class UserGroup implements OnInit {
-
-    lstAccountNumbers: any;
-    lstLicenseUserGroups: any;
-    licenseUserGroup: any;
-    lstLicenseUserGroupUsers: any;
-    lstAllUsers: any;
-    mode: string = 'Search';
-    license: License;
-    updateUserGroupFrm: FormGroup;
-    error: any;
-    alerts: string;
-    modalAlerts: string;
-    divClass: string = '';
-    topPos: string = '2000px';
-    selectedRow: number = 0;
-    selectedId: number = 0;
-    modalRef: BsModalRef;
-    checkedRecords: Array<number>;
-    
-    constructor(private userService: UserService, private router: Router, private activeRoute: ActivatedRoute, private fb: FormBuilder, private modalService: BsModalService) { }
-
-    ngOnInit(): void
-    {
-        this.selectedRow = 0;   
-        this.divClass = 'col-sm-12';
-        this.license = new License();
-        this.alerts = '';
-        this.updateUserGroupFrm = this.fb.group({
-            userGroupName: ['', Validators.required],
-          });
-        this.GetLicenseAccounts();
-
-        $('#fixed_hdr2').fxdHdrCol({
-			fixedCols: 0,
-			width: "100%",
-			height: 330,
-			colModal: [
-			{ width: 80, align: 'center' },
-			{ width: 200, align: 'center' },
-			{ width: 200, align: 'Center' },
-			{ width: 200, align: 'Center' },
-			{ width: 200, align: 'Center' },
-			{ width: 250, align: 'Center' },
-			],
-			sort: true
-        });
-        if(document.getElementById("fixed_table_rc") != undefined){
-            document.getElementById("fixed_table_rc").remove();
-        }
-        var testScript = document.createElement("script");
-        testScript.setAttribute("id", "fixed_table_rc");
-        testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
-        testScript.setAttribute("type", "text/javascript");
-        document.body.appendChild(testScript);
-    }
-
-    openModal(template: TemplateRef<any>) {
-        this.modalRef = this.modalService.show(template);
-    }
-
-    onChange(Idx: number, Id: number, isChecked: boolean){
-        if(isChecked){
-            this.checkedRecords[Idx] = Id;
-        }
-        else{
-            this.checkedRecords[Idx] = 0;
-        }
-    }
-
-    SetClickedRow(i: number, item: any) {
-        this.selectedRow = i;
-        this.selectedId = item['Id'];   
-        this.licenseUserGroup = item;
-    }
-
-    BindFormFields(data){
-        this.lstLicenseUserGroups = data;
-        this.licenseUserGroup = this.lstLicenseUserGroups[this.selectedRow];
-        this.selectedId = this.licenseUserGroup['Id']; 
-    }
-
-    BindUserFormFields(data){
-        this.lstLicenseUserGroupUsers = data;
-        if(this.mode == 'Edit'){
-            this.checkedRecords = new Array<number>(this.lstLicenseUserGroupUsers.length);
-            for (let i = 0; i < this.lstLicenseUserGroupUsers.length ; i++) {
-                if(this.lstLicenseUserGroupUsers[i].InGroup > 0){
-                    this.checkedRecords[i] = this.lstLicenseUserGroupUsers[i].Id;
-                }
-            }
-        }
-        else{
-            this.lstLicenseUserGroupUsers = this.lstLicenseUserGroupUsers.filter(C => C.InGroup> 0);
-        }
-    }
-
-    GetLicenseAccounts() { 
-        this.userService.GetAccountNumber()
-        .subscribe(st => { this.lstAccountNumbers = st; }, error => this.error = <any>error); 
-    }
-
-    GetLicenseUserGroups() { 
-        this.alerts = '';
-        this.userService.GetLicenseUserGroups(this.license.LicenseId)
-        .subscribe(st => { this.BindFormFields(st); }, error => this.error = <any>error); 
-    }
-
-    GetLicenseUserGroupUsers() { 
-        this.alerts = '';
-        this.userService.GetLicenseUserGroupUsers(this.license.LicenseId, this.selectedId)
-        .subscribe(st => { this.BindUserFormFields(st); }, error => this.error = <any>error); 
-    }
-
-    AccountNumberChanged(LicenseId: number){
-        this.license.LicenseId = LicenseId;
-        this.lstLicenseUserGroups = null;
-        this.GetLicenseUserGroups();
-    }
-
-    AfterDeleteData(data, template) {
-        if (data.Status == "false") {
-            this.alerts = "<span>License user group delete unsuccessfull</span>";
-        } else {
-            this.modalAlerts = "<p>License user group deleted successfully</p>";
-            this.modalRef = this.modalService.show(template);
-            this.GetLicenseUserGroups();
-        }
-    }
-
-    AfterInsertData(data, template) {
-        if (data.Status == "false") {
-            this.alerts = "<span>License user group save unsuccessfull</span>";
-        } else {
-            this.modalAlerts = "<p>License user group saved successfully</p>";
-            this.modalRef = this.modalService.show(template);
-            this.GetLicenseUserGroups();
-        }
-    }
-
-    AfterUpdateData(data, template) {
-        if (data.Status == "false") {
-            this.alerts = "<span>License user group update unsuccessfull</span>";
-        } else {
-            this.modalAlerts = "<p>License user group updated successfully</p>";
-            this.modalRef = this.modalService.show(template);
-            this.GetLicenseUserGroups();
-        }
-    }
-
-    InsertLicenseUserGroup(title: string, template: TemplateRef<any>) {
-        this.alerts = '';
-        if(title == '' || title == undefined){
-            this.alerts = "<span>Please enter a name for user group.</span>";
-            return;
-        }
-        var obj = {
-             'id': 0, 'licenseId': this.license.LicenseId, 'title': title, 
-                'isActive': true, 'creationDate': new Date(), 
-                'modifiedDate': new Date()
-            };
-        if(this.alerts == ''){
-                return this.userService.InsertUpdateLicenseUserGroup(obj)
-                .subscribe(
-                n => (this.AfterInsertData(n, template)),
-                error => this.error = <any>error);
-        }
-    }
-
-    UpdateLicenseUserGroup(template: TemplateRef<any>) {
-        this.alerts = '';
-        var obj = {
-            'id': this.licenseUserGroup.Id, 
-            'licenseId': this.license.LicenseId, 
-            'title': this.updateUserGroupFrm.controls['userGroupName'].value, 
-            'isActive': this.licenseUserGroup.IsActive, 
-            'creationDate': this.licenseUserGroup.CreationDate, 
-            'modifiedDate': this.licenseUserGroup.ModifiedDate
-        };
-        if(this.alerts == ''){
-                return this.userService.InsertUpdateLicenseUserGroup(obj)
-                .subscribe(
-                n => (
-                    this.UpdateLicenseUserGroupUsers(template)
-                ),
-                error => this.error = <any>error);
-        }
-    }
-
-    UpdateLicenseUserGroupUsers(template: TemplateRef<any>) {
-        var userIds = '';
-        this.checkedRecords.filter(C => C > 0).forEach(element => {
-            if(element > 0){
-                userIds += element + ',';
-            }
-        });
-        if(userIds!=''){
-            userIds = userIds.substr(0, userIds.length - 1);
-        }
-        return this.userService.UpdateLicenseUserGroupUsers(this.selectedId, userIds)
-        .subscribe(
-            n => (                    
-                this.AfterUpdateData(n, template)
-            ),
-            error => this.error = <any>error);
-    }
-
-    DeleteLicenseUserGroup(template: TemplateRef<any>){
-        this.modalRef.hide();
-        this.alerts = '';
-        if(this.selectedId == 0){
-            this.alerts = "<span>Please select a license user group</span>";
-        }
-        if(this.alerts == ''){
-            return this.userService.DeleteLicenseUserGroup(this.selectedId)
-                .subscribe(
-                data => (this.AfterDeleteData(data, template)),
-                error => {
-                    this.error = <any>error; 
-                    this.alerts = "<span>License user group delete unsuccessfull</span>";
-                });
-        }
-    }
-    
-    EditLicenseUserGroup(){
-        $('.ft_r thead tr th:eq(0)').show();
-        this.mode = 'Edit';
-        this.topPos = '100px';
-        this.alerts = '';
-        this.updateUserGroupFrm.controls['userGroupName'].setValue(this.licenseUserGroup.Title);
-        this.GetLicenseUserGroupUsers();
-    }
-    
-    ViewLicenseUserGroup(){
-        $('.ft_r thead tr th:eq(0)').hide();
-        this.mode = 'View';
-        this.topPos = '100px';
-        this.alerts = '';
-        this.updateUserGroupFrm.controls['userGroupName'].setValue(this.licenseUserGroup.Title);
-        this.GetLicenseUserGroupUsers();
-    }
-
-    CancelAddEdit(){
-        this.mode = 'Search';
-        this.topPos = '2000px';
-        this.GetLicenseUserGroups();
-        this.selectedRow = this.lstLicenseUserGroups.findIndex(C => C.Id == this.selectedId);
-        this.SetClickedRow(this.selectedRow, this.lstLicenseUserGroups.find(C => C.Id == this.selectedId));
-    }
-}
-import { Component, OnInit, AfterViewInit,ViewChild } from '@angular/core';
-import { UserService } from './user.service';
-import { Router } from '@angular/router';
-import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { User } from '../UserEntity/datamodel';
-import { UserManageRightsModel } from '../UserEntity/datamodel';
-import { Http, Response } from '@angular/http';
-//import { Global } from '../../Shared/global';
-//import { DBOperation } from 'S';
-import { Observable } from 'rxjs/Observable';
-import { ConfirmService } from '../../Shared/Confirm/confirm.service';
-import 'rxjs/Rx';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/filter';
-import { LoadingService } from '../../shared/loading.service';   
-declare var $: any;
-import { DatePipe } from '@angular/common';
-import { GlobalService } from '../../Shared/global';
-@Component({
-  templateUrl:'./users.component.html' // '../../../../../wwwroot/html/UpdateProfile/updateuserprofile.component.html'
-})
-
-export class UsersList implements OnInit {
-
-  Mode: string = 'Manage';
-  modalTitle: string;
-  Users: FormGroup;
-  adduserFrm: FormGroup;
-  managerightFrm: FormGroup;
-  alerts: string;
-  public UserTypeList: any;
-  public AccountTypeList: any;
-  public UserList: any;
-  public UserManageRightsList: Array<UserManageRightsModel>;
-  emailPattern = "^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$";
-  public UserTypeListByLicense: any;
-  public AccountNumberList: any;
-  public ProductEditionList: any;
-  UserEntity: User;
-  public UserManageRightsEntity: UserManageRightsModel;
-  topPos: string = '2000px';
-  datePipe: DatePipe = new DatePipe('en-US');
-  error;
-  selectedRow: number = 0;
-  selectedId: number = 0;
-  divClass: string;
-  isActive: boolean;
-  NoRecord: string;
-  //@ViewChild("profileModal")
-  //profileModal: ModalComponent;
-  //errorMessage: any;
-  constructor(private _loadingService: LoadingService,private userservice: UserService, private router: Router, private fb: FormBuilder, private http: Http,
-    private _confirmService: ConfirmService,private global:GlobalService
-  ) { }
- 
-  ngOnInit(): void {
-    this.modalTitle = 'LIST USER';
-    this.alerts = '';
-    this.NoRecord = this.global.NoRecords;
-    this.Users = this.fb.group({
-      FirstName:[''],
-      LastName: [''],
-      EmailId:  [''],
-      AccountNumber: [''],
-      UserTypeId: [0], //bug#28162
-      AccountTypeId: [0]
-     // Gender: ['', Validators.required],
-   //   Email: ['']
-          
-    });
-    this.adduserFrm = this.fb.group({
-      id: [''],
-      UserName: ['', Validators.required],
-      Password: ['', [Validators.required, Validators.minLength(8)]],
-      ConfirmPassword: ['', Validators.required],
-      FirstName: ['', Validators.required],
-      LastName: ['', Validators.required],
-      EmailId: ['', Validators.required],
-      AccountNumber: [''],
-      UserType: [''],
-      AccountType: [''],
-      Createddate: [''],
-      LastModifiedDate: [''],
-      Createdby: [''],
-      Modifiedby: [''],
-      DeactivationDate: [''],
-      isActive: [false],
-      UserStatusActive: ['false'],
-      UserStatusInActive:['']
-    });
-    this.managerightFrm = this.fb.group({
-      id: [''],
-      UserTypeTitle: ['']
-    });
-    this._loadingService.ShowLoading("global-loading");
-    this.GetUserType();
-    this.GetAccountType();
-    this._loadingService.HideLoading("global-loading");
-    $('#fixed_hdr2').fxdHdrCol({
-      fixedCols: 0,
-      width: "100%",
-      height: 300,
-      colModal: [
-        { width: 180, align: 'center' },
-        { width: 230, align: 'center' },
-        { width: 150, align: 'Center' },
-        { width: 150, align: 'Center' },
-        { width: 350, align: 'Center' },
-        { width: 200, align: 'Center' },
-        { width: 130, align: 'Center' },
-        { width: 120, align: 'center' },
-        { width: 280, align: 'Center' },
-        { width: 180, align: 'center' },
-        { width: 200, align: 'center' },
-        { width: 170, align: 'center' },
-        { width: 80, align: 'center' },
-        { width: 150, align: 'center' },
-        { width: 150, align: 'center' },
-        { width: 180, align: 'Center' },
-        { width: 400, align: 'Center' },
-        { width: 150, align: 'center' },
-        { width: 110, align: 'center' },
-      ],
-      sort: true
-    });
-    document.getElementById("fixed_table_rc").remove();
-    var testScript = document.createElement("script");
-    testScript.setAttribute("id", "fixed_table_rc");
-    testScript.setAttribute("src", "../assets/scripts/fixed_table_rc.js");
-    testScript.setAttribute("type", "text/javascript");
-    document.body.appendChild(testScript);
-    this._loadingService.ShowLoading("global-loading");
-    //this.bindUsers();   
-    this._loadingService.HideLoading("global-loading");
-    
-    //this.GetUserList();
-  }
-  handleChange(evt) {
-    debugger;
-    var target = evt.target;
-    if (target.value == 'true') {
-      this.isActive = true;
-    }
-    else if (target.value == 'false') {
-      this.isActive = false;
-    }
-  }
-  
-  public SetClickedRow(i: number, item: any) {
-    this.selectedRow = i;
-    this.selectedId = item['Id'];
-    this.UserEntity = item;
-  }
-  public SetClickedRowManageRight(j: number, item: any) {
-    this.selectedRow = j;
-    this.selectedId = item['Id'];
-    this.UserManageRightsList = item;
-  }
-  redirect() {
-    this.router.navigate(['/']);
-  }
- 
-  GetUserType() {
-    this.userservice.GetUserType().subscribe(x => { this.UserTypeList = x; }, error => this.error = <any>error);
-  }
-  GetAccountType() {
-    this.userservice.GetAccountType().subscribe(x => { this.AccountTypeList = x; }, error => this.error = <any>error);
-  }
-  GetUserList() {
-    //this.userservice.GetUserList().subscribe(x => { this.UserList = x; }, error => this.error = <any>error);
-  }
-  GetUserRights() {
-    this.userservice.GetManageUserRights({
-      UserId: this.managerightFrm.controls['id'].value,
-      UserType: this.managerightFrm.controls['UserTypeTitle'].value
-    })
-      .subscribe(x => { console.log(x); this.UserManageRightsList = x }, error => {
-        this.error = <any>error;
-        this.alerts = "<span>" + this.error + "</span>";
-      });
-  }
-  SearchUserList(this)
-  {
-    this._loadingService.ShowLoading("global-loading");
-    var UserFilterControl = this.Users.value;
-    this.userservice.GetUserList(
-      {
-        FirstName: this.Users.controls['FirstName'].value,
-        LastName: this.Users.controls['LastName'].value,
-        EmailId: this.Users.controls['EmailId'].value,
-        AccountNumber: this.Users.controls['AccountNumber'].value,
-        UserTypeId: (this.Users.controls['UserTypeId'].value != null && this.Users.controls['UserTypeId'].value !='' ? this.Users.controls['UserTypeId'].value:0),
-        AccountTypeId: (this.Users.controls['AccountTypeId'].value != null && this.Users.controls['AccountTypeId'].value != ''? this.Users.controls['AccountTypeId'].value : 0),
-        
-
-      })
-
-      .subscribe(x => { this.BindFormFields(x) }, error => this.error = <any>error);
-    
-  }
-  BindFormFields(data) {
-    this.UserList = data;
-    if (this.UserList.length > 0) {
-      this.NoRecord = '';
-      this._loadingService.HideLoading("global-loading");
-    }
-    if (this.UserList.length == 0) {
-      this.NoRecord = this.global.NoRecords;
-      this._loadingService.HideLoading("global-loading");
-    }
-  }
-  EditUser() {
-    debugger;
-    this.Mode = 'Edit';
-    this.modalTitle = 'Edit USER';
-    this.topPos = '100px';
-    this.divClass = 'col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3';
-    this.alerts = '';
-    this.adduserFrm.controls['id'].setValue(this.UserEntity.Id)
-    this.adduserFrm.controls['FirstName'].setValue(this.UserEntity.FirstName)
-    this.adduserFrm.controls['LastName'].setValue(this.UserEntity.LastName)
-    this.adduserFrm.controls['EmailId'].setValue(this.UserEntity.EmailId)
-    this.adduserFrm.controls['UserName'].setValue(this.UserEntity.LoginId)
-    this.adduserFrm.controls['Password'].setValue(this.UserEntity.Password)
-    this.adduserFrm.controls['ConfirmPassword'].setValue(this.UserEntity.Password)
-    this.adduserFrm.controls['AccountNumber'].setValue(this.UserEntity.AccountNumber)
-    this.adduserFrm.controls['UserType'].setValue(this.UserEntity.UserTypeTitle)
-    this.adduserFrm.controls['AccountType'].setValue(this.UserEntity.AccountTypeTitle)
-    this.adduserFrm.controls['Createddate'].setValue(this.datePipe.transform(this.UserEntity.CreationDate, 'MM/dd/yyyy'))
-    this.adduserFrm.controls['LastModifiedDate'].setValue(this.datePipe.transform(this.UserEntity.ModifiedDate, 'MM/dd/yyyy'))
-    this.adduserFrm.controls['Createdby'].setValue(this.UserEntity.Createdby)
-    this.adduserFrm.controls['Modifiedby'].setValue(this.UserEntity.Modifiedby)
-    this.adduserFrm.controls['DeactivationDate'].setValue(this.datePipe.transform(this.UserEntity.DeactivationDate, 'MM/dd/yyyy'))
-    if (this.UserEntity.UserStatus == 'Active') {
-      this.adduserFrm.controls['UserStatusActive'].setValue('true')
-    }
-    else {
-      this.adduserFrm.controls['UserStatusActive'].setValue('false')
-    }
-    //this.adduserFrm.controls['UserStatusActive'].setValue(true)
-    //this.adduserFrm.controls['UserStatusInActive'].setValue(false)
-    this.isActive = (this.UserEntity.UserStatus=='Active'?true :false)
-    
-  }
-
-  EditManageUserRights() {
-    this.Mode = 'ManageRight';
-    this.modalTitle = 'MANAGE USER Right';
-    this.topPos = '100px';
-    this.divClass = 'col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3';
-    this.alerts = '';
-    this.managerightFrm.controls['id'].setValue(this.UserEntity.Id);
-    this.managerightFrm.controls['UserTypeTitle'].setValue(this.UserEntity.UserTypeTitle);
-    this.GetUserRights();
-  }
-
-  public UpdateUser(this) {
-    this.alerts = '';
-    if (this.adduserFrm.value.UserName == '') {
-      this.alerts += '<span>User Name is required.</span>';
-    }
-    if (this.adduserFrm.value.Password == '') {
-      this.alerts += '</br><span>Password of minimum 8 characters is required.</span>';
-    }
-    if (this.adduserFrm.value.ConfirmPassword == '') {
-      this.alerts += '</br><span>Confirm Password is required.</span>';
-    }
-    if (this.adduserFrm.value.EmailId == '') {
-      this.alerts += '</br><span>Email Id is required.</span>';
-    }
-    if (this.adduserFrm.value.FirstName == '') {
-      this.alerts += '</br><span>First Name is required.</span>';
-    }
-    if (this.adduserFrm.value.LastName == '') {
-      this.alerts += '</br><span>Last Name is required.</span>';
-    }
-    if (this.adduserFrm.value.newPassword != this.adduserFrm.value.confirmPassword) {
-      this.alerts += '</br><span>Password and confirm password must be same</span>';
-    }
-    
-    if (this.adduserFrm.valid && this.alerts == '') {
-      this.adduserFrm.controls['isActive'].setValue(this.adduserFrm.value.UserStatusActive) 
-      
-      var UserEntity = this.adduserFrm.value;
-       
-      return this.userservice.UpdateUserEntity(UserEntity)
-        .subscribe(
-        n => (this.AfterInsertData(n)),
-        error => {
-          this.error = <any>error;
-          this.alerts = "<span>" + this.error + "</span>";
-        });
-    }
-
-  }
-
-  //public DeleteUnblockedUser(this) {
-  //  this.alerts = '';
-  //}
-
-  AfterInsertData(data) {
-  
-    if (data == "User updated successfully") {
-      this.alerts = '';
-      this._confirmService.activate("User updated successfully.", "alertMsg");
-    }
-    //if (this.closeflag) {
-    //  this.close.emit(null);
-    //}
-    //else {
-    //}
-  }
-  
-  ResetFormFields() {
-    //this.ChangeUserIdFrm.reset()
-    //this.ChangeUserIdFrm.controls['id'].setValue(this.user.Id)
-    //this.ChangeUserIdFrm.controls['loginid'].setValue(this.user.LoginId)
-    //this.ChangeUserIdFrm.controls['newloginid'].setValue('')
-    //this.ChangeUserIdFrm.controls['confirmloginid'].setValue('')
-    this.alerts = '';
-  }
-  
-}
 Binary files a/500-DBDump/AIA-StoredProcedures/usp_GetAccountNumber.sql and b/500-DBDump/AIA-StoredProcedures/usp_GetAccountNumber.sql differ
 Binary files /dev/null and b/500-DBDump/AIA-StoredProcedures/usp_GetlicensesList.sql differ