From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/SimpleEventRegister.page | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/pages/SimpleEventRegister.page b/force-app/main/default/pages/SimpleEventRegister.page
index 37f50b1..2efc14e 100644
--- a/force-app/main/default/pages/SimpleEventRegister.page
+++ b/force-app/main/default/pages/SimpleEventRegister.page
@@ -1,4 +1,4 @@
-<apex:page standardController="Event" tabStyle="Event" extensions="SimpleEventRegisterController" id="page" sidebar="true" action="{!init}">
+<apex:page standardController="Event" tabStyle="Event" extensions="SimpleEventRegisterController" id="page" sidebar="true" action="{!init}" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.jquerysuggestcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
@@ -6,6 +6,10 @@
<apex:includeScript value="{!URLFOR($Resource.jquerysuggestjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+<!-- Add By Li Jun for PIPL 20220225 -->
+<apex:includeScript value="{!URLFOR($Resource.AWSService, 'AWSService.js') }" />
+<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<!-- Add By Li Jun for PIPL 20220225 -->
<script>
var ros = '{!$User.State_Hospital__c}';
var act = '鐥呴櫌';
@@ -282,6 +286,72 @@
//2021-08-10 mzy update SWAG-C5R6GW 璇环浠诲姟鏂板瀛楁 end
}
+ //Add By Li Jun 20220225 for PIPL Start
+ AWSService.sfSessionId = '{!GETSESSIONID()}';
+ var staticResources = JSON.parse('{!staticResource}');
+ var contactAWSIds = JSON.parse('{!contactAWSIds}');
+ console.log('contactAWSIds:'+JSON.stringify(contactAWSIds));
+ var sfIdToContactInfo = {};
+ function preparePayloadForSearchContact(){
+ let searchPayload = new Object();
+ searchPayload.dataIds = contactAWSIds;
+ searchPayload.contactName = '';
+ return JSON.stringify(searchPayload);
+ }
+ function searchContactAll(){
+ let data = preparePayloadForSearchContact();
+ let searchCallBack = function searchCallBack(result){
+ let contacts = result.object;
+ if(contacts == null){
+ return;
+ }
+ for(var i=0;i<contacts.length;i++){
+ let temp = {}
+ temp.lastName = contacts[i].lastName?contacts[i].lastName:'';
+ if(contacts[i].sfRecordId){
+ sfIdToContactInfo[contacts[i].sfRecordId] = temp;
+ }
+ }
+ console.log('AWS Result:'+JSON.stringify(sfIdToContactInfo));
+ let v1Id = j$(escapeVfId('page:form:all:visitSettings:visitor1Id')).value();
+ if(sfIdToContactInfo.hasOwnProperty(v1Id)){
+ document.getElementById("page:form:all:visitSettings:visitor1").value = sfIdToContactInfo[v1Id].lastName;
+ }
+ let v2Id = j$(escapeVfId('page:form:all:visitSettings:visitor2Id')).value();
+ if(sfIdToContactInfo.hasOwnProperty(v2Id)){
+ document.getElementById("page:form:all:visitSettings:visitor2").value = sfIdToContactInfo[v2Id].lastName;
+ }
+ };
+ AWSService.search(staticResources.searchUrl,data,searchCallBack,staticResources.token);
+ }
+ //Add By Li Jun 20220225 for PIPL End
+
+ // 2021-07-29 zyh update start
+ function OPDPlan_F(){
+ var cid = document.getElementById('page:form:all:visitSettings:opportunity5111');
+ var cid1 = document.getElementById('page:form:all:visitSettings:opportunity').value;
+ var cid2 = document.getElementById('page:form:all:visitSettings:opportunity2').value;
+ if (cid.checked == true && cid1 == '' && cid2 == '') {
+ if(!confirm("鎮ㄥ垱寤虹殑OPD璁″垝娌℃湁鍏宠仈璇环锛岄渶瑕佸鎵瑰埌鍓�昏銆�")){
+ return;
+ }
+ // alert('鎮ㄥ垱寤虹殑OPD璁″垝娌℃湁鍏宠仈璇环锛岄渶瑕佸鎵瑰埌鍓�昏銆�');
+ }
+ // save();
+ }/*
+ function OPDPlan_F1(){
+ var cid = document.getElementById('page:form:all:visitSettings:opportunity5111');
+ var cid1 = document.getElementById('page:form:all:visitSettings:opportunity').value;
+ var cid2 = document.getElementById('page:form:all:visitSettings:opportunity2').value;
+ if (cid.checked == true && cid1 == '' && cid2 == '') {
+ if(!confirm("鎮ㄥ垱寤虹殑OPD璁″垝娌℃湁鍏宠仈璇环锛岄渶瑕佸鎵瑰埌鍓�昏銆�")){
+ return;
+ }
+ // alert('鎮ㄥ垱寤虹殑OPD璁″垝娌℃湁鍏宠仈璇环锛岄渶瑕佸鎵瑰埌鍓�昏銆�');
+ }
+ saveAndNew();
+ }*/
+ // 2021-07-29 zyh update end
</script>
<style>
.visitorplace_results {
@@ -320,12 +390,15 @@
<apex:form id="form">
+ <!-- // 2021-07-29 zyh update start -->
+<!-- <apex:actionFunction action="{!save}" name="save" reRender="visitSettings" oncomplete="blockme();unblockUI();"/>
+<apex:actionFunction action="{!saveAndNew}" name="saveAndNew" reRender="visitSettings" oncomplete="blockme();unblockUI();"/> -->
+ <!-- // 2021-07-29 zyh update end -->
<apex:actionFunction name="callHospital" action="{!visitToHospital}" immediate="true" rerender="visitSettings"/>
<apex:actionFunction name="callAgent" action="{!visitToAgent}" immediate="true" rerender="visitSettings"/>
<apex:actionFunction name="callTraining" action="{!visitToTraining}" immediate="true" rerender="visitSettings"/>
<apex:actionFunction name="callCampaign" action="{!visitToCampaign}" immediate="true" rerender="visitSettings"/>
<apex:actionFunction name="callNone" action="{!visitToNone}" immediate="true" rerender="visitSettings"/>
-
<apex:pageBlock title="浜嬩欢缂栬緫" mode="edit" id="all">
@@ -388,10 +461,20 @@
<!-- 20200922 zh SWAG-BS6BYA 鏍峰紡璋冩暣 start -->
<!-- 璁块棶瀵硅薄1 -->
- <apex:inputText label="璁块棶瀵硅薄" value="{!targetEvent.Visitor1__c}" rendered="{!isHospital}" id="visitor1" onchange="clearVisitorId('visitor1Id');" onClick="searchVisitor2(value);"/>
+ <!-- <apex:inputText label="璁块棶瀵硅薄" value="{!targetEvent.Visitor1__c}" rendered="{!isHospital}" id="visitor1" onchange="clearVisitorId('visitor1Id');" onClick="searchVisitor2(value);"/> -->
+ <!-- Add by Li Jun for PIPL 20220303 Start -->
+ <apex:inputText label="璁块棶瀵硅薄" value="{!idVisitor1PI}" rendered="{!isHospital}" id="visitor1" onchange="clearVisitorId('visitor1Id');" onClick="searchVisitor2(value);"/>
+ <!-- Add by Li Jun for PIPL 20220303 End -->
<apex:pageblockSectionItem />
<!-- 璁块棶瀵硅薄2 -->
- <apex:inputText label=" " value="{!targetEvent.Visitor2__c}" rendered="{!isHospital}" id="visitor2" onchange="clearVisitorId('visitor2Id');" onClick="searchVisitor2(value);"/>
+ <!-- <apex:inputText label=" " value="{!targetEvent.Visitor2__c}" rendered="{!isHospital}" id="visitor2" onchange="clearVisitorId('visitor2Id');" onClick="searchVisitor2(value);"/> -->
+ <!-- Add by Li Jun for PIPL 20220303 Start -->
+ <apex:inputText label=" " value="{!idVisitor2PI}" rendered="{!isHospital}" id="visitor2" onchange="clearVisitorId('visitor2Id');" onClick="searchVisitor2(value);"/>
+ <!-- Add by Li Jun for PIPL 20220303 End -->
+ <script>
+ console.log('Load AWS Data');
+ searchContactAll();
+ </script>
<apex:pageblockSectionItem rendered="{!isAgent}"/>
<!-- <apex:pageblockSectionItem /> -->
<!-- 璇环1 -->
@@ -407,7 +490,7 @@
<!--2021-12-23 mzy 澶囧搧浠诲姟 stat 鍙湁鐢ㄦ埛鎷滆鏃跺彲浠ュ嬀閫� OPD璁″垝-->
<!-- 10101104 zh SFDC-BUF6KM OPD琚姩浠诲姟 start -->
<!-- <apex:inputField label="{!$ObjectType.Event.fields.OPDPlan_Flag__c.label}" value="{!targetEvent.OPDPlan_Flag__c}" rendered="True" id="opportunity5111" onFocus="setSuggestOpportunity5();" onchange="resetValue('page:form:all:visitSettings:opportunity5');" /> -->
- <apex:inputField label="{!$ObjectType.Event.fields.OPDPlan_Flag__c.label}" value="{!targetEvent.OPDPlan_Flag__c}" rendered="{!!isOpdDisable && isHospital}" id="opportunity5111" onFocus="setSuggestOpportunity5();" onchange="resetValue('page:form:all:visitSettings:opportunity5');" />
+ <apex:inputField label="{!$ObjectType.Event.fields.OPDPlan_Flag__c.label}" value="{!targetEvent.OPDPlan_Flag__c}" rendered="{!!isOpdDisable && isHospital}" id="opportunity5111" onFocus="setSuggestOpportunity5();" onchange="resetValue('page:form:all:visitSettings:opportunity5');" onclick="OPDPlan_F();" />
<apex:inputField label="{!$ObjectType.Event.fields.OPDPlan_Flag__c.label}" value="{!targetEvent.OPDPlan_Flag__c}" rendered="{!isOpdDisable && isHospital}" html-disabled="true" />
<!-- 10101104 zh SFDC-BUF6KM OPD琚姩浠诲姟 end -->
<!--2021-12-23 mzy 澶囧搧浠诲姟 end 鍙湁鐢ㄦ埛鎷滆鏃跺彲浠ュ嬀閫� OPD璁″垝-->
@@ -561,8 +644,8 @@
</apex:pageblockSection>
<apex:pageBlockButtons >
- <apex:commandButton value="淇濆瓨" rerender="all,msgs" action="{!save}" onclick="blockme();" oncomplete="unblockUI();disablePurpose();" />
- <apex:commandButton value="淇濆瓨骞舵柊寤�" rerender="all,msgs" action="{!saveAndNew}" onclick="blockme(); disablePurpose();" oncomplete="unblockUI();"/>
+ <apex:commandButton value="淇濆瓨" rerender="all,msgs" action="{!save}" onclick=" blockme();" oncomplete="unblockUI();disablePurpose();" />
+ <apex:commandButton value="淇濆瓨骞舵柊寤�" rerender="all,msgs" action="{!saveAndNew}" onclick=" blockme(); disablePurpose();" oncomplete="unblockUI();"/>
<apex:commandButton value="鍙栨秷" action="{!cancel}" onclick="blockme();" oncomplete="unblockUI();"/>
</apex:pageBlockButtons>
--
Gitblit v1.9.1