Penambahan field keterangan, revisi tampilan cetak skrd dan halaman public

esipkd/models/isipkd.py

@@ -395,6 +395,8 @@ class ARInvoice(CommonModel, Base):
     pejabat_nama    = Column(String(64))
     pejabat_pangkat = Column(String(64))
     pejabat_nip     = Column(String(64))
+    ## 19 Okt 2020
+    keterangan     = Column(String(250))
 
     subjekpajaks    = relationship("SubjekPajak", backref=backref('arinvoices'))
     objekpajaks     = relationship("ObjekPajak",  backref=backref('arinvoices'))

esipkd/views/arinvoice_b.py

@@ -150,6 +150,13 @@ class AddSchema(colander.Schema):
                     title="Objek",
                     oid = "objek_pajak_nm"
                     )
+    keterangan = colander.SchemaNode(
+                    colander.String(),
+                    title="Keterangan",
+                    oid = "keterangan",
+                    missing=None,
+                    widget=widget.TextAreaWidget(rows=3, cols=10, css_class="forme")
+                    )
                     
     kode   = colander.SchemaNode(
                     colander.String(),
@@ -226,7 +233,8 @@ class AddSchema(colander.Schema):
     pejabat_pangkat = colander.SchemaNode(
                     colander.String(),
                     title="Pangkat Pejabat",
-                    oid = "pejabat_pangkat"
+                    oid = "pejabat_pangkat",
+                    default = "Pengguna Anggaran / Kuasa Pengguna Anggaran"
                     )
     pejabat_nip = colander.SchemaNode(
                     colander.String(),
@@ -833,6 +841,7 @@ def view_pdf(request):
                               ARInvoice.wp_alamat_2.label('wp_alamat_2'),
                               ARInvoice.wp_kode.label('wp_kode'),
                               ARInvoice.rek_nama.label('rek_nama'),
+                              ARInvoice.keterangan.label('keterangan'),
                               ARInvoice.rek_kode.label('rek_kode'),
                               ARInvoice.periode_1.label('periode_1'),
                               ARInvoice.periode_2.label('periode_2'),
@@ -864,6 +873,7 @@ def view_pdf(request):
         item.wp_alamat  = (row.wp_alamat_2 and row.wp_alamat_2 != '-') and ('{} {}'.format(row.wp_alamat_1, row.wp_alamat_2)) or row.wp_alamat_1
         item.wp_kode   = row.wp_kode
         item.rek_nama   = row.rek_nama
+        item.keterangan = row.keterangan
         item.rek_kode   = row.rek_kode
         item.periode_1  = dmy(row.periode_1)
         item.periode_2  = dmy(row.periode_2)
@@ -872,7 +882,7 @@ def view_pdf(request):
         item.tahunskrd  = row.tahun_id
         BULAN = dict(BULANS)
         bulan = row.tgl_tetap.strftime('%m')
-        item.tgl_tetap  = '{} {},'.format(row.tgl_tetap.strftime('%d'),BULAN[bulan])
+        item.tgl_tetap  = '{} {}'.format(row.tgl_tetap.strftime('%d'),BULAN[bulan])
         item.tahun_tetap = row.tgl_tetap.year
         item.tahun      = datetime.now().year
         item.jumlah     = thousand(row.jumlah)

esipkd/views/public.py

@@ -342,6 +342,7 @@ def view_public(request):
                         func.trim(ARInvoice.wp_kode).label('wp_kode'),
                         func.trim(ARInvoice.rek_nama).label('rek_nama'),
                         func.trim(ARInvoice.rek_kode).label('rek_kode'),
+                        ARInvoice.keterangan.label('keterangan'),
                         ARInvoice.periode_1.label('periode_1'),
                         ARInvoice.periode_2.label('periode_2'),
                         ARInvoice.kode.label('kode'),

esipkd/views/templates/arinvoice/add_b.pt

@@ -107,6 +107,17 @@
                            ${error}</p>          
           </div>
         </div>
+        <!--keterangan -->
+        <div class="form-group" tal:define="field form['keterangan']" id="item-${field.oid}">
+          <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
+              ${field.title}</label>
+          <div class="col-md-9">
+              ${structure:field.serialize()}
+              <p id="error-${field.oid}" class="help-block" tal:condition="field.error"
+                           tal:repeat="error field.error.messages()">
+                           ${error}</p>          
+          </div>
+        </div>
         <!--periode_1 -->
         <div class="form-group" tal:define="field form['periode_1']" id="item-${field.oid}">
           <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">

esipkd/views/templates/arinvoice/edit_b.pt

@@ -56,6 +56,17 @@
                            ${error}</p>          
           </div>
         </div>
+        <!--keterangan -->
+        <div class="form-group" tal:define="field form['keterangan']" id="item-${field.oid}">
+          <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
+              ${field.title}</label>
+          <div class="col-md-9">
+              ${structure:field.serialize()}
+              <p id="error-${field.oid}" class="help-block" tal:condition="field.error"
+                           tal:repeat="error field.error.messages()">
+                           ${error}</p>          
+          </div>
+        </div>
         <!--kode -->
         <div class="form-group" tal:define="field form['kode']" id="item-${field.oid}">
           <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">

esipkd/views/templates/public/skrd.pt

@@ -66,7 +66,7 @@
       <table class="table table-bordered main-table">
         <tr>
             <td><b>PEMERINTAH PROVINSI JAWA BARAT <br>
-                OPD ${data.unit_nama}</b>
+                ${data.unit_nama}</b>
             </td>
             <td align="center"><h3>SKRD</h3></td>
             <td align="center"><b>No. SKRD</b></td>
@@ -123,7 +123,7 @@
         </tr>
         <tr>
             <td align="center"><b>${data.rek_kode}</b></td>
-            <td><b>${data.rek_nama}</b></td>
+            <td><b>${data.rek_nama}</b> ${data.keterangan}</td>
             <td align="right"><b>${'{:n}'.format(data.jumlah)}</b></td>
         </tr>
         <tr>
@@ -150,7 +150,7 @@
         <tr>
             <td align="center"><p><img src="data:image/png;base64, ${qrcodebase64}" width="150" height="150"></p></td>
             <td></td>
-            <td align="center"><b>${data.tgl_tetap.strftime('%d %B')}, Tahun ${data.tahun_id}</b><br>
+            <td align="center"><b>${data.tgl_tetap.strftime('%d %B')} ${data.tahun_id}</b><br>
                 ${data.pejabat_pangkat}<br><br><br><br><br>
                 ${data.pejabat_nama}<br>
                 NIP. ${data.pejabat_nip}