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

flyhi feedback changes

Browse Source
This commit is contained in:
bitbucket 2022-10-13 16:16:56 +05:30
parent a2f69f3714
commit 3827b81823
25 changed files with 355 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ng6-seed/salespd_pwa__testing_07-09-2020.zip Normal file
View File

Binary file not shown.

3
ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list-filter/fly-hi-list-filter.component.html Normal file
View File

@ -0,0 +1,3 @@
<p>
fly-hi-list-filter works!
</p>

0
ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list-filter/fly-hi-list-filter.component.scss Normal file
View File

25
ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list-filter/fly-hi-list-filter.component.spec.ts Normal file
View File

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { FlyHiListFilterComponent } from './fly-hi-list-filter.component';
describe('FlyHiListFilterComponent', () => {
let component: FlyHiListFilterComponent;
let fixture: ComponentFixture<FlyHiListFilterComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ FlyHiListFilterComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(FlyHiListFilterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

15
ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list-filter/fly-hi-list-filter.component.ts Normal file
View File

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-fly-hi-list-filter',
templateUrl: './fly-hi-list-filter.component.html',
styleUrls: ['./fly-hi-list-filter.component.scss']
})
export class FlyHiListFilterComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}

137
ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list.component.html
View File

@ -49,6 +49,7 @@
</div>
<!--End Mobile View Code-->
<!--Start Web View Code-->
<div *ngIf="!flyHiData">
<div fxLayout="row wrap" *ngFor="let details of flyHiData">
<div class="cell" fxFlex.xs="10" fxFlex.sm="10" fxFlex.md="6" fxFlex.lg="6" fxFlex.xl="9" style="justify-content:flex-end">
<small mat-line>{{details.sales_pd_id}}</small>
@ -134,9 +135,145 @@
</div>
<mat-divider></mat-divider>
</div>
</div>
<!--End Web View Code-->
</div>
<mat-table [dataSource]="dataSourceTab4" matSort *ngIf="flyHiData.length > 0" >
<ng-container matColumnDef="sales_pd_id">
<mat-cell fxFlex.xs="10" fxFlex.sm="5" fxFlex.md="5" fxFlex.lg="6" fxFlex.xl="3" class="cell" *matCellDef="let details;" style="justify-content:flex-end">
<div [ngStyle]="{ 'font-weight': 'bold','font-size':'16px'}" mat-line>{{details.sales_pd_id}}</div>
<!-- <small mat-line>{{details.sales_pd_id
}}</small> -->
</mat-cell>
</ng-container>
<ng-container matColumnDef="sales_pd_sno">
<mat-cell fxFlex.xs="10" fxFlex.sm="15" fxFlex.md="18" fxFlex.lg="15" fxFlex.xl="14" class="cell" *matCellDef="let details;">
<!-- <span *ngIf="details.is_child" mat-line>
<b>{{details.is_child == 0 ? details.applicant_name : 'Add On PD' }}</b>
</span>
<br> -->
<small mat-line [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}" style="font-weight: bold;
text-align: left;
">{{details.sales_pd_sno}}</small><br/>
<small class="fontsize" style="color: black;font-weight: bold;" mat-line >{{details.sales_pd_type_master}}</small><br/>
<!-- <span class="fontsize" *ngIf="!details.lender_applicant_id"> Not Provided</span>
<span class="fontsize" *ngIf="details.lender_applicant_id"> {{details.lender_applicant_id}}</span>
<span class="fontsize" *ngIf="details.customer_segment_abbr">-({{details.customer_segment_abbr}} )</span><br>
<small mat-line *ngIf="details.fin_institute_name != null">{{details.fin_institute_name}}</small> -->
</mat-cell>
</ng-container>
<ng-container matColumnDef="applicant_name">
<mat-cell class="cell" *matCellDef="let details">
<span *ngIf="details.applicant_name" mat-line>
<b>{{details.applicant_name}}</b>
</span><br>
<span class="fontsize" mat-line> {{details.applicant_id}}</span>
</mat-cell>
</ng-container>
<ng-container matColumnDef="short_name">
<mat-cell class="cell" *matCellDef="let details">
<span style="font-weight:500"> <small mat-line>{{details.short_name}}</small></span><br/>
<span style="text-align: center;font-weight:400;font-size: 17px;"> <small mat-line>{{details.abbr}}</small></span>
</mat-cell>
</ng-container>
<ng-container matColumnDef="officer_name">
<mat-cell class="cell" *matCellDef="let details">
<span *ngIf="!details.officer_name" mat-line>
<small>--</small>
</span>
<span *ngIf="details.officer_name" mat-line>
<small mat-line >{{details.officer_name}}</small>
</span>
</mat-cell>
</ng-container>
<ng-container matColumnDef="status">
<mat-cell class="cell" *matCellDef="let details">
<span *ngIf="!details.status" mat-line>
<small>--</small>
</span>
<span *ngIf="details.status" mat-line>
<small mat-line [ngStyle]="{'color':details.status == 'COMPLETED' ? 'green' :'orange'}">{{details.status}}</small>
</span>
</mat-cell>
</ng-container>
<ng-container matColumnDef="createdon">
<mat-cell class="cell" *matCellDef="let details">
<small mat-line>{{details.createdon | date: 'dd/MM/yyyy'}}</small>
</mat-cell>
</ng-container>
<ng-container matColumnDef="view">
<mat-cell class="cell" *matCellDef="let details">
<!-- <small mat-line>{{details.createdon | date: 'dd/MM/yyyy'}}</small> -->
<button mat-button mat-icon-button class="hover-icon" type="button" [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}" (click)="editForm(details)"
matTooltip="View" matTooltipPosition="left"><mat-icon>visibility</mat-icon></button>
<button mat-button mat-icon-button class="hover-icon" type="button" matTooltip="Report" [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}" [disabled]="details.status != 'COMPLETED'"
matTooltipPosition="above" color="primary" [matMenuTriggerFor]="menu1"><mat-icon [ngStyle]="{'color':details.status == 'COMPLETED' ? '#0d93a9' :'gray'}">more_vert</mat-icon> </button>
<mat-menu #menu1="matMenu">
<button style="float: right" mat-menu-item class="hover-icon" type="button" matTooltip="PDF Download" [disabled]="details.status != 'COMPLETED'"
matTooltipPosition="left" [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}" (click)="salesPDpdf(details.sales_pd_id)"><mat-icon [ngStyle]="{'color':details.status == 'COMPLETED' ? '#0d93a9' :'gray'}" >file_download</mat-icon> <span [ngStyle]="{'color':details.status == 'COMPLETED' ? '#0d93a9' :'gray'}" >PDF Download</span></button>
<button mat-menu-item (click)="regeneratereport(details.sales_pd_id,'report')" [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}">
<mat-icon [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}">autorenew</mat-icon>
<span [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}">Re-Generate Report</span>
</button>
</mat-menu>
</mat-cell>
</ng-container>
<!-- <ng-container matColumnDef="Action">
<mat-cell class="cell" *matCellDef="let details;">
<button mat-button mat-icon-button class="hover-icon" type="button" matTooltip="ReGenerate" [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}" [disabled]="details.status != 'COMPLETED'"
matTooltipPosition="above" color="primary" [matMenuTriggerFor]="menu1"><mat-icon [ngStyle]="{'color':details.status == 'COMPLETED' ? '#0d93a9' :'gray'}">more_vert</mat-icon> </button>
<mat-menu #menu1="matMenu">
<button style="float: right" mat-menu-item class="hover-icon" type="button" matTooltip="PDF Download" [disabled]="details.status != 'COMPLETED'"
matTooltipPosition="left" [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}" (click)="salesPDpdf(details.sales_pd_id)"><mat-icon [ngStyle]="{'color':details.status == 'COMPLETED' ? '#0d93a9' :'gray'}" >file_download</mat-icon> <span [ngStyle]="{'color':details.status == 'COMPLETED' ? '#0d93a9' :'gray'}" >PDF Download</span></button>
<button mat-menu-item (click)="regeneratereport(details.sales_pd_id,'report')" [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}">
<mat-icon [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}">autorenew</mat-icon>
<span [ngStyle]="{'color':roleID == 20 ? '#0d93a9' :'#f44336'}">Re-Generate Report</span>
</button>
</mat-menu>
</mat-cell>
</ng-container> -->
<mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">
</mat-row>
</mat-table>
</mat-card-content>
<div [hidden]="recordStatus">
<mat-paginator #paginator class="mat-elevation-z1" [length]="length" [pageIndex]="pageIndex" [pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25,50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
</mat-paginator>
</div>
</mat-tab>
</mat-tab-group>
</mat-card>

11
ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list.component.scss
View File

@ -139,5 +139,16 @@ p.note {
font-size: 80%;
}
}
::ng-deep.mat-tab-body-content {
height: 100%;
overflow: hidden !important;
}
.mat-row {
min-width: max-content;
}
mat-table{
width: 98%;
}

42
ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list.component.ts
View File

@ -1,19 +1,22 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Component, Input, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { FlyhiService } from '../services/flyhi.service';
import { Router, ActivatedRoute } from '@angular/router';
import { MatDialog, MatTableDataSource, MatPaginator, MatSort } from '@angular/material';
import { MatDialog, MatTableDataSource, MatPaginator, MatSort, PageEvent } from '@angular/material';
import { ConstantsProvider } from 'app/providers/constants/constants';
import { LoaderService } from 'app/shared/loaderService/loader.service';
import { SalesPdService } from 'app/sales-pd/services/sales-pd.service';
import { ReGenerateReportComponent } from 'app/sales-pd/sales-pd-list/re-generate-report/re-generate-report.component';
@Component({
selector: 'app-fly-hi-list',
templateUrl: './fly-hi-list.component.html',
styleUrls: ['./fly-hi-list.component.scss']
styleUrls: ['./fly-hi-list.component.scss'],
encapsulation: ViewEncapsulation.None
})
export class FlyHiListComponent implements OnInit {
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
@Input() bindFilterValue: string;
public dataLengthTab4: number;
public dataSourceTab4 = new MatTableDataSource();
is_sales_login:boolean = false
@ -25,7 +28,12 @@ export class FlyHiListComponent implements OnInit {
limitMsg: boolean = false;
finallink: string;
filter_drop_down_data: { product_ids: any[]; lender_ids: any[]; pd_status: any[]; };
length = 5;
pageIndex = 0;
pageSize = 10;
pageEvent: PageEvent;
displayedColumns = ['sales_pd_id','sales_pd_sno','applicant_name','short_name','officer_name','status','createdon','view'
];
constructor(private loaderService:LoaderService,private constantProvider:ConstantsProvider,private dialog:MatDialog,private route: ActivatedRoute, private router: Router,private _fly_Hi:FlyhiService,private SalesPDService:SalesPdService) {
this.roleID = localStorage.getItem('user_role');
setTimeout(()=>{
@ -320,20 +328,20 @@ export class FlyHiListComponent implements OnInit {
}
// regeneratereport(data,option)
// {
regeneratereport(data,option)
{
// const dialogRef = this.dialog.open(ReGenerateReportComponent,{
// data: {pdid: data,option: option},
// disableClose: true,
// minWidth: '30%',
// maxWidth: '40%',
const dialogRef = this.dialog.open(ReGenerateReportComponent,{
data: {pdid: data,option: option},
disableClose: true,
minWidth: '30%',
maxWidth: '40%',
// })
// dialogRef.afterClosed()
// .subscribe(dataresult => {
// // this.viewPdDetails(this.viewID,this.masterRandomString)
// })
// }
})
dialogRef.afterClosed()
.subscribe(dataresult => {
// this.viewPdDetails(this.viewID,this.masterRandomString)
})
}
}

49
ng6-seed/src/app/fly-hi/fly-hi.module.ts
View File

@ -29,7 +29,48 @@ import { AngularSplitModule } from 'angular-split';
import { FormComponent } from './forms-dynamic/form/form.component';
import { ImageVideoComponent } from './image-video/image-video.component';
import { AnswerOptionCreateDialogComponent } from './forms-dynamic/answer-option-create-dialog/answer-option-create-dialog.component';
import { FlyHiListFilterComponent } from './fly-hi-list/fly-hi-list-filter/fly-hi-list-filter.component';
import { NotifierModule, NotifierOptions } from 'angular-notifier';
const pdCustomNotifierOptions: NotifierOptions = {
position: {
horizontal: {
position: 'right',
distance: 12
},
vertical: {
position: 'top',
distance: 32,
gap: 10
}
},
theme: 'material',
behaviour: {
autoHide: 2000,
onClick: 'hide',
onMouseover: 'pauseAutoHide',
showDismissButton: true,
stacking: 4
},
animations: {
enabled: true,
show: {
preset: 'slide',
speed: 300,
easing: 'ease'
},
hide: {
preset: 'fade',
speed: 300,
easing: 'ease',
offset: 50
},
shift: {
speed: 300,
easing: 'ease'
},
overlap: 150
}
};
@NgModule({
imports: [
CommonModule,
@ -79,10 +120,10 @@ import { AnswerOptionCreateDialogComponent } from './forms-dynamic/answer-option
OwlDateTimeModule,
OwlNativeDateTimeModule,
AngularSplitModule,
MatVideoModule
MatVideoModule,
NotifierModule.withConfig(pdCustomNotifierOptions),
],
declarations:[StartPd2Component,DynamicFormComponent,DynamicQuestionTemplateComponent,FormComponent,AnswerOptionCreateDialogComponent],
declarations:[StartPd2Component,DynamicFormComponent,DynamicQuestionTemplateComponent,FormComponent,AnswerOptionCreateDialogComponent, FlyHiListFilterComponent],
exports:[StartPd2Component],
entryComponents:[FlyHiListComponent,DynamicFormComponent,DynamicQuestionTemplateComponent,FormComponent],
providers:[ConstantsProvider,{ provide: MAT_DATE_LOCALE, useValue: 'en-GB' },{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},

4
ng6-seed/src/app/fly-hi/forms-dynamic/dynamic-form/dynamic-question-template/dynamic-question-template.component.ts
View File

@ -434,10 +434,11 @@ export class DynamicQuestionTemplateComponent implements OnInit {
this.local_city1=this.quesService.convertArrayNames(['city_id','city_name'], this.local_city1)
// console.log( this.local_city1)
this.city_array.push( this.local_city1)
// val.answers = null
if(this.city_array[this.json_index] == undefined){
val.answers = this.local_city1
}else{
this.city_array[this.json_index] = this.local_city1
val.answers = this.city_array[this.json_index]
}
@ -457,6 +458,7 @@ export class DynamicQuestionTemplateComponent implements OnInit {
if(this.pincode_array[this.json_index] == undefined){
val.answers = this.local_pincode1
}else{
this.pincode_array[this.json_index] = this.local_pincode1
val.answers = this.pincode_array[this.json_index]
}
// console.log( this.pincode_array,index)

2
ng6-seed/src/app/fly-hi/forms-dynamic/form/form.component.html
View File

@ -56,4 +56,4 @@
</button>
</div>
</mat-dialog-actions>
<!-- <notifier-container></notifier-container> -->
<notifier-container></notifier-container>

2
ng6-seed/src/app/fly-hi/forms-dynamic/form/form.component.ts
View File

@ -501,7 +501,7 @@ export class FormComponent implements OnInit {
this._flyhi.saveForm(params).subscribe(result=>{
if(result['dataStatus']) {
this.loaderService.closeMatSpinnerDialog()
// this.notifier.notify("success","Saved Successfully");
this.notifier.notify("success","Saved Successfully");
setTimeout(()=>{
this.dialogRef.close('refresh')
},1500)

2
ng6-seed/src/app/providers/constants/constants.ts
View File

@ -65,7 +65,7 @@ export class ConstantsProvider {
lenUserPoolId: "ap-south-1_4kkhgsYo0", // Username
lenClientId: "57t9fv113b5eab5pra127bbgn0", // ClientId for mobile
}
return (environment.production === true ? production : testing);
return (environment.production === true && environment.typeofEnvironment === 1? production : testing);

40
ng6-seed/src/app/sales-pd/components/ques-template/ques-template.html
View File

@ -76,8 +76,8 @@
<div >
<div class="top">
<!-- Thumbnail-->
<div class="thumbnail">
<div class="date" style="margin-bottom: -35px; text-align: end;" *ngIf="role_id == '20'">
<div class="thumbnail" >
<div class="date" style="margin-bottom: -35px; text-align: end;" *ngIf="parent_ques.get('answer_value').value != '' && role_id == '20'">
<!-- <button mat-raised-button mat-icon-button mat-mini-fab
class="date mr-1 mb-1 hover-icon" type="button"
matTooltip="edit" (click)="imageCrop(doc)"
@ -95,13 +95,24 @@
<img *ngIf="parent_ques.get('answer_value').value != ''" [src]="parent_ques.get('answer_value').value" imageViewer class="doc-image-bucket">
<img class="image-class" *ngIf="parent_ques.get('answer_value').value != ''" [src]="parent_ques.get('answer_value').value" imageViewer >
</div>
</div><br/>
<p *ngIf="parent_ques.get('answer_value').value == ''">Image is not captured.</p>
<div class="dummy-img" *ngIf="parent_ques.get('answer_value').value == ''">
<p
style="justify-content: center;align-content: center;text-align: center;align-items: center; margin-top: 10%;">
<span style="font-size: 15px;">
Image is not Captured.
</span><br />
<span style="font-size: 15px;">
<mat-icon>camera</mat-icon>
</span>
</p>
</div>
<!-- <p *ngIf="parent_ques.get('answer_value').value == ''">Image is not captured.</p> -->
<label ><strong>{{parent_ques.get('question').value}}</strong>
<!-- <button mat-raised-button mat-icon-button mat-mini-fab
class="date1 mr-1 mb-1 hover-icon" type="button"
@ -383,8 +394,23 @@
<!-- <div *ngIf="single_ques.get('type').value == '10'"> -->
<!-- {{parent_ques.value.questions_group.length}} -->
<p style="margin-left: 45px;font-weight:bold;" *ngIf="parent_ques.value.questions_group.length == 1 &&
group_ques.value.questions[0].answer_value == ''">Image is not captured.</p>
<div class="dummy-img" *ngIf="parent_ques.value.questions_group.length == 1 &&
group_ques.value.questions[0].answer_value == ''">
<p
style="justify-content: center;align-content: center;text-align: center;align-items: center; margin-top: 10%;">
<span style="font-size: 15px;">
Image is not Captured.
</span> <br />
<span style="font-size: 15px;">
Add More images.
</span> <br />
<span style="font-size: 15px;">
<mat-icon>camera</mat-icon>
</span>
</p>
</div>
<!-- <p style="margin-left: 45px;font-weight:bold;" *ngIf="parent_ques.value.questions_group.length == 1 &&
group_ques.value.questions[0].answer_value == ''">Image is not captured.</p> -->
<div fxLayout="column" style="align-self: center;text-align: center;padding: 0" *ngFor="let single_ques of group_ques.controls.questions['controls'];let s_i=index;let s_l=last"
[formGroupName]="s_i">
<div style="width: 100%;justify-content: center;text-align: center;align-content: center;margin:2%;padding-right: 20px;" *ngIf="single_ques.get('answer_value').value != ''">
@ -403,7 +429,7 @@
<mat-icon style="font-size: 14px; line-height: 0px;">edit</mat-icon>
</button>
</div>
<img [src]="single_ques.get('answer_value').value" imageViewer class="doc-image-bucket" >
<img [src]="single_ques.get('answer_value').value" imageViewer class="image-class" >
<br/>
</div>
</div>

31
ng6-seed/src/app/sales-pd/components/ques-template/ques-template.scss
View File

@ -85,12 +85,39 @@
right: -10px;
top: 4px;
background-color: #e00201 ;
}
.top .thumbnail .date1 {
// margin-right: 13px;
position: absolute;
right: -10px;
top: 50px;
background-color: #e00201 ;
}
.thumbnail{
max-width: 200px;
width: auto;
// height: 200px;
margin-top: 25px;
padding: 1.4%;
}
.dummy-img {
width: 125px;
height: 120px;
}
.dummy-img {
width: 200px;
height: 170px;
border: 3px dashed rgba(0, 0, 0, 0.2);
border-radius: 7px;
background: #eeee;
color: gray;
}
.image-class {
width: 200px;
height: 170px;
}

4
ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts
View File

@ -42,7 +42,8 @@ import { ImageEditComponent } from './image-edit/image-edit.component';
*/
@Component({
selector: 'ques-template',
templateUrl: 'ques-template.html'
templateUrl: 'ques-template.html',
styleUrls: ['ques-template.scss']
})
export class QuesTemplateComponent {
photoStructure = photoJSONStructure
@ -1607,6 +1608,7 @@ this.proceedonChangeProperty(modified)
// return invalid;
}
onSubmit(flag){
console.log(this.quesAnsForm.getRawValue())
// this.loaderService.showMatSpinnerDialog('Please wait...')
//1-Submit 0-Draft

1
ng6-seed/src/app/sales-pd/home/home.ts
View File

@ -772,6 +772,7 @@ export class Section9 {
console.log("Leaving on ionViewCanLeave");
}
setGroupControl(event){
console.log(event)
this.formGroupValue=event
}
checkImageUploadingStatus(sec_value) {

6
ng6-seed/src/app/sales-pd/sales-pd-list/re-generate-report/re-generate-report.component.ts
View File

@ -17,7 +17,9 @@ export class ReGenerateReportComponent implements OnInit {
title:any;
question:any;
geolocation:FormControl = new FormControl('',Validators.compose([Validators.required]))
constructor(private loaderService:LoaderService,notifier: NotifierService,private SalesPDService:SalesPdService,private dialogRef: MatDialogRef<ReGenerateReportComponent>,@Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
roleID: string;
constructor(private loaderService:LoaderService,notifier: NotifierService,private SalesPDService:SalesPdService,private dialogRef: MatDialogRef<ReGenerateReportComponent>,@Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier;
this.roleID = localStorage.getItem('user_role'); }
ngOnInit() {
this.option=this.data.option;
@ -42,7 +44,7 @@ export class ReGenerateReportComponent implements OnInit {
this.loaderService.showMatSpinnerDialog('Please wait...')
if(option=='report')
{
this.SalesPDService.generatesalereport(pdid)
this.SalesPDService.generatesalereport(pdid,this.roleID)
.subscribe(
data => {
if (data.status == 200) {

2
ng6-seed/src/app/sales-pd/section-list/section-list.component.html
View File

@ -15,7 +15,7 @@
</button>&nbsp;&nbsp;</span>
<button *ngIf="customer_link != '' && sales_pd_type == '2'" mat-raised-button mat-icon-button class="hover-icon" type="button" matTooltip="Copy Link" matTooltipPosition="above" (click)="copyToClipBoard(customer_link_with_text, 'Customer Link is copied')"><mat-icon>file_copy</mat-icon></button>&nbsp;&nbsp;
<button *ngIf="customer_link != '' && sales_pd_type == '2' ||flyHiUserId.user_role == '20' "[ngStyle]="{'color':flyHiUserId.user_role == '20' ? '#0d93a9' :'#f44336'}" mat-raised-button mat-icon-button class="hover-icon" type="button" matTooltip="Copy Link" matTooltipPosition="above" (click)="copyToClipBoard(customer_link_with_text, 'Customer Link is copied')"><mat-icon>file_copy</mat-icon></button>&nbsp;&nbsp;
<!-- <button *ngIf="customer_link != '' && sales_pd_type == '2'" mat-raised-button mat-icon-button class="hover-icon" type="button" matTooltip="Send Link vai SMS" matTooltipPosition="above" (click)="shareViaSMS()" ><mat-icon>textsms</mat-icon>
<ion-label >Send Link via SMS</ion-label>

4
ng6-seed/src/app/sales-pd/section-list/section-list.module.ts
View File

@ -4,9 +4,13 @@ import { SectionListRoutingModule } from './section-list-routing.module';
import { SectionListComponent } from './section-list.component';
import { SharedModule } from 'app/shared/shared.module';
import { MaterialModule } from '../material_modules/material.module';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatTooltipModule } from '@angular/material';
@NgModule({
imports: [
MatTooltipModule,
SectionListRoutingModule,
SharedModule,
MaterialModule

10
ng6-seed/src/app/sales-pd/services/sales-pd.service.ts
View File

@ -687,10 +687,16 @@ getCityPincode(value){
//return this.storage.remove(key)
}
generatesalereport(params :any): Observable<any> {
generatesalereport(params :any,role_id:any): Observable<any> {
// let httpParams = new HttpParams().set('pdid', countpdid);
// httpParams = httpParams.append('random_string',randomString);
return this._http.get(api_url + 'regenerateSaleReport?sales_pd_id=' +params)
if(role_id == '20'){
return this._http.get(api_url + 'regenerateFlyhiReport?sales_pd_id=' +params)
}else{
return this._http.get(api_url + 'regenerateSaleReport?sales_pd_id=' +params)
}
// .pipe(
// catchError(this.handleError('role', []))
// )

7
ng6-seed/src/assets/data/flyhi.json
View File

@ -799,7 +799,7 @@
},
{
"question": "Constitution of Employer / Business Applicant",
"question": "",
"question_key": "constitution_of_employer_business_applicant",
"type": "2",
"field_width": "100",
@ -813,10 +813,7 @@
"answer_id": "1",
"answer": "Private Ltd"
},
{
"answer_id": "2",
"answer": "Ltd"
},
{
"answer_id": "3",
"answer": "Trust/Society"

2
ng6-seed/src/environments/environment.prod.ts
View File

@ -1,6 +1,6 @@
export const environment = {
production: true,
typeofEnvironment:1,
environmentName: 'Production Environment',//Live Environment.
apiEndpoint: 'https://api.pdgenie.com/sparqprod/api/',

2
ng6-seed/src/environments/environment.stage.ts
View File

@ -5,7 +5,7 @@
export const environment = {
production: true,
typeofEnvironment:2,
environmentName: 'Development Environment',//Localhost Environment.
// apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/',

2
ng6-seed/src/environments/environment.ts
View File

@ -5,7 +5,7 @@
export const environment = {
production: false,
typeofEnvironment:3,
environmentName: 'Development Environment',//Localhost Environment.
// apiEndpoint: 'https://apitest.pdgenie.com/sparqtest/api/',