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

Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

Browse Source
This commit is contained in:
dineshkumarkannan 2018-11-17 10:34:04 +05:30
commit f528afd0a8
6 changed files with 298 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
View File

@ -59,7 +59,7 @@
<mat-form-field style="width: 100%">
<mat-select placeholder="Sub product Name" formControlName="fk_subproduct_id">
<mat-select placeholder="Sub Product Name" formControlName="fk_subproduct_id">
<mat-option *ngFor="let SPL of subProductList" [value]="SPL.subproduct_id" >
{{SPL.subproduct_name}}
</mat-option>
@ -116,7 +116,7 @@
</mat-form-field>
<mat-form-field style="width: 100%;">
<mat-select placeholder="City" formControlName="fk_city">
` <mat-option *ngFor="let CL of cityList" [value]="CL.city_id">
` <mat-option *ngFor="let CL of cityList" [value]="CL.city_id">
{{CL.city_name}}
</mat-option>
@ -221,11 +221,11 @@
<div fxLayout="row" fxLayoutWrap="wrap">
<div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
<mat-card class="p-2" style="opacity: 0.5;">
<mat-card class="p-2">
<h5>Co-Applicant</h5>
<!-- <button _ngcontent-c29="" class="mr-1 mb-2 mat-fab1 mat-accent" mat-fab="" (click)="addCoApplicant(createWithLongContent)"><span class="mat-button-wrapper"><mat-icon _ngcontent-c29="" class="mat-icon material-icons" role="img" aria-hidden="true">add</mat-icon></span><div class="mat-button-ripple mat-ripple mat-button-ripple-round" matripple=""></div><div class="mat-button-focus-overlay"></div></button> -->
<!--<button mat-fab class="mr-1 mb-1" color="primary" (click)="addCoApplicant()"><mat-icon>add</mat-icon></button>-->
<button mat-fab class="mr-1 mb-1" color="primary" style="opacity: 0.5;border:2px;border-radius: 50%;" (click)="addCoApplicant()"><mat-icon>group_add</mat-icon><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button>
<button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add Co-Applicant" matTooltipPosition="above" style="opacity: 0.8;border:2px;border-radius: 50%;" (click)="addCoApplicant()"><mat-icon>group_add</mat-icon><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button>
<!-- <button mat-raised-button mat-button-sm color="primary" (click)="addCoApplicant()" type="button">Add More Co-Applicant</button> -->
</mat-card>
@ -240,26 +240,23 @@
<mat-list>
<mat-list-item>
<!-- <button mat-raised-button mat-button-sm color="primary" type="button">Add Document</button> -->
<button mat-fab class="mr-1 mb-1" color="primary" style="opacity: 0.5;" (click)="addMoreDocs()" class="mat-button-wrapper"><mat-icon>attach_file</mat-icon><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button>
<button mat-fab matTooltip="Add Document" matTooltipPosition="above" class="mr-1 mb-1" color="primary" (click)="addMoreDocs()" class="mat-button-wrapper"><mat-icon>attach_file</mat-icon><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button>
</mat-list-item>
</mat-list-item><br>
</mat-list>
<mat-list *ngFor="let docList of documents.controls; let d = index;" [formGroupName]="d">
<!-- <h3 mat-subheader>Upload Documents</h3> -->
<mat-list-item>
<mat-form-field style="width: 100%">
<mat-form-field style="width: 50%">
<input matInput placeholder="Document Name" formControlName="doc_name" type="text">
</mat-form-field>
</mat-list-item>
<mat-list-item>
<div style="width:50%">
<input type="file" title="Browse Document" (change)="fileSelectionEvent($event,d)" formControlName="documentFile">
</mat-list-item>
<mat-list-item>
<!-- <button mat-button color="accent" (click)="removeItem(d)" type="button">Remove</button> -->
<div style="width:20%">
<span (click)="removeItem(d)">
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>
</span>
</div>
</mat-list-item>
@ -286,7 +283,7 @@
</mat-card-actions>
</form>
</mat-card-content>
</mat-card>
</mat-card>

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

@ -70,7 +70,7 @@
</mat-form-field>
<mat-form-field>
<mat-select multiple placeholder="Other family members invovled"
formControlName="other_main_person"formControlName="family_members_involved" (selectionChange)="relationChanged($event)">
formControlName="family_members_involved" (selectionChange)="relationChanged($event)">
<mat-option value="{{member.relationship_id}}" *ngFor="let member of relationData">{{member.name}}</mat-option>
</mat-select>
</mat-form-field>

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

@ -75,13 +75,19 @@ export class BusinessInfoComponent implements OnInit {
return data.records.family_members_involved[key];
});
let enduse: any = [];
let existRelative: any =[];
selectedMembers.forEach(val => {
enduse.push(val.member);
existRelative.push(val);
});
this.relativeNames = existRelative;
if (DesgnArray.length == 0) {
Desgn.push(this.createDesignation());
} else {
DesgnArray.forEach(datas => {
Desgn.push(this.createDesignation());
});
}
if (PartnrArray.length == 0) {
Partnr.push(this.createPartners());
@ -90,7 +96,7 @@ export class BusinessInfoComponent implements OnInit {
Partnr.push(this.createPartners());
});
}
if (data.other_documents == 'yes') {
if (data.records.other_documents == 'yes') {
DocArray = Object.keys(data.records.documents).map(function (key) {
return data.records.documents[key];
});
@ -114,7 +120,6 @@ export class BusinessInfoComponent implements OnInit {
businessVal.designation = DesgnArray;
businessVal.partners = PartnrArray;
businessVal.documents = DocArray;
console.log('businessVal', businessVal);
this.businessForm.setValue(businessVal);
} else {

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

@ -13,10 +13,10 @@
<input matInput placeholder="Year (format: 2015-16)" formControlName="financial_year">
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Annual Sale" formControlName="financial_annual_sale" (change)="calMargin(i, details)">
<input matInput placeholder="Annual Sale" formControlName="financial_annual_sale" (change)="calMargin(i, details)" type="number">
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Net Profit / Loss" formControlName="financial_net_profit" (change)="calMargin( i, details); calYearVariation( i, details)">
<input matInput placeholder="Net Profit / Loss" formControlName="financial_net_profit" (change)="calMargin( i, details); calYearVariation( i, details)" type="number">
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Margin" formControlName="financial_margin">
@ -52,10 +52,10 @@
<input matInput placeholder="Year (format: 2015-16)" formControlName="estimate_year">
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Annual Sale" formControlName="estimate_annual_sale" (change)="calMarginVal( i, details)">
<input matInput placeholder="Annual Sale" formControlName="estimate_annual_sale" (change)="calMarginVal( i, details)" type="number">
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Net Profit / Loss" formControlName="estimate_net_profit" (change)="calMarginVal( i, details); calVariation( i, details)">
<input matInput placeholder="Net Profit / Loss" formControlName="estimate_net_profit" (change)="calMarginVal( i, details); calVariation( i, details)" type="number">
</mat-form-field>
<mat-form-field>
<input matInput disabled placeholder="Margin" formControlName="estimate_margin">

1
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
View File

@ -46,7 +46,6 @@ export class FinancialInfoComponent implements OnInit {
params.pd_id = this.pdid;
params.pd_form_id = this.form_id;
this._pd.retriveForm(params).subscribe(value => {
console.log('value', value);
const financial_date = <FormArray>this.financialForm.controls['date_per_financial'];
const estimated_val = <FormArray>this.financialForm.controls['estimated_value'];
if (value.status == 200) {

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

@ -12,26 +12,29 @@
</div>
</div>
<div fxLayout="row wrap" fxFlex.gt-sm="100" fxFlex.gt-xs="100" fxFlex="100">
<div fxFlex.gt-sm="50" fxFlex.gt-xs="50" fxFlex="50" class="align-self-center pt-1" >
<div style="width:100%;display: inline-flex;">
<div style="width:65%" class="align-self-center pt-1" >
<div fxLayout="row">
<div class="pl-1 pr-1 profile-i" fxFlex.xs="85" fxFlex.sm="85" fxFlex.md="85" fxFlex.lg="85" fxFlex.xl="85">
<div class="pl-1 pr-1 profile-i">
<p> {{userDetails.user_first_name}} {{userDetails.user_last_name}}</p>
<p>{{userDetails.role_name}}</p>
<p> {{userDetails.email}}</p>
<p> {{userDetails.mobile_no}}</p>
<p> {{userDetails.city_name}} ,{{userDetails.state_name}} </p>
</div>
</div>
</div>
<div fxFlex.gt-sm="50" fxFlex.gt-xs="50" fxFlex="50" class="align-self-center pt-1">
<button type="button" class="UserActions-editButton edit-button EdgeButton EdgeButton--tertiary" data-scribe-element="profile_edit_button" (click)="changePassword()">
<span class="button-text">Change Password</span>
<div style="width:35%" class="align-self-center pt-1">
<div fxLayout="row">
<p> {{userDetails.email}}</p>
<p> {{userDetails.mobile_no}}</p>
<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>
</button>
<button type="button" class="UserActions-editButton edit-button EdgeButton EdgeButton--tertiary" data-scribe-element="profile_edit_button" (click)="editprofile()">
<span class="button-text">Edit Profile</span>
<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>
</button>
</div>
</div>
</div>