From 828bf5097f1121f6321cb4775830b2a055aaa026 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 13 Feb 2022 10:08:55 +0300 Subject: [PATCH] fixed cei issue --- .../src/app/eit/add-cei/add-cei.component.ts | 126 +++++++++--------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/Mohem/src/app/eit/add-cei/add-cei.component.ts b/Mohem/src/app/eit/add-cei/add-cei.component.ts index 13195626..8d9ef1f6 100644 --- a/Mohem/src/app/eit/add-cei/add-cei.component.ts +++ b/Mohem/src/app/eit/add-cei/add-cei.component.ts @@ -1152,11 +1152,11 @@ export class AddCeiComponent implements OnInit { } else { if ( this.validateEitObj[i].APPLICATION_COLUMN_NAME == - "PEI_OBJECT_VERSION_NUMBER" + "CEI_OBJECT_VERSION_NUMBER" ) obj.peiObjVer = this.validateEitObj[i].NUMBER_VALUE; else if ( - this.validateEitObj[i].APPLICATION_COLUMN_NAME == "PEI_EXTRA_INFO_ID" + this.validateEitObj[i].APPLICATION_COLUMN_NAME == "CONTACT_EXTRA_INFO_ID" ) obj.peiExtraInfoID = this.validateEitObj[i].NUMBER_VALUE; } @@ -1349,60 +1349,60 @@ export class AddCeiComponent implements OnInit { } } // end for - // if (this.getPassdirfromNotifiPage) { - // let updatedObj1 = this.validateEitObj.find( - // x => x.APPLICATION_COLUMN_NAME === "PEI_ACTION" - // ); - // let updatedObj2 = this.validateEitObj.find( - // x => x.APPLICATION_COLUMN_NAME === "PEI_EXTRA_INFO_ID" - // ); - // let updatedObj3 = this.validateEitObj.find( - // x => x.APPLICATION_COLUMN_NAME === "PEI_OBJECT_VERSION_NUMBER" - // ); - // this.updatedValues.push(updatedObj1); - // this.updatedValues.push(updatedObj2); - // this.updatedValues.push(updatedObj3); - // valuseArr = this.fillExtraInformation( - // valuseArr, - // updatedObj1.VARCHAR2_VALUE, - // updatedObj2.NUMBER_VALUE, - // updatedObj3.NUMBER_VALUE, - // transNo - // ); - // } else { - // if (this.eitSubmitAction == EIT_ACTION.ADD) { - // this.updatedValues = this.fillExtraValuesUpdated( - // this.updatedValues, - // "NEW_ROW", - // -1, - // 0, - // transNo - // ); - // valuseArr = this.fillExtraInformation( - // valuseArr, - // "NEW_ROW", - // -1, - // 0, - // transNo - // ); - // } else if (this.eitSubmitAction == EIT_ACTION.UPDATE) { - // valuseArr = this.fillExtraInformation( - // valuseArr, - // "UPDATE_ROW", - // this.ExtraObj.peiExtraInfoID, - // this.ExtraObj.peiObjVer, - // transNo - // ); - // } else if (this.eitSubmitAction == EIT_ACTION.DELETE) { - // valuseArr = this.fillExtraInformation( - // valuseArr, - // "DELETE_ROW", - // this.ExtraObj.peiExtraInfoID, - // this.ExtraObj.peiObjVer, - // transNo - // ); - // } - // } + if (this.getPassdirfromNotifiPage) { + let updatedObj1 = this.validateEitObj.find( + x => x.APPLICATION_COLUMN_NAME === "PEI_ACTION" + ); + let updatedObj2 = this.validateEitObj.find( + x => x.APPLICATION_COLUMN_NAME === "CONTACT_EXTRA_INFO_ID" + ); + let updatedObj3 = this.validateEitObj.find( + x => x.APPLICATION_COLUMN_NAME === "CEI_OBJECT_VERSION_NUMBER" + ); + this.updatedValues.push(updatedObj1); + this.updatedValues.push(updatedObj2); + this.updatedValues.push(updatedObj3); + valuseArr = this.fillExtraInformation( + valuseArr, + updatedObj1.VARCHAR2_VALUE, + updatedObj2.NUMBER_VALUE, + updatedObj3.NUMBER_VALUE, + transNo + ); + } else { + if (this.eitSubmitAction == EIT_ACTION.ADD) { + this.updatedValues = this.fillExtraValuesUpdated( + this.updatedValues, + "NEW_ROW", + -1, + 0, + transNo + ); + valuseArr = this.fillExtraInformation( + valuseArr, + "NEW_ROW", + -1, + 0, + transNo + ); + } else if (this.eitSubmitAction == EIT_ACTION.UPDATE) { + valuseArr = this.fillExtraInformation( + valuseArr, + "UPDATE_ROW", + this.ExtraObj.peiExtraInfoID, + this.ExtraObj.peiObjVer, + transNo + ); + } else if (this.eitSubmitAction == EIT_ACTION.DELETE) { + valuseArr = this.fillExtraInformation( + valuseArr, + "DELETE_ROW", + this.ExtraObj.peiExtraInfoID, + this.ExtraObj.peiObjVer, + transNo + ); + } + } return valuseArr; } // end getElementsValues @@ -1429,7 +1429,7 @@ export class AddCeiComponent implements OnInit { }; let obj2 = { TRANSACTION_NUMBER: 1, - APPLICATION_COLUMN_NAME: "PEI_OBJECT_VERSION_NUMBER", + APPLICATION_COLUMN_NAME: "CEI_OBJECT_VERSION_NUMBER", VARCHAR2_VALUE: null, NUMBER_VALUE: peiObjVer, DATATYPE: "NUMBER", @@ -1442,7 +1442,7 @@ export class AddCeiComponent implements OnInit { SEGMENT_PROMPT: "" }; let obj3 = { - APPLICATION_COLUMN_NAME: "PEI_EXTRA_INFO_ID", + APPLICATION_COLUMN_NAME: "CONTACT_EXTRA_INFO_ID", DATATYPE: "NUMBER", DATE_VALUE: null, DESC_FLEX_CONTEXT_CODE: "", @@ -1470,22 +1470,22 @@ export class AddCeiComponent implements OnInit { values.push({ TRANSACTION_NUMBER: transNo, NAME: "PEI_ACTION", - VARCHAR2_VALUE: peiAction, + VARCHAR2_VALUE: 'NEW_ROW', NUMBER_VALUE: null, DATE_VALUE: null }); values.push({ TRANSACTION_NUMBER: transNo, - NAME: "PEI_EXTRA_INFO_ID", + NAME: "CONTACT_EXTRA_INFO_ID", VARCHAR2_VALUE: null, - NUMBER_VALUE: peiExtraInfoID, + NUMBER_VALUE: 0, DATE_VALUE: null }); values.push({ TRANSACTION_NUMBER: transNo, - NAME: "PEI_OBJECT_VERSION_NUMBER", + NAME: "CEI_OBJECT_VERSION_NUMBER", VARCHAR2_VALUE: null, - NUMBER_VALUE: peiObjVer, + NUMBER_VALUE: 0, DATE_VALUE: null }); return values;