Skip to content

iwan / eis

Go to a project
Commit 6bba88d9 by iwan
Options

Update eis.py

1 parent 02868209
Inline Side-by-side
Showing 1 changed file with 10 additions and 8 deletions
views/eis.py
...@@ -111,14 +111,6 @@ class eis(BaseView): ...@@ -111,14 +111,6 @@ class eis(BaseView):
elif req.matchdict['act']=='dasboard': elif req.matchdict['act']=='dasboard':
columns = [
ColumnDT(subq.nama, mData="jenis_pajak"),
ColumnDT(subq.target, mData="target"),
ColumnDT(subq.amt_bulan, mData="realisasi_bulan_ini"),
ColumnDT(subq.amt_tahun, mData="realisasi_sampai_dengan"),
ColumnDT(subq.sisa_target, mData="sisa_target"),
ColumnDT(subq.persen, mData="persen"),
]
max_tahun = EisDBSession.query(func.max(Eis.tahun)).scalar() max_tahun = EisDBSession.query(func.max(Eis.tahun)).scalar()
subq = EisDBSession.query( subq = EisDBSession.query(
func.max(Eis.nama).label('nama'), func.max(Eis.nama).label('nama'),
...@@ -140,6 +132,16 @@ class eis(BaseView): ...@@ -140,6 +132,16 @@ class eis(BaseView):
filter(Eis.tahun==max_tahun, Eis.chart_type == 'line').\ filter(Eis.tahun==max_tahun, Eis.chart_type == 'line').\
group_by(Eis.kode,Eis.nama).order_by(Eis.kode) group_by(Eis.kode,Eis.nama).order_by(Eis.kode)
query = EisDBSession.query().select_from(subq.subquery()) query = EisDBSession.query().select_from(subq.subquery())
columns = [
ColumnDT(subq.nama, mData="jenis_pajak"),
ColumnDT(subq.target, mData="target"),
ColumnDT(subq.amt_bulan, mData="realisasi_bulan_ini"),
ColumnDT(subq.amt_tahun, mData="realisasi_sampai_dengan"),
ColumnDT(subq.sisa_target, mData="sisa_target"),
ColumnDT(subq.persen, mData="persen"),
]
rowTable = DataTables(req.GET, query, columns) rowTable = DataTables(req.GET, query, columns)
return rowTable.output_result() return rowTable.output_result()
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!