diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
index 3fdc14c5f..425b15ecc 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
@@ -34,7 +34,7 @@ export class NeighbourHoodComponent implements OnInit {
{'id': 2,'name': "Negative"},
{'id': 3,'name': "Insufficient information provided"}];
amtInwords : any = [];
- isOtherApplicant: boolean;
+ // isOtherApplicant: any = [];
constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,private dialogRef: MatDialogRef) {
this.pdid = this.data.pdmaster_details.pd_id;
this.notifier = notifier;
@@ -111,7 +111,7 @@ export class NeighbourHoodComponent implements OnInit {
exist_neighbourhood_details.forEach((element,index) => {
this.toggleVisibility(element.did_not_know_the_business_operation,index,1);
this.toggleVisibility(element.did_not_know_the_owner,index,2);
- this.selectedApplicants(referencecheckControl,element.organisation_owner);
+ // this.selectedApplicants(referencecheckControl,element.organisation_owner,index);
neighbourhoodControl.push(this.createNeighbourhood(element));
});
}
@@ -346,7 +346,7 @@ validateAllFormFields(formGroup: any) {
}
toggleVisibility(e,index,flag){
- // console.log(e,index);
+ console.log(e,index);
if(flag == 1){
this.isDisplay[index] = e;
}
@@ -355,19 +355,29 @@ toggleVisibility(e,index,flag){
}
}
-selectedApplicants(items,e){
-
- if(e != 0){
- this.isOtherApplicant = false;
- items.controls['other_organisation_owner'].setValue('');
- items.controls['other_organisation_owner'].clearValidators();
- }else{
- this.isOtherApplicant = true;
- items.controls['other_organisation_owner'].setValidators([Validators.required]);
+checkOthers(values){
+ if(values!=null) {
+ return values.id==0 ? true : false;
+ }
+ else {
+ return false;
}
-
- items.controls['other_organisation_owner'].updateValueAndValidity();
}
+// selectedApplicants(items,e,i){
+
+// if(e != 0){
+// this.isOtherApplicant[i] = false;
+// // items.controls['other_organisation_owner'].setValue('');
+// // items.controls['other_organisation_owner'].clearValidators();
+// // items.controls['other_organisation_owner'].updateValueAndValidity();
+// }else{
+// this.isOtherApplicant[i] = true;
+// // items.controls['other_organisation_owner'].setValidators([Validators.required]);
+// // items.controls['other_organisation_owner'].updateValueAndValidity();
+// }
+
+
+// }
/** Amount InWords */
inWords(e,i){
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
index 44d0519ec..c44af0972 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
@@ -382,27 +382,30 @@ tradingFormCreation(val) {
} else {
if(datas.manufacturing_raw_materials != undefined){
- for (let val of datas.manufacturing_raw_materials) {
-
+ // for (let val of datas.manufacturing_raw_materials) {
+ datas.manufacturing_raw_materials.forEach((val,index) => {
+
if(val.raw_value){
- this.M_rawValueInWords = this._pd.convertNumberToWords(val.raw_value);
+ this.M_rawValueInWords[index] = this._pd.convertNumberToWords(val.raw_value);
// this.M_financialRawValueInWords = this._pd.convertNumberToWords(val.rawmaterial_value);
}
rawMaterial.push(this.createRawmaterial(val));
- }
+ });
}
else{
rawMaterial.push(this.createRawmaterial(null));
}
if(datas.manufacturing_finished_goods != undefined){
- for (let val of datas.manufacturing_finished_goods) {
+ // for (let val of datas.manufacturing_finished_goods) {
+ datas.manufacturing_finished_goods.forEach((val,index) => {
+
if(val.goods_value){
- this.M_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value);
+ this.M_goodsValueInWords[index] = this._pd.convertNumberToWords(val.goods_value);
// this.M_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value);
}
finishedGoods.push(this.createGoods(val));
- }
+ });
}
else{
finishedGoods.push(this.createGoods(null));
@@ -470,15 +473,16 @@ tradingFormCreation(val) {
} else {
if(datas.retail_traded_goods !== undefined){
- for (let val of datas.retail_traded_goods) {
+ // for (let val of datas.retail_traded_goods) {
+ datas.retail_traded_goods.forEach((val,index) => {
if(val.estimated_traded_goods_value){
- this.R_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
+ this.R_tradedGoodsValueInWords[index] = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
// this.R_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value);
}
tradedGoods.push(this.createTradedGoods(val));
- }
+ });
}
else{
tradedGoods.push(this.createTradedGoods(null));
@@ -569,14 +573,15 @@ tradingFormCreation(val) {
} else {
if(datas.trading_traded_goods !==undefined)
{
- for (let val of datas.trading_traded_goods) {
+ // for (let val of datas.trading_traded_goods) {
+ datas.trading_traded_goods.forEach((val,index) => {
if(val.estimated_traded_goods_value){
- this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
+ this.T_tradedGoodsValueInWords[index] = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
// this.T_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value);
}
tradedGoods.push(this.createTradedGoods(val));
- }
+ });
}
else{
tradedGoods.push(this.createTradedGoods(null));
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
index 7c2875f6c..29360cd04 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
@@ -87,12 +87,12 @@
-
+
No.of days of Credit Provided by Supplier
-
+
-
+
@@ -196,12 +196,12 @@
-
-
+
+
diff --git a/ng6-seed/src/app/settings/entity/entity.module.ts b/ng6-seed/src/app/settings/entity/entity.module.ts
index 5826adc71..601165950 100755
--- a/ng6-seed/src/app/settings/entity/entity.module.ts
+++ b/ng6-seed/src/app/settings/entity/entity.module.ts
@@ -39,7 +39,7 @@ import { EntityEditBillingInfoComponent } from './entity-edit/entity-edit-billin
import { DialogAddEditBillingInfo } from './entity-edit/entity-edit-billing-info/entity-edit-billing-info.component';
import { EntityEditVendorCityInfoComponent } from './entity-edit/entity-edit-vendor-city-info/entity-edit-vendor-city-info.component';
import { EntityBranchAddComponent } from './entity-edit/entity-branch-add/entity-branch-add.component';
-// import { MatTooltipModule } from '@angular/material/tooltip';
+import { MatTooltipModule } from '@angular/material/tooltip';
/**
* Custom angular notifier options
*/
@@ -97,7 +97,7 @@ const customNotifierOptions: NotifierOptions = {
MatProgressBarModule,MatDialogModule, MatSortModule,
MatToolbarModule,MatSelectModule,MatListModule, MatMenuModule,
MatCheckboxModule,
- // MatTooltipModule,
+ MatTooltipModule,
MatTabsModule,
MatChipsModule,
MatExpansionModule,
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html
index 6ee99b859..5f056cd75 100755
--- a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html
+++ b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html
@@ -86,7 +86,7 @@
-
+
diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html
index 2d219137c..74149b532 100755
--- a/ng6-seed/src/app/settings/users/register/register.component.html
+++ b/ng6-seed/src/app/settings/users/register/register.component.html
@@ -156,8 +156,12 @@
-
-
+
+
+
+
+
+
diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts
index d04a52e1c..da174b7c4 100755
--- a/ng6-seed/src/app/settings/users/register/register.component.ts
+++ b/ng6-seed/src/app/settings/users/register/register.component.ts
@@ -386,7 +386,10 @@ this.loader = true;
}
}
-
+ onResetForEdit(){
+ this.userupdate();
+ }
+
checktype(e){
// console.log(e);
this.roleAccess= false;