Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build issues changes , entity , masters - kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-11-14 17:03:48 +05:30
parent f6926d3c72
commit 2b039e28d5
12 changed files with 100 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ng6-seed/src/app/dashboard/dashboard.service.ts
View File

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

14
ng6-seed/src/app/settings/entity/entity.component.ts
View File

@ -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 {
} // }

10
ng6-seed/src/app/settings/entity/entity.module.ts
View File

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

2
ng6-seed/src/app/settings/entity/entity.routing.ts
View File

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

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

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

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

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

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

@ -1,90 +1,78 @@
<div *ngIf="listView"> <div *ngIf="listView">
<mat-card> <mat-card>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-1"> <div fxLayout="row" fxLayoutAlign="start center" class="mb-1">
<div class="ml-xs mr-xs" style="width: 30%;"> <div class="ml-xs mr-xs" style="width: 30%;">
<mat-card-title><span> PD Team</span></mat-card-title> <mat-card-title><span> PD Team</span></mat-card-title>
</div> </div>
</div> </div>
<mat-card-content> <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 class="filter-container mat-elevation-z8">
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header"> <div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div *ngIf="!noRecordFound" class="ml-xs mr-xs" style="width: 80%;"> <div *ngIf="!noRecordFound" class="ml-xs mr-xs" style="width: 80%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;"> <mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div>
<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" (click)="managepdteam()" matTooltip="Manage PD Team"
matTooltipPosition="above"><mat-icon>people</mat-icon></button>
</div>
</div> </div>
<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> <mat-table *ngIf="!noRecordFound" [dataSource]="dataSource" matSort>
<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>
<ng-container matColumnDef="serialno">
<mat-header-cell *matHeaderCellDef mat-sort-header>Sl </mat-header-cell>
<mat-cell *matCellDef="let row; let i = index;"> {{row.serialno}} </mat-cell>
</ng-container>
<ng-container matColumnDef="team_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Team </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.team_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="lender_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Lender </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.lender_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row">
<!--{{row.isactive}}-->
<mat-slide-toggle class="example-margin" [color]="color" [checked]="row.isactive==1?true:false" [matTooltip]="row.isactive==1?'Active':'Inactive'"
matTooltipPosition="above" (click)="isactivePdTeam(row.pdteam_id,row.isactive)">
</mat-slide-toggle>
</mat-cell>
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editPdTeam(row.pdteam_id)"><mat-icon>edit</mat-icon></button>
</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;">
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div> </div>
</mat-card-content>
<!-- <div class="ml-xs mr-xs" style="width: 10%; text-align: right;"> </mat-card>
<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 >
<ng-container matColumnDef="serialno">
<mat-header-cell *matHeaderCellDef mat-sort-header>Sl </mat-header-cell>
<mat-cell *matCellDef="let row; let i = index;"> {{row.serialno}} </mat-cell>
</ng-container>
<ng-container matColumnDef="team_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Team </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.team_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="lender_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Lender </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.lender_name}} </mat-cell>
</ng-container>
<ng-container matColumnDef="isactive">
<mat-header-cell *matHeaderCellDef mat-sort-header> Active </mat-header-cell>
<mat-cell *matCellDef="let row"><!--{{row.isactive}}-->
<mat-slide-toggle
class="example-margin" [color]="color"
[checked] ="row.isactive==1?true:false"
[matTooltip]="row.isactive==1?'Active':'Inactive'"
matTooltipPosition="above"
(click)="isactivePdTeam(row.pdteam_id,row.isactive)">
</mat-slide-toggle>
</mat-cell>
</ng-container>
<ng-container matColumnDef="actions">
<mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editPdTeam(row.pdteam_id)"><mat-icon>edit</mat-icon></button>
</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;">
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
</mat-card-content>
</mat-card>
</div> </div>
<notifier-container></notifier-container> <!--<div *ngIf="!listView">
<div *ngIf="!listView">
<app-pd-team-edit [childMessage]="parentMessage"></app-pd-team-edit> <app-pd-team-edit [childMessage]="parentMessage"></app-pd-team-edit>
</div> </div>-->
<notifier-container></notifier-container>

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

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

4
ng6-seed/src/app/settings/service/masters/masters.service.ts
View File

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

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

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

4
ng6-seed/src/app/settings/settings.module.ts
View File

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

3
ng6-seed/src/app/settings/users/users.module.ts
View File

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