KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'Feature#Bajet' into 'new-super'

Browse Source 
Feature#bajet

See merge request online-sistem1/kaunter!226
This commit is contained in:
hafifie rahman
2023-03-29 01:53:15 +00:00
parent 02732c292b b728a837ba
commit a892849f43
2 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/homepage/khazanah/home.blade.php
+2 -2
View File
@@ -272,9 +272,9 @@
<a href="{{ url('alirantunai') }}" class="btn btn-info btn-lg btn-block mb-3">Aliran <a href="{{ url('alirantunai') }}" class="btn btn-info btn-lg btn-block mb-3">Aliran
Tunai</a> Tunai</a>
</div> </div>
{{-- <div class="row"> <div class="row">
<a href="{{ route('khazanah.bajet') }}" class="btn btn-info btn-lg btn-block mb-3">Bajet</a> <a href="{{ route('khazanah.bajet') }}" class="btn btn-info btn-lg btn-block mb-3">Bajet</a>
</div> --}} </div>
</div> </div>
</div> </div>
resources/views/khazanah/bajet.blade.php
+44 -30
View File
@@ -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 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>
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between col-12">
<div> <div class="row col-9">
<span class="col-5 font-weight-bold">HARIAN</span> <span class="col-4 font-weight-bold ml-n4 text-left">HARIAN</span>
<span class="col-1">:</span> <span class="col-1">:</span>
<span id="pembharian" class="col-5"></span> <span id="pembharian" class="col-6 text-left"></span>
</div> </div>
<div> <div>
<span id="pembpercent">-100%</span> <span id="pembpercent">-100%</span>
</div> </div>
</div> </div>
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between col-12">
<div> <div class="row col-9">
<span class="col-5 font-weight-bold">BAJET</span> <span class="col-4 font-weight-bold ml-n4 text-left">BAJET</span>
<span class="col-1">:</span> <span class="col-1">:</span>
<span id="pembbajet" class="col-5"></span> <span id="pembbajet" class="col-6 text-left"></span>
</div> </div>
<span>varians</span> <span>varians</span>
</div> </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 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>
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between col-12">
<div> <div class="row col-9">
<span class="col-5 font-weight-bold text-left">HARIAN</span> <span class="col-4 font-weight-bold ml-n4 text-left">HARIAN</span>
<span class="col-1">:</span> <span class="col-1">:</span>
<span id="penbharian" class="col-5"></span> <span id="penbharian" class="col-6 text-left"></span>
</div> </div>
<div> <div>
<span id="penbpercent">0%</span> <span id="penbpercent">0%</span>
</div> </div>
</div> </div>
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between col-12">
<div> <div class="row col-9">
<span class="col-5 font-weight-bold">BAJET</span> <span class="col-4 font-weight-bold ml-n4 text-left">BAJET</span>
<span class="col-1">:</span> <span class="col-1">:</span>
<span id="penbbajet" class="col-5"></span> <span id="penbbajet" class="col-6 text-left"></span>
</div> </div>
<span>varians</span> <span>varians</span>
</div> </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 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>
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between col-12">
<div> <div class="row col-9">
<span class="col-5 font-weight-bold">HARIAN</span> <span class="col-4 font-weight-bold ml-n4 text-left">HARIAN</span>
<span class="col-1">:</span> <span class="col-1">:</span>
<span id="keunharian" class="col-5"></span> <span id="keunharian" class="col-6 text-left"></span>
</div> </div>
<div> <div>
<span id="keunpercent">0%</span> <span id="keunpercent">0%</span>
</div> </div>
</div> </div>
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between col-12">
<div> <div class="row col-9">
<span class="col-5 font-weight-bold">BAJET</span> <span class="col-4 font-weight-bold ml-n4 text-left">BAJET</span>
<span class="col-1">:</span> <span class="col-1">:</span>
<span id="keunbajet" class="col-5"></span> <span id="keunbajet" class="col-6 text-left"></span>
</div> </div>
<span>varians</span> <span>varians</span>
</div> </div>
@@ -207,6 +207,8 @@
</div> </div>
<script> <script>
const d = new Date();
let tahunsemasa = d.getFullYear();
let pusherenv = "{{ env('PUSHER_APP_KEY') }}"; let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
let api_url = "{{ $api_url }}"; let api_url = "{{ $api_url }}";
@@ -446,6 +448,7 @@
datatype:'json', datatype:'json',
data:{ data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'year' : tahunsemasa
}, },
beforeSend: function() { beforeSend: function() {
pembbul = 1; pembbul = 1;
@@ -466,6 +469,7 @@
datatype:'json', datatype:'json',
data:{ data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'year' : tahunsemasa
}, },
beforeSend: function() { beforeSend: function() {
penbbul = 1; penbbul = 1;
@@ -486,6 +490,7 @@
datatype:'json', datatype:'json',
data:{ data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'year' : tahunsemasa
}, },
beforeSend: function() { beforeSend: function() {
keunbul = 1; keunbul = 1;
@@ -512,9 +517,10 @@
success:function(data){ success:function(data){
$('#pembharian').text('RM' + formatter.format(data[0].gadaiToday)); $('#pembharian').text('RM' + formatter.format(data[0].gadaiToday));
$('#pembbajet').text('RM' + formatter.format(data[0].bajetharian.toFixed(2))); $('#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').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.gadaianremaining = formatter.format(data[0].remaining.toFixed(2)),
// this.percentcumgadai = (100 - data[0].percentcum) // this.percentcumgadai = (100 - data[0].percentcum)
pembhar = 0; pembhar = 0;
@@ -538,9 +544,10 @@
success:function(data){ success:function(data){
$('#penbharian').text('RM' + formatter.format(data[0].tebusToday)); $('#penbharian').text('RM' + formatter.format(data[0].tebusToday));
$('#penbbajet').text('RM' + formatter.format(data[0].bajetharian.toFixed(2))); $('#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').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.gadaianremaining = formatter.format(data[0].remaining.toFixed(2)),
// this.percentcumgadai = (100 - data[0].percentcum) // this.percentcumgadai = (100 - data[0].percentcum)
penbhar = 1; penbhar = 1;
@@ -562,9 +569,10 @@
success:function(data){ success:function(data){
$('#keunharian').text('RM' + formatter.format(data[0].upahToday)); $('#keunharian').text('RM' + formatter.format(data[0].upahToday));
$('#keunbajet').text('RM' + formatter.format(data[0].bajetharian.toFixed(2))); $('#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').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.gadaianremaining = formatter.format(data[0].remaining.toFixed(2)),
// this.percentcumgadai = (100 - data[0].percentcum) // this.percentcumgadai = (100 - data[0].percentcum)
keunhar = 0; keunhar = 0;
@@ -580,6 +588,7 @@
datatype:'json', datatype:'json',
data:{ data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'year' : tahunsemasa
}, },
beforeSend: function() { beforeSend: function() {
pembtah = 1; pembtah = 1;
@@ -602,6 +611,8 @@
datatype:'json', datatype:'json',
data:{ data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'year' : tahunsemasa
}, },
beforeSend: function() { beforeSend: function() {
penbtah = 1; penbtah = 1;
@@ -623,6 +634,7 @@
datatype:'json', datatype:'json',
data:{ data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'year' : tahunsemasa
}, },
beforeSend: function() { beforeSend: function() {
keuntah = 1; keuntah = 1;
@@ -645,6 +657,7 @@
datatype:'json', datatype:'json',
data:{ data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'year' : tahunsemasa
}, },
beforeSend: function() { beforeSend: function() {
bilangan = 1; bilangan = 1;
@@ -657,6 +670,7 @@
datatype:'json', datatype:'json',
data:{ data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'year' : tahunsemasa
}, },
success:function(datatebus){ success:function(datatebus){
bilangan = 2; bilangan = 2;