From a6b5178c7295be4525ee0f607e42f72a12a2e3d6 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 15 Mar 2017 15:45:26 +0000
Subject: [PATCH] #3527 fix - Changes on licenses list and routes
---
securis/src/main/webapp/src/app/license.list.component.ts | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/securis/src/main/webapp/src/app/license.list.component.ts b/securis/src/main/webapp/src/app/license.list.component.ts
index 9ff77ba..2417192 100644
--- a/securis/src/main/webapp/src/app/license.list.component.ts
+++ b/securis/src/main/webapp/src/app/license.list.component.ts
@@ -1,10 +1,13 @@
-import { Router } from '@angular/router';
+import { LocaleService } from './common/i18n';
+import { ActivatedRoute, Router } from '@angular/router';
import { MdDialog, MdDialogConfig } from '@angular/material';
import { TdDataTableService, TdDataTableSortingOrder, ITdDataTableSortChangeEvent, ITdDataTableColumn } from '@covalent/core';
import { IPageChangeEvent } from '@covalent/core';
import { Component, AfterViewInit } from '@angular/core';
import { TdMediaService } from '@covalent/core';
import { LicensesService } from './resources/licenses';
+import { PacksService } from './resources/packs';
+
import { LicenseFormComponent } from './forms/license.form.component';
var lic_example = { activation_code: '19fa8d30-29cb-4b59-81b5-3837af8204b6',
@@ -34,12 +37,13 @@
})
export class LicenseListComponent implements AfterViewInit {
data: any[] = [];
+ pack: any = null;
columns: ITdDataTableColumn[] = [
- { name: 'code', label: 'Code', tooltip: 'License pack code' },
- { name: 'application_name', label: 'App name' },
- { name: 'licensetype_code', label: 'License type' },
- { name: 'organization_name', label: 'Organization' },
- { name: 'used_licenses', label: 'Lics', tooltip: 'Initial/Available pack licenses' },
+ { name: 'code', label: 'Code', tooltip: 'License code' },
+ { name: 'full_name', label: 'User name' },
+ { name: 'email', label: 'User email' },
+ { name: 'expiration_date', label: 'Expiration date' },
+ { name: 'status', label: 'Status' },
{ name: 'menu', label: '' }
];
@@ -50,7 +54,7 @@
fromRow: number = 1;
currentPage: number = 1;
pageSize: number = 10;
- sortBy: string = 'application_name';
+ sortBy: string = 'expiration_date';
sortOrder: TdDataTableSortingOrder = TdDataTableSortingOrder.Descending;
filteredItems = this.data.length;
license_menu_options : any[] = [{
@@ -73,21 +77,36 @@
constructor(private _dataTableService: TdDataTableService,
private media: TdMediaService,
+ private $L: LocaleService,
private router: Router,
+ private route: ActivatedRoute,
private dialog: MdDialog,
private licenseForm: LicenseFormComponent,
- private licenses: LicensesService) {
- this.licenses.get().subscribe(
- list => {
- this.data = list;
- this.filter();
- },
- err => console.error(err)
- );
+ private licenses: LicensesService,
+ private packs: PacksService) {
}
ngOnInit(): void {
- this.filter();
+ this.route.params.subscribe(params => {
+ var packId = +params['id']; // (+) converts string 'id' to a number
+ this.licenses.getByPack(packId).subscribe(
+ list => {
+ this.data = list;
+ this.filter();
+ },
+ err => console.error(err)
+ );
+ this.packs.get(packId).subscribe(
+ packData => {
+ this.pack = packData;
+ },
+ err => console.error(err)
+ );
+ });
+ }
+
+ isLicenseExpired(lic: any): boolean {
+ return lic.expiration_date < (new Date().getTime());
}
createLicense() : void {
--
Gitblit v1.3.2