-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AstuteClient2/src/app/nav-bar/nav-bar.component.ts b/AstuteClient2/src/app/nav-bar/nav-bar.component.ts
index 7b4c9f8..383bc23 100644
--- a/AstuteClient2/src/app/nav-bar/nav-bar.component.ts
+++ b/AstuteClient2/src/app/nav-bar/nav-bar.component.ts
@@ -1,5 +1,7 @@
import {Component, Input, OnInit} from '@angular/core';
import {AstuteClientService} from '../services/astute-client-service';
+import {Router} from "@angular/router";
+import {ToastManagerService} from "../services/toast-manager/toast-service.service";
@Component({
selector: 'app-nav-bar',
@@ -16,20 +18,26 @@ export class NavBarComponent implements OnInit {
@Input() settingsActive: boolean;
- constructor(private astuteClientService: AstuteClientService) {
+ constructor(private astuteClientService: AstuteClientService, private router: Router, private toastService: ToastManagerService) {
}
ngOnInit() {
}
- // logout() {
- // this.astuteClientService.logout().then((data) => {
- // if (data) {
- // alert('Logout successful');
- // } else {
- // alert('Logout unsuccessful');
- // }
- // });
- // }
+ logout() {
+ this.astuteClientService.logout().then((data) => {
+ if (data) {
+ this.router.navigate(['/login']);
+ this.notif('Logout successful');
+ } else {
+ this.notif('Logout unsuccessful');
+ }
+ });
+ }
+
+ // ** toast notification method
+ notif(text: string) {
+ this.toastService.show(text, {classname: 'bg-danger text-light'});
+ }
}
diff --git a/AstuteClient2/src/app/services/toast-manager/toast-service.service.ts b/AstuteClient2/src/app/services/toast-manager/toast-service.service.ts
index 15cb84b..2bb16f9 100644
--- a/AstuteClient2/src/app/services/toast-manager/toast-service.service.ts
+++ b/AstuteClient2/src/app/services/toast-manager/toast-service.service.ts
@@ -5,8 +5,9 @@ import {Injectable, TemplateRef} from '@angular/core';
})
export class ToastManagerService {
toasts: any[] = [];
- show(textOrTpl: string | TemplateRef
, options: any = {}) {
- this.toasts.push({ textOrTpl, ...options });
+ show(textOrTpl: string, options: any = {}) {
+ const words = textOrTpl.split(' ').length;
+ this.toasts.push({ textOrTpl, delay: (words + 1) * 1000, ...options });
}
remove(toast) {
diff --git a/AstuteClient2/src/app/services/toast-manager/toasts-container/toasts-container.component.css b/AstuteClient2/src/app/services/toast-manager/toasts-container/toasts-container.component.css
index 13b4ccf..bd829e1 100644
--- a/AstuteClient2/src/app/services/toast-manager/toasts-container/toasts-container.component.css
+++ b/AstuteClient2/src/app/services/toast-manager/toasts-container/toasts-container.component.css
@@ -1,7 +1,7 @@
:host {
position: fixed;
top: 0;
- right: 0;
+ left: 0;
margin: 0.5em;
z-index: 1200;
}
\ No newline at end of file
diff --git a/AstuteClient2/src/app/services/toast-manager/toasts-container/toasts-container.component.html b/AstuteClient2/src/app/services/toast-manager/toasts-container/toasts-container.component.html
index 72b9637..5e5481d 100644
--- a/AstuteClient2/src/app/services/toast-manager/toasts-container/toasts-container.component.html
+++ b/AstuteClient2/src/app/services/toast-manager/toasts-container/toasts-container.component.html
@@ -2,7 +2,7 @@
*ngFor="let toast of toastService.toasts"
[class]="toast.classname"
[autohide]="true"
- [delay]="toast.delay || 5000"
+ [delay]="toast.delay || 15000"
(hide)="toastService.remove(toast)"
>
diff --git a/AstuteClient2/src/app/settings/settings.component.ts b/AstuteClient2/src/app/settings/settings.component.ts
index f728cbf..2dedd0f 100644
--- a/AstuteClient2/src/app/settings/settings.component.ts
+++ b/AstuteClient2/src/app/settings/settings.component.ts
@@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import {AstuteClientService} from '../services/astute-client-service';
import {Router} from '@angular/router';
+import {ToastManagerService} from "../services/toast-manager/toast-service.service";
@Component({
selector: 'app-settings',
@@ -17,7 +18,8 @@ export class SettingsComponent implements OnInit {
gridColumnApi;
constructor(private astuteClientService: AstuteClientService,
- private router: Router) {
+ private router: Router,
+ private toastService: ToastManagerService) {
}
ngOnInit() {
@@ -29,11 +31,11 @@ export class SettingsComponent implements OnInit {
console.log(data);
this.astuteClientService.updateServiceType(data.serviceTypeId, data).then((d) => {
if (!d) {
- alert('Service Type updating failed, check input fields');
+ this.notif('Service Type updating failed, check input fields');
}
this.refreshServiceTypeData();
}, (reason) => {
- alert('Update Service Type failed: ' + reason);
+ this.notif('Update Service Type failed: ' + reason);
});
}
@@ -41,11 +43,11 @@ export class SettingsComponent implements OnInit {
const data = {'serviceTypeName': ''};
this.astuteClientService.createServiceType(data).then((d) => {
if (!d) {
- alert('Create Service Type Failed!');
+ this.notif('Create Service Type Failed!');
}
this.refreshServiceTypeData();
}, (reason) => {
- alert('Create Service Type Failed: ' + reason);
+ this.notif('Create Service Type Failed: ' + reason);
});
}
@@ -73,12 +75,15 @@ export class SettingsComponent implements OnInit {
this.astuteClientService.logout().then((data) => {
if (data) {
this.router.navigate(['/login']);
- alert('Logout successful');
+ this.notif('Logout successful');
} else {
- alert('Logout unsuccessful');
+ this.notif('Logout unsuccessful');
}
});
}
-
+ // ** toast notification method
+ notif(text: string) {
+ this.toastService.show(text, {classname: 'bg-danger text-light'});
+ }
}
diff --git a/AstuteClient2/src/styles.css b/AstuteClient2/src/styles.css
index bb7c0b7..b48d58a 100644
--- a/AstuteClient2/src/styles.css
+++ b/AstuteClient2/src/styles.css
@@ -1,4 +1,4 @@
/* You can add global styles to this file, and also import other style files */
@import '~bootstrap/dist/css/bootstrap.min.css';
-@import "~ag-grid/dist/styles/ag-grid.css";
-@import "~ag-grid/dist/styles/ag-theme-balham.css";
+@import "~ag-grid-community/dist/styles/ag-grid.css";
+@import "~ag-grid-community/dist/styles/ag-theme-balham.css";