Skip to content

aa.gusti / eis

Go to a project
Commit d709c349 by aa.gustiana@gmail.com
Options

Perbaikan ketinggian chart

1 parent 78972a06
Inline Side-by-side
Showing 2 changed files with 19 additions and 14 deletions
eispajak/views/pcpd.py
...@@ -516,8 +516,8 @@ class Views(BaseView): ...@@ -516,8 +516,8 @@ class Views(BaseView):
func.sum(PembayaranSppt.jml_sppt_yg_dibayar - PembayaranSppt.denda_sppt))\ func.sum(PembayaranSppt.jml_sppt_yg_dibayar - PembayaranSppt.denda_sppt))\
.filter(PembayaranSppt.thn_pajak_sppt == tahun).scalar() .filter(PembayaranSppt.thn_pajak_sppt == tahun).scalar()
bagi = 1000000 bagi = 1000000
resp["realisasi"] = [["Ketetapan", ketetapan/bagi or 0], resp["realisasi"] = [["Ketetapan", ketetapan and ketetapan/bagi or 0],
["Realisasi", realisasi/bagi or 0]] ["Realisasi", realisasi and realisasi/bagi or 0]]
elif act == 'bphtb': elif act == 'bphtb':
resp = self.get_bphtb_data() resp = self.get_bphtb_data()
......
eispajak/views/templates/pbb.pt
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="panel panel-default text-center"> <div class="panel panel-default text-center" id="panelRealisasi">
<div class="panel-heading"> <div class="panel-heading">
<img src="${home}/eis/static/42x42-money-transfer.png" class="icon-rounded" alt="" align="left"> <img src="${home}/eis/static/42x42-money-transfer.png" class="icon-rounded" alt="" align="left">
<h5 class="text-left bold"> <h5 class="text-left bold">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<img src="${home}/eis/static/42x42-pie-chart.png" class="icon-rounded" alt="" align="left"> <img src="${home}/eis/static/42x42-pie-chart.png" class="icon-rounded" alt="" align="left">
<h5 class="text-left bold">Ketetapan dan Realisasi tahun ${request.session['tahun']} <h5 class="text-left bold">Ketetapan dan Realisasi tahun ${request.session['tahun']} (Juta)
<i class="fa fa-info-circle pull-right icon-color"></i> <i class="fa fa-info-circle pull-right icon-color"></i>
</h5> </h5>
</div> </div>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6 hide"> <!-- <div class="col-md-6 hide">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<img src="${home}/eis/static/42x42-chart.png" class="icon-rounded" alt="" align="left"> <img src="${home}/eis/static/42x42-chart.png" class="icon-rounded" alt="" align="left">
...@@ -101,9 +101,9 @@ ...@@ -101,9 +101,9 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
<div class="row"> <!-- <div class="row">
<div class="col-md-6 hide"> <div class="col-md-6 hide">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
...@@ -134,7 +134,8 @@ ...@@ -134,7 +134,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="panel panel-default"> <div class="panel panel-default">
...@@ -212,10 +213,14 @@ ...@@ -212,10 +213,14 @@
var newData; var newData;
$(document).ready(function () { $(document).ready(function () {
var ctx = document.getElementById('chartPie').getContext('2d'); var ctxBar = document.getElementById('chartPie').getContext('2d');
var canvas = document.getElementById('chartPie'); var canvasBar = document.getElementById('chartPie');
canvas.width = window.innerWidth; canvasBar.width = window.innerWidth;
canvas.height = window.innerHeight / 2; // canvas.height = window.innerHeight / 2;
console.log(window.innerHeight);
console.log($("#panelRealisasi").height())
canvasBar.height = $("#panelRealisasi").height() + 125;
canvasBar.parentNode.parentNode.parentNode.style.height = $("#panelRealisasi").height() + "px";
// const bar_data = { // const bar_data = {
// labels: [ // labels: [
// 'Ketetapan', // 'Ketetapan',
...@@ -265,7 +270,7 @@ ...@@ -265,7 +270,7 @@
}; };
barChart = new Chart(ctx, barChart = new Chart(ctxBar,
{ {
type: 'bar', type: 'bar',
data: bar_data, data: bar_data,
...@@ -516,7 +521,7 @@ ...@@ -516,7 +521,7 @@
var tableRefresh = function () { var tableRefresh = function () {
table.clear(); table.clear();
newData.tabel.forEach(function (row) { newData.tabel.forEach(function (row) {
console.log(row); // console.log(row);
table.row.add([ table.row.add([
row.kode, row.kode,
row.nama, row.nama,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!