Commit 3dd8a11e by aa.gusti

perbaikan minor

1 parent dec6b5ca
header ="""
JENIS GAJI : {jenis_gaji}
BULAN : {bulan}
KODE UNIT : {unit_kd}
UNIT KERJA : {unit_nm}
+----+------------------------------+-----+---------------------------------+---------------------+---------------+------+
| | | STA | P E N G H A S I L A N | P O T O N G A N | | |
| | |KAWIN|-----------+----------+----------+----------+----------| | |
| | NAMA | |GAPOK |-T.UMUM |-T.PPH |-PFK.BULOG|-I.ASKES | JUMLAH | |
|NO. | NIP.PEGAWAI | JML |TUNJ. KEL |-T.STRUK |-I.ASKES |-IWP. |-I.JKK/JKM| PENGHASILAN |TANDA |
|URUT| STATUS PEG. (PNS/CPNS) |ANAK/|a.IST/SUAMI|-T.FUNGS |-I.JKK/JKM|-TAPERUM |-LAIN-LAIN| BERSIH YANG |TANGAN|
| | |JIWA |b.ANAK |-T.TMBH.UM|-P BULAT |-PPH.PS.21| | DIBAYARKAN | |
| | | | |-T.BERAS |JML.KOTOR |-SEWA RMH |JML.POTNGN| | |
|----+------------------------------+-----+-----------+----------+----------+----------+----------+---------------+------|
| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 |
|----+------------------------------+-----+-----------+----------+----------+----------+----------+---------------+------|
"""
+----+------------------------------+-----+---------------------------------+---------------------+---------------+------+
|{no}|{nama} | |GAPOK |-T.UMUM |-T.PPH |-PFK.BULOG|-I.ASKES | JUMLAH | |
| |{nip} {tgl_lahir} | JML |TUNJ. KEL |-T.STRUK |-I.ASKES |-IWP. |-I.JKK/JKM| PENGHASILAN |TANDA |
| |{peg_st}/{peg_kd}.{peg_tm} | NAK/|a.IST/SUAMI|-T.FUNGS |-I.JKK/JKM|-TAPERUM |-LAIN-LAIN| BERSIH YANG |TANGAN|
| |{gol_kd} - {gol_nm} |JIWA |b.ANAK |-T.TMBH.UM|-P BULAT |-PPH.PS.21| | DIBAYARKAN | |
| |MKG: {mk} Thn,{th} Bln.{bl} | | |-T.BERAS |JML.KOTOR |-SEWA RMH |JML.POTNGN| | |
|----+------------------------------+-----+-----------+----------+----------+----------+----------+---------------+------|
...@@ -10,6 +10,8 @@ from dateutil.relativedelta import relativedelta ...@@ -10,6 +10,8 @@ from dateutil.relativedelta import relativedelta
from deform import (widget, Form, ValidationFailure, FileData, ) from deform import (widget, Form, ValidationFailure, FileData, )
from deform.widget import SelectWidget from deform.widget import SelectWidget
from opensipkd.base.views.upload import tmpstore from opensipkd.base.views.upload import tmpstore
from pyramid.httpexceptions import HTTPFound, HTTPNotFound
from opensipkd.tools import dmy, get_settings, get_ext, \ from opensipkd.tools import dmy, get_settings, get_ext, \
date_from_str, get_random_string date_from_str, get_random_string
from opensipkd.tools.buttons import btn_save, btn_cancel, btn_close, btn_delete, \ from opensipkd.tools.buttons import btn_save, btn_cancel, btn_close, btn_delete, \
...@@ -17,8 +19,6 @@ from opensipkd.tools.buttons import btn_save, btn_cancel, btn_close, btn_delete, ...@@ -17,8 +19,6 @@ from opensipkd.tools.buttons import btn_save, btn_cancel, btn_close, btn_delete,
btn_pdf, btn_unpost, btn_post btn_pdf, btn_unpost, btn_post
from opensipkd.tools.captcha import get_captcha from opensipkd.tools.captcha import get_captcha
from opensipkd.tools.report import csv_response, file_response from opensipkd.tools.report import csv_response, file_response
from pyramid.httpexceptions import HTTPFound, HTTPNotFound
from .common import DataTables from .common import DataTables
from .. import DBSession, get_params, get_urls from .. import DBSession, get_params, get_urls
from ..scripts.initializedb import append_csv from ..scripts.initializedb import append_csv
...@@ -144,6 +144,8 @@ class BaseView(object): ...@@ -144,6 +144,8 @@ class BaseView(object):
$('#parent_kd').val(datum.kode); $('#parent_kd').val(datum.kode);
});""" });"""
self.form_widget = None
self.edit_schema = "" self.edit_schema = ""
self.add_schema = "" self.add_schema = ""
self.upload_schema = UploadSchema self.upload_schema = UploadSchema
...@@ -205,6 +207,8 @@ class BaseView(object): ...@@ -205,6 +207,8 @@ class BaseView(object):
if "after_bind" in kwargs and kwargs["after_bind"]: if "after_bind" in kwargs and kwargs["after_bind"]:
form_params["after_bind"] = kwargs["after_bind"] form_params["after_bind"] = kwargs["after_bind"]
# schema = class_form(validator=kwargs["validator"]) # schema = class_form(validator=kwargs["validator"])
if self.form_widget:
form_params["widget"] = self.form_widget
schema = class_form(**form_params) schema = class_form(**form_params)
...@@ -401,7 +405,7 @@ class BaseView(object): ...@@ -401,7 +405,7 @@ class BaseView(object):
def after_view(self, **kwargs): def after_view(self, **kwargs):
return self.route_list(**kwargs) return self.route_list(**kwargs)
def next_act(self): def next_act(self, **kwargs):
url_dict = self.req.matchdict url_dict = self.req.matchdict
raise HTTPNotFound raise HTTPNotFound
...@@ -410,7 +414,7 @@ class BaseView(object): ...@@ -410,7 +414,7 @@ class BaseView(object):
filename = jasper_export(self.report_file) filename = jasper_export(self.report_file)
return file_response(self.req, filename=filename[0]) return file_response(self.req, filename=filename[0])
def csv_response(self): def csv_response(self, **kwargs):
query = self.table.query_register() query = self.table.query_register()
row = query.first() row = query.first()
header = row.keys() header = row.keys()
...@@ -428,7 +432,7 @@ class BaseView(object): ...@@ -428,7 +432,7 @@ class BaseView(object):
def list_filter(self, query): def list_filter(self, query):
return query return query
def get_list(self): def get_list(self, **kwargs):
url = [] url = []
select_list = {} select_list = {}
if not self.columns: if not self.columns:
...@@ -492,16 +496,16 @@ class BaseView(object): ...@@ -492,16 +496,16 @@ class BaseView(object):
def view_act(self, **kwargs): def view_act(self, **kwargs):
url_dict = self.req.matchdict url_dict = self.req.matchdict
if url_dict['act'] == 'grid': if url_dict['act'] == 'grid':
return self.get_list() return self.get_list(**kwargs)
elif url_dict['act'] == 'csv': elif url_dict['act'] == 'csv':
return self.csv_response() return self.csv_response(**kwargs)
elif url_dict['act'] == 'pdf': elif url_dict['act'] == 'pdf':
return self.pdf_response() return self.pdf_response(**kwargs)
else: else:
return self.next_act() return self.next_act(**kwargs)
def view_add(self, **kwargs): def view_add(self, **kwargs):
# bindings = self.get_bindings() # bindings = self.get_bindings()
...@@ -557,10 +561,13 @@ class BaseView(object): ...@@ -557,10 +561,13 @@ class BaseView(object):
row.from_dict(values) row.from_dict(values)
if hasattr(row, "status"): if hasattr(row, "status"):
status = "status" in values and values["status"] or 0 status = "status" in values and values["status"] or 0
log.debug(status)
try: try:
status = int(status) status = int(status)
except: except:
status = status and 1 or 0 status = status and 1 or 0
log.debug(status)
row.status = status row.status = status
self.db_session.add(row) self.db_session.add(row)
self.db_session.flush() self.db_session.flush()
...@@ -571,6 +578,7 @@ class BaseView(object): ...@@ -571,6 +578,7 @@ class BaseView(object):
if k not in values: if k not in values:
if v: if v:
values[k] = v values[k] = v
log.debug(values)
return self.save(values, self.req.user, row) return self.save(values, self.req.user, row)
def id_not_found(self, **kwargs): def id_not_found(self, **kwargs):
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!