-
-
-
-
-|
-
-
- Signup On
-
+
+ |
-
-
+
-
-
+ Signup On
+
+
-
-
-
-
+ |
+
+
+
+
+
+
|
+
+
-
-
+
+
+
+ |
+
+
+
+
+ Name
+
+
+
+
+
+
+ |
+
+
+
+
+ Email
+
+
+
+
+
+
+ |
+
+
+
+
+ Mobile
+
+
+
+
+
+
+ |
+
+
+
+
+ Subscription ID
+
+
+
+
+
+
+ |
+
+
+
+
+ Subscribed On
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+ |
+
- Companies
+
+
- |
+
+ |
-
- Name
-
+ Transaction Limit
+
-
+
+
- |
+
+
+
+
+ |
+
-
- Email
-
+ Remaining Transaction
+
-
+
+
- |
+
+ |
+
-
- Mobile
-
+ AddOn Transaction
+
-
+
+
- |
+
+ |
-
-
- Subscription ID
-
+ Additional Charges
+
-
+
+
- |
+
+
+ |
-
-
- Subscribed On
-
+ Rate/Transaction
+
-
+
+
-
-
- |
- |
|---|
+
diff --git a/apps/web-giddh-admin/src/app/subscription/components/user-list/user-list.component.ts b/apps/web-giddh-admin/src/app/subscription/components/user-list/user-list.component.ts
index 398850a..92ade61 100644
--- a/apps/web-giddh-admin/src/app/subscription/components/user-list/user-list.component.ts
+++ b/apps/web-giddh-admin/src/app/subscription/components/user-list/user-list.component.ts
@@ -1,7 +1,6 @@
import { Component, OnInit, ViewChild, Input } from '@angular/core';
import { Observable, Subject } from 'rxjs';
import { UserService } from '../../../services/user.service';
-import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
import { SubscriberList, PAGINATION_COUNT, TotalUsersCount, CommonPaginatedRequest, StatusModel, TotalSubscribers } from '../../../modules/modules/api-modules/subscription';
import * as moment from 'moment/moment';
import { GeneralService } from '../../../services/general.service';
@@ -15,9 +14,10 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
import { cloneDeep } from '../../../lodash-optimized';
import { ColumnFilterService } from '../../../services/column-filter.service';
import { FavouriteColumnPageTypeEnum } from '../../../actions/general/general.const';
-import { BsDropdownDirective } from 'ngx-bootstrap/dropdown';
import { UserFieldFilterColumnNames } from '../../../models/company';
import { SubscriptionService } from '../../../services/subscription.service';
+import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
+import { BsDropdownDirective } from 'ngx-bootstrap/dropdown';
@Component({
selector: 'app-user-list',
templateUrl: './user-list.component.html',
@@ -71,7 +71,8 @@ export class UserListComponent implements OnInit {
public timeoutLastSeen: any;
public tempOperation: any = "";
@ViewChild("dp") public dp;
- public adminUsersList: any;
+ /** Admin user list */
+ public adminUsersList: any[] = [];
public isAllOwnerSelected: boolean = false;
public selectedOwners: string[] = [];
public today: Date;
@@ -121,11 +122,9 @@ export class UserListComponent implements OnInit {
}
constructor(private generalService: GeneralService, private userService: UserService, private modalService: BsModalService, private router: Router, private toaster: ToasterService, private plansService: PlansService,
- private authenticationService: AuthenticationService, private columnFilterService: ColumnFilterService, private subscriptionService: SubscriptionService, ) {
+ private authenticationService: AuthenticationService, private columnFilterService: ColumnFilterService, private subscriptionService: SubscriptionService,) {
this.today = new Date();
this.getUserListPostRequest.lastSeen = {}
- this.getUserListPostRequest.lastSeen.operation = "BEFORE";
- this.tempOperation = "relative_before";
this.getAllAdminUsers();
}
@@ -140,11 +139,16 @@ export class UserListComponent implements OnInit {
this.getUserListRequest.page = 1;
this.getUserListRequest.sortBy = '';
this.getUserListRequest.sortType = '';
- this.getAllUserData();
+ // this.getAllUserData();
this.getAllSubscriptionTotalData();
this.getAllPlans();
this.getOnboardCountries();
+ /** To check local storage filter available */
+ this.checkLocalStorageFilter();
+
+
+
/** Search using user name */
this.searchViaUserName$.pipe(
debounceTime(1000),
@@ -420,6 +424,8 @@ export class UserListComponent implements OnInit {
*/
public getAllUserData() {
this.getAllSubscriptionTotalData();
+ localStorage.setItem("userListFilter", JSON.stringify(this.getUserListPostRequest));
+ localStorage.setItem("userPaginationFilter", JSON.stringify(this.getUserListRequest));
this.userService.getAllSubscriptionsByUser(this.getUserListRequest, this.getUserListPostRequest).subscribe(res => {
if (res.status === 'success') {
this.userlistRes = res.body;
@@ -511,7 +517,7 @@ export class UserListComponent implements OnInit {
*/
public resetFilters() {
this.bsValue = null;
- this.tempOperation = 'relative_before';
+ this.tempOperation = 'BEFORE';
this.getUserListPostRequest.lastSeen = {};
this.getUserListPostRequest.lastSeen.operation = 'relative_before';
this.getUserListPostRequest.lastSeen.from = '';
@@ -525,7 +531,7 @@ export class UserListComponent implements OnInit {
this.getUserListPostRequest.mobile = '';
this.getUserListPostRequest.subscriptionId = '';
this.getUserListPostRequest.planUniqueNames = this.selectedPlans = [];
- this.getUserListPostRequest.countryCodes = this.selectedCountries = [];
+ this.getUserListPostRequest.userCountryCodes = this.selectedCountries = [];
this.getUserListPostRequest.status = this.selectedPlanStatus = [];
this.getUserListPostRequest.startedAtFrom = '';
this.getUserListPostRequest.managerUniqueNames = [];
@@ -534,6 +540,7 @@ export class UserListComponent implements OnInit {
this.getUserListPostRequest.expiry = '';
this.inlineSearch = null;
this.getUserListPostRequest.transactionLimitField = '';
+ this.getUserListPostRequest.transactionLimit = '';
this.getUserListPostRequest.remainingTxn = '';
this.getUserListPostRequest.addOnTxn = '';
this.getUserListPostRequest.ratePerExtraTxn = '';
@@ -736,11 +743,12 @@ export class UserListComponent implements OnInit {
this.getAllPlansRequest.sortBy = '';
this.getAllPlansRequest.sortType = '';
this.plansService.getAllPlans(this.getAllPlansRequest, this.getAllPlansPostRequest).subscribe(res => {
+ this.allPlans = [];
if (res.status === 'success') {
- this.allPlans = [];
res.body.results.forEach(key => {
this.allPlans.push({ label: key.name, value: key.uniqueName, additional: false });
});
+ this.checkLocalStorageFilter();
} else {
this.toaster.clearAllToaster();
this.toaster.errorToast("Something went wrong in getting plans! Please try again.");
@@ -930,7 +938,7 @@ export class UserListComponent implements OnInit {
});
}
this.isAllCountriesSelected();
- this.getUserListPostRequest.countryCodes = this.selectedCountries;
+ this.getUserListPostRequest.userCountryCodes = this.selectedCountries;
this.getAllUserData();
// this.getAllPlans();
}
@@ -952,7 +960,7 @@ export class UserListComponent implements OnInit {
let index = this.selectedCountries.indexOf(item.value);
this.selectedCountries.splice(index, 1);
}
- this.getUserListPostRequest.countryCodes = this.selectedCountries;
+ this.getUserListPostRequest.userCountryCodes = this.selectedCountries;
this.isAllCountriesSelected();
this.getAllUserData();
// this.getAllPlans();
@@ -1159,4 +1167,61 @@ export class UserListComponent implements OnInit {
}
});
}
+
+ /**
+ *To check local storage filter available
+ *
+ * @memberof UserListComponent
+ */
+ public checkLocalStorageFilter(): void {
+
+ let userFilter = localStorage.getItem("userListFilter");
+ let userPaginationFilter = localStorage.getItem("userPaginationFilter");
+ if (userFilter || userPaginationFilter) {
+ let retrievedUserFilterObject = JSON.parse(userFilter);
+ let retrievedUserPaginationFilterObject = JSON.parse(userPaginationFilter);
+ this.getUserListPostRequest = retrievedUserFilterObject;
+ this.getUserListRequest = retrievedUserPaginationFilterObject;
+ if (this.getUserListPostRequest && this.getUserListPostRequest.planUniqueNames && this.getUserListPostRequest.planUniqueNames.length > 0) {
+ this.selectedPlans = this.getUserListPostRequest.planUniqueNames;
+ this.allPlans.map(res => {
+ res.additional = this.getUserListPostRequest.planUniqueNames.includes(res.value);
+ });
+ }
+ if (this.getUserListPostRequest && this.getUserListPostRequest.managerUniqueNames && this.getUserListPostRequest.managerUniqueNames.length > 0) {
+ this.selectedOwners = this.getUserListPostRequest.managerUniqueNames;
+ this.adminUsersList.map(res => {
+ res.additional = this.getUserListPostRequest.managerUniqueNames.includes(res.uniqueName);
+ });
+ }
+ if (this.getUserListPostRequest && this.getUserListPostRequest.status && this.getUserListPostRequest.status.length > 0) {
+ this.selectedPlanStatus = this.getUserListPostRequest.status;
+ this.planStatusType.active = this.planStatusType.expired = this.planStatusType.trial = false;
+ this.selectedPlanStatus.forEach(res => {
+ this.planStatusType[res] = true;
+ });
+ }
+ if (this.getUserListPostRequest && this.getUserListPostRequest.countryCodes && this.getUserListPostRequest.countryCodes.length > 0) {
+ this.selectedCountries = this.getUserListPostRequest.countryCodes;
+ this.countrySource.map(res => {
+ res.additional = this.getUserListPostRequest.countryCodes.includes(res.value);
+ });
+ }
+ if (this.getUserListPostRequest && this.getUserListPostRequest.lastSeen && this.getUserListPostRequest.lastSeen.operation) {
+ if (this.getUserListPostRequest.lastSeen.days) {
+ this.tempOperation = 'RELATIVE_' + this.getUserListPostRequest.lastSeen.operation;
+ } else if (this.getUserListPostRequest.lastSeen.from || this.getUserListPostRequest.lastSeen.to) {
+ this.tempOperation = 'ABSOLUTE_' + this.getUserListPostRequest.lastSeen.operation;
+ } else if (this.getUserListPostRequest.lastSeen.operation === 'UNAVAILABLE' || this.getUserListPostRequest.lastSeen.operation === 'AVAILABLE') {
+ this.tempOperation = this.getUserListPostRequest.lastSeen.operation;
+ }
+
+ }
+ this.getAllUserData();
+ } else {
+ this.getUserListPostRequest.lastSeen.operation = "BEFORE";
+ this.tempOperation = "BEFORE";
+ this.getAllUserData();
+ }
+ }
}
\ No newline at end of file
diff --git a/apps/web-giddh-admin/src/app/subscription/subscription.module.ts b/apps/web-giddh-admin/src/app/subscription/subscription.module.ts
index 5b96f58..b3a1d32 100644
--- a/apps/web-giddh-admin/src/app/subscription/subscription.module.ts
+++ b/apps/web-giddh-admin/src/app/subscription/subscription.module.ts
@@ -6,9 +6,6 @@ import { SubscriptionRoutingModule } from './subscription-routing.module';
import { SubscriptionComponent } from './subscription-component/subscription.component';
import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
import { UserListComponent } from './components/user-list/user-list.component';
-import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
-import { PaginationModule } from 'ngx-bootstrap/pagination';
-import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { CompanyAdvanceSearchComponent } from './components/company-advance-search/company-advance-search.component';
import { AdvanceSearchComponent } from './components/advance-search/advance-search.component';
import { TabsModule } from 'ngx-bootstrap/tabs';
@@ -22,6 +19,9 @@ import { TimeAgoPipe } from 'time-ago-pipe';
import { UpdateTransactionsComponent } from './components/update-transactions/update-transactions.component';
import { ShSelectModule } from '../theme/ng-virtual-select/sh-select.module';
import { AssignPlanComponent } from './components/assign-plan/assign-plan.component';
+import { PaginationModule } from 'ngx-bootstrap/pagination';
+import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
@NgModule({
declarations: [SubscriptionComponent, SubscriptionContainerComponent, UserListComponent, AdvanceSearchComponent, EditPlanModalComponent, EditSubscriptionsComponent, TimeAgoPipe, UpdateTransactionsComponent, AssignPlanComponent, CompanyAdvanceSearchComponent],
diff --git a/apps/web-giddh-admin/src/assets/css/style-2.css b/apps/web-giddh-admin/src/assets/css/style-2.css
index c3fa394..26df4b9 100644
--- a/apps/web-giddh-admin/src/assets/css/style-2.css
+++ b/apps/web-giddh-admin/src/assets/css/style-2.css
@@ -1176,11 +1176,15 @@ bs-datepicker-container {
background: #eeeff9!important;
}
+.min-width-120 {
+ min-width: 120px !important;
+}
+.min-width-210 {
+ min-width: 210px !important;
+}
.min-width-110 {
- min-width: 101px !important;
+ min-width: 110px !important;
}
-
-
/* .multiselect-dropdown {
max-width: 200px !important;
min-width: 200px !important;