default Database, model skp + tbp

models/skp.py

@@ -38,12 +38,14 @@ class Skp(SipkdBase, CommonModel):
         # keybend = '2084_'
         # keybend = '2084_'
         # seharusnya parameter nip dimana keybend diquery dari tabel bendahara
         # seharusnya parameter nip dimana keybend diquery dari tabel bendahara
         # seperti unitkey
         # seperti unitkey
-        unit_kode = values['unit_kode']
         # unit_kode = '3.01.01.02.'
         # unit_kode = '3.01.01.02.'
         # UNIT kode harusnya parameter didalam values
         # UNIT kode harusnya parameter didalam values
+	    #perubahan mulai disini
+        unit_kode = values['unit_kode']
         nip = values['nip']
         nip = values['nip']
         unitkey = DaftUnit.get_key(unit_kode) 
         unitkey = DaftUnit.get_key(unit_kode) 
         keybend = Bendahara.get_key(unitkey,nip)
         keybend = Bendahara.get_key(unitkey,nip)
+        #perubahan selesai disini
         mtgkey = RekPdpt.get_key(values['rekening_kd'])
         mtgkey = RekPdpt.get_key(values['rekening_kd'])
         row_skp = Skp()
         row_skp = Skp()
         
         
@@ -76,9 +78,14 @@ class Skp(SipkdBase, CommonModel):
         
         
     @classmethod
     @classmethod
     def hapus(cls, values):
     def hapus(cls, values):
-        keybend = '2084_'
-        unit_kode = '3.01.01.02.'
+	    #perubahan mulai disini
+        unit_kode = values['unit_kode']
+        nip = values['nip']
         unitkey = DaftUnit.get_key(unit_kode) 
         unitkey = DaftUnit.get_key(unit_kode) 
+        keybend = Bendahara.get_key(unitkey,nip)
+        #perubahan selesai disini
+        # keybend = '2084_'
+        # unit_kode = '3.01.01.02.'
         noskp = values['noskp']
         noskp = values['noskp']
         #hapus detail
         #hapus detail
         row_skpdet = SipkdDBSession.query(SkpDet).\
         row_skpdet = SipkdDBSession.query(SkpDet).\

models/tbp.py

@@ -39,15 +39,14 @@ class Tbp(SipkdBase, CommonModel):
         # keybend = '2084_'
         # keybend = '2084_'
         # seharusnya parameter nip dimana keybend diquery dari tabel bendahara
         # seharusnya parameter nip dimana keybend diquery dari tabel bendahara
         # seperti unitkey
         # seperti unitkey
-        unit_kode = values['unit_kode']
         # unit_kode = '3.01.01.02.'
         # unit_kode = '3.01.01.02.'
         # UNIT kode harusnya parameter didalam values
         # UNIT kode harusnya parameter didalam values
+	    #perubahan mulai disini
+        unit_kode = values['unit_kode']
         nip = values['nip']
         nip = values['nip']
         unitkey = DaftUnit.get_key(unit_kode) 
         unitkey = DaftUnit.get_key(unit_kode) 
         keybend = Bendahara.get_key(unitkey,nip)
         keybend = Bendahara.get_key(unitkey,nip)
-        mtgkey = RekPdpt.get_key(values['rekening_kd'])
-
-
+        #perubahan selesai disini
         mtgkey = RekPdpt.get_key(values['rekening_kd'])
         mtgkey = RekPdpt.get_key(values['rekening_kd'])
         
         
         values['unitkey']  = unitkey
         values['unitkey']  = unitkey
@@ -103,9 +102,14 @@ class Tbp(SipkdBase, CommonModel):
         return True
         return True
     @classmethod
     @classmethod
     def hapus(cls, values):
     def hapus(cls, values):
-        keybend = '2084_'
-        unit_kode = '3.01.01.02.'
+	    #perubahan mulai disini
+        unit_kode = values['unit_kode']
+        nip = values['nip']
         unitkey = DaftUnit.get_key(unit_kode) 
         unitkey = DaftUnit.get_key(unit_kode) 
+        keybend = Bendahara.get_key(unitkey,nip)
+        #perubahan selesai disini
+        # keybend = '2084_'
+        # unit_kode = '3.01.01.02.'
         row_bku = SipkdDBSession.query(BkuTbp).\
         row_bku = SipkdDBSession.query(BkuTbp).\
                 filter_by(notbp=values['notbp'], unitkey=unitkey).delete()
                 filter_by(notbp=values['notbp'], unitkey=unitkey).delete()
         row_tbpdet = SipkdDBSession.query(TbpDet).\
         row_tbpdet = SipkdDBSession.query(TbpDet).\

scripts/data/bend.csv

+"keybend","jns_bend","nip","kdbank","unitkey","jab_bend","rekbend","saldobend","NPWPbend","tglstopbend","saldobendt"
+"2084_","1","1212","2","212","","111111222222",250000,"","",
+"2084_","1","2121","2","212","","111111222222",300000,"","",
\ No newline at end of file

scripts/data/daftbank.csv

+"kdbank","nmbank","akbank","alamat","telepon","cabang"
+"2","Bank Bri","Bri","Kartosuro","","Singopuran"

scripts/data/daftunit.csv

 "unitkey","kdlevel","kdunit","nmunit","akrounit","alamat","telepon","type"
 "unitkey","kdlevel","kdunit","nmunit","akrounit","alamat","telepon","type"
-"2221","4","2.2.2.1","Unit Bendahara","Bendahara","Kantor Bendahara","(0271)728728","1"
+"212","4","3.01.01.02.","Unit Solo","Solo","Kantor Solo","(0271)728728","1"

scripts/data/daftunit.py

-DaftUnitData = {
-    'options': ['insert if not exists'],
-    'csv': ['daftunit.csv'],
-    'keys':['unitkey'],
-}

scripts/data/matangd.csv

+"mtgkey","kdper","nmper","mtglevel","kdkhusus","type"
+"11","3331","Pendapatan Toilet","3","2","1"

scripts/data/pegawai.csv

+"nip","kdgol","unitkey","nama","alamat","jabatan","pddk"
+"1212","","212","Bejo","Singopuran","Jabat Tangan",""
+"2121","","212","Nasi Goreng","Singopuran","Jabatan Hehehehe",""
\ No newline at end of file

scripts/data/sipkd.py

+DaftUnitData = {
+    'options': ['insert if not exists'],
+    'csv': ['routes.csv'],
+    'keys':['kode'],
+}
+PegawaiData = {
+    'options': ['insert if not exists'],
+    'csv': ['pegawai.csv'],
+    'keys':['nip'],
+}
+DaftBankData = {
+    'options': ['insert if not exists'],
+    'csv': ['daftbank.csv'],
+    'keys':['kdbank'],
+}
+BendaharaData = {
+    'options': ['insert if not exists'],
+    'csv': ['bend.csv'],
+    'keys':['keybend'],
+}
+RekeningPendapatanData = {
+    'options': ['insert if not exists'],
+    'csv': ['matangd.csv'],
+    'keys':['mtgkey'],
+}

scripts/initial_data.py

@@ -8,13 +8,17 @@ from ..models import (
     )
     )
 
 
 from .data.routes import RouteData
 from .data.routes import RouteData
-from .data.daftunit import DaftUnitData
+from .data.sipkd import (DaftUnitData, PegawaiData, DaftBankData
+                            BendaharaData, RekeningPendapatanData)
 #from .data.sp2d import Sp2dData
 #from .data.sp2d import Sp2dData
 #from .data.sp2d_potongan import Sp2dPotonganData
 #from .data.sp2d_potongan import Sp2dPotonganData
 
 
 fixtures = [
 fixtures = [
     ('routes', RouteData),
     ('routes', RouteData),
-    ('daftunit', DaftUnitData)
+    ('pegawai', DaftUnitData)
+    ('daftbank', DaftUnitData)
+    ('bend', DaftUnitData)
+    ('matangd', DaftUnitData)
     ]
     ]
     
     
 def insert():
 def insert():