Merge pull request #1122 from deepa-s-13/Dev-2.0

OBPAS CHANGES
upyog · May 31, 2024 · 4ffe5cb · 4ffe5cb
2 parents 054da9a + 079277d
commit 4ffe5cb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/.../web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js b/.../web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js
@@ -307,21 +307,33 @@
           updatedFormData.owners = [];
         }
         if((approvedColony?.code=="NO") ) 
-        { if(NocNumber || uploadedFile || formData?.owners?.uploadedFile || formData?.owners?.NocNumber){
-          onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index);          
+        { if(NocNumber || uploadedFile || formData?.owners?.uploadedFile ){
+          if((greenbuilding?.code==="YES"))
+          { if(greenuploadedFile || formData?.owners?.greenuploadedFile){
+            onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index);          
+          }
+          else{
+            alert("Please Upload Document")
+          }  }
+          else{
+          onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index);        
+        }  
         }
         else{
           alert("Please fill NOC number or Upload NOC Document")
         }  }
-        if((greenbuilding?.code==="YES"))
+
+        else{
+          if((greenbuilding?.code==="YES"))
           { if(greenuploadedFile || formData?.owners?.greenuploadedFile){
             onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index);          
           }
           else{
             alert("Please Upload Document")
           }  }
-        else{
+          else{
           onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index);
+          }
         }        
       };
 

diff --git a/...als/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js b/...als/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js
@@ -374,21 +374,23 @@ console.log("appl", applicationDetails)
           {!isEditApplication && detail?.additionalDetails?.permissions && workflowDetails?.data?.nextActions?.length > 0 && (
             <PermissionCheck applicationData={applicationDetails?.applicationData} t={t} permissions={detail?.additionalDetails?.permissions} />
           )}
-          {/* {detail?.additionalDetails?.obpsDocuments && (
+          {detail?.additionalDetails?.obpsDocuments && (
+            <div style={{display:"flex"}}>
             <BPADocuments
               t={t}
               applicationData={applicationDetails?.applicationData}
               docs={detail.additionalDetails.obpsDocuments}
               bpaActionsDetails={workflowDetails}
             />
-          )} */}
+            </div>
+          )}
 
           {/* to get Document values */}
-          {( detail?.additionalDetails?.obpsDocuments?.[0]?.values) && (
+          {/* {( detail?.additionalDetails?.obpsDocuments?.[0]?.values) && (
                   <div style={{marginTop: "-8px"}}>
                     {<DocumentsPreview documents={getOrderDocuments(detail?.additionalDetails?.obpsDocuments?.[0]?.values)} svgStyles = {{}} isSendBackFlow = {false} isHrLine = {true} titleStyles ={{fontSize: "20px", lineHeight: "24px", "fontWeight": 700, marginBottom: "10px"}}/>}
                   </div>
-                )}
+                )} */}
           {detail?.additionalDetails?.noc && (
             <NOCDocuments
               t={t}