Merge branch 'master' of https://git.opensipkd.com/aa.gusti/opensipkd-tools

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 = ''

opensipkd/tools/report.py

@@ -254,7 +254,7 @@ def csv_response(request, value, filename=None):
     return response
     return response
 
 
 
 
-def xls_response(request, value, filename=None, header_format=None):
+def xls_response(request, value, filename=None, header_format=None, startrow=1):
     if not filename:
     if not filename:
         filename = get_random_string(20)+".xls"
         filename = get_random_string(20)+".xls"
     response = request.response
     response = request.response
@@ -280,11 +280,11 @@ def xls_response(request, value, filename=None, header_format=None):
             'border': 1
             'border': 1
         }
         }
     hformat = workbook.add_format(header_format)
     hformat = workbook.add_format(header_format)
-    df.to_excel(writer, sheet_name='Sheet1', startrow=1, header=False, index=False)
+    df.to_excel(writer, sheet_name='Sheet1', startrow=startrow, header=False, index=False)
 
 
     # Write the column headers with the defined format.
     # Write the column headers with the defined format.
     for col_num, value in enumerate(df.columns.values):
     for col_num, value in enumerate(df.columns.values):
-        writer.sheets['Sheet1'].write(0, col_num, value, hformat)
+        writer.sheets['Sheet1'].write(startrow-1, col_num, value, hformat)
     writer.close()
     writer.close()
     # writer.save()
     # writer.save()
     with open(filename, 'rb') as f:
     with open(filename, 'rb') as f:

pyproject.toml

@@ -2,11 +2,13 @@
 requires = ['setuptools >= 61.0.0', 'wheel']
 requires = ['setuptools >= 61.0.0', 'wheel']
 build-backend = 'setuptools.build_meta'
 build-backend = 'setuptools.build_meta'
 
 
-[tool.setuptools]
-packages = ["opensipkd.tools"]
+# [tool.setuptools]
+# packages = ["opensipkd.tools"]
 
 
-[tools.setuptools.packages.find]
+[tool.setuptools.packages.find]
 include = ["opensipkd.*"]
 include = ["opensipkd.*"]
+namespaces = true  # This is the critical line for shared prefixes!
+
 
 
 [tool.mypy]
 [tool.mypy]
 exclude = []
 exclude = []