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

Fairoj completePD issue fixed

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-07-12 11:35:40 +05:30
parent 09091964f7
commit 06cb8968f7
8 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.sourcemaps/main.js.map
View File

File diff suppressed because one or more lines are too long

4
src/pages/input/bounced-reject/bounced-reject.ts
View File

@ -56,7 +56,7 @@ export class BouncedRejectPage {
{
if(this.bounce_reason !=null && this.bounce_reason !=1)
{
let data = {'pd_id':this.pdDetails.pd_id,'pd_status':this.pdDetails.pd_status,'fk_updatedby':this.users,'bounce_reason':this.bounce_reason,'bounce_reason_others':this.bounce_reason_others};
let data = {'pd_id':this.pdDetails.pd_id,'pd_status':this.pdDetails.pd_status,'fk_updatedby':this.users,'bounce_reason':this.bounce_reason,'bounce_reason_others':this.bounce_reason_others,'random_string':this.pdDetails.random_string};
// console.log(this.bounce_reason)
// console.log(this.bounce_reason_others);
console.log(data);
@ -72,7 +72,7 @@ export class BouncedRejectPage {
}
else if(this.bounce_reason == 1 && this.bounce_reason_others != '' && this.bounce_reason_others !=null )
{
let data = {'pd_id':this.pdDetails.pd_id,'pd_status':this.pdDetails.pd_status,'fk_updatedby':this.users,'bounce_reason':this.bounce_reason,'bounce_reason_others':this.bounce_reason_others};
let data = {'pd_id':this.pdDetails.pd_id,'pd_status':this.pdDetails.pd_status,'fk_updatedby':this.users,'bounce_reason':this.bounce_reason,'bounce_reason_others':this.bounce_reason_others,'random_string':this.pdDetails.random_string};
// console.log(this.bounce_reason)
// console.log(this.bounce_reason_others);
console.log(data);

3
src/pages/map-address/map-address.ts
View File

@ -82,7 +82,8 @@ console.log("d",this.master,'kd',this.applicants,'dks',this.applicants);
let update_records={"pd_id":null,"parent_pd_id":this.master.parent_pd_id,"fk_address_id":this.addressData.pd_address_id,"pd_status":"ACCEPTED","fk_updatedby":this.aws.getlocale(),
"fk_customer_segment":values.fk_customer_segment,
"pd_co_applicant_id":values.pd_co_applicant_id,
"mobile_no":values.mobile_no
"mobile_no":values.mobile_no,
'random_string':this.master.random_string
}
console.log("update",update_records);
this.pdTrigger.updatepdStatus(update_records).subscribe(res=>{

2
src/pages/otp/otp.ts
View File

@ -159,7 +159,7 @@ export class OtpPage {
this.geolocation.getCurrentPosition().then((resp) => {
let currentPosPDofficer = resp.coords.latitude+","+resp.coords.longitude;
data = {'pd_id':this.applicatentDetails.pd_id,'pd_status':'STARTED','mobile_no':this.applicatentDetails.applicat_details[0].mobile_no,'fk_updatedby':this.users,'link':currentPosPDofficer};
data = {'pd_id':this.applicatentDetails.pd_id,'pd_status':'STARTED','mobile_no':this.applicatentDetails.applicat_details[0].mobile_no,'fk_updatedby':this.users,'link':currentPosPDofficer,'random_string':this.applicatentDetails.random_string};
console.log(data);
this.pddetails.updatepdStatus(data).subscribe(res=>
{

6
src/pages/pd-question-category/pd-question-category.ts
View File

@ -364,6 +364,10 @@ searchitem:any;
}
}
PdFormCompletnessCheck(){
if(!this.overallqustioncountAccess){// For checking Answered Forms
this.toast.pdTriggerappmessage("Please complete all the Forms");
return;
}
this.pdstatusprovide.pdFormsCompletenessCheck(this.questionCate.pdmaster_details.pd_id).subscribe(res=>{
console.log(res['records']);
if(res['records'].length > 0){
@ -431,7 +435,7 @@ else{ //IF ADDRESS COUNT 0 THIS BLOCK EXECUTED
this.toast.pdTriggerappmessage("Please complete all the Forms");
}
else{
let data = {'pd_id':this.questionCate.pdmaster_details.pd_id,'pd_status':status,'fk_updatedby':users,'updatedon':currentdate};
let data = {'pd_id':this.questionCate.pdmaster_details.pd_id,'pd_status':status,'fk_updatedby':users,'updatedon':currentdate,'random_string':this.questionCate.pdmaster_details.random_string};
this.pdstatusprovide.updatepdStatus(data).subscribe(res=>
{

27
src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.ts
View File

@ -877,6 +877,7 @@ else{
}
setValidationForRemarks(value,rec,index,type?){
let billing_info_values:any=[];
console.log("value of for",this.clientInfoForm.value)
let form_values=this.clientInfoForm.value
@ -887,11 +888,11 @@ else{
if(form_values.manufacturing_details[0].main_raw_materials.length > 0){
form_values.manufacturing_details[0].main_raw_materials.forEach(res=>{
if(res.manufacturing_product_name != '' && res.manufacturing_contact_person_mobile_number != ''){
this.billing_available=true
billing_info_values.manufacturing=+1
return
}
else{
this.billing_available=false
billing_info_values.manufacturing=0
}
})
}
@ -907,11 +908,11 @@ else{
form_values.service_provider_details[0].service_products.forEach(res=>{
if(res.service_provider_product_name != '' && res.service_provider_product_contact_person_mobile_number != ''){
console.log("service last check",this.billing_available)
this.billing_available=true
billing_info_values.service=+1
return
}
else{
this.billing_available=false
billing_info_values.service=0
}
})
}
@ -924,18 +925,30 @@ else{
if(form_values.trade_details[0].trading_products.length > 0){
form_values.trade_details[0].trading_products.forEach(res=>{
if(res.trade_product_name != '' && res.trade_product_contact_person_mobile_number != ''){
this.billing_available=true
billing_info_values.trade=+1
return
}
else{
this.billing_available=false
billing_info_values.trade=0
}
})
}
}
}
}
console.log(this.billing_available)
console.log("billing value",billing_info_values);
// billing_info_values=billing_info_values.filter(val=>val.service > 0 || val.trade > 0 || val.manufacturing >= '1')
if(billing_info_values.service >0 || billing_info_values.manufacturing >0 || billing_info_values.trade >0){
this.billing_available=true
console.log("manu",billing_info_values.manufacturing);
}
else{
this.billing_available=false
}
console.log("billing available",this.billing_available)
}

28
src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.ts
View File

@ -536,6 +536,7 @@ export class PdQuestionSupplierInfoPage {
});
}
setValidationForRemarks(value,rec,index,type?){
let billing_info_values:any=[];
console.log("value of for",this.supplierInfoForm.value)
let form_values=this.supplierInfoForm.value
@ -545,27 +546,28 @@ export class PdQuestionSupplierInfoPage {
if(form_values.manufacturing_details[0].main_raw_materials.length > 0){
form_values.manufacturing_details[0].main_raw_materials.forEach(res=>{
if(res.manufacturing_raw_material_name != '' && res.manufacturing_contact_person_mobile_number != ''){
this.billing_available=true
billing_info_values.manufacturing=+1
return
}
else{
this.billing_available=false
billing_info_values.manufacturing=0
}
})
}
// if(rec.)
}
}
if(form_values.servicing_details[0] != null){
if(form_values.servicing_details[0].service_providers){
if(form_values.servicing_details[0].service_providers.length >0){
form_values.servicing_details[0].service_providers.forEach(res=>{
if(res.service_provider_name != '' && res.service_provider_contact_person_mobile_number != ''){
this.billing_available=true
billing_info_values.service=+1
return
}
else{
this.billing_available=false
billing_info_values.service=0
}
})
}
@ -576,17 +578,29 @@ export class PdQuestionSupplierInfoPage {
if(form_values.trade_details[0].trading_products.length > 0){
form_values.trade_details[0].trading_products.forEach(res=>{
if(res.trade_product_name != '' && res.trade_product_contact_person_mobile_number != ''){
this.billing_available=true
billing_info_values.trade=+1
return
}
else{
this.billing_available=false
billing_info_values.trade=0
}
})
}
}
}
console.log(this.billing_available)
console.log("billing value",billing_info_values);
// billing_info_values=billing_info_values.filter(val=>val.service > 0 || val.trade > 0 || val.manufacturing >= '1')
if(billing_info_values.service >0 || billing_info_values.manufacturing >0 || billing_info_values.trade >0){
this.billing_available=true
console.log("manu",billing_info_values.manufacturing);
}
else{
this.billing_available=false
}
console.log("after filter the billing values",billing_info_values)
console.log("billing available",this.billing_available)
}
cameraEnable(){

1
src/providers/_guard/token.interceptor.ts
View File

@ -53,6 +53,7 @@ export class TokenInterceptor implements HttpInterceptor{
private handleError<T> (operation = 'operation', result?: T) {
return (error: any): Observable<T> => {
console.log("error",error)
if(error instanceof HttpErrorResponse){
console.error("Error: " + error.status);
if(error.status == 401){