Commit 7976e69e by Ari Agung Prasetiyo

penyesuaian target pbb

1 parent b3d77e48
...@@ -193,6 +193,8 @@ class Views(BaseView): ...@@ -193,6 +193,8 @@ class Views(BaseView):
elif kode == 'opsen_bbnkb': elif kode == 'opsen_bbnkb':
targets = targets.filter( targets = targets.filter(
TargetsBangbadil.kode.ilike('4.1.1.11%')) TargetsBangbadil.kode.ilike('4.1.1.11%'))
elif kode == 'pbb':
targets = targets.filter(TargetsBangbadil.kode == jenis_pajak[kode]["kode"])
else: else:
targets = targets.filter( targets = targets.filter(
TargetsBangbadil.kode.ilike(jenis_pajak[kode]["kode"]+'%')) TargetsBangbadil.kode.ilike(jenis_pajak[kode]["kode"]+'%'))
...@@ -244,11 +246,7 @@ class Views(BaseView): ...@@ -244,11 +246,7 @@ class Views(BaseView):
week, weekTrx, weekly, weeklyTrx, weeklyAcc, weeklyAccTrx = \ week, weekTrx, weekly, weeklyTrx, weeklyAcc, weeklyAccTrx = \
self.get_daily_data(PembayaranSppt, field, None, filter_exp) self.get_daily_data(PembayaranSppt, field, None, filter_exp)
try: ytd_target = float(self.get_targets("pbb"))
ytd_target = self.get_targets("pbb")
except:
ytd_target = 0
ytd_persen = round(ytd/ytd_target * 100, 2) if ytd_target > 0 else 0 ytd_persen = round(ytd/ytd_target * 100, 2) if ytd_target > 0 else 0
return {"today": amt, return {"today": amt,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!