From 4238b5408fde989099dc289e4f830ac3c1a0a6d3 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 11 五月 2022 17:04:57 +0800
Subject: [PATCH] Page Enhance 0511
---
force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page | 3
force-app/main/default/pages/ViewOnCallDecrypt.page | 38 +++++++++++-
force-app/main/default/pages/NewOnCall.page | 6 +
force-app/main/default/pages/ViewConsumApplyEquipmentSetDetailDecrypt.page | 4 +
force-app/main/default/pages/NewRepair.page | 33 +++++++---
force-app/main/default/pages/ViewAddressDecryptInfo.page | 9 ++-
force-app/main/default/pages/NewAndEditAddress.page | 9 ++-
force-app/main/default/pages/NewConsumApply.page | 9 ++-
force-app/main/default/pages/NewAndEditReport.page | 3
force-app/main/default/pages/ViewRepairEncrypt.page | 18 ++++--
10 files changed, 98 insertions(+), 34 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditAddress.page b/force-app/main/default/pages/NewAndEditAddress.page
index 266b8d1..b1a70c6 100644
--- a/force-app/main/default/pages/NewAndEditAddress.page
+++ b/force-app/main/default/pages/NewAndEditAddress.page
@@ -159,9 +159,12 @@
}
var queryBack = function queryBack(data) {
console.log('data = ' + data);
- document.querySelector("[data-id='Telephone__c']").value = data.object.telephone;
- document.querySelector("[data-id='ZipCode__c']").value = data.object.zipCode;
- document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
+ if(document.querySelector("[data-id='Telephone__c']"))
+ document.querySelector("[data-id='Telephone__c']").value = data.object.telephone;
+ if(document.querySelector("[data-id='ZipCode__c']"))
+ document.querySelector("[data-id='ZipCode__c']").value = data.object.zipCode;
+ if(document.querySelector("[data-id='Detailed_Address__c']"))
+ document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
unblockUI();
};
diff --git a/force-app/main/default/pages/NewAndEditReport.page b/force-app/main/default/pages/NewAndEditReport.page
index 847ab3d..e380866 100644
--- a/force-app/main/default/pages/NewAndEditReport.page
+++ b/force-app/main/default/pages/NewAndEditReport.page
@@ -718,7 +718,8 @@
//Replace Vlookup Field
replaceSearchContactLookup();
//3. Set Readonly Attribute
- document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
+ if(document.querySelector("[data-id='OwnerId']"))
+ document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
//濡傛灉鏄疧PD璁″垝杩囨潵鐨�
if('{!no1Name}' != '' && '{!no1Id}' != ''){
diff --git a/force-app/main/default/pages/NewConsumApply.page b/force-app/main/default/pages/NewConsumApply.page
index 5eb258d..f9386a3 100644
--- a/force-app/main/default/pages/NewConsumApply.page
+++ b/force-app/main/default/pages/NewConsumApply.page
@@ -57,8 +57,10 @@
//Query Required Parameter
var queryBack = function queryBack(data) {
console.log('data = ' + data);
- document.querySelector("[data-id='Phone_number__c']").value = data.object.phoneNumber;
- document.querySelector("[data-id='direct_shippment_address__c']").value = data.object.directShippmentAddress;
+ if(document.querySelector("[data-id='Phone_number__c']"))
+ document.querySelector("[data-id='Phone_number__c']").value = data.object.phoneNumber;
+ if(document.querySelector("[data-id='direct_shippment_address__c']"))
+ document.querySelector("[data-id='direct_shippment_address__c']").value = data.object.directShippmentAddress;
unblockUI();
};
@@ -320,7 +322,8 @@
let dataId = contactsInfo[sfId];
let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
let queryBackContactName = function queryBackContactName(result){
- document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
+ if(document.querySelector("[data-id='Loaner_medical_Staff__c']"))
+ document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
//document.querySelector("[data-id='LastName']").value = result.object.lastName;
};
AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);
diff --git a/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page b/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
index 1f34438..c0a088f 100644
--- a/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
+++ b/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
@@ -50,7 +50,8 @@
//Query Required Parameter
var queryBack = function queryBack(data) {
console.log('data = ' + data);
- document.querySelector("[data-id='Trial_User__c']").value = data.object.trialUser;
+ if(document.querySelector("[data-id='Trial_User__c']"))
+ document.querySelector("[data-id='Trial_User__c']").value = data.object.trialUser;
unblockUI();
};
diff --git a/force-app/main/default/pages/NewOnCall.page b/force-app/main/default/pages/NewOnCall.page
index 4a269e6..2b17d5b 100644
--- a/force-app/main/default/pages/NewOnCall.page
+++ b/force-app/main/default/pages/NewOnCall.page
@@ -37,8 +37,10 @@
var queryBack = function queryBack(data) {
console.log('data = ' + data);
//document.querySelector("[id='page:form:pageBlock:pageBlockSection:j_id1:0:j_id2']").value = data.object.callerPhone;
- document.getElementById(api_id_map['Caller_phone__c']).value = data.object.callerPhone; //20220404 By Chen Yanan
- document.querySelector("[data-id='Responsible_Person_HP__c']").value = data.object.responsiblePersonHP;
+ if(document.getElementById(api_id_map['Caller_phone__c']))
+ document.getElementById(api_id_map['Caller_phone__c']).value = data.object.callerPhone; //20220404 By Chen Yanan
+ if(document.querySelector("[data-id='Responsible_Person_HP__c']"))
+ document.querySelector("[data-id='Responsible_Person_HP__c']").value = data.object.responsiblePersonHP;
unblockUI();
};
diff --git a/force-app/main/default/pages/NewRepair.page b/force-app/main/default/pages/NewRepair.page
index 05f513d..20b67eb 100644
--- a/force-app/main/default/pages/NewRepair.page
+++ b/force-app/main/default/pages/NewRepair.page
@@ -252,22 +252,32 @@
var queryBack = function queryBack(data) {
console.log(data);
- document.querySelector("[data-id='address_Contacts__c']").value = data.object.addressContacts;
- document.querySelector("[data-id='address_Contacts_Name__c']").value = data.object.addressContactsName;
- document.querySelector("[data-id='address_Telephone__c']").value = data.object.addressTelephone;
- document.querySelector("[data-id='address_ZipCode__c']").value = data.object.addressZipCode;
- document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
- document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicant;
+ if(document.querySelector("[data-id='address_Contacts__c']"))
+ document.querySelector("[data-id='address_Contacts__c']").value = data.object.addressContacts;
+ if(document.querySelector("[data-id='address_Contacts_Name__c']"))
+ document.querySelector("[data-id='address_Contacts_Name__c']").value = data.object.addressContactsName;
+ if(document.querySelector("[data-id='address_Telephone__c']"))
+ document.querySelector("[data-id='address_Telephone__c']").value = data.object.addressTelephone;
+ if(document.querySelector("[data-id='address_ZipCode__c']"))
+ document.querySelector("[data-id='address_ZipCode__c']").value = data.object.addressZipCode;
+ if(document.querySelector("[data-id='Detailed_Address__c']"))
+ document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
+ if(document.querySelector("[data-id='RepairApplicant__c']"))
+ document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicant;
AWSService.query(staticResourceAddress.queryUrl, '{!DecryptAWSDataId}', queryBackDecrypt, staticResourceAddress.token);
};
var queryBackContact = function queryBack(data) {
console.log(data);
- document.querySelector("[data-id='address_Contacts__c']").value = data.object.lastName;
+ if(document.querySelector("[data-id='address_Contacts__c']"))
+ document.querySelector("[data-id='address_Contacts__c']").value = data.object.lastName;
};
var queryBackDecrypt = function queryBack(data) {
- document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
- document.querySelector("[data-id='address_ZipCode__c']").value = data.object.zipCode;
- document.querySelector("[data-id='address_Telephone__c']").value = data.object.telephone;
+ if(document.querySelector("[data-id='Detailed_Address__c']"))
+ document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
+ if(document.querySelector("[data-id='address_ZipCode__c']"))
+ document.querySelector("[data-id='address_ZipCode__c']").value = data.object.zipCode;
+ if(document.querySelector("[data-id='address_Telephone__c']"))
+ document.querySelector("[data-id='address_Telephone__c']").value = data.object.telephone;
AWSService.query(staticResourceContact.queryUrl, '{!ContactAWSDataId}', queryBackContact, staticResourceContact.token);
}
@@ -508,7 +518,8 @@
blockme();//add by Li Jun 20220428 By Li Jun
var staticResourceRepairSubOrder = JSON.parse('{!staticResourceRepairSubOrder}');
let queryBackRepairSubOrder = function queryBackRepairSubOrder(data) {
- document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicantName;
+ if(document.querySelector("[data-id='RepairApplicant__c']"))
+ document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicantName;
unblockUI();//add by Li Jun 20220428 By Li Jun
EditButton(false);//add by Li Jun 20220428 By Li Jun
};
diff --git a/force-app/main/default/pages/ViewAddressDecryptInfo.page b/force-app/main/default/pages/ViewAddressDecryptInfo.page
index e3ef890..462d595 100644
--- a/force-app/main/default/pages/ViewAddressDecryptInfo.page
+++ b/force-app/main/default/pages/ViewAddressDecryptInfo.page
@@ -18,9 +18,12 @@
AWSService.query(staticResources.queryUrl, '{!AWSDataId}', queryBack, staticResources.token);
}
var queryBack = function queryBack(data) {
- document.querySelector("[data-id='Telephone__c']").innerHTML = data.object.telephone;
- document.querySelector("[data-id='ZipCode__c']").innerHTML = data.object.zipCode;
- document.querySelector("[data-id='Detailed_Address__c']").innerHTML = data.object.detailedAddress;
+ if(document.querySelector("[data-id='Telephone__c']"))
+ document.querySelector("[data-id='Telephone__c']").innerHTML = data.object.telephone;
+ if(document.querySelector("[data-id='ZipCode__c']"))
+ document.querySelector("[data-id='ZipCode__c']").innerHTML = data.object.zipCode;
+ if(document.querySelector("[data-id='Detailed_Address__c']"))
+ document.querySelector("[data-id='Detailed_Address__c']").innerHTML = data.object.detailedAddress;
};
sfdcPage.appendToOnloadQueue(function () {
diff --git a/force-app/main/default/pages/ViewConsumApplyEquipmentSetDetailDecrypt.page b/force-app/main/default/pages/ViewConsumApplyEquipmentSetDetailDecrypt.page
index 1e4b29a..3cf6b8b 100644
--- a/force-app/main/default/pages/ViewConsumApplyEquipmentSetDetailDecrypt.page
+++ b/force-app/main/default/pages/ViewConsumApplyEquipmentSetDetailDecrypt.page
@@ -22,7 +22,9 @@
AWSService.query(staticResources.queryUrl, '{!AWSDataId}', queryBack, staticResources.token);
}
var queryBack = function queryBack(data) {
- document.querySelector("[id='page:form:pageBlock:pageBlockSection:j_id2:0:j_id3']").innerHTML = data.object.trialUser;
+ if(document.querySelector("[data-id='Trial_User__c']")){
+ document.querySelector("[data-id='Trial_User__c']").innerText = data.object.trialUser;
+ }
};
sfdcPage.appendToOnloadQueue(function () {
console.log('sfdcPage.appendToOnloadQueue');
diff --git a/force-app/main/default/pages/ViewOnCallDecrypt.page b/force-app/main/default/pages/ViewOnCallDecrypt.page
index aaabf0e..59ceedb 100644
--- a/force-app/main/default/pages/ViewOnCallDecrypt.page
+++ b/force-app/main/default/pages/ViewOnCallDecrypt.page
@@ -13,18 +13,50 @@
<apex:pageBlockSection showHeader="false" title="" collapsible="true" columns="2" id="pageBlockSection">
<!--Each section has layoutFields, let's iterate them as well-->
<apex:repeat value="{!encryptedAPIList}" var="encryptedAPI">
- <apex:outputField html-data-id="{!encryptedAPI}" value="{!On_Call__c[encryptedAPI]}" />
+ <apex:outputField html-data-id="{!encryptedAPI}" title="{!ApiPrefix}{!encryptedAPI}" value="{!On_Call__c[encryptedAPI]}" />
</apex:repeat>
</apex:pageBlockSection>
<script>
// AWSService.sfSessionId = '{!GETSESSIONID()}'; // 20220404 By Chen Yanan
var staticResources = JSON.parse('{!staticResource}');
+ var AWSToSobjectEncryptedMapJson = JSON.parse('{!AWSToSobjectEncryptedMapJson}');
+ var ApiPrefix = '{!ApiPrefix}';
function QueryConsumApplyFromAWS() {
AWSService.query(staticResources.queryUrl, '{!AWSDataId}', queryBack, staticResources.token);
}
var queryBack = function queryBack(data) {
- document.querySelector("[data-id='Responsible_Person_HP__c']").innerHTML = data.object.responsiblePersonHP;
- document.querySelector("[id='page:form:pageBlock:pageBlockSection:j_id2:1:j_id3']").innerHTML = data.object.callerPhone;
+
+ // document.querySelector("[data-id='Responsible_Person_HP__c']").innerHTML = data.object.responsiblePersonHP;
+ // document.querySelector("[id='page:form:pageBlock:pageBlockSection:j_id2:1:j_id3']").innerHTML = data.object.callerPhone;
+ console.log('resp from aws:'+JSON.stringify(data.object));
+ if(!data.object){
+ console.log('data.object is ' + data.object);
+ return;
+ }
+ for(let f in AWSToSobjectEncryptedMapJson){
+ let t = "[title='"+ApiPrefix+AWSToSobjectEncryptedMapJson[f]+"']";
+ let ele = document.querySelector(t);
+ if(ele){
+ ele.title = '';
+ if(data.object.hasOwnProperty(f)){
+ if (f == 'email') {
+ let eml = document.querySelector("[data-id='Email']");
+ if(eml){ //20220403 By Chen Yanan
+ eml.href = 'mailto:'+data.object[f];
+ eml.text = data.object[f];
+ continue;
+ }
+ }
+ ele.innerHTML = data.object[f];
+ }
+ else{
+ console.log(f + 'is not in data.object');
+ }
+ }else{
+ console.log('selector='+t+' not found');
+ }
+
+ }
};
sfdcPage.appendToOnloadQueue(function () {
console.log('sfdcPage.appendToOnloadQueue');
diff --git a/force-app/main/default/pages/ViewRepairEncrypt.page b/force-app/main/default/pages/ViewRepairEncrypt.page
index c03951d..cca3540 100644
--- a/force-app/main/default/pages/ViewRepairEncrypt.page
+++ b/force-app/main/default/pages/ViewRepairEncrypt.page
@@ -28,12 +28,18 @@
}
var queryBack = function queryBack(data) {
console.log(data);
- document.querySelector("[data-id='address_Contacts__c']").innerHTML = data.object.addressContacts;
- document.querySelector("[data-id='address_Contacts_Name__c']").innerHTML = data.object.addressContactsName;
- document.querySelector("[data-id='address_Telephone__c']").innerHTML = data.object.addressTelephone;
- document.querySelector("[data-id='address_ZipCode__c']").innerHTML = data.object.addressZipCode;
- document.querySelector("[data-id='Detailed_Address__c']").innerHTML = data.object.detailedAddress;
- document.querySelector("[data-id='RepairApplicant__c']").innerHTML = data.object.repairApplicant;
+ if(document.querySelector("[data-id='address_Contacts__c']"))
+ document.querySelector("[data-id='address_Contacts__c']").innerHTML = data.object.addressContacts;
+ if(document.querySelector("[data-id='address_Contacts_Name__c']"))
+ document.querySelector("[data-id='address_Contacts_Name__c']").innerHTML = data.object.addressContactsName;
+ if(document.querySelector("[data-id='address_Telephone__c']"))
+ document.querySelector("[data-id='address_Telephone__c']").innerHTML = data.object.addressTelephone;
+ if(document.querySelector("[data-id='address_ZipCode__c']"))
+ document.querySelector("[data-id='address_ZipCode__c']").innerHTML = data.object.addressZipCode;
+ if(document.querySelector("[data-id='Detailed_Address__c']"))
+ document.querySelector("[data-id='Detailed_Address__c']").innerHTML = data.object.detailedAddress;
+ if(document.querySelector("[data-id='RepairApplicant__c']"))
+ document.querySelector("[data-id='RepairApplicant__c']").innerHTML = data.object.repairApplicant;
//AWSService.query(staticResourceAddress.queryUrl, '{!DecryptAWSDataId}', queryBackDecrypt, staticResourceAddress.token);
};
/*
--
Gitblit v1.9.1