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

Chnages : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-04-22 20:33:42 +05:30
parent 4457a1c4f5
commit 40fa393b31
14 changed files with 188 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,7 @@ export class AddressComponent implements OnInit {
if (AddressDetails != null) {
return this.fb.group({
address: [AddressDetails.address, Validators.compose([Validators.required])],
address_type: [AddressDetails.address_type, Validators.compose([Validators.required])],
address_type: [AddressDetails.address_type || '', Validators.compose([Validators.required])],
address_type_others: [AddressDetails.address_type_others],
state: [AddressDetails.state],
city: [AddressDetails.city],

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
View File

@ -102,8 +102,9 @@
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field>
<input matInput autocomplete="off" placeholder="Year(s)"
formControlName="vintage_year" OnlyNumber type="text" (change)="checkWithExistBusinessYear(itemrow,$event.target.value,i)">
formControlName="vintage_year" OnlyNumber type="text" (change)="checkWithExistBusinessYear(itemrow,$event.target.value,i)" required>
<mat-hint style="color: red;">{{yearErrorMessage[i]}}</mat-hint>
<mat-error *ngIf="itemrow.controls['vintage_year'].hasError('required')">Year Required</mat-error>
</mat-form-field>
<mat-form-field>
<input matInput autocomplete="off" placeholder="Month(s)"

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

@ -46,10 +46,12 @@
| titlecase}}</mat-option>
<mat-option value="Others">Others</mat-option>
</mat-select>
<mat-error *ngIf="members.controls['partner_name'].hasError('required')">Name Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 40%;" *ngIf="members.value.partner_name=='Others'">
<input matInput placeholder="Specify Others" formControlName="partner_other_name"
required>
<mat-error *ngIf="members.controls['partner_other_name'].hasError('required')">Name Required</mat-error>
</mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button
mat-icon-button (click)="deletePartnerDetails(i)" matTooltip="Delete"
@ -57,8 +59,9 @@
<mat-icon>delete</mat-icon>
</button>
</div>
<div fxLayout="row nowrap" class="state-margin" *ngIf='!EntityTypeFlag'>
<mat-form-field style="width: 45%;" *ngIf="generalExistEntityType!='4' && generalExistEntityType!='9' && generalExistEntityType.value!=''">
<div fxLayout="row nowrap" class="state-margin">
<!-- generalExistEntityType!='4' && generalExistEntityType!='9' && generalExistEntityType.value!='' -->
<mat-form-field style="width: 45%;" *ngIf="!EntityTypeFlag">
<input matInput placeholder="Share of Profit / Shareholding (%)"
OnlyNumber type="text" formControlName="shareholding">
</mat-form-field>
@ -72,10 +75,10 @@
</mat-form-field>
</div>
<p style="margin-left: 2% !important" *ngIf='!EntityTypeFlag'>No of Years in
<p style="margin-left: 2% !important">No of Years in
Current Business </p>
<div fxLayout="row nowrap" class="state-margin" *ngIf='!EntityTypeFlag'>
<div fxLayout="row nowrap" class="state-margin">
<mat-form-field style="width: 20%;">
<input matInput placeholder="Year" formControlName="current_business_experiance_year"
@ -83,6 +86,7 @@
OnlyNumber type="text" (change)="checkWithExistBusinessYear($event.target.value,i,members)"
[readonly]="isreadonlyyear[i]">
<mat-hint style="color: red;">{{yearErrorMessage[i]}}</mat-hint>
<mat-error *ngIf="members.controls['current_business_experiance_year'].hasError('required')">Year Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 21%;">
<input matInput placeholder="Month" formControlName="current_business_experiance_month"
@ -95,12 +99,14 @@
OnlyNumber type="text" (keyup)="getWorkExperience(members.value,i)"
autocomplete="off" required (change)="checkWithExistTotalWorkExperience($event.target.value,i,members)">
<mat-hint style="color: red;">{{errorMessageForExistTotalWorkExperience[i]}}</mat-hint>
<mat-error *ngIf="members.controls['total_business_experiance'].hasError('required')">Total Work Experience Required</mat-error>
</mat-form-field>
</div>
<div fxLayout="row nowrap" *ngIf="members.value.total_business_previous_experience!=undefined && !EntityTypeFlag">
<mat-form-field style="width: 82%;">
<input matInput placeholder="Previous Work Experience Details"
formControlName="total_business_previous_experience" required>
<mat-error *ngIf="members.controls['total_business_previous_experience'].hasError('required')">Previous Work Experience Details Required</mat-error>
</mat-form-field>
</div>
@ -249,6 +255,7 @@
<mat-form-field style="width: 35%;">
<input matInput type="text" placeholder="Main Product" formControlName="main_products"
required>
<mat-error *ngIf="manufacturing.controls['main_products'].hasError('required')">Main Product Details Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 30%;">
<mat-select formControlName="area_of_sale" placeholder="Area of Sale"
@ -258,6 +265,7 @@
<mat-option value="Export">Export</mat-option>
<mat-option value="Both">Both</mat-option>
</mat-select>
<mat-error *ngIf="manufacturing.controls['area_of_sale'].hasError('required')">Area of Sale Required</mat-error>
</mat-form-field>
<!-- this is under manufacture -->
@ -268,6 +276,7 @@
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
<mat-error *ngIf="manufacturing.controls['pan_india_options'].hasError('required')">Is PAN India Required</mat-error>
</mat-form-field>
<ng-container *ngIf="manufacturing.value.india_where_sale_done !=undefined && manufacturing.value.countries_where_export_done ==undefined">
<div formArrayName="india_where_sale_done">
@ -282,14 +291,15 @@
{{SL.state_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="manufacturing.controls['pan_india_options'].hasError('required')">Is PAN India Required</mat-error>
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select multiple formControlName="city_name"
placeholder="City" required>
<mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)"
[value]="CL.city_id">{{CL.city_name}}</mat-option>
</mat-select>
<mat-error *ngIf="manufacturing.controls['city_name'].hasError('required')">City Required</mat-error>
</mat-form-field>
@ -355,10 +365,12 @@
{{CL.country_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="countryList.controls['country_name'].hasError('required')">Country Name Required</mat-error>
</mat-form-field>
<mat-form-field style="width:70%;">
<input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in' : getPlaceHolderName(countryList.get('country_name').value)"
formControlName="approx_sale" required>
<mat-error *ngIf="countryList.controls['approx_sale'].hasError('required')">Approx % of Sale Required</mat-error>
<!-- <input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Approx % of Sale' : getPlaceHolderName(countryList.get('country_name').value)" formControlName="approx_sale" required> -->
<!-- <input matInput [placeholder]=" 'Out of Total Export Sales what % of Sales is done in ' getPlaceHolderName(countryList.get('country_name').value)" formControlName="approx_sale" required> -->
</mat-form-field>
@ -392,6 +404,7 @@
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
<mat-error *ngIf="manufacturing.controls['pan_india_options'].hasError('required')">Is PAN India Required</mat-error>
</mat-form-field>
</div>
<div formArrayName="india_where_sale_done">
@ -404,14 +417,15 @@
{{SL.state_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['state_name'].hasError('required')">State Required</mat-error>
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select multiple formControlName="city_name"
placeholder="City" required>
<mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)"
[value]="CL.city_id">{{CL.city_name}}</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['city_name'].hasError('required')">City Required</mat-error>
</mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon"
@ -468,11 +482,13 @@
{{CL.country_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="countryList.controls['country_name'].hasError('required')">Country Name Required</mat-error>
</mat-form-field>
<mat-form-field style="width:70%;">
<!-- <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required> -->
<input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in' : getPlaceHolderName(countryList.get('country_name').value)"
formControlName="approx_sale" required>
<mat-error *ngIf="countryList.controls['country_name'].hasError('required')">Approx % of Sale Required</mat-error>
</mat-form-field>
@ -530,6 +546,7 @@
<mat-form-field style="width: 35%;">
<input matInput type="text" placeholder="Main Product" formControlName="main_products"
required>
<mat-error *ngIf="retail.controls['main_products'].hasError('required')">Main Product Details Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 30%;">
<mat-select formControlName="area_of_sale" placeholder="Area of Sale"
@ -539,6 +556,7 @@
<mat-option value="Export">Export</mat-option>
<mat-option value="Both">Both</mat-option>
</mat-select>
<mat-error *ngIf="retail.controls['area_of_sale'].hasError('required')">Area of Sale Required</mat-error>
</mat-form-field>
<!-- this is under Retail -->
<mat-form-field style="width: 20%;" *ngIf="retail.value.pan_india_options !=undefined && retail.value.area_of_sale =='Within India'">
@ -548,6 +566,7 @@
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
<mat-error *ngIf="retail.controls['pan_india_options'].hasError('required')">Is PAN India Required</mat-error>
</mat-form-field>
<ng-container *ngIf="retail.value.india_where_sale_done !=undefined && retail.value.countries_where_export_done ==undefined">
<div formArrayName="india_where_sale_done">
@ -560,6 +579,7 @@
{{SL.state_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['state_name'].hasError('required')">State Required</mat-error>
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select multiple formControlName="city_name"
@ -568,6 +588,7 @@
[value]="CL.city_id">{{CL.city_name}}</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['city_name'].hasError('required')">City Required</mat-error>
</mat-form-field>
@ -633,11 +654,13 @@
{{CL.country_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="countryList.controls['country_name'].hasError('required')">Country Name Required</mat-error>
</mat-form-field>
<mat-form-field style="width:70%;">
<!-- <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required> -->
<input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in' : getPlaceHolderName(countryList.get('country_name').value)"
formControlName="approx_sale" required>
<mat-error *ngIf="countryList.controls['approx_sale'].hasError('required')">Approx % of Sale Required</mat-error>
</mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon"
@ -669,6 +692,7 @@
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
<mat-error *ngIf="retail.controls['pan_india_options'].hasError('required')">Is PAN India Required</mat-error>
</mat-form-field>
</div>
<div formArrayName="india_where_sale_done">
@ -681,6 +705,7 @@
{{SL.state_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['state_name'].hasError('required')">State Required</mat-error>
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select multiple formControlName="city_name"
@ -689,6 +714,7 @@
[value]="CL.city_id">{{CL.city_name}}</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['city_name'].hasError('required')">City Required</mat-error>
</mat-form-field>
@ -748,11 +774,13 @@
{{CL.country_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="countryList.controls['country_name'].hasError('required')">Country Name Required</mat-error>
</mat-form-field>
<mat-form-field style="width:70%;">
<!-- <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required> -->
<input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in' : getPlaceHolderName(countryList.get('country_name').value)"
formControlName="approx_sale" required>
<mat-error *ngIf="countryList.controls['approx_sale'].hasError('required')">Approx % of Sale Required</mat-error>
</mat-form-field>
@ -812,6 +840,7 @@
<mat-form-field style="width: 35%;">
<input matInput type="text" placeholder="Main Product" formControlName="main_products"
required>
<mat-error *ngIf="wholesale.controls['main_products'].hasError('required')">Main Product Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 30%;">
<mat-select formControlName="area_of_sale" placeholder="Area of Sale"
@ -821,6 +850,7 @@
<mat-option value="Export">Export</mat-option>
<mat-option value="Both">Both</mat-option>
</mat-select>
<mat-error *ngIf="wholesale.controls['area_of_sale'].hasError('required')">Area of Sale Required</mat-error>
</mat-form-field>
<!-- this is under whole sale -->
<mat-form-field style="width: 20%;" *ngIf="wholesale.value.pan_india_options !=undefined && wholesale.value.area_of_sale =='Within India'">
@ -830,6 +860,7 @@
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
<mat-error *ngIf="wholesale.controls['pan_india_options'].hasError('required')">Is PAN India Required</mat-error>
</mat-form-field>
<ng-container *ngIf="wholesale.value.india_where_sale_done !=undefined && wholesale.value.countries_where_export_done ==undefined">
<div formArrayName="india_where_sale_done">
@ -837,20 +868,21 @@
[formGroupName]="s">
<mat-form-field style="width:34%;">
<mat-select placeholder="State" formControlName="state_name"
<mat-select placeholder="state_name" formControlName="state_name"
required>
<mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
{{SL.state_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['state_name'].hasError('required')">State Required</mat-error>
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select multiple formControlName="city_name"
placeholder="City" required>
<mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)"
[value]="CL.city_id">{{CL.city_name}}</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['city_name'].hasError('required')">City Required</mat-error>
</mat-form-field>
@ -913,11 +945,13 @@
{{CL.country_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="countryList.controls['country_name'].hasError('required')">Country Name Required</mat-error>
</mat-form-field>
<mat-form-field style="width:70%;">
<!-- <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required> -->
<input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in' : getPlaceHolderName(countryList.get('country_name').value)"
formControlName="approx_sale" required>
<mat-error *ngIf="countryList.controls['approx_sale'].hasError('required')">Approx % of Sale Required</mat-error>
</mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon"
@ -947,6 +981,7 @@
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
<mat-error *ngIf="wholesale.controls['pan_india_options'].hasError('required')">Is PAN India Required</mat-error>
</mat-form-field>
</div>
<div formArrayName="india_where_sale_done">
@ -959,14 +994,15 @@
{{SL.state_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['state_name'].hasError('required')">State Required</mat-error>
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select multiple formControlName="city_name"
placeholder="City" required>
<mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)"
[value]="CL.city_id">{{CL.city_name}}</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['city_name'].hasError('required')">City Required</mat-error>
</mat-form-field>
@ -1029,11 +1065,13 @@
{{CL.country_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="countryList.controls['country_name'].hasError('required')">Country Name Required</mat-error>
</mat-form-field>
<mat-form-field style="width:70%;">
<!-- <input matInput placeholder="Approx % of Sale" c -->
<input matInput [placeholder]="countryList.get('country_name').value == '' ? 'Out of Total Export Sales what % of Sales is done in' : getPlaceHolderName(countryList.get('country_name').value)"
formControlName="approx_sale" required>
<mat-error *ngIf="countryList.controls['approx_sale'].hasError('required')">Approx % of Sale Required</mat-error>
</mat-form-field>
@ -1092,6 +1130,7 @@
<mat-form-field style="width: 35%;">
<input matInput type="text" placeholder="Services Provided"
formControlName="main_products" required>
<mat-error *ngIf="serviceprovider.controls['main_products'].hasError('required')">Services Provided Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 30%;">
<mat-select formControlName="area_of_sale" placeholder="Area of Service"
@ -1101,6 +1140,7 @@
<mat-option value="Export">Export</mat-option>
<mat-option value="Both">Both</mat-option>
</mat-select>
<mat-error *ngIf="serviceprovider.controls['area_of_sale'].hasError('required')">Area of Service Required</mat-error>
</mat-form-field>
<!-- this is under service -->
<mat-form-field style="width: 20%;" *ngIf="serviceprovider.value.pan_india_options !=undefined && serviceprovider.value.area_of_sale =='Within India'">
@ -1110,6 +1150,7 @@
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
<mat-error *ngIf="serviceprovider.controls['pan_india_options'].hasError('required')">Is PAN India Required</mat-error>
</mat-form-field>
<ng-container *ngIf="serviceprovider.value.india_where_sale_done !=undefined && serviceprovider.value.countries_where_export_done ==undefined">
<div formArrayName="india_where_sale_done">
@ -1123,6 +1164,7 @@
{{SL.state_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['state_name'].hasError('required')">State Required</mat-error>
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select multiple formControlName="city_name"
@ -1131,6 +1173,7 @@
[value]="CL.city_id">{{CL.city_name}}</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['city_name'].hasError('required')">City Required</mat-error>
</mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon"
mat-raised-button mat-icon-button (click)="removeServiceState(sp,s,'1')"
@ -1191,10 +1234,12 @@
{{CL.country_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="countryList.controls['country_name'].hasError('required')">Country Name Required</mat-error>
</mat-form-field>
<mat-form-field style="width:35%;">
<input matInput placeholder="Approx % of Revenue From Service"
formControlName="approx_sale" required>
<mat-error *ngIf="countryList.controls['approx_sale'].hasError('required')">Approx % of Sales Required</mat-error>
</mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon"
@ -1225,6 +1270,7 @@
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
<mat-error *ngIf="serviceprovider.controls['pan_india_options'].hasError('required')">Is PAN India Required</mat-error>
</mat-form-field>
</div>
<div formArrayName="india_where_sale_done">
@ -1237,6 +1283,7 @@
{{SL.state_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['state_name'].hasError('required')">Where, In India, Is The Service Provided Required</mat-error>
</mat-form-field>
<mat-form-field style="width:45%;">
<mat-select multiple formControlName="city_name"
@ -1245,6 +1292,7 @@
[value]="CL.city_id">{{CL.city_name}}</mat-option>
</mat-select>
<mat-error *ngIf="saleList.controls['city_name'].hasError('required')">City Required</mat-error>
</mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon"
@ -1303,10 +1351,12 @@
{{CL.country_name}}
</mat-option>
</mat-select>
<mat-error *ngIf="countryList.controls['country_name'].hasError('required')">Country Name Required</mat-error>
</mat-form-field>
<mat-form-field style="width:35%;">
<input matInput placeholder="Approx % of Revenue From Service"
formControlName="approx_sale" required>
<mat-error *ngIf="countryList.controls['approx_sale'].hasError('required')">Approx % of Revenue From Service Required</mat-error>
</mat-form-field>
@ -1453,6 +1503,7 @@
<mat-option value="no major changes in sales">No Major Changes In Sales
</mat-option>
</mat-select>
<mat-error *ngIf="businessForm.controls['seasonality'].hasError('required')">Is The Business Seasonal Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 60%" *ngIf="businessForm.controls['seasonality'].value == 'yes'">
<mat-select multiple placeholder="In Which Period Is Maximum Sale / Service Done "
@ -1471,12 +1522,14 @@
<mat-option value="12">December</mat-option>
</mat-select>
<mat-error *ngIf="businessForm.controls['peak_period_of_business'].hasError('required')">In Which Period Is Maximum Sale / Service Done Required</mat-error>
</mat-form-field>
</div>
<div fxLayout="row nowrap" *ngIf="businessForm.controls['seasonality'].value == 'yes'">
<mat-form-field style="width: 60%">
<textarea matInput placeholder="Comments" formControlName="month_of_business_run"
required></textarea>
<mat-error *ngIf="businessForm.controls['month_of_business_run'].hasError('required')">Comments Required</mat-error>
</mat-form-field>
<!-- <mat-form-field>
@ -1498,10 +1551,12 @@
<mat-form-field>
<input matInput placeholder="Permanent" (change)="checkTotalEmployee(businessForm)"
type="number" formControlName="employees_permanent" required>
<mat-error *ngIf="businessForm.controls['employees_permanent'].hasError('required')">Permanent Required</mat-error>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Temporary" (change)="checkTotalEmployee(businessForm)"
type="number" formControlName="employees_temporary" required>
<mat-error *ngIf="businessForm.controls['employees_temporary'].hasError('required')">Temporary Required</mat-error>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Total" type="number" formControlName="employees_total"
@ -1514,7 +1569,7 @@
<mat-hint align="start" style="font-size:90%" *ngIf="businessForm.controls['employees_appx_salary'].value != ''">{{"&#8377;"}}
{{businessForm.controls['employees_appx_salary'].value | numberToWords}}
Only</mat-hint>
<mat-error *ngIf="businessForm.controls['employees_appx_salary'].hasError('required')">Approximate total monthly salary paid to employees Required</mat-error>
<!-- <input matInput placeholder="Approximate total monthly salary paid to employees"
(keyup)="inWords($event,1)" formControlName="employees_appx_salary"
required type="number">
@ -1532,6 +1587,7 @@
<mat-card-content class="matcard">
<mat-form-field>
<input matInput placeholder="Total" formControlName="officer_total" required>
<mat-error *ngIf="businessForm.controls['officer_total'].hasError('required')">Total Required</mat-error>
</mat-form-field>
<!-- <mat-form-field>
<input matInput placeholder="Permanent"
@ -1548,6 +1604,7 @@
<mat-option value="no">No</mat-option>
<!-- <mat-option value="not applicable">Not Applicable</mat-option> -->
</mat-select>
<mat-error *ngIf="businessForm.controls['was_the_company_name_board_sighted'].hasError('required')">Was the Company name board sighted ? Required</mat-error>
</mat-form-field>
</mat-card-content>
</mat-card>
@ -1563,6 +1620,7 @@
<mat-option value="no">No</mat-option>
<mat-option value="not applicable">Not Applicable</mat-option>
</mat-select>
<mat-error *ngIf="businessForm.controls['shop_eat_act_cert'].hasError('required')">Shop and Est Act Cert Required</mat-error>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="GST Regn Cert" formControlName="gst_Regn_cert"
@ -1571,6 +1629,7 @@
<mat-option value="no">No</mat-option>
<mat-option value="not applicable">Not Applicable</mat-option>
</mat-select>
<mat-error *ngIf="businessForm.controls['gst_Regn_cert'].hasError('required')">GST Regn Cert Required</mat-error>
</mat-form-field>
<mat-form-field *ngIf="businessForm.controls['export_import_cert']">
<mat-select placeholder="Export / Import cert" formControlName="export_import_cert"
@ -1579,6 +1638,7 @@
<mat-option value="no">No</mat-option>
<mat-option value="not applicable">Not Applicable</mat-option>
</mat-select>
<mat-error *ngIf="businessForm.controls['export_import_cert'].hasError('required')">Export / Import cert Required</mat-error>
</mat-form-field>
<mat-form-field *ngIf="businessForm.controls['factory_cert']">
<mat-select placeholder="Factory Cert" formControlName="factory_cert" required>
@ -1586,6 +1646,7 @@
<mat-option value="no">No</mat-option>
<mat-option value="not applicable">Not Applicable</mat-option>
</mat-select>
<mat-error *ngIf="businessForm.controls['factory_cert'].hasError('required')">Factory Cert Required</mat-error>
</mat-form-field>
<mat-form-field *ngIf="businessForm.controls['practice_cert']">
<mat-select placeholder="Cert of Practice" formControlName="practice_cert"
@ -1594,6 +1655,7 @@
<mat-option value="no">No</mat-option>
<mat-option value="not applicable">Not Applicable</mat-option>
</mat-select>
<mat-error *ngIf="businessForm.controls['practice_cert'].hasError('required')">Cert of Practice Required</mat-error>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="PF Regn" formControlName="pf_regn" required>
@ -1601,6 +1663,7 @@
<mat-option value="no">No</mat-option>
<mat-option value="not applicable">Not Applicable</mat-option>
</mat-select>
<mat-error *ngIf="businessForm.controls['pf_regn'].hasError('required')">PF Regn Required</mat-error>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="ESIC Regn" formControlName="esic_regn" required>
@ -1608,6 +1671,7 @@
<mat-option value="no">No</mat-option>
<mat-option value="not applicable">Not Applicable</mat-option>
</mat-select>
<mat-error *ngIf="businessForm.controls['esic_regn'].hasError('required')">ESIC Regn Required</mat-error>
</mat-form-field>
<mat-form-field>
@ -1617,6 +1681,7 @@
<mat-option value="no">No</mat-option>
<!-- <mat-option value="not applicable">Not Applicable</mat-option> -->
</mat-select>
<mat-error *ngIf="businessForm.controls['other_documents'].hasError('required')">Do You Want to Add Other Documents? Required</mat-error>
</mat-form-field>
<div formArrayName="documents" *ngIf="businessForm.controls['other_documents'].value == 'yes'">
<div *ngFor="let members of businessForm.controls.documents['controls']; let i=index"

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

@ -1221,8 +1221,6 @@ export class BusinessInfoComponent implements OnInit {
let master_name = 'BUSINESSENTITYTYPE';
this._pd.getAllMasterDatas(master_name).subscribe(data => {
let filterList = data.records.filter(val => val.business_entity_type_id == this.generalExistEntityType);
console.log('data.records',data.records);
console.log('filterList',filterList);
this.businessEntityTypeList.business_entity_type_id = filterList[0].business_entity_type_id == 1;
this.businessEntityTypeList.business_entity_type_name = filterList[0].business_entity_type_id != 1 ? filterList[0].business_entity_type_name : this.generalExistEntityType_other;
this.businessEntityTypeList.section_label = filterList[0].business_entity_type_id != 1 ? filterList[0].section_label : this.generalExistEntityType_other;
@ -1230,8 +1228,7 @@ export class BusinessInfoComponent implements OnInit {
// if(this.businessForm.controls.partners['controls'].length > 1)
// {}
// if (this.businessEntityTypeList.business_entity_type_name == 'OPC (One Person Company)' || this.businessEntityTypeList.business_entity_type_name == 'Sole proprietorship') {
if (this.businessEntityTypeList.business_entity_type_name == 'OPC (One Person Company)' || this.businessEntityTypeList.business_entity_type_name == 'Partnership' || this.businessEntityTypeList.business_entity_type_name == 'Others (Please Specify)') {
if (this.businessEntityTypeList.business_entity_type_name == 'OPC (One Person Company)' || this.businessEntityTypeList.business_entity_type_name == 'Sole proprietorship') {
this.EntityTypeFlag = true;
}
// data.records.forEach(val => {
@ -1462,31 +1459,31 @@ export class BusinessInfoComponent implements OnInit {
control2.controls['shareholding'].updateValueAndValidity();
control2.controls['shareholding'].setValue('100');
}
// control.controls[0].removeControl('shareholding');
// control.controls[0].removeControl('started_business');
// control.controls[0].removeControl('current_business_experiance_year');
// control.controls[0].removeControl('current_business_experiance_month');
// control.controls[0].removeControl('total_business_experiance');
control2.controls['started_business'].setValue('');
// control2.controls['started_business'].setValue('');
control2.controls['current_business_experiance_year'].clearValidators();
control2.controls['current_business_experiance_year'].updateValueAndValidity();
control2.controls['current_business_experiance_year'].setValue('');
// control2.controls['current_business_experiance_year'].clearValidators();
// control2.controls['current_business_experiance_year'].updateValueAndValidity();
// control2.controls['current_business_experiance_year'].setValue('');
control2.controls['current_business_experiance_month'].setValue('');
// control2.controls['current_business_experiance_month'].setValue('');
control2.controls['total_business_experiance'].clearValidators();
control2.controls['total_business_experiance'].updateValueAndValidity();
control2.controls['total_business_experiance'].setValue('');
// control2.controls['total_business_experiance'].clearValidators();
// control2.controls['total_business_experiance'].updateValueAndValidity();
// control2.controls['total_business_experiance'].setValue('');
// if(control2.controls['total_business_previous_experience'].value !=undefined){
// control2.controls['total_business_previous_experience'].clearValidators();
// control2.controls['total_business_previous_experience'].updateValueAndValidity();
// control2.controls['total_business_previous_experience'].setValue('0');
// }
}
if (!this.businessForm.valid) {
this.notifier.notify('warning', "Please Check All Manatory Fields..");

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

@ -40,7 +40,8 @@
<input matInput placeholder="Raw Material Name" formControlName="manufacturing_raw_material_name">
</mat-form-field>-->
<mat-form-field style="width: 45%">
<input matInput placeholder="Client Name" formControlName="manufacturing_client_name">
<input matInput placeholder="Client Name" formControlName="manufacturing_client_name" required>
<mat-error *ngIf="items.controls['manufacturing_client_name'].hasError('required')">Client Name Required</mat-error>
</mat-form-field>
</div>
<div fxLayout="row nowrap">
@ -173,7 +174,8 @@
<input matInput placeholder="Trade Product Name" formControlName="trade_product_name">
</mat-form-field>-->
<mat-form-field style="width: 45%">
<input matInput placeholder="Client Name" formControlName="trade_client_name">
<input matInput placeholder="Client Name" formControlName="trade_client_name" required>
<mat-error *ngIf="items.controls['trade_client_name'].hasError('required')">Client Name Required</mat-error>
</mat-form-field>
</div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none">
@ -306,7 +308,8 @@
</mat-select>
</mat-form-field>
<mat-form-field style="width: 45%">
<input matInput placeholder="Client Name" formControlName="service_provider_client_name">
<input matInput placeholder="Client Name" formControlName="service_provider_client_name" required>
<mat-error *ngIf="items.controls['service_provider_client_name'].hasError('required')">Client Name Required</mat-error>
</mat-form-field>
</div>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts
View File

@ -170,8 +170,7 @@ export class CurrentLoanComponent implements OnInit {
} else {
this._pd.getAssetsWithLoanFromBusiness(this.pdid).subscribe(data => {
console.log(data);
if (data.dataStatus == true) {
let AssetData = data.record;
@ -201,7 +200,7 @@ export class CurrentLoanComponent implements OnInit {
})
});
}
console.log('AssetData.other_assests.length',AssetData.other_assests.length,AssetData.other_assests);
if (AssetData.other_assests.length > 0) {
AssetData.other_assests.map(element => {
this.dataFromAssets.push({
@ -214,7 +213,7 @@ export class CurrentLoanComponent implements OnInit {
})
});
}
console.log('this.dataFromAssets',this.dataFromAssets);
// id: "4", name: "Equipments and machinaries", isactive: "1", flag: "1", is_others: "0"
// id: "7", name: "Investments", isactive: "1", flag: "0", is_others: "0"
// id: "6", name: "Life Insurance Policy", isactive: "1", flag: "0", is_others: "0"

25
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
View File

@ -15,10 +15,11 @@
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-card>
<mat-form-field style="width:50%;">
<mat-select placeholder="Customer Behaviour" formControlName="final_custormer_remark_type">
<mat-select placeholder="Customer Behaviour" formControlName="final_custormer_remark_type" required>
<mat-option>Select</mat-option>
<mat-option *ngFor="let pm of m_remarkTypeCustomerBehaviour" [value]="pm.customer_behaviour_id">{{pm.customer_behaviour_id == 1 ? 'Other Negative Behaviour': pm.description }}</mat-option>
</mat-select>
<mat-error *ngIf="_finalRemarkForm.controls['final_custormer_remark_type'].hasError('required')">Customer Behaviour Required</mat-error>
</mat-form-field>
<mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['final_custormer_remark_type'].value == 1">
<input matInput autocomplete="off" placeholder="Specify Customer Behaviour" formControlName="final_other_customer_behaviour">
@ -35,8 +36,8 @@
<mat-option value="fairly_suited">Fairly Suited</mat-option>
<mat-option value="not_suited">Not Suited</mat-option>
</mat-select>
<mat-error *ngIf="_finalRemarkForm.controls['is_service_provided'].hasError('required')">Service Provided Required</mat-error>
</mat-form-field>
<mat-error *ngIf="_finalRemarkForm.controls['is_service_provided'].hasError('required')">Service Provided Required</mat-error>
</mat-card-content>
</mat-card>
<br>
@ -47,6 +48,7 @@
<mat-option *ngFor="let list of m_recommendationList" [value]="list.pdofficer_recommendation_id">{{
list.pdofficer_recommendation }}</mat-option>
</mat-select>
<mat-error *ngIf="_finalRemarkForm.controls['pd_officers_recommendation'].hasError('required')">PD Officers Recommendation Required</mat-error>
</mat-form-field>
<mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['pd_officers_recommendation'].value == 1">
<input matInput autocomplete="off" placeholder="Specify PD Officers Recommendation" formControlName="others_pd_officers_recommendation">
@ -119,6 +121,25 @@
</div>
</div>
</span>
<div class="toggle" fxLayout="row nowrap">
<mat-label>Was the PD Address Outside Geographic Limit (OGL)</mat-label>&nbsp;&nbsp;
<mat-slide-toggle formControlName="was_the_pd_address_ogl"></mat-slide-toggle>
</div>
<mat-form-field style="width:50%;">
<mat-select placeholder="Mode of Transport Used to Visit the PD address" formControlName="mode_of_transport_during_visit"
required>
<mat-option>Select</mat-option>
<mat-option value="two-wheeler"> Two Wheeler</mat-option>
<mat-option value="four-wheeler"> Four Wheeler</mat-option>
<mat-option value="public-transport"> Public Transport</mat-option>
<mat-option value="others"> Others</mat-option>
</mat-select>
<mat-error *ngIf="_finalRemarkForm.controls['mode_of_transport_during_visit'].hasError('required')">Mode of Transport Used to Visit the PD address Required</mat-error>
</mat-form-field>
<mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['mode_of_transport_during_visit'].value == 'others'">
<input matInput autocomplete="off" placeholder="Specify the Mode of Transport Used to Visit the PD address" formControlName="others_transport" required>
<mat-error *ngIf="_finalRemarkForm.controls['mode_of_transport_during_visit'].hasError('required')">Specify the Mode of Transport Used to Visit the PD address Required</mat-error>
</mat-form-field>
<!-- <mat-form-field style="width:40%;" *ngIf="_finalRemarkForm.controls['pd_officers_recommendation'].value == 1">
<input matInput autocomplete="off" placeholder="Specify PD Officers Recommendation" formControlName="others_pd_officers_recommendation">
</mat-form-field>

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.scss
View File

@ -1,7 +1,9 @@
// .example-full-width{
// width : 100%;
// }
.toggle{
padding: 1.4rem;
}
.paragraph_change {
color: #fff !important;
background-color: #e00201 !important;

37
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
View File

@ -68,10 +68,13 @@ export class FinalRemarksComponent implements OnInit {
pdid: [this.pdid],
formid: ['20'],
final_custormer_remark_type: [],
final_other_customer_behaviour: [],
final_other_customer_behaviour: ['', Validators.required],
is_service_provided: ['', Validators.required],
pd_officers_recommendation: ['', Validators.required],
others_pd_officers_recommendation: [''],
was_the_pd_address_ogl:[''],
mode_of_transport_during_visit: ['', Validators.required],
others_transport:[''],
// reason_for_positive:[''],
// reason_for_negative:[''],
// reason_for_refer_to_credit:[''],
@ -170,6 +173,9 @@ export class FinalRemarksComponent implements OnInit {
// this._finalRemarkForm.controls.reason_for_positive.setValue(data.records.reason_for_positive);
// this._finalRemarkForm.controls.reason_for_negative.setValue(data.records.reason_for_negative);
// this._finalRemarkForm.controls.reason_for_refer_to_credit.setValue(data.records.reason_for_refer_to_credit);
this._finalRemarkForm.controls.was_the_pd_address_ogl.setValue(data.records.was_the_pd_address_ogl ? data.records.was_the_pd_address_ogl :'');
this._finalRemarkForm.controls.mode_of_transport_during_visit.setValue(data.records.mode_of_transport_during_visit ? data.records.mode_of_transport_during_visit :'');
this._finalRemarkForm.controls.others_transport.setValue(data.records.others_transport ? data.records.others_transport :'');
if (data.records.recommendation_positive.length > 0) {
let recommendationPositiveCtrl: any = this._finalRemarkForm.get('recommendation_positive') as FormArray;
@ -242,14 +248,30 @@ export class FinalRemarksComponent implements OnInit {
/** To Save/Edited Popup Data */
onSubmit() {
console.log('this._finalRemarkForm.value',this._finalRemarkForm.value);
this.submitted = true;
if (this._finalRemarkForm.controls.final_custormer_remark_type.value == 1) {
this._finalRemarkForm.controls['final_other_customer_behaviour'].setValidators([Validators.required]);
this._finalRemarkForm.controls['final_other_customer_behaviour'].updateValueAndValidity();
}
else{
this._finalRemarkForm.controls['final_other_customer_behaviour'].setValue('');
this._finalRemarkForm.controls['final_other_customer_behaviour'].clearValidators();
}
if (this._finalRemarkForm.controls.mode_of_transport_during_visit.value == 'others') {
this._finalRemarkForm.controls['others_transport'].setValidators([Validators.required]);
}
else{
this._finalRemarkForm.controls['others_transport'].setValue('');
this._finalRemarkForm.controls['others_transport'].clearValidators();
}
this._finalRemarkForm.controls['others_transport'].updateValueAndValidity();
this._finalRemarkForm.controls['final_other_customer_behaviour'].updateValueAndValidity();
// stop here if form is invalid
if (this._finalRemarkForm.invalid) {
this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!');
this.validateAllFormFields(this._finalRemarkForm);
return;
} else {
var answerFormValues = this._finalRemarkForm.value;
@ -554,4 +576,15 @@ export class FinalRemarksComponent implements OnInit {
this._finalRemarkForm.controls['reason_for_negative'].updateValueAndValidity();
}
/** To validate All Form Fields */
validateAllFormFields(formGroup: any) {
Object.keys(formGroup.controls).forEach(field => {
const control = formGroup.get(field);
if (control instanceof FormControl) {
control.markAsTouched({ onlySelf: true });
} else if (control instanceof FormGroup) {
this.validateAllFormFields(control);
}
});
}
}

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

@ -388,7 +388,7 @@ export class GeneralInfoComponent implements OnInit {
business_date_object: [elementValue.business_date_object],
is_active: [elementValue.is_active],
is_new: [elementValue.is_new],
associate_pd_id:[this.pdid]
associate_pd_id:[elementValue.associate_pd_id]
});
}
@ -435,7 +435,8 @@ export class GeneralInfoComponent implements OnInit {
// add more companies
addMoreCompanies() {
let control: any = this._generalForm.get('companies') as FormArray;
let setValues: any = { company_order_id: control.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '', business_date_object: '', is_active: true, is_new: true }
let setValues: any = { company_order_id: control.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '',business_date_object: '', is_active: true, is_new: true, associate_pd_id:this.pdid}
console.log('setValues',setValues);
control.push(this.createCompanies(setValues))
}
@ -624,7 +625,8 @@ export class GeneralInfoComponent implements OnInit {
// submit form details
temp: number = 0;
submitGeneralForm(formData: any) {
// console.log('formData',formData);
console.log('formData',formData);
if (formData.individuals.length > 0) {
formData.individuals.forEach((val, index) => {

15
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
View File

@ -37,12 +37,13 @@
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="stock_observed"
(selectionChange)="checkComments($event.value,1,a);">
(selectionChange)="checkComments($event.value,1,a);" required>
<mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option>
<!-- <mat-option value="stock not required to be maintained">Stock not required to be maintained</mat-option> -->
</mat-select>
<mat-error *ngIf="mrm.controls['stock_observed'].hasError('required')">Stock Required</mat-error>
</mat-form-field>
<span *ngIf="mrm.get('stock_observed').value == 'yes'">
<mat-form-field style="width:30%">
@ -95,7 +96,7 @@
<span *ngIf="RMCommentCard">
<mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of Raw Materials observed, sufficient considering the size of operations"
formControlName="is_sufficiant_raw">
formControlName="is_sufficiant_raw" required>
<mat-option>Select</mat-option>
<mat-option *ngFor="let val of RMsufficientList" [value]="val.value" [disabled]="val.disabled">
{{val.isdisplayvalue}}
@ -105,6 +106,7 @@
<!-- <mat-option value="not applicable">Not Applicable</mat-option> -->
<!-- <mat-option value="not applicable">Stock not required to be maintained</mat-option> -->
</mat-select>
<mat-error *ngIf="md.controls['is_sufficiant_raw'].hasError('required')">Is the stock of Raw Materials observed, sufficient considering the size of operations Required</mat-error>
</mat-form-field>
<mat-form-field appearance="outline" style="width: 90%" *ngIf="md.get('is_sufficiant_raw').value == 'no'">
<mat-label> <i>Please comment on the stock level observed?</i>
@ -128,7 +130,7 @@
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="goods_observed"
(selectionChange)="checkComments($event.value,2,b);">
(selectionChange)="checkComments($event.value,2,b);" required>
<mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option>
@ -205,7 +207,7 @@
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="traded_goods_observed"
(selectionChange)="checkComments($event.value,3,e)">
(selectionChange)="checkComments($event.value,3,e)" required>
<mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No Stock Observed</mat-option>
@ -285,7 +287,7 @@
</mat-form-field>
<mat-form-field style="width:30%">
<mat-select placeholder="Stock" formControlName="traded_goods_observed"
(selectionChange)="checkComments($event.value,4,g)">
(selectionChange)="checkComments($event.value,4,g)" required>
<mat-option>Select</mat-option>
<mat-option value="yes">Add Stock Details</mat-option>
<mat-option value="no">No stock observed</mat-option>
@ -350,7 +352,7 @@
<br>
<mat-form-field style="width:90%">
<mat-select placeholder="Is the stock of finished / traded goods observed, sufficient considering the size of operations"
formControlName="is_sufficiant_finished_and_traded_goods">
formControlName="is_sufficiant_finished_and_traded_goods" required>
<mat-option>Select</mat-option>
<mat-option *ngFor="let val of TGsufficientList" [value]="val.value" [disabled]="val.isdisabled">
{{val.isdisplayvalue}}
@ -360,6 +362,7 @@
<mat-option value="not applicable">Stock not required to be maintained</mat-option> -->
<!-- <mat-option value="not applicable">Not Applicable</mat-option> -->
</mat-select>
<mat-error *ngIf="stockForms.controls['is_sufficiant_finished_and_traded_goods'].hasError('required')">Is the stock of finished / traded goods observed, sufficient considering the size of operations Required</mat-error>
</mat-form-field>
<mat-form-field appearance="outline" style="width: 90%" *ngIf="this.stockForms.controls.is_sufficiant_finished_and_traded_goods.value == 'no'">
<mat-label> <i>Please comment on the stock level observed?</i> </mat-label>

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

@ -31,7 +31,8 @@
<input matInput placeholder="Raw Material Name" formControlName="manufacturing_raw_material_name">
</mat-form-field>
<mat-form-field style="width: 45%">
<input matInput placeholder="Supplier Name" formControlName="manufacturing_supplier_name">
<input matInput placeholder="Supplier Name" formControlName="manufacturing_supplier_name" required>
<mat-error *ngIf="items.controls['manufacturing_supplier_name'].hasError('required')">Supplier Name Required</mat-error>
</mat-form-field>
</div>
@ -67,7 +68,7 @@
<input matInput placeholder="Contact Person Mobile Number" autocomplete="off"
formControlName="manufacturing_contact_person_mobile_number" OnlyNumber
type="text" maxlength="10">
<mat-error>Enter Valid Mobile Number.</mat-error>
<mat-error>Enter Valid Mobile Number.</mat-error>
</mat-form-field>
<mat-form-field style="width: 15%">
<input matInput autocomplete="off" placeholder="STD Code" formControlName="person_stdcode"
@ -168,7 +169,8 @@
</mat-select>
</mat-form-field>
<mat-form-field style="width: 45%">
<input matInput placeholder="Supplier Name" formControlName="trade_supplier_name">
<input matInput placeholder="Supplier Name" formControlName="trade_supplier_name" required>
<mat-error *ngIf="items.controls['trade_supplier_name'].hasError('required')">Supplier Name Required</mat-error>
</mat-form-field>
</div>
<div fxLayout="row nowrap">
@ -204,7 +206,8 @@
<input matInput placeholder="Contact Person Mobile Number" autocomplete="off"
formControlName="trade_product_contact_person_mobile_number" OnlyNumber
type="text" maxlength="10">
<mat-error>Enter Valid Mobile Number.</mat-error>
<mat-error>Enter Valid Mobile Number.</mat-error>
<!-- <mat-error *ngIf="items.controls['trade_product_contact_person_mobile_number'].invaild">Enter Valid Mobile Number.</mat-error> -->
</mat-form-field>
<mat-form-field style="width: 15%">

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

@ -192,14 +192,19 @@
<mat-card-content>
<div fxLayout="row nowrap">
<div fxFlex="10" appPdLocatedMapView [value]="addresses">
<!-- <span><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span> -->
<span><i class="fa-1x fa fa-map-marker"></i></span>
</div>
<div fxFlex="90">
<div fxFlex="90">
<!-- <span *ngIf="addresses.state_name" class="hover-icon"> {{addresses.addressline}},<br> {{addresses.city_name}},<br>{{addresses.state_name}}-{{addresses.pincode == 1 ? addresses.other_pincode : addresses.pincode_display }} </span> -->
<span *ngIf="addresses.state_name" class="hover-icon"> {{addresses.addressline1}},<br> {{addresses.city_name}},<br>{{addresses.state_name}}-{{addresses.pincode_id == 1 ? addresses.other_pincode : addresses.pincode }} </span>
</div>
</div>
</div>
<div fxLayout="row nowrap" *ngIf="addresses.addtional_pd_data.length>0" style="color: #e00201">
<span fxFlex="10" ><mat-icon>people</mat-icon></span>
<span fxFlex="90" *ngIf="addresses.addtional_pd_data[0].customer_segment_abbr"> {{addresses.addtional_pd_data[0].customer_segment_abbr}} </span>
</div>
</mat-card-content>
<!-- <mat-divider></mat-divider> -->

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

@ -120,7 +120,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
});
// console.log('data.records.pd_addressdata', data.records.pd_addressdata);
this.pdMasterData[0].addresses = data.records.pd_address.filter(item => item.isactive == 1);
// console.log('this.pdMasterData[0].addresses', this.pdMasterData[0].addresses);
console.log('this.pdMasterData[0].addresses', this.pdMasterData[0].addresses);
this.currentPDStatus = data.records.pd_master_details[0].pd_status;
this.pdAdditionalReqData = data.records.pd_additional_requirements;
// enable pd start time