From 579f488ab774ccd54696a23299c7a86a0eedd5f3 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Wed, 29 Mar 2023 09:49:03 +0800
Subject: [PATCH 1/2] fix bajet

---
 resources/views/khazanah/bajet.blade.php | 74 ++++++++++++++----------
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/resources/views/khazanah/bajet.blade.php b/resources/views/khazanah/bajet.blade.php
index 60b5e82..eae6de3 100644
--- a/resources/views/khazanah/bajet.blade.php
+++ b/resources/views/khazanah/bajet.blade.php
@@ -25,22 +25,22 @@
                                     <div id="pembprogress" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
                                 </div>
 
-                                <div class="d-flex justify-content-between">
-                                    <div>
-                                        <span class="col-5 font-weight-bold">HARIAN</span>
+                                <div class="d-flex justify-content-between col-12">
+                                    <div class="row col-9">
+                                        <span class="col-4 font-weight-bold ml-n4 text-left">HARIAN</span>
                                         <span class="col-1">:</span>
-                                        <span id="pembharian" class="col-5"></span>
+                                        <span id="pembharian" class="col-6 text-left"></span>
                                     </div>
                                     <div>
                                         <span id="pembpercent">-100%</span>
                                     </div>
                                     
                                 </div>
-                                <div class="d-flex justify-content-between">
-                                    <div>
-                                        <span class="col-5 font-weight-bold">BAJET</span>
+                                <div class="d-flex justify-content-between col-12">
+                                    <div class="row col-9">
+                                        <span class="col-4 font-weight-bold ml-n4 text-left">BAJET</span>
                                         <span class="col-1">:</span>
-                                        <span id="pembbajet" class="col-5"></span>
+                                        <span id="pembbajet" class="col-6 text-left"></span>
                                     </div>
                                     <span>varians</span>
                                 </div>
@@ -54,22 +54,22 @@
                                     <div id="penbprogress" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
                                 </div>
 
-                                <div class="d-flex justify-content-between">
-                                    <div>
-                                        <span class="col-5 font-weight-bold text-left">HARIAN</span>
+                                <div class="d-flex justify-content-between col-12">
+                                    <div class="row col-9">
+                                        <span class="col-4 font-weight-bold ml-n4 text-left">HARIAN</span>
                                         <span class="col-1">:</span>
-                                        <span id="penbharian" class="col-5"></span>
+                                        <span id="penbharian" class="col-6 text-left"></span>
                                     </div>
                                     <div>
                                         <span id="penbpercent">0%</span>
                                     </div>
                                     
                                 </div>
-                                <div class="d-flex justify-content-between">
-                                    <div>
-                                        <span class="col-5 font-weight-bold">BAJET</span>
+                                <div class="d-flex justify-content-between col-12">
+                                    <div class="row col-9">
+                                        <span class="col-4 font-weight-bold ml-n4 text-left">BAJET</span>
                                         <span class="col-1">:</span>
-                                        <span id="penbbajet" class="col-5"></span>
+                                        <span id="penbbajet" class="col-6 text-left"></span>
                                     </div>
                                     <span>varians</span>
                                 </div>
@@ -83,22 +83,22 @@
                                     <div id="keunprogress" class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 0%;" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
                                 </div>
 
-                                <div class="d-flex justify-content-between">
-                                    <div>
-                                        <span class="col-5 font-weight-bold">HARIAN</span>
+                                <div class="d-flex justify-content-between col-12">
+                                    <div class="row col-9">
+                                        <span class="col-4 font-weight-bold ml-n4 text-left">HARIAN</span>
                                         <span class="col-1">:</span>
-                                        <span id="keunharian" class="col-5"></span>
+                                        <span id="keunharian" class="col-6 text-left"></span>
                                     </div>
                                     <div>
                                         <span id="keunpercent">0%</span>
                                     </div>
                                     
                                 </div>
-                                <div class="d-flex justify-content-between">
-                                    <div>
-                                        <span class="col-5 font-weight-bold">BAJET</span>
+                                <div class="d-flex justify-content-between col-12">
+                                    <div class="row col-9">
+                                        <span class="col-4 font-weight-bold ml-n4 text-left">BAJET</span>
                                         <span class="col-1">:</span>
-                                        <span id="keunbajet" class="col-5"></span>
+                                        <span id="keunbajet" class="col-6 text-left"></span>
                                     </div>
                                     <span>varians</span>
                                 </div>
@@ -207,6 +207,8 @@
 </div>
 <script>
 
+    const d = new Date();
+    let tahunsemasa = d.getFullYear();
     let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
     let api_url = "{{ $api_url }}";
 
@@ -446,6 +448,7 @@
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'year' : tahunsemasa
             },
             beforeSend: function() {
                 pembbul = 1;
@@ -466,6 +469,7 @@
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'year' : tahunsemasa
             },
             beforeSend: function() {
                 penbbul = 1;
@@ -486,6 +490,7 @@
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'year' : tahunsemasa
             },
             beforeSend: function() {
                 keunbul = 1;
@@ -512,9 +517,10 @@
             success:function(data){
                 $('#pembharian').text('RM' + formatter.format(data[0].gadaiToday));
                 $('#pembbajet').text('RM' + formatter.format(data[0].bajetharian.toFixed(2)));
-                $('#pembpercent').text(data[0].percentDiff + '%');
+                $('#pembpercent').text(data[0].percentDiff.toFixed(2) + '%');
                 $('#pembprogress').text(100 - data[0].percentcum + '%');
-                $("#pembprogress").css("width",100 - data[0].percentcum);
+                // $("#pembprogress").css("width",100 - data[0].percentcum);
+                $("#pembprogress").width(100 - data[0].percentcum + '%');
                 // this.gadaianremaining = formatter.format(data[0].remaining.toFixed(2)),
                 // this.percentcumgadai = (100 - data[0].percentcum)
                 pembhar = 0;
@@ -538,9 +544,10 @@
             success:function(data){
                 $('#penbharian').text('RM' + formatter.format(data[0].tebusToday));
                 $('#penbbajet').text('RM' + formatter.format(data[0].bajetharian.toFixed(2)));
-                $('#penbpercent').text(data[0].percentDiff + '%');
+                $('#penbpercent').text(data[0].percentDiff.toFixed(2) + '%');
                 $('#penbprogress').text(100 - data[0].percentcum + '%');
-                $("#penbprogress").css("width",100 - data[0].percentcum);
+                // $("#penbprogress").css("width",100 - data[0].percentcum);
+                $("#penbprogress").width(100 - data[0].percentcum + '%');
                 // this.gadaianremaining = formatter.format(data[0].remaining.toFixed(2)),
                 // this.percentcumgadai = (100 - data[0].percentcum)
                 penbhar = 1;
@@ -562,9 +569,10 @@
             success:function(data){
                 $('#keunharian').text('RM' + formatter.format(data[0].upahToday));
                 $('#keunbajet').text('RM' + formatter.format(data[0].bajetharian.toFixed(2)));
-                $('#keunpercent').text(data[0].percentDiff + '%');
+                $('#keunpercent').text(data[0].percentDiff.toFixed(2) + '%');
                 $('#keunprogress').text(100 - data[0].percentcum + '%');
-                $("#keunprogress").css("width",100 - data[0].percentcum);
+                // $("#keunprogress").css("width",100 - data[0].percentcum);
+                $("#keunprogress").width(100 - data[0].percentcum + '%');
                 // this.gadaianremaining = formatter.format(data[0].remaining.toFixed(2)),
                 // this.percentcumgadai = (100 - data[0].percentcum)
                 keunhar = 0;
@@ -580,6 +588,7 @@
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'year' : tahunsemasa
             },
             beforeSend: function() {
                 pembtah = 1;
@@ -602,6 +611,8 @@
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'year' : tahunsemasa
+
             },
             beforeSend: function() {
                 penbtah = 1;
@@ -623,6 +634,7 @@
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'year' : tahunsemasa
             },
             beforeSend: function() {
                 keuntah = 1;
@@ -645,6 +657,7 @@
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'year' : tahunsemasa
             },
             beforeSend: function() {
                 bilangan = 1;
@@ -657,6 +670,7 @@
                     datatype:'json',
                     data:{
                         'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                        'year' : tahunsemasa
                     },
                     success:function(datatebus){
                         bilangan = 2;

From b728a837badf906e6da86846b49aab19b75694cb Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Wed, 29 Mar 2023 09:51:13 +0800
Subject: [PATCH 2/2] enable bajet button in homepage of khazanah

---
 resources/views/homepage/khazanah/home.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
index 88ca38d..06cf5b3 100644
--- a/resources/views/homepage/khazanah/home.blade.php
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -272,9 +272,9 @@
                             <a href="{{ url('alirantunai') }}" class="btn btn-info btn-lg btn-block  mb-3">Aliran
                                 Tunai</a>
                         </div>
-                        {{-- <div class="row">
+                        <div class="row">
                             <a href="{{ route('khazanah.bajet') }}" class="btn btn-info btn-lg btn-block mb-3">Bajet</a>
-                        </div> --}}
+                        </div>
                     </div>
 
                 </div>