iWan Mampir, Penyesuaian Keterangan Target/Realisasi/Persentase

views/eis.py

@@ -114,7 +114,7 @@ class eis(BaseView):
         elif req.matchdict['act']=='dasboard':
         elif req.matchdict['act']=='dasboard':
             # max_tahun = EisDBSession.query(func.max(Eis.tahun)).scalar()
             # max_tahun = EisDBSession.query(func.max(Eis.tahun)).scalar()
             max_tahun = ses['tahun']
             max_tahun = ses['tahun']
-            subq = EisDBSession.query(
+            subqx = EisDBSession.query(
                     func.max(Eis.nama).label('nama'),
                     func.max(Eis.nama).label('nama'),
                     func.sum(ChartItem.value_1+ChartItem.value_2+ChartItem.value_3+ChartItem.value_4+\
                     func.sum(ChartItem.value_1+ChartItem.value_2+ChartItem.value_3+ChartItem.value_4+\
                         ChartItem.value_5+ChartItem.value_6+ChartItem.value_7+ChartItem.value_8+ChartItem.value_9+\
                         ChartItem.value_5+ChartItem.value_6+ChartItem.value_7+ChartItem.value_8+ChartItem.value_9+\
@@ -133,6 +133,20 @@ class eis(BaseView):
                     join(Chart, and_(Chart.id == ChartItem.chart_id, Chart.chart_type == 'line')).\
                     join(Chart, and_(Chart.id == ChartItem.chart_id, Chart.chart_type == 'line')).\
                     filter(Eis.tahun==max_tahun).\
                     filter(Eis.tahun==max_tahun).\
                     group_by(Eis.kode,Eis.nama,Eis.tahun).order_by(Eis.kode).subquery()
                     group_by(Eis.kode,Eis.nama,Eis.tahun).order_by(Eis.kode).subquery()
+
+            subq = EisDBSession.query(
+                    (Eis.nama).label('nama'),
+                    (ChartItem.value_1*12).label('target'),
+                    (Eis.amt_bulan).label('amt_bulan'),
+                    (Eis.amt_tahun).label('amt_tahun'),
+                    ((ChartItem.value_1*12) - Eis.amt_tahun).label('sisa_target'),
+                    cast(func.round(((Eis.amt_tahun)/
+                     (ChartItem.value_1*12))*100,2),String).label('persen')).\
+                    join(ChartItem, and_(func.trim(ChartItem.rekening_kd)==func.trim(Eis.kode),ChartItem.source_type=='target')).\
+                    join(Chart, and_(Chart.id == ChartItem.chart_id, Chart.chart_type == 'line')).\
+                    filter(Eis.tahun==max_tahun).\
+                    order_by(Eis.kode).subquery()
+
             query = EisDBSession.query().select_from(subq)
             query = EisDBSession.query().select_from(subq)
             columns = [
             columns = [
               ColumnDT(subq.c.nama, mData="jenis_pajak"),
               ColumnDT(subq.c.nama, mData="jenis_pajak"),

views/templates/dashboard.pt

@@ -287,19 +287,34 @@
                 });
                 });
                 legend(document.getElementById('legend_${dat.id}'), lineChartData_${dat.id});
                 legend(document.getElementById('legend_${dat.id}'), lineChartData_${dat.id});
 
 
+                /* iWan Mampir Remark
                 var total_target = 0;
                 var total_target = 0;
                 for (var i = 0; i < (html.target).length; i++) {
                 for (var i = 0; i < (html.target).length; i++) {
                   total_target += html.target[i];
                   total_target += html.target[i];
+                  // console.log('--> '+html.label[i]);
                   // console.log('--> '+html.target[i]);
                   // console.log('--> '+html.target[i]);
                 }
                 }
-                // console.log('Ini adalah data target : '+html.target);
-                // console.log('Ini adalah total target : '+total_target);
+                console.log('Ini adalah data target : '+html.target);
+                console.log('Ini adalah total target : '+total_target);
+
                 var total_realisasi = 0;
                 var total_realisasi = 0;
                 for (var i = 0; i < (html.realisasi).length; i++) {
                 for (var i = 0; i < (html.realisasi).length; i++) {
                   total_realisasi += html.realisasi[i];
                   total_realisasi += html.realisasi[i];
                 }
                 }
+                */
+
+                var total_target = 0;
+                for (i = 0; i < bulan+1; i++) {
+                    total_target = html.target[i];
+                }
+                console.log('Ini adalah total target : '+total_target);
 
 
-                var persentase =(Math.round((total_realisasi/total_target)*100))
+                var total_realisasi = 0;
+                for (i = 0; i < bulan+1; i++) {
+                  total_realisasi = html.realisasi[i];
+                }
+
+                var persentase = (Math.round((total_realisasi/total_target)*100))
 
 
                 $("#ket_target${dat.id}").html(total_target.toString().replace(/\B(?=(\d{3})+(?!\d))/g, "."));
                 $("#ket_target${dat.id}").html(total_target.toString().replace(/\B(?=(\d{3})+(?!\d))/g, "."));
                 $("#ket_realisasi${dat.id}").html(total_realisasi.toString().replace(/\B(?=(\d{3})+(?!\d))/g, "."));
                 $("#ket_realisasi${dat.id}").html(total_realisasi.toString().replace(/\B(?=(\d{3})+(?!\d))/g, "."));