From c42ec52c218c7f6d6986be64e09d87a94b679408 Mon Sep 17 00:00:00 2001
From: "afiq.hamzah" <afiq.hamzah@pkb.net.my>
Date: Sun, 11 Dec 2022 15:22:06 +0800
Subject: [PATCH] Fix photo validation not working when sah marhun

---
 resources/views/marhun/marhun.blade.php | 38 +++++++++++++------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index fe1311d7..a04e5276 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -64,19 +64,21 @@
                 <div class="col-6">
                     <div class="card card-overall-marhun">
                         <div class="card-header">Keseluruhan Marhun</div>
-                        <div class="card-body" style="align-self: center; justify-content: center;">
+                        <div class="card-body pl-0 pr-0" style="align-self: center; justify-content: center;">
                             @if ($lelongbid['filemarhun_filename'] != null)
                             <button type="button" data-toggle="modal" onclick="kesulurahanMarhunData(this)" data-lelongid="{{$lelongbid['lelong_id']}}" data-lelongbidid="{{$lelongbid['id']}}" data-lelongbid_status_semak="{{ $lelongbid['status_semak'] }}" data-fileid="{{ $lelongbid['filemarhun_id'] }}" data-target="#modaloverallphoto">
                                 <img src="{{ route('marhun.showphotomarhun', ['norujukan_sag' => $lelongbid['norujukan'], 'filemarhun_id' => $lelongbid['filemarhun_id']]) }}" width="100%">
                             </button>
                             @else
                             <p>Tiada Data</p>
-                            <button type="button" data-toggle="modal" data-target="#modaloverallphoto">Muat Naik Gambar</button>
-                            <button
-                                data-dismiss="modal"
-                                onclick="modalOverallPhotoCapture.initiateTakeMarhunPhoto()" type="button"
-                            >Ambil Gambar Baru
-                            </button>
+                            <div class="container d-flex justify-content-between p-0 mr-4">
+                                <button
+                                    data-dismiss="modal"
+                                    onclick="modalOverallPhotoCapture.initiateTakeMarhunPhoto()" type="button"
+                                >Ambil Gambar Marhun
+                                </button>
+                                <button type="button" data-toggle="modal" data-target="#modaloverallphoto">Muat Naik Gambar Marhun</button>
+                            </div>
                             @endif
                         </div>
                     </div>
@@ -235,9 +237,9 @@
                         @else
                             <button style="width:7%;" class="btn btn-success button-confirm-marhun" onclick="confirm()" data-is_overall_marhun_photo_uploaded="{{ $lelongbid['filemarhun_filename'] != null }}">Semak/button>
                         @endif
-                       
+
                    @else
-                   <button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak</button>
+                   <button style="width:7%;" class="btn btn-success button-confirm-marhun" onclick="confirm()" data-is_overall_marhun_photo_uploaded="{{ $lelongbid['filemarhun_filename'] != null }}">Semak</button>
                    @endif
                  {{-- <button style="width:7%;" class="btn btn-warning">Dalam Proses Pengesahan</button> --}}
                 @elseif($lelongbid->status_semak == 1)
@@ -245,13 +247,13 @@
                 @endif
             </div>
         </div>
-        
 
-                
-                
-                
-                
-                
+
+
+
+
+
+
             </div>
 
         </div>
@@ -573,7 +575,7 @@
                 modalOverallPhoto.querySelectorAll('button.action-invalid-after-semak')
                                     .forEach(button => button.style.display = 'none');
             }
-            
+
             prepareModalUpdateCaptureEachMarhun(modalTitle, marhunId, fileId);
             prepareModalUpdateUploadEachMarhun(modalTitle, marhunId, fileId, fileName);
             prepareModalViewPhotoEachMarhun(fileName);
@@ -705,11 +707,11 @@
                             }
                         },
                     }
-                });            
+                });
         }
 
         function confirm() {
-            
+
             const is_pass_validation = validateOverallMarhunPhotoTook();
 
             if (! is_pass_validation) {