Skip to content

Taufik Yulianto / esipkd

Go to a project
Commit a2f96041 by Taufikyu
Options

perbaiki script denda manual 1%

1 parent bf413cdb
Inline Side-by-side
Showing 3 changed files with 26 additions and 27 deletions
esipkd/views/bjb_qris.py
...@@ -314,9 +314,9 @@ class view(object): ...@@ -314,9 +314,9 @@ class view(object):
return dict() return dict()
######### #########
# Add # # Add #
######### #########
@view_config(route_name='bjbqris-add', renderer='templates/bjbqris/add-edit.pt', permission='add') @view_config(route_name='bjbqris-add', renderer='templates/bjbqris/add-edit.pt', permission='add')
def view_add(self): def view_add(self):
request = self.req request = self.req
...@@ -370,9 +370,9 @@ class view(object): ...@@ -370,9 +370,9 @@ class view(object):
form.set_appstruct(values) form.set_appstruct(values)
return dict(form=form) return dict(form=form)
########## ##########
# Action # # Action #
########## ##########
@view_config(route_name='bjbqris-act', renderer='json', permission='read') @view_config(route_name='bjbqris-act', renderer='json', permission='read')
def view_act(self): def view_act(self):
req = self.req req = self.req
...@@ -426,7 +426,7 @@ class view(object): ...@@ -426,7 +426,7 @@ class view(object):
outerjoin(ArPayment, ArInvoice.id==ArPayment.arinvoice_id).\ outerjoin(ArPayment, ArInvoice.id==ArPayment.arinvoice_id).\
filter( #ArInvoice.departemen_id==req.session['departemen_id'], filter( #ArInvoice.departemen_id==req.session['departemen_id'],
func.to_char(BJBQRIS.created,'YYYY') == str(req.session['tahun'])) func.to_char(BJBQRIS.created,'YYYY') == str(req.session['tahun']))
rowTable = DataTables(req, BJBQRIS, query, columns) rowTable = DataTables(req, BJBQRIS, query, columns)
return rowTable.output_result() return rowTable.output_result()
......
esipkd/views/bjb_va.py
...@@ -312,9 +312,9 @@ class view(object): ...@@ -312,9 +312,9 @@ class view(object):
return dict() return dict()
######### #########
# Add # # Add #
######### #########
@view_config(route_name='bjbva-add', renderer='templates/bjbva/add-edit.pt', permission='read') @view_config(route_name='bjbva-add', renderer='templates/bjbva/add-edit.pt', permission='read')
def view_add(self): def view_add(self):
request = self.req request = self.req
...@@ -370,10 +370,9 @@ class view(object): ...@@ -370,10 +370,9 @@ class view(object):
form.set_appstruct(values) form.set_appstruct(values)
return dict(form=form) return dict(form=form)
########
######## # Edit #
# Edit # ########
########
@view_config(route_name='bjbva-edt', renderer='templates/bjbva/add-edit.pt', permission='edit') @view_config(route_name='bjbva-edt', renderer='templates/bjbva/add-edit.pt', permission='edit')
def view_edit(self): def view_edit(self):
request = self.req request = self.req
...@@ -410,10 +409,9 @@ class view(object): ...@@ -410,10 +409,9 @@ class view(object):
form.set_appstruct(values) form.set_appstruct(values)
return dict(form=form) return dict(form=form)
##########
########## # Delete #
# Delete # ##########
##########
@view_config(route_name='bjbva-del', renderer='templates/bjbva/delete.pt', permission='delete') @view_config(route_name='bjbva-del', renderer='templates/bjbva/delete.pt', permission='delete')
def view_delete(self): def view_delete(self):
request = self.req request = self.req
...@@ -437,9 +435,9 @@ class view(object): ...@@ -437,9 +435,9 @@ class view(object):
return dict(row=row, form=form.render()) return dict(row=row, form=form.render())
########## ##########
# Action # # Action #
########## ##########
@view_config(route_name='bjbva-act', renderer='json', permission='read') @view_config(route_name='bjbva-act', renderer='json', permission='read')
def view_act(self): def view_act(self):
req = self.req req = self.req
...@@ -493,7 +491,7 @@ class view(object): ...@@ -493,7 +491,7 @@ class view(object):
outerjoin(ArPayment, ArInvoice.id==ArPayment.arinvoice_id).\ outerjoin(ArPayment, ArInvoice.id==ArPayment.arinvoice_id).\
filter( #ArInvoice.departemen_id==req.session['departemen_id'], filter( #ArInvoice.departemen_id==req.session['departemen_id'],
func.to_char(BJBVA.created,'YYYY') == str(req.session['tahun'])) func.to_char(BJBVA.created,'YYYY') == str(req.session['tahun']))
rowTable = DataTables(req, BJBVA, query, columns) rowTable = DataTables(req, BJBVA, query, columns)
return rowTable.output_result() return rowTable.output_result()
......
esipkd/views/daftar.py
...@@ -16,11 +16,12 @@ from ..models.isipkd import( ...@@ -16,11 +16,12 @@ from ..models.isipkd import(
## Untuk perhitungan bunga ## ## Untuk perhitungan bunga ##
############################# #############################
def hitung_bunga(pokok, jatuh_tempo): def hitung_bunga(pokok, jatuh_tempo):
row = DBSession.query(Param.denda).first() #row = DBSession.query(Param.denda).first()
if row: #if row:
persen_denda = row.denda # persen_denda = row.denda
else: #else:
return 0 # return 0
persen_denda = 1
kini = date.today() kini = date.today()
denda = bln_tunggakan = 0 denda = bln_tunggakan = 0
jatuh_tempo = jatuh_tempo jatuh_tempo = jatuh_tempo
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!