From 9ffb17a36a2546165f0ec01696141ada4c382fe6 Mon Sep 17 00:00:00 2001
From: Rifo Genadi <rifoagenadi@gmail.com>
Date: Sat, 13 Apr 2019 21:55:16 +0700
Subject: [PATCH] Add percentage
---
database/database.py | 10 +++++-----
modules/apbd.py | 8 +++++---
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/database/database.py b/database/database.py
index 40c327e..75601e5 100644
--- a/database/database.py
+++ b/database/database.py
@@ -45,7 +45,7 @@ class Rekening(mongo.Document):
kode_rekening = mongo.StringField(required=True)
nama_rekening = mongo.StringField(required=True)
jumlah_rincian = mongo.IntField(required=True)
- persentase = mongo.IntField()
+ persentase = mongo.FloatField()
class Kegiatan(mongo.Document):
id_program = mongo.IntField(required=True)
@@ -53,7 +53,7 @@ class Kegiatan(mongo.Document):
nama_kegiatan = mongo.StringField(required=True)
rekening = mongo.ListField(mongo.StringField(), default=[], required=True)
jumlah_rincian = mongo.IntField(default = 0)
- persentase = mongo.IntField()
+ persentase = mongo.FloatField()
class Program(mongo.Document):
id_skpd = mongo.IntField(required=True)
@@ -61,7 +61,7 @@ class Program(mongo.Document):
nama_program = mongo.StringField(required=True)
kegiatan = mongo.ListField(mongo.IntField(), default=[], required=True)
jumlah_rincian = mongo.IntField(default = 0)
- persentase = mongo.IntField()
+ persentase = mongo.FloatField()
class SKPD(mongo.Document):
id_urusan = mongo.IntField(required=True)
@@ -69,7 +69,7 @@ class SKPD(mongo.Document):
nama_skpd = mongo.StringField(required=True)
program = mongo.ListField(mongo.IntField(), default=[], required=True)
jumlah_rincian = mongo.IntField(default = 0)
- persentase = mongo.IntField()
+ persentase = mongo.FloatField()
class Urusan(mongo.Document):
tahun = mongo.IntField(required=True)
@@ -77,7 +77,7 @@ class Urusan(mongo.Document):
nama_urusan = mongo.StringField(required=True)
skpd = mongo.ListField(mongo.IntField(), default=[], required=True)
jumlah_rincian = mongo.IntField(default = 0)
- persentase = mongo.IntField()
+ persentase = mongo.FloatField()
if __name__ == "__main__":
app = Flask(__name__)
diff --git a/modules/apbd.py b/modules/apbd.py
index 61b8f77..09e9da7 100644
--- a/modules/apbd.py
+++ b/modules/apbd.py
@@ -10,12 +10,14 @@ def getAllUrusan():
jumlah_rincian = 0
for urusan in urusans:
- jumlah_rincian += urusan['jumlah_rincian']
+ jumlah_rincian += int(urusan['jumlah_rincian'])
+ data = []
for urusan in urusans:
urusan.persentase = (urusan['jumlah_rincian']/jumlah_rincian)*100
-
+ data.append(urusan)
+
return jsonify({
'status': "200",
- 'response': urusans
+ 'response': data
})
\ No newline at end of file
--
GitLab