build issues changes , entity , masters - kdk

ng6-seed/src/app/dashboard/dashboard.service.ts

@@ -14,7 +14,9 @@ import { environment } from 'environments/environment';
 /** Consant Value For Created Date And Updated Date  */
 const currentdate = new Date().toJSON().slice(0,19).replace('T',' ');
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 
 export class DashboardService {
 

ng6-seed/src/app/settings/entity/entity.component.ts

@@ -1,7 +1,7 @@
-import { Component } from '@angular/core';
+// import { Component } from '@angular/core';
-@Component({
+// @Component({
-  template: `<h2>Entity Master Details List</h2>
+//   template: `<h2>Entity Master Details List</h2>
-  `
+//   `
-})
+// })
-export class EntityComponent { 
+// export class EntityComponent { 
-} 
+// } 

ng6-seed/src/app/settings/entity/entity.module.ts

@@ -22,7 +22,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { EntityRouting } from './entity.routing';
 
-import { EntityComponent } from './entity.component';
+// import { EntityComponent } from './entity.component';
 import { EntityListComponent } from './entity-list/entity.list.component';
 import { EntityAddComponent } from './entity-add/entity.add.component';
 import { EntityEditComponent } from './entity-edit/entity.edit.component';
@@ -38,7 +38,7 @@ import { EntityEditBillingInfoComponent } from './entity-edit/entity-edit-billin
 
 import { DialogAddEditBillingInfo } from './entity-edit/entity-edit-billing-info/entity-edit-billing-info.component';
 import { EntityEditVendorCityInfoComponent } from './entity-edit/entity-edit-vendor-city-info/entity-edit-vendor-city-info.component';
-import { MatTooltipModule } from '@angular/material/tooltip';
+// import { MatTooltipModule } from '@angular/material/tooltip';
 /**
  * Custom angular notifier options
  */
@@ -96,7 +96,7 @@ const customNotifierOptions: NotifierOptions = {
     MatProgressBarModule,MatDialogModule, MatSortModule,
     MatToolbarModule,MatSelectModule,MatListModule, MatMenuModule,
     MatCheckboxModule,
-    MatTooltipModule,
+    // MatTooltipModule,
     MatTabsModule,
     MatChipsModule,
   MatExpansionModule,
@@ -105,7 +105,7 @@ const customNotifierOptions: NotifierOptions = {
     ReactiveFormsModule
   ],
   declarations: [
-    EntityComponent,
+    // EntityComponent,
     EntityListComponent,
     EntityEditComponent,
     EntityAddComponent,
@@ -118,7 +118,7 @@ const customNotifierOptions: NotifierOptions = {
     EntityEditVendorCityInfoComponent
   ],
   entryComponents: [
-    // EntityEditComponent
+    EntityEditComponent,
     DialogAddEditBillingInfo,
     DialogEntityAddTatComponent,
     EntityAddComponent

ng6-seed/src/app/settings/entity/entity.routing.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 // Entity Component
-import { EntityComponent } from './entity.component';
+// import { EntityComponent } from './entity.component';
 import { EntityListComponent } from './entity-list/entity.list.component';
 import { EntityAddComponent } from './entity-add/entity.add.component';
 import { EntityEditComponent } from './entity-edit/entity.edit.component';

ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.spec.ts

@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {  IndustryMasterDialogComponent } from './industry-master-dialog.component';
+import {  IndustryClassificationDialogComponent } from './industry_classification-dialog.component';
 
 describe('IndustryMasterDialogComponent ', () => {
-  let component: IndustryMasterDialogComponent ;
+  let component: IndustryClassificationDialogComponent ;
-  let fixture: ComponentFixture<IndustryMasterDialogComponent >;
+  let fixture: ComponentFixture<IndustryClassificationDialogComponent >;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ IndustryMasterDialogComponent  ]
+      declarations: [ IndustryClassificationDialogComponent  ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(IndustryMasterDialogComponent );
+    fixture = TestBed.createComponent(IndustryClassificationDialogComponent );
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.spec.ts

@@ -1,20 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { PdAllocationTypeListComponent } from './pd-allocation-type-list.component';
+import { PdNotificationListComponent } from './pd-notification-list.component';
 
 describe('PdAllocationTypeListComponent', () => {
-  let component: PdAllocationTypeListComponent;
+  let component: PdNotificationListComponent;
-  let fixture: ComponentFixture<PdAllocationTypeListComponent>;
+  let fixture: ComponentFixture<PdNotificationListComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ PdAllocationTypeListComponent ]
+      declarations: [ PdNotificationListComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(PdAllocationTypeListComponent);
+    fixture = TestBed.createComponent(PdNotificationListComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html

@@ -6,9 +6,6 @@
       </div>
     </div>
     <mat-card-content>
-  <!-- <div *ngIf="loader">
-    <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
-  </div>  <br> -->
 
       <div class="filter-container  mat-elevation-z8">
         <div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
@@ -20,15 +17,13 @@
           <div *ngIf="noRecordFound" class="nocontent ml-xs mr-xs" style="width: 80%;">No records found</div>
           <div class="ml-xs mr-xs" style="width: 20%; text-align: right;">
 
-          <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color"  matTooltip="Add PD Team" matTooltipPosition="above" [routerLink]="['/setting/pdteam/addpdteam']" ><mat-icon>add</mat-icon></button>
+            <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" matTooltip="Add PD Team" matTooltipPosition="above"
-          <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="managepdteam()" matTooltip="Manage PD Team" matTooltipPosition="above"><mat-icon>people</mat-icon></button>
+              [routerLink]="['/setting/pdteam/addpdteam']"><mat-icon>add</mat-icon></button>
+            <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="managepdteam()" matTooltip="Manage PD Team"
+              matTooltipPosition="above"><mat-icon>people</mat-icon></button>
 
           </div>
 
-        <!-- <div class="ml-xs mr-xs" style="width: 10%; text-align: right;">
-            <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addPdTeam()" matTooltip="Add PD Team" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
->>>>>>> 3ad6314e0e602cb2c232acb142715009dca646f9
-        </div> -->
         </div>
 
         <mat-table *ngIf="!noRecordFound" [dataSource]="dataSource" matSort>
@@ -50,13 +45,10 @@
 
           <ng-container matColumnDef="isactive">
             <mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
-          <mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
+            <mat-cell *matCellDef="let row">
-            <mat-slide-toggle
+              <!--{{row.isactive}}-->
-            class="example-margin" [color]="color"
+              <mat-slide-toggle class="example-margin" [color]="color" [checked]="row.isactive==1?true:false" [matTooltip]="row.isactive==1?'Active':'Inactive'"
-            [checked] ="row.isactive==1?true:false"
+                matTooltipPosition="above" (click)="isactivePdTeam(row.pdteam_id,row.isactive)">
-            [matTooltip]="row.isactive==1?'Active':'Inactive'" 
-            matTooltipPosition="above"
-            (click)="isactivePdTeam(row.pdteam_id,row.isactive)">
               </mat-slide-toggle>
             </mat-cell>
           </ng-container>
@@ -77,14 +69,10 @@
 
         <mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
       </div>
-
-
-    
-
     </mat-card-content>
   </mat-card>
 </div>
-<notifier-container></notifier-container>
+<!--<div *ngIf="!listView">
-<div *ngIf="!listView">
   <app-pd-team-edit [childMessage]="parentMessage"></app-pd-team-edit>
-</div>
+</div>-->
+<notifier-container></notifier-container>

ng6-seed/src/app/settings/pd-team/pd-team.module.ts

@@ -94,14 +94,14 @@ const customNotifierOptions: NotifierOptions = {
     MatProgressBarModule,
     MatDialogModule, 
     MatSortModule,
-    MatToolbarModule,
     MatSelectModule,
     FlexLayoutModule,
     NgxMatSelectSearchModule,
     NgxDatatableModule,
     MatSortModule,
     MatSlideToggleModule,
-    MatTooltipModule,MatListModule,DragulaModule,
+    MatTooltipModule,
+    MatListModule,DragulaModule,
     NotifierModule.withConfig(customNotifierOptions),
   ],
   declarations: [

ng6-seed/src/app/settings/service/masters/masters.service.ts

@@ -21,7 +21,9 @@ export interface Master {
           constant_name:string;
 }
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 
 export class MastersService {
   

ng6-seed/src/app/settings/service/masters/pd-team.service.ts

@@ -14,7 +14,9 @@ const currentdate = new Date().toJSON().slice(0,19).replace('T',' ');
 /** Environment  */
 import { environment } from 'environments/environment';
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 
 export class PdTeamService {
   

ng6-seed/src/app/settings/settings.module.ts

@@ -25,7 +25,7 @@ import { UserListComponent } from './users/user-list/user-list.component';
 import { RouterModule } from '@angular/router';
 import { SettingsRoutes } from './settings.routing';
 import { RegisterComponent } from '../session/register/register.component';
-import { UserService } from './service/user.service';
+// import { UserService } from './service/user.service';
 
 import { MastersModule } from './masters/masters.module';
 import { PdTeamModule } from './pd-team/pd-team.module';
@@ -50,7 +50,7 @@ import { EntityModule } from './entity/entity.module';
   ],
   
   providers:[
-    UserService
+    // UserService
   ],
   
 //  declarations: [AddEntityComponent, EditEntityComponent, EntityListComponent]

ng6-seed/src/app/settings/users/users.module.ts

@@ -23,6 +23,7 @@ import { RegisterComponent } from './register/register.component';
 import { UserListComponent} from './user-list/user-list.component';
 import { UserProfileComponent, ChangePasswordDialog } from './user-profile/user-profile.component';
 
+import { UserService } from './../service/user.service';
 import { NewPasswordDialog, ForgotPass } from '../../session/login/login.component';
 // import { HttpClientModule } from '@angular/common/http';
 @NgModule({
@@ -41,7 +42,7 @@ import { NewPasswordDialog, ForgotPass } from '../../session/login/login.compone
     // HttpClientModule,
   ],
   declarations: [UserListComponent, RegisterComponent,UserProfileComponent],
-  
+  providers: [ UserService ]
   
 })
 export class UsersModule { }