Commit 5a1e5685 by taufikyu

revisi eis

1 parent d4887d64
...@@ -14,6 +14,8 @@ from ..models.isipkd import (DBSession, ARInvoice, ARSspd, User, Unit, ...@@ -14,6 +14,8 @@ from ..models.isipkd import (DBSession, ARInvoice, ARSspd, User, Unit,
ObjekPajak, SubjekPajak, Rekening, Wilayah) ObjekPajak, SubjekPajak, Rekening, Wilayah)
from .arinvoice import save as save_invoice from .arinvoice import save as save_invoice
from ..models.rpc import DepartemenRoute from ..models.rpc import DepartemenRoute
import logging
log = logging.getLogger(__name__)
now = datetime.now() now = datetime.now()
datenow = now.date() datenow = now.date()
...@@ -174,6 +176,11 @@ def set_invoice(request, data): ...@@ -174,6 +176,11 @@ def set_invoice(request, data):
'pokok','denda','bunga','jumlah','periode_1', 'pokok','denda','bunga','jumlah','periode_1',
'periode_2','jatuh_tempo','tgl_tetap','no_skrd'] 'periode_2','jatuh_tempo','tgl_tetap','no_skrd']
get_mandatory(data, param) get_mandatory(data, param)
## LOGGING SET INVOICE ##
log.error('==== SET INVOICE ====')
log.error(data)
values = clear_null_value(data) values = clear_null_value(data)
if 'jatuh_tempo' in values and values['jatuh_tempo']: if 'jatuh_tempo' in values and values['jatuh_tempo']:
values['jatuh_tempo'] = date_from_str(values['jatuh_tempo']) values['jatuh_tempo'] = date_from_str(values['jatuh_tempo'])
...@@ -259,6 +266,11 @@ def get_payment(request, data): ...@@ -259,6 +266,11 @@ def get_payment(request, data):
""" """
auth_from_rpc(request) auth_from_rpc(request)
get_mandatory(data, ['kd_bayar']) get_mandatory(data, ['kd_bayar'])
## LOGGING GET PAYMENT ##
log.error('==== GET PAYMENT ====')
log.error(data)
row_invoice = DBSession.query(ARInvoice).filter_by(kode=data['kd_bayar']).first() row_invoice = DBSession.query(ARInvoice).filter_by(kode=data['kd_bayar']).first()
if not row_invoice: if not row_invoice:
raise JsonRpcBillNotFoundError raise JsonRpcBillNotFoundError
...@@ -337,6 +349,10 @@ def send_payment(request, data): ...@@ -337,6 +349,10 @@ def send_payment(request, data):
) )
# print('>>>>>>>>>>> DEBUG DATA PAYMENT',d) # print('>>>>>>>>>>> DEBUG DATA PAYMENT',d)
## LOGGING SEND PAYMENT ##
log.error('==== SEND PAYMENT ====')
log.error(d)
response = requests.post(ws_url, data=json.dumps(d), verify=False) response = requests.post(ws_url, data=json.dumps(d), verify=False)
if response.status_code != 200: if response.status_code != 200:
continue continue
......
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
.link-styleless { .link-styleless {
text-decoration: none !important; text-decoration: none !important;
color:inherit !important; color:inherit !important;
cursor: pointer;
} }
.modal-body { .modal-body {
overflow-x:scroll !important; overflow-x:scroll !important;
...@@ -89,6 +90,13 @@ ...@@ -89,6 +90,13 @@
.bgth { .bgth {
background-color: #ddebf6 !important; background-color: #ddebf6 !important;
} }
.modal-backdrop {
visibility: hidden !important;
}
.modal.in {
background-color: rgba(0,0,0,0.5);
}
.modal { overflow: auto !important; }
</style> </style>
<tal:block tal:condition="not statusadmin"> <tal:block tal:condition="not statusadmin">
<div class="well"> <div class="well">
...@@ -118,15 +126,15 @@ Selamat datang di aplikasi SIPANDU ...@@ -118,15 +126,15 @@ Selamat datang di aplikasi SIPANDU
<tal:block tal:condition="statusadmin"> <tal:block tal:condition="statusadmin">
<div class="col-md-6"> <div class="col-md-6">
<h4>REALISASI PENDAPATAN DAERAH TAHUN ${dates['year']}</h4> <h4>REALISASI PENDAPATAN DAERAH TAHUN ${dates['year']}</h4>
<font class="labeltab">Tanggal : ${request.session['date']}</font> <font class="labeltab">Tanggal : ${dates['day'].strftime('%d-%m-%Y')}</font>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<form method="get"> <form method="get">
<div class="col-md-5"> <div class="col-md-5">
<input id="date" type="text" class="form-control date" name="date" value="${request.session['date']}"> <input id="date" type="text" class="form-control date" name="date" onchange="this.form.submit()" value="${dates['day'].strftime('%d-%m-%Y')}">
</div> </div>
<div class="col-md-7"> <div class="col-md-7">
<select id="unit" class="form-control" name="unit"> <select id="unit" class="form-control" name="unit" onchange="this.form.submit()">
<option></option> <option></option>
<option tal:repeat="o opds" value="${o.kode.strip()}">${o.kode.strip()} - ${o.nama}</option> <option tal:repeat="o opds" value="${o.kode.strip()}">${o.kode.strip()} - ${o.nama}</option>
</select> </select>
...@@ -197,7 +205,7 @@ Selamat datang di aplikasi SIPANDU ...@@ -197,7 +205,7 @@ Selamat datang di aplikasi SIPANDU
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<tal:block tal:repeat="r data['rek']"> <tal:block tal:repeat="r data['rek']">
<a class="link-styleless" title="klik untuk melihat daftar lengkap rekening" data-toggle="modal" data-target="#rekeningdetail"> <a class="link-styleless" title="klik untuk melihat daftar lengkap rekening" data-toggle="modal" data-target="#rekeningdetail${r['kode'].replace('.','')}">
<div class="col-md-3 wrapopd"> <div class="col-md-3 wrapopd">
<font class="kodeopd">${r['kode']}</font> <font class="kodeopd">${r['kode']}</font>
<font class="namaopd">${r['nama']}</font> <font class="namaopd">${r['nama']}</font>
...@@ -208,6 +216,9 @@ Selamat datang di aplikasi SIPANDU ...@@ -208,6 +216,9 @@ Selamat datang di aplikasi SIPANDU
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="clearfix"></div> <div class="clearfix"></div>
<!-- MODAL START HERE -->
<!-- MODAL RANKING-->
<div class="modal fade" id="ranking" tabindex="-1" role="dialog"> <div class="modal fade" id="ranking" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
...@@ -215,8 +226,8 @@ Selamat datang di aplikasi SIPANDU ...@@ -215,8 +226,8 @@ Selamat datang di aplikasi SIPANDU
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="col-md-6"> <div class="col-md-12">
<h5>Ranking Penerimaan OPD Periode ${dates['day'].strftime('%d-%m-%Y')}</h5> <h5>Detail Ranking Penerimaan OPD Periode ${dates['day'].strftime('%d-%m-%Y')}</h5>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<table class="table table-bordered"> <table class="table table-bordered">
...@@ -230,13 +241,15 @@ Selamat datang di aplikasi SIPANDU ...@@ -230,13 +241,15 @@ Selamat datang di aplikasi SIPANDU
</thead> </thead>
<tbody> <tbody>
<tal:block tal:repeat="so data['sopd']"> <tal:block tal:repeat="so data['sopd']">
<tr> <tal:block tal:condition="so['nominal']">
<tr class="link-styleless" title="klik untuk melihat daftar lengkap ranking" data-toggle="modal" data-target="#ranking${so['kode'].replace('.','')}">
<td style="text-align:center;">${so['peringkat']}</td> <td style="text-align:center;">${so['peringkat']}</td>
<td style="text-align:left;">${so['kode']}</td> <td style="text-align:left;">${so['kode']}</td>
<td style="text-align:left;">${so['unit']}</td> <td style="text-align:left;">${so['unit']}</td>
<td style="text-align:right;">${'{:n}'.format(so['nominal'])}</td> <td style="text-align:right;">${'{:n}'.format(so['nominal'])}</td>
</tr> </tr>
</tal:block> </tal:block>
</tal:block>
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -246,8 +259,50 @@ Selamat datang di aplikasi SIPANDU ...@@ -246,8 +259,50 @@ Selamat datang di aplikasi SIPANDU
</div> </div>
</div> </div>
</div> </div>
<!--MODAL DETAIL RANKING -->
<div class="modal fade" id="rekeningdetail" tabindex="-1" role="dialog"> <tal:block tal:repeat="so data['sopd']">
<div class="modal fade" id="ranking${so['kode'].replace('.','')}" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
<div class="col-md-12">
<h5>Ranking Penerimaan ${so['kode']} - ${so['unit']} Periode ${dates['day'].strftime('%d-%m-%Y')}</h5>
</div>
<div class="clearfix"></div>
<table class="table table-bordered">
<thead>
<tr>
<th style="text-align:center;">Kode Unit</th>
<th style="text-align:center;">Nama Unit</th>
<th style="text-align:center;">Nominal</th>
</tr>
</thead>
<tbody>
<tal:block tal:repeat="so4 data['sopd4']">
<tal:block tal:condition="so4['kode'].startswith(so['kode'])">
<tr>
<td style="text-align:left;">${so4['kode']}</td>
<td style="text-align:left;">${so4['unit']}</td>
<td style="text-align:right;">${'{:n}'.format(so4['nominal'])}</td>
</tr>
</tal:block>
</tal:block>
</tbody>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</tal:block>
<!--MODAL DETAIL REKENING -->
<tal:block tal:repeat="ru data['rek']">
<div class="modal fade" id="rekeningdetail${ru['kode'].replace('.','')}" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
...@@ -271,6 +326,7 @@ Selamat datang di aplikasi SIPANDU ...@@ -271,6 +326,7 @@ Selamat datang di aplikasi SIPANDU
</thead> </thead>
<tbody> <tbody>
<tal:block tal:repeat="r data['rek']"> <tal:block tal:repeat="r data['rek']">
<tal:block tal:condition="ru['kode']==r['kode']">
<tr> <tr>
<td style="text-align:right;"><b>${'{}.'.format(r['no'])}</b></td> <td style="text-align:right;"><b>${'{}.'.format(r['no'])}</b></td>
<td style="text-align:left;"><b>${r['kode']}</b></td> <td style="text-align:left;"><b>${r['kode']}</b></td>
...@@ -300,6 +356,7 @@ Selamat datang di aplikasi SIPANDU ...@@ -300,6 +356,7 @@ Selamat datang di aplikasi SIPANDU
<td style="text-align:right;"><b>${r['persen']}</b></td> <td style="text-align:right;"><b>${r['persen']}</b></td>
</tr> </tr>
</tal:block> </tal:block>
</tal:block>
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -309,6 +366,8 @@ Selamat datang di aplikasi SIPANDU ...@@ -309,6 +366,8 @@ Selamat datang di aplikasi SIPANDU
</div> </div>
</div> </div>
</div> </div>
</tal:block>
</div> </div>
<script type="text/javascript" src="/static/js/Chart.min.js"></script> <script type="text/javascript" src="/static/js/Chart.min.js"></script>
<script type="text/javascript" src="/static/js/jquery-2.1.1.min.js"></script> <script type="text/javascript" src="/static/js/jquery-2.1.1.min.js"></script>
...@@ -453,13 +512,11 @@ Selamat datang di aplikasi SIPANDU ...@@ -453,13 +512,11 @@ Selamat datang di aplikasi SIPANDU
"submitFormat": "dd-mm-yyyy", "submitFormat": "dd-mm-yyyy",
"format": "dd-mm-yyyy",}); "format": "dd-mm-yyyy",});
}); });
$("#date, #unit").change(function(){
$(this).parents('form').submit();
});
$('.date').attr('readonly', true); $('.date').attr('readonly', true);
$('.date').css('background-color', 'transparent'); $('.date').css('background-color', 'transparent');
<tal:block tal:condition="'unit' in request.session and request.session['unit']"> <tal:block tal:condition="'unit' in request.params and request.params['unit']">
$("#unit").val("${request.session['unit']}"); $("#unit").val("${request.params['unit'].strip()}");
</tal:block> </tal:block>
</script> </script>
</tal:block> </tal:block>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!