diff --git a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts
index 62f166ac7..dc2cbe7bb 100644
--- a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts
+++ b/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts
@@ -20,9 +20,9 @@ export interface Master {
export class PdTrigerService {
- private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
+ //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
//private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/";
- //private apiUrl = "http://ssa.sineedge.com/sparqtest/api/";
+ private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
constructor(private _http: HttpClient,
private _aws:AwsService) { }
diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
index c9e265933..07d63f9c1 100644
--- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
@@ -1,54 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
+
+ -->
-
-
-
-
- Sl
- {{row.serialno}}
-
-
-
+
+
+
+ No records found
-
+ No records found
-
-
-
\ No newline at end of file
diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss
index ed0fe77d4..dea0560d5 100644
--- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss
+++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.scss
@@ -1,126 +1,14 @@
-
-/* Structure
-.example-container {
- display: flex;
- flex-direction: column;
- min-width: 300px;
-}
-
-
-.example-header {
- min-height: 56px;
- max-height: 56px;
- display: flex;
- align-items: center;
- padding: 8px 24px 0;
- font-size: 20px;
- justify-content: space-between;
- border-bottom: 1px solid transparent;
-}
-
-.mat-input-container {
- font-size: 14px;
- flex-grow: 1;
- margin-left: 32px;
- margin-top: 8px;
-}
-
-.example-no-results {
- display: flex;
- justify-content: center;
- padding: 24px;
- font-size: 12px;
- font-style: italic;
-}
-
- Selection styles
-.example-selection-header {
- font-size: 18px;
- background: rgba(255, 64, 129, 0.3);
- border-bottom: 1px solid #d696ac;
-}
-
-.mat-column-select {
- max-width: 54px;
-}
-
-.mat-row:hover, .example-selected-row {
- background: #f5f5f5;
-}
-
-.mat-row:active, .mat-row.example-selected-row {
- background: #eaeaea;
-}
-
-.mat-table {
- overflow: auto;
- max-height: 500px;
-}
-/*** Structure *
-.example-container {
- display: flex;
- flex-direction: column;
- min-width: 30px;
- width : 80%;
- margin : 20px auto;
-}
-
-.example-header {
- min-height: 64px;
- padding: 8px 24px 0;
-}****/
-
-
-
-// .example-header {
-// min-height: 56px;
-// max-height: 56px;
-// display: flex;
-// align-items: center;
-// padding: 8px 24px 0;
-// font-size: 20px;
-// justify-content: space-between;
-// border-bottom: 1px solid transparent;
-// }
-
-
-// .active:hover{
-// color: green;
-// font-size: 20px;
-// }
-// .deactive:hover{
-// color: red;
-// font-size: 20px;
-// }
-
-// mat-cell{
-// display:flex !important;
-// justify-content:center!important;
-// }
-
-// mat-header-cell {
-// display:flex;
-// justify-content:center;
-// }
-
-// .example-h2 {
-// margin: 10px;
-// }
-
-// .example-section {
-// display: flex;
-// align-content: center;
-// align-items: center;
-// height: 60px;
-// }
-
+/** Table SerialNo CSS */
.example-margin {
margin: 10px;
}
+
+/** Table CSS - Dislplay Data */
.mat-table {
display: table;
-
-
+ width: 100%;
+ overflow: auto;
+ max-height: 500px;
> .mat-header-row, > .mat-row {
display: table-row;
@@ -137,54 +25,26 @@
}
}
-
-.mat-form-field {
- font-size: 14px;
- width: 100%;
-}
-
+/** Table CSS -nocontent */
.nocontent {
color: red;
font-size: 16px;
- //display:flex;
- //justify-content:center;
- // min-height: 56px;
- // max-height: 56px;
text-align: center;
}
-.example-container {
- display: flex;
- flex-direction: column;
- min-width: 300px;
-}
-
-.example-header {
- min-height: 64px;
- padding: 8px 24px 0;
-}
-
-
-
-/** new ..**
-.example-container {
- display: flex;
- flex-direction: column;
- min-width: 300px;
-}
-
-.example-header {
- min-height: 64px;
- padding: 8px 24px 0;
-}
-
+/** Table CSS - Search(or)Filter Field */
.mat-form-field {
font-size: 14px;
width: 100%;
}
-
-.mat-table {
- overflow: auto;
- max-height: 500px;
+
+.filter-container {
+ display: flex;
+ flex-direction: column;
+ min-width: 300px;
}
-*/
\ No newline at end of file
+
+.filter-header {
+ min-height: 64px;
+ padding: 8px 24px 0;
+}
\ No newline at end of file
diff --git a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.ts b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.ts
index e0440bf06..98a1e9063 100644
--- a/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.ts
+++ b/ng6-seed/src/app/settings/masters/component/pd-team/pd-team-list/pd-team-list.component.ts
@@ -11,6 +11,7 @@ MatTableDataSource } from '@angular/material';
/** Service */
import { MastersService } from '../../../../service/masters/masters.service';
import { PdTeamService } from '../../../../service/masters/pd-team.service';
+import { NotifierService } from 'angular-notifier';
/** Dialog Component */
import { PdTeamDialogComponent } from '../pd-team-dialog/pd-team-dialog.component';
@@ -30,6 +31,7 @@ export class PdTeamListComponent implements OnInit {
color = 'primary';
userData = null;
noRecordFound: boolean = false;
+ private notifier: NotifierService;
public dataLength: number;
@@ -39,10 +41,11 @@ export class PdTeamListComponent implements OnInit {
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
- constructor(private dialog: MatDialog,
+ constructor(private dialog: MatDialog, notifier: NotifierService,
private _MasterService: MastersService,
private _PdTeamService: PdTeamService) {
this.getPdTeam();
+ this.notifier = notifier;
}
ngOnInit() {}
@@ -130,7 +133,8 @@ export class PdTeamListComponent implements OnInit {
this.getPdTeam();
}
else{
- alert("SomeThing Wents Wrong Try Again !");
+ //alert("SomeThing Wents Wrong Try Again !");
+ this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
}
});
}