fixnop

opensipkd/tools/pbb.py

@@ -107,7 +107,7 @@ class FixDati2(BaseFixLength):
     def get_structure(self):
     def get_structure(self):
         return DATI2
         return DATI2
 
 
-    def kd_dati2(self):
+    def dati2(self):
         return self["kd_propinsi"]+'.'+self['kd_dati2']
         return self["kd_propinsi"]+'.'+self['kd_dati2']
 
 
 
 
@@ -115,24 +115,24 @@ class FixKecamatan(FixDati2):
     def get_structure(self):
     def get_structure(self):
         return KECAMATAN
         return KECAMATAN
 
 
-    def kd_kecamatan(self):
-        return super().kd_dati2+'.'+self['kd_kecamatan']
+    def kecamatan(self):
+        return super().dati2()+'.'+self['kd_kecamatan']
 
 
 
 
 class FixKelurahan(FixKecamatan):
 class FixKelurahan(FixKecamatan):
     def get_structure(self):
     def get_structure(self):
         return KELURAHAN
         return KELURAHAN
 
 
-    def kd_kelurahan(self):
-        return super().kd_kecamatan+'.'+self['kd_kelurahan']
+    def kelurahan(self):
+        return super().kecamatan()+'.'+self['kd_kelurahan']
 
 
 
 
 class FixBlok(FixKelurahan):
 class FixBlok(FixKelurahan):
     def get_structure(self):
     def get_structure(self):
         return BLOK
         return BLOK
 
 
-    def kd_blok(self):
-        return super().kd_kelurahan+'.'+self['kd_blok']
+    def blok(self):
+        return super().kelurahan()+'.'+self['kd_blok']
 
 
 
 
 class FixKantor(BaseFixLength):
 class FixKantor(BaseFixLength):
@@ -164,7 +164,7 @@ class FixNop(FixBlok):
         return NOP
         return NOP
 
 
     def nop(self):
     def nop(self):
-        return ".".join([self.kd_blok(), self["no_urut"], self["kd_jns_op"]])
+        return ".".join([self.blok(), self["no_urut"], self["kd_jns_op"]])
 
 
     def get_formatted(self):
     def get_formatted(self):
         s = ''
         s = ''