From 569fb3d13e3d02b594cbb55581676d4896259f0b Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Tue, 22 Mar 2022 18:42:07 +0800
Subject: [PATCH] fix notify

---
 resources/js/Permohonan/SenaraiMohon.vue | 500 +----------------------
 resources/js/Permohonan/StatusMohon.vue  |  12 +-
 resources/js/components/util/Notify.vue  |   6 +-
 3 files changed, 23 insertions(+), 495 deletions(-)

diff --git a/resources/js/Permohonan/SenaraiMohon.vue b/resources/js/Permohonan/SenaraiMohon.vue
index 6557399..8e30336 100644
--- a/resources/js/Permohonan/SenaraiMohon.vue
+++ b/resources/js/Permohonan/SenaraiMohon.vue
@@ -1,489 +1,6 @@
 <template>
     <div class="mx-auto">
 
-      <!-- <h1 class="font-bold flex justify-center">Senarai Cawangan dan Baki Peti Besi </h1> -->
-
-<!-- 
-    <div class="flex justify-center items-center">
-      <table class="w-2/3 justify-center items-center leading-normal">
-            <thead class="text-center">
-              <tr>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                  Cawangan
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                  Peti Besi (RM)
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                  Cawangan
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                  Peti Besi (RM)
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                  Cawangan
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                  Peti Besi (RM)
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                  Cawangan
-                </th>
-                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
-                  Peti Besi (RM)
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                 <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                 <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                 <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                 <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                 <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          Kota Bharu 2
-                      </p>
-                    </div>
-                  </div>
-                </td>
-                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
-                  <div class="flex items-center">
-                    <div class="ml-3">
-                      <p class="text-gray-900 whitespace-no-wrap">
-                          100,000
-                      </p>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-            </tbody>
-      </table>
-    </div> -->
-
-
       <div class="mx-auto flex justify-between mb-4">
         <h1 class="font-bold flex flex-row justify-end">Permohonan Yang Masih Aktif</h1>
         <button class="p-2 text-white bg-blue-500 rounded">Rekod Permohonan</button>
@@ -495,6 +12,9 @@
                 <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
                   Cawangan
                 </th>
+                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+                  Baki PetiBesi(RM)
+                </th>
                 <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
                   No Permohonan
                 </th>
@@ -525,6 +45,14 @@
                     </div>
                   </div>
                 </td>
+                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+                  <div class="flex items-center">
+                    <div class="ml-3">
+                      <p class="text-gray-900 whitespace-no-wrap" v-text="formatterfunction(mohon.baki_petibesi)">
+                      </p>
+                    </div>
+                  </div>
+                </td>
                 <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
                   <div class="flex items-center">
                     <div class="ml-3">
@@ -537,7 +65,6 @@
                   <div class="flex items-center">
                     <div class="ml-3">
                       <p class="text-gray-900 whitespace-no-wrap" v-text="mohon.tarikh_permohonan">
-                          s2019-19-20
                       </p>
                     </div>
                   </div>
@@ -563,7 +90,6 @@
                   <div class="flex items-center">
                     <div class="ml-3">
                       <p :class="mohon.jenismohon == 'permohonanwang' ? 'bg-green-500' : 'bg-red-500'" class="text-white whitespace-no-wrap p-2 rounded" v-text="checkjenismohon(mohon.jenismohon)">
-                          Permohonan Wang
                       </p>
                     </div>
                   </div>
@@ -605,9 +131,9 @@ export default {
 	},
   data(){
     return{
-        showpermohonan:[],
+        showpermohonan:{},
         currentPage:1,
-        paginate: []
+        paginate: {}
     }
   },
   created() {
diff --git a/resources/js/Permohonan/StatusMohon.vue b/resources/js/Permohonan/StatusMohon.vue
index fc68cc7..06df839 100644
--- a/resources/js/Permohonan/StatusMohon.vue
+++ b/resources/js/Permohonan/StatusMohon.vue
@@ -51,7 +51,7 @@
     
                     <div class="flex flex-column">
     
-                        <p class="font-weight-bold text-center">PPC / PC<br>Mohon Wang</p>
+                        <p class="font-weight-bold text-center">Permohonan <br>Cawangan</p>
     
                     </div>
     
@@ -61,7 +61,7 @@
     
                     <div class="flex flex-column">
     
-                        <p class="font-weight-bold text-center">Operasi <br> Mengesahkan <br> Permohonan</p>
+                        <p class="font-weight-bold text-center">Pengesahan<br>Operasi</p>
     
                     </div>
     
@@ -71,7 +71,7 @@
     
                     <div class="d-flex flex-column">
     
-                        <p class="font-weight-bold text-center">Akaun <br> Mengesahkan<br> Permohonan</p>
+                        <p class="font-weight-bold text-center">Akaun</p>
     
                     </div>
     
@@ -81,7 +81,7 @@
     
                     <div class="d-flex flex-column">
     
-                        <p class="font-weight-bold text-center">PB <br> Mengesahkan <br> Permohonan</p>
+                        <p class="font-weight-bold text-center">Kelulusan <br>Pengurus Besar</p>
     
                     </div>
     
@@ -91,7 +91,7 @@
     
                     <div class="d-flex flex-column">
     
-                        <p class="font-weight-bold text-center">Akaun <br> Menghantar <br> Deposit</p>
+                        <p class="font-weight-bold text-center">Akaun <br> Deposit Ke Bank <br>Selesai</p>
     
                     </div>
     
@@ -101,7 +101,7 @@
     
                     <div class="d-flex flex-column">
     
-                        <p class="font-weight-bold text-center">PPC / PC <br> Terima Wang</p>
+                        <p class="font-weight-bold text-center">Cawangan<br> Terima Wang</p>
     
                     </div>
     
diff --git a/resources/js/components/util/Notify.vue b/resources/js/components/util/Notify.vue
index 5949d6e..ee6b786 100644
--- a/resources/js/components/util/Notify.vue
+++ b/resources/js/components/util/Notify.vue
@@ -3,7 +3,8 @@
     <div id="notification" ref="notification" class="notification cursor-pointer" v-on:click="toggleDropdown()"></div>
         <div ref="popoverDropdownRef" v-bind:class="{'hidden': !dropdownShow, 'block': dropdownShow}" class="origin-top-right w-96 right-0 mt-2 w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1">
             <div class="py-1 px-2" role="none">
-                <template v-if="showkelulusan.data.length > 0">
+                <template>
+                <!-- <template v-if="showkelulusan.data.length > 0"> -->
                     <div v-for="(kelulusan,index) in showkelulusan.data" :key="index" class="text-gray-700 block px-2 py-5 text-sm hover:bg-yellow-500 cursor-pointer">
                         <div class="justify-between flex">
                             <div class="w-4/6">
@@ -20,7 +21,8 @@
                 </template>
                 
                 <!-- <a class="text-gray-700 block px-4 py-2 text-sm hover:bg-yellow-500 cursor-pointer" role="menuitem" tabindex="-1" id="menu-item-0">a<br><b>a</b></a> -->
-                <template v-else>
+                <!-- <template v-else> -->
+                    <template>
                     <div class="flex place-content-center w-full">
                         <div class="grid mx-auto mb-4">
                             <img src="/img/notify.jpg" class="h-20 w-20 mx-auto" alt="Windster Logo">