fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp

@@ -25,6 +25,7 @@
    <aura:attribute name="isClone" type="Boolean" default="False" />
    <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
    <ltng:require scripts="{! $Resource.jquery183minjs }" />
<<<<<<< HEAD
    <aura:attribute name="isModalOpen" type="boolean" default="false" />
    <aura:attribute name="searchKeyWord" type="string" default="" />
    <aura:attribute name="contactAWSIds" type="List" />
@@ -40,6 +41,16 @@
        event="c:NewAgencyContactEvent"
        action="{!c.closeAgencyContact}"
    />
=======
    <aura:attribute name="isModalOpen" type="boolean" default="false"/>
    <aura:attribute name="searchKeyWord" type="string" default=""/>
    <aura:attribute name="contactAWSIds" type="List"/>
    <aura:attribute name="login" type="Boolean" default="false"/>
    <aura:attribute name="show" type="Boolean" default="false"/>
    <aura:attribute name="showNewAgencyContact" type="Boolean" default="false"/>
    <aura:handler name="NewAgencyContactEvent" event="c:NewAgencyContactEvent" action="{!c.closeAgencyContact}"/>
    <aura:attribute name="agencyHospitalId" type="String" default = ""/>
>>>>>>> LEXCommunityLiJun

    <div class="{! v.container_class}">
        <!-- header -->
@@ -53,12 +64,17 @@
            <aura:if isTrue="{!v.showSpinner}">
                <lightning:spinner alternativeText="Loading" size="medium" />
            </aura:if>
<<<<<<< HEAD
            <lightning:recordEditForm objectApiName="Agency_Opportunity__c">
                <lightning:accordion
                    activeSectionName="{! v.section_names }"
                    allowMultipleSectionsOpen="true"
                    class="greyyyy"
                >
=======
            <lightning:recordEditForm objectApiName="Agency_Opportunity__c" onload="{!c.handleLoad}">
                <lightning:accordion activeSectionName="{! v.section_names }" allowMultipleSectionsOpen="true" class="greyyyy" >
>>>>>>> LEXCommunityLiJun
                    <aura:iteration items="{!v.layout}" var="section">
                        <aura:if isTrue="{! section.editHeading }">
                            <lightning:accordionSection
@@ -211,6 +227,7 @@
                        </lightning:layout>
                        <div id="QueryResult" style="margin-top: 20px"></div>
                    </div>
<<<<<<< HEAD

                    <aura:if isTrue="{!v.showNewAgencyContact}">
                        <section
@@ -229,5 +246,28 @@
            </section>
            <div class="slds-backdrop slds-backdrop_open"></div>
        </aura:if>
=======
                        
                        <!-- <aura:if isTrue="{!v.showNewAgencyContact}">
                            <section role="dialog" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01" class="slds-modal slds-fade-in-open"  aura:id="NewAgencyContact" id="NewAgencyContact">
                              <c:NewAgencyContact2 />
                            </section>
                        </aura:if> -->

                        <aura:if isTrue="{!v.showNewAgencyContact}">
                            <section role="dialog" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01"
                                class="slds-modal slds-fade-in-open" aura:id="NewAgencyContact"
                                id="NewAgencyContact" aria-describedby="modal-content-id-2" style="z-index: 9999;">
                                <c:NewAgencyContact2 agencyHospitalId="{!v.agencyHospitalId}"/>
                            </section>
                            <div class="slds-backdrop2 slds-backdrop_open2"></div>
                        </aura:if>
                        
                    </div>                               
                </section>             
                <div class="slds-backdrop slds-backdrop_open"></div>  
                
            </aura:if>           
>>>>>>> LEXCommunityLiJun
    </div>
</aura:component>