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

Chenages

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-07-11 12:12:40 +05:30
parent 10260e05a7
commit 01a9dbff57
10 changed files with 93 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html
View File

@ -36,8 +36,8 @@
<span style="font-size: 13px;" >{{details.lender_full_name}} ({{details.lender_applicant_id}})</span><br> <span style="font-size: 13px;" >{{details.lender_full_name}} ({{details.lender_applicant_id}})</span><br>
</div> </div>
<div fxFlex="45" style="text-align:right;" *ngIf="details.pd_status!=pdStatusCheck.DRAFT"> <div fxFlex="45" style="text-align:right;" *ngIf="details.pd_status!=pdStatusCheck.DRAFT">
<button mat-raised-button mat-button-sm mat-icon-button class="mr-1 hover-icon" type="button" matTooltip="PD Allocation" matTooltipPosition="above" (click)="pdAllocationTo(details)" *ngIf="roleAccessDetails.allocate"><mat-icon>verified_user</mat-icon></button> <span *ngIf="userRoleID == 3 || userRoleID == 10"><button mat-raised-button mat-button-sm mat-icon-button class="mr-1 hover-icon" type="button" matTooltip="PD Allocation" matTooltipPosition="above" (click)="pdAllocationTo(details)" *ngIf="roleAccessDetails.allocate"><mat-icon>verified_user</mat-icon></button></span>
<button mat-raised-button mat-button-sm mat-icon-button class=" hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(details)" *ngIf="roleAccessDetails.schedule"><mat-icon>schedule</mat-icon></button> <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button mat-raised-button mat-button-sm mat-icon-button class=" hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(details)" *ngIf="roleAccessDetails.schedule"><mat-icon>schedule</mat-icon></button></span>
</div> </div>
</div> </div>
</mat-card-title> </mat-card-title>

1
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts
View File

@ -18,6 +18,7 @@ import { SchedulePdComponent } from './../schedule-pd/schedule-pd.component';
}) })
export class MapPdViewComponent implements OnInit, OnDestroy { export class MapPdViewComponent implements OnInit, OnDestroy {
private notifier:NotifierService; private notifier:NotifierService;
public userRoleID = +localStorage.getItem('user_role');
lat:string lat:string
lng:string lng:string
mapDetails:any[] = []; mapDetails:any[] = [];

76
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
View File

@ -206,53 +206,53 @@
</div> </div>
</ng-template> --> </ng-template> -->
<ng-template matTabContent> <ng-template matTabContent>
<div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles"> <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
<div fxLayout="row wrap" style="padding:20px;"> <div fxLayout="row wrap" style="padding:20px;">
<div fxFlex="100"> <div fxFlex="100">
<div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList"> <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
<div class="p-list-main mb-2" *ngIf="doc.document_type != 'pdf'"> <div class="p-list-main mb-2" *ngIf="doc.document_type != 'pdf'">
<div class="p-list"> <div class="p-list">
<div class="top"> <div class="top">
<!-- Thumbnail--> <!-- Thumbnail-->
<div class="thumbnail"> <div class="thumbnail">
<button mat-raised-button mat-icon-button class="date mr-1 mb-1 hover-icon" type="button" matTooltip="edit" (click)="imageCrop(doc)" <button mat-raised-button mat-icon-button class="date mr-1 mb-1 hover-icon" type="button" matTooltip="edit" (click)="imageCrop(doc)"
matTooltipPosition="right"> matTooltipPosition="right">
<mat-icon>edit</mat-icon> <mat-icon>edit</mat-icon>
</button> </button>
<img src="{{doc.document}}" alt="{{doc.document_name}}"> <img src="{{doc.document}}" alt="{{doc.document_name}}">
</div> </div>
<label *ngIf="doc.document_title != ''" <label *ngIf="doc.document_title != ''"
style="font-size: 0.85rem">{{doc.document_title}}</label></div> style="font-size: 0.85rem">{{doc.document_title}}</label></div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div fxFlex="row"> </div>
<div fxFlex="100" class="m-gap p-gap"> <div fxFlex="row">
<div fxLayout="row" fxLayoutWrap="wrap"> <div fxFlex="100" class="m-gap p-gap">
<div *ngFor="let doc of documentsAndFilesList"> <div fxLayout="row" fxLayoutWrap="wrap">
<div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50" <div *ngFor="let doc of documentsAndFilesList">
fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20" <div class="text-center mb-2 hover-icon" fxFlex.xs="50" fxFlex.sm="50"
*ngIf="doc.document_type == 'pdf';"> fxFlex.md="20" fxFlex.lg="20" fxFlex.xl="20"
<!-- <a href="http://www.google.com" target="_blank"> --> *ngIf="doc.document_type == 'pdf';">
<mat-icon <!-- <a href="http://www.google.com" target="_blank"> -->
style="color: #e00201;font-size: 60px !important;width:inherit !important;" <mat-icon
(click)="pdf(doc.document)">picture_as_pdf</mat-icon> style="color: #e00201;font-size: 60px !important;width:inherit !important;"
<span class="d-block">{{doc.document_title}}</span> (click)="pdf(doc.document)">picture_as_pdf</mat-icon>
<!-- </a> --> <span class="d-block">{{doc.document_title}}</span>
</div> <!-- </a> -->
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<ng-template #noFiles> </div>
<mat-card-content> <ng-template #noFiles>
<p style="margin: 20px;">No Files</p> <mat-card-content>
</mat-card-content> <p style="margin: 20px;">No Files</p>
</ng-template> </mat-card-content>
</ng-template>
</ng-template> </ng-template>
</mat-tab> </mat-tab>
</mat-tab-group> </mat-tab-group>

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts
View File

@ -58,7 +58,7 @@ public salesDeclaredCustomer: any=[];
public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequencyList,businessExpenseList: this.businessExpenseList,businessIncomeList:this.businessIncomeList,pdid:'',company_id:'',grossProfitTypeList:this.grossProfitTypeList,salesDeclaredCustomer:this.salesDeclaredCustomer}; public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequencyList,businessExpenseList: this.businessExpenseList,businessIncomeList:this.businessIncomeList,pdid:'',company_id:'',grossProfitTypeList:this.grossProfitTypeList,salesDeclaredCustomer:this.salesDeclaredCustomer};
DailyPurchaseComponent:boolean; DailyPurchaseComponent:boolean;
PurchaseComponent:boolean; PurchaseComponent:boolean;
documentsAndFilesList: any; documentsAndFilesList: any = [];
//public finalData: any; //public finalData: any;
constructor(notifier: NotifierService, private route: ActivatedRoute, constructor(notifier: NotifierService, private route: ActivatedRoute,
private router: Router, private router: Router,
@ -103,6 +103,7 @@ public viewerOptions: any = {
this.getAIMaster('FREQUENCY',2); this.getAIMaster('FREQUENCY',2);
this.getAIMaster('BUSINESSEXPENSES',3); this.getAIMaster('BUSINESSEXPENSES',3);
this.getAIMaster('BUSINESSINCOME',4); this.getAIMaster('BUSINESSINCOME',4);
this.retriveFile();
} }
// load ai details // load ai details
loadAIDetails(): void{ loadAIDetails(): void{

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts
View File

@ -242,7 +242,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
let addressType = dataValue.address_type != 1 ? selectedAddressType.address_type : dataValue.address_type_others; let addressType = dataValue.address_type != 1 ? selectedAddressType.address_type : dataValue.address_type_others;
this.address_type = addressType; this.address_type = addressType;
let address = dataValue.address + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.pincode == 1 ? dataValue.pincode_others : selectedPincode.pincode); let address = dataValue.address.replace(/\n/g,"") + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.pincode == 1 ? dataValue.pincode_others : selectedPincode.pincode);
this.placeholderName[inx] = 'Was any business activity seen at the ' + addressType + ' during PD visit?'; this.placeholderName[inx] = 'Was any business activity seen at the ' + addressType + ' during PD visit?';
let addressLabel = address + ' / ' + addressType; let addressLabel = address + ' / ' + addressType;
@ -284,7 +284,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
let addressType = dataValue.address_type != 1 ? selectedAddressType.address_type : dataValue.address_type_others; let addressType = dataValue.address_type != 1 ? selectedAddressType.address_type : dataValue.address_type_others;
this.address_type = addressType; this.address_type = addressType;
let address = dataValue.alternative_address + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.alternative_pincode == 1 ? dataValue.alternative_pincode_others : selectedPincode.pincode); let address = dataValue.alternative_address.replace(/\n/g,"") + ' , ' + selectedCity.city_name + ',' + selectedState.name + '-' + (dataValue.alternative_pincode == 1 ? dataValue.alternative_pincode_others : selectedPincode.pincode);
this.placeholderName[inx] = 'Was any business activity seen at the ' + addressType + ' during PD visit?'; this.placeholderName[inx] = 'Was any business activity seen at the ' + addressType + ' during PD visit?';
let addressLabel = address + ' / ' + addressType; let addressLabel = address + ' / ' + addressType;
@ -566,7 +566,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
initBusinessAddressDetailsWithdata(data) { initBusinessAddressDetailsWithdata(data) {
return this._formBuilder.group({ return this._formBuilder.group({
address_label: [data.address_label], address_label: [data.address_label.replace(/\n/g,"")],
business_years: [data.business_years], business_years: [data.business_years],
business_month: [data.business_month], business_month: [data.business_month],
business_address_availability: [data.business_address_availability], business_address_availability: [data.business_address_availability],

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
View File

@ -1057,8 +1057,8 @@
<div fxLayout="row wrap" class="tab_class" *ngFor="let countryList of wholesale.get('countries_where_export_done').controls; let c = index" <div fxLayout="row wrap" class="tab_class" *ngFor="let countryList of wholesale.get('countries_where_export_done').controls; let c = index"
[formGroupName]="c"> [formGroupName]="c">
<mat-form-field style="width:70%;"> <mat-form-field style="width:70%;">
<mat-label>Countries Where Max Sales Done for <!-- <mat-label>Countries Where Max Sales Done for
{{wholesale.value.main_products}}</mat-label> {{wholesale.value.main_products}}</mat-label> -->
<mat-label>Countries Where The Export Is Being Done for <mat-label>Countries Where The Export Is Being Done for
{{wholesale.value.main_products}}</mat-label> {{wholesale.value.main_products}}</mat-label>

2
ng6-seed/src/app/settings/users/user-profile/user-profile-component.html
View File

@ -30,7 +30,7 @@
<button mat-raised-button mat-icon-button type="button" matTooltip="Change Password" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" data-scribe-element="profile_edit_button" (click)="changePassword()"> <button mat-raised-button mat-icon-button type="button" matTooltip="Change Password" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" data-scribe-element="profile_edit_button" (click)="changePassword()">
<mat-icon>https</mat-icon> <mat-icon>https</mat-icon>
</button> </button>
<span *ngIf="userRoleID == '10'"><button mat-raised-button mat-icon-button type="button" matTooltip="Edit Profile" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" data-scribe-element="profile_edit_button" (click)="editprofile()"> <span *ngIf="userRoleID == 10"><button mat-raised-button mat-icon-button type="button" matTooltip="Edit Profile" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" data-scribe-element="profile_edit_button" (click)="editprofile()">
<mat-icon>edit</mat-icon> <mat-icon>edit</mat-icon>
</button></span> </button></span>
</div> </div>

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

@ -20,14 +20,14 @@ export const environment = {
venUserPoolId: '', venUserPoolId: '',
venClientId: '', venClientId: '',
firebase: { firebase: {
apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk", apiKey: "AIzaSyCk86rasBR2-sXlVu6ACUO406EM_1mcwgo",
authDomain: "ssa-push.firebaseapp.com", authDomain: "pdgenie-prod.firebaseapp.com",
databaseURL: "https://ssa-push.firebaseio.com", databaseURL: "https://pdgenie-prod.firebaseio.com%26quot%3B%2C/",
projectId: "ssa-push", projectId: "pdgenie-prod",
storageBucket: "ssa-push.appspot.com", storageBucket: "",
messagingSenderId: "627754063571", messagingSenderId: "906855209078",
appId: "1:627754063571:web:8cfa56d80607267b" appId: "1:906855209078:web:c1583378f1fb2c71"
} }
}; };

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

@ -19,13 +19,24 @@ export const environment = {
venUserPoolId: '', venUserPoolId: '',
venClientId: '', venClientId: '',
// firebase: {
// apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk",
// authDomain: "ssa-push.firebaseapp.com",
// databaseURL: "https://ssa-push.firebaseio.com",
// projectId: "ssa-push",
// storageBucket: "ssa-push.appspot.com",
// messagingSenderId: "627754063571",
// appId: "1:627754063571:web:8cfa56d80607267b"
// }
firebase: { firebase: {
apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk", apiKey: "AIzaSyCk86rasBR2-sXlVu6ACUO406EM_1mcwgo",
authDomain: "ssa-push.firebaseapp.com", authDomain: "pdgenie-prod.firebaseapp.com",
databaseURL: "https://ssa-push.firebaseio.com", databaseURL: "https://pdgenie-prod.firebaseio.com%26quot%3B%2C/",
projectId: "ssa-push", projectId: "pdgenie-prod",
storageBucket: "ssa-push.appspot.com", storageBucket: "",
messagingSenderId: "627754063571", messagingSenderId: "906855209078",
appId: "1:627754063571:web:8cfa56d80607267b" appId: "1:906855209078:web:c1583378f1fb2c71"
} }
}; };

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

@ -12,14 +12,24 @@ export const environment = {
authorization: 'sparqvenba2018', authorization: 'sparqvenba2018',
// firebase: {
// apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk",
// authDomain: "ssa-push.firebaseapp.com",
// databaseURL: "https://ssa-push.firebaseio.com",
// projectId: "ssa-push",
// storageBucket: "ssa-push.appspot.com",
// messagingSenderId: "627754063571",
// appId: "1:627754063571:web:8cfa56d80607267b"
// },
firebase: { firebase: {
apiKey: "AIzaSyCzmyM0WJ0wdLf8UsYoZ4GreICimyt7SEk", apiKey: "AIzaSyCk86rasBR2-sXlVu6ACUO406EM_1mcwgo",
authDomain: "ssa-push.firebaseapp.com", authDomain: "pdgenie-prod.firebaseapp.com",
databaseURL: "https://ssa-push.firebaseio.com", databaseURL: "https://pdgenie-prod.firebaseio.com%26quot%3B%2C/",
projectId: "ssa-push", projectId: "pdgenie-prod",
storageBucket: "ssa-push.appspot.com", storageBucket: "",
messagingSenderId: "627754063571", messagingSenderId: "906855209078",
appId: "1:627754063571:web:8cfa56d80607267b" appId: "1:906855209078:web:c1583378f1fb2c71"
}, },
region: 'ap-south-1', region: 'ap-south-1',