From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期五, 08 四月 2022 14:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG

---
 force-app/main/default/pages/ViewAgencyContactDecryptInfo.page |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/pages/ViewAgencyContactDecryptInfo.page b/force-app/main/default/pages/ViewAgencyContactDecryptInfo.page
index 9e9746b..1e09ea9 100644
--- a/force-app/main/default/pages/ViewAgencyContactDecryptInfo.page
+++ b/force-app/main/default/pages/ViewAgencyContactDecryptInfo.page
@@ -1,5 +1,7 @@
 <apex:page standardController="Agency_Contact__c" extensions="NewAndEditAgencyContactController" id="page">
+    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
     <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+    <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
     <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }"/>
     <apex:form id="form">
         <apex:pageblock id="pageBlock">
@@ -10,7 +12,7 @@
                 </apex:repeat>
             </apex:pageBlockSection>
             <script>
-                var config = {
+                var config = { 
                     SobjectName : "{!SobjectName}",
                     ApiPrefix:"{!ApiPrefix}",
                     AWSToSobjectMap:{!AWSToSobjectMapJson},
@@ -18,14 +20,27 @@
                     AWSToSobjectEncryptedMap:{!AWSToSobjectEncryptedMapJson}
                 };
                 var staticResources = JSON.parse('{!staticResource}');
+                //var staticResourceAWSContact = JSON.parse('{!staticResourceAWSContact}');
                 function QuerySobjectFromAWS() {
                     AWSService.query(staticResources.queryUrl, '{!AWSDataId}', queryBack, staticResources.token);
+                    // console.log('Query contact by awsid:'+'{!awsContactId}');
+                    // if('{!awsContactId}'){
+                    //     AWSService.query(staticResourceAWSContact.queryUrl, '{!awsContactId}', queryBack, staticResources.token);
+                    // }                    
+                    
                 }
                 var queryBack = function queryBack(data) {
                     if(!data.object){
                         console.log('data.object is ' + data.object);
                         return;
                     }
+                    // console.log('Data from AWS:'+JSON.stringify(data.object));
+                    // if('{!awsContactId}'){
+                    //     data.object.name = data.object.lastName;
+                    //     data.object.type = data.object.type;
+                    //     data.object.doctorDivision1 = data.object.doctorDivision1;
+                    // }
+                    // console.log('Data from AWS:'+JSON.stringify(data.object));
 
                     for(let f in config.AWSToSobjectNonEncryptedMap){
                         let t = "[title='"+config.ApiPrefix+config.AWSToSobjectNonEncryptedMap[f]+"']";

--
Gitblit v1.9.1