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

merge pd form master : kms

Browse Source
This commit is contained in:
gandhimathi 2018-11-14 17:52:48 +05:30
parent b9952b5d4c
commit b492f2b42d
13 changed files with 157 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

119
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
View File

@ -46,69 +46,69 @@ export class StartPdComponent implements OnInit, OnDestroy {
// category static form buttons
categoryFormButtons: any = [
{
"form_id": 1,
"form_name": "Supplier Details"
},
{
"form_id": 2,
"form_name": "Client Details",
},
{
"form_id": 3,
"form_name": "Personal Details",
},
{
"form_id":4,
"form_name":"Asset Details",
},
{
"form_id": 5,
"form_name": "Address"
},
{
"form_id": 6,
"form_name": "Family",
},
{
"form_id": 7,
"form_name": "Banking",
},
{
"form_id": 8,
"form_name": "Current Loan",
},
{
"form_id": 9,
"form_name": "Other Income",
},
{
"form_id": 10,
"form_name": "Loan Details",
},
{
"form_id": 11,
"form_name": "Stock",
},
{
"form_id": 12,
"form_name": "Employmet Info",
},
{
"form_id": 13,
"form_name": "Business Info",
},
{
"form_id": 14,
"form_name": "Financial Info",
},
];
// categoryFormButtons: any = [
// {
// "form_id": 1,
// "form_name": "Supplier Details"
// },
// {
// "form_id": 2,
// "form_name": "Client Details",
// },
// {
// "form_id": 3,
// "form_name": "Personal Details",
// },
// {
// "form_id":4,
// "form_name":"Asset Details",
// },
// {
// "form_id": 5,
// "form_name": "Address"
// },
// {
// "form_id": 6,
// "form_name": "Family",
// },
// {
// "form_id": 7,
// "form_name": "Banking",
// },
// {
// "form_id": 8,
// "form_name": "Current Loan",
// },
// {
// "form_id": 9,
// "form_name": "Other Income",
// },
// {
// "form_id": 10,
// "form_name": "Loan Details",
// },
// {
// "form_id": 11,
// "form_name": "Stock",
// },
// {
// "form_id": 12,
// "form_name": "Employmet Info",
// },
// {
// "form_id": 13,
// "form_name": "Business Info",
// },
// {
// "form_id": 14,
// "form_name": "Financial Info",
// },
// ];
pdFullDetails:any=[];
// category static form buttons
// categoryFormButtons: any;
categoryFormButtons: any;
// = [
// {
// "form_id": 1,
@ -293,6 +293,7 @@ pdFullDetails:any=[];
if (data.status == 200) {
this.pdMasterList=data.records.pdmaster_details;
this.categoryList=data.records.question_answers;
this.categoryFormButtons = data.records.template_forms;
let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1);
this.mainApplicantName = filterApplicantName[0].applicant_name;
this.currentPDStatus = data.records.pdmaster_details.pd_status;

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

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

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

@ -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';

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 { IndustryMasterDialogComponent } from './industry-master-dialog.component';
import { IndustryClassificationDialogComponent } from './industry_classification-dialog.component';
describe('IndustryMasterDialogComponent ', () => {
let component: IndustryMasterDialogComponent ;
let fixture: ComponentFixture<IndustryMasterDialogComponent >;
let component: IndustryClassificationDialogComponent ;
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();
});

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 { PdAllocationTypeListComponent } from './pd-allocation-type-list.component';
import { PdNotificationListComponent } from './pd-notification-list.component';
describe('PdAllocationTypeListComponent', () => {
let component: PdAllocationTypeListComponent;
let fixture: ComponentFixture<PdAllocationTypeListComponent>;
let component: PdNotificationListComponent;
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();
});

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

@ -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" (click)="managepdteam()" matTooltip="Manage PD Team" matTooltipPosition="above"><mat-icon>people</mat-icon></button>
<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 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-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-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>
@ -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>

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

@ -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: [

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

@ -21,7 +21,9 @@ export interface Master {
constant_name:string;
}
@Injectable()
@Injectable({
providedIn: 'root'
})
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 */
import { environment } from 'environments/environment';
@Injectable()
@Injectable({
providedIn: 'root'
})
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 { 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]

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