diff --git a/ng6-seed/src/app/dashboard/dashboard.service.ts b/ng6-seed/src/app/dashboard/dashboard.service.ts index e87616fad..0e4384116 100644 --- a/ng6-seed/src/app/dashboard/dashboard.service.ts +++ b/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 { diff --git a/ng6-seed/src/app/settings/entity/entity.component.ts b/ng6-seed/src/app/settings/entity/entity.component.ts index 81b196f17..eed9accb7 100644 --- a/ng6-seed/src/app/settings/entity/entity.component.ts +++ b/ng6-seed/src/app/settings/entity/entity.component.ts @@ -1,7 +1,7 @@ -import { Component } from '@angular/core'; -@Component({ - template: `

Entity Master Details List

- ` -}) -export class EntityComponent { -} \ No newline at end of file +// import { Component } from '@angular/core'; +// @Component({ +// template: `

Entity Master Details List

+// ` +// }) +// export class EntityComponent { +// } \ No newline at end of file diff --git a/ng6-seed/src/app/settings/entity/entity.module.ts b/ng6-seed/src/app/settings/entity/entity.module.ts index 44148d555..a6a5d04e7 100644 --- a/ng6-seed/src/app/settings/entity/entity.module.ts +++ b/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 diff --git a/ng6-seed/src/app/settings/entity/entity.routing.ts b/ng6-seed/src/app/settings/entity/entity.routing.ts index dd088e903..da8366b0e 100644 --- a/ng6-seed/src/app/settings/entity/entity.routing.ts +++ b/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'; diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.spec.ts b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.spec.ts index 1a9feee41..045a2017c 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.spec.ts +++ b/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 fixture: ComponentFixture; + let component: IndustryClassificationDialogComponent ; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ IndustryMasterDialogComponent ] + declarations: [ IndustryClassificationDialogComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(IndustryMasterDialogComponent ); + fixture = TestBed.createComponent(IndustryClassificationDialogComponent ); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.spec.ts b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.spec.ts index 22d79c3df..2a4fc995a 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.spec.ts +++ b/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 fixture: ComponentFixture; + let component: PdNotificationListComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ PdAllocationTypeListComponent ] + declarations: [ PdNotificationListComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(PdAllocationTypeListComponent); + fixture = TestBed.createComponent(PdNotificationListComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html index e20d2a1f1..c81881908 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html @@ -1,90 +1,78 @@
-
- PD Team -
-
- - +
+ PD Team +
+
+ -
-
-
+
+
+
+
+ +
+ + + + +
+
- -
- - - -
+ - -
- - - - - Sl - {{row.serialno}} - - - - Team - {{row.team_name}} - + + Sl + {{row.serialno}} + - - Lender - {{row.lender_name}} - - - - Active - - - - - - - - Action - - - - - - - - - - - - - -
+ + Team + {{row.team_name}} + + + Lender + {{row.lender_name}} + - + + Active + + + + + + - - + + Action + + + + + + + + + + + + + +
+ +
- -
+ + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/pd-team/pd-team.module.ts b/ng6-seed/src/app/settings/pd-team/pd-team.module.ts index dac9173f9..5dd92d6e3 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team.module.ts +++ b/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: [ diff --git a/ng6-seed/src/app/settings/service/masters/masters.service.ts b/ng6-seed/src/app/settings/service/masters/masters.service.ts index eb8d45625..67a22174f 100644 --- a/ng6-seed/src/app/settings/service/masters/masters.service.ts +++ b/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 { diff --git a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts index 1a837032a..544aa2401 100644 --- a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts +++ b/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 { diff --git a/ng6-seed/src/app/settings/settings.module.ts b/ng6-seed/src/app/settings/settings.module.ts index 1278c61a9..102385a5b 100644 --- a/ng6-seed/src/app/settings/settings.module.ts +++ b/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] diff --git a/ng6-seed/src/app/settings/users/users.module.ts b/ng6-seed/src/app/settings/users/users.module.ts index 0f8c5e310..debf4f1a2 100644 --- a/ng6-seed/src/app/settings/users/users.module.ts +++ b/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 { }