Commit 2f250ffc by taufikyu

revisi report, revisi setup

1 parent ae7f0c0b
No preview for this file type
...@@ -1430,9 +1430,7 @@ class ViewLaporan(BaseViews): ...@@ -1430,9 +1430,7 @@ class ViewLaporan(BaseViews):
return response return response
elif url_dict['act']=='Laporan_16' : elif url_dict['act']=='Laporan_16' :
query = DBSession.query(ARSspd.bayar.label('jumlah'), query = DBSession.query(ARSspd.tgl_bayar.label('tgl'),
ARSspd.bunga.label('bunga'),
ARSspd.tgl_bayar.label('tgl'),
ARInvoice.unit_id.label('un_id'), ARInvoice.unit_id.label('un_id'),
ARInvoice.unit_kode.label('un_kd'), ARInvoice.unit_kode.label('un_kd'),
ARInvoice.unit_nama.label('un_nm'), ARInvoice.unit_nama.label('un_nm'),
...@@ -1442,7 +1440,11 @@ class ViewLaporan(BaseViews): ...@@ -1442,7 +1440,11 @@ class ViewLaporan(BaseViews):
ARInvoice.kode.label('kd'), ARInvoice.kode.label('kd'),
ARInvoice.wp_nama.label('wp_nm'), ARInvoice.wp_nama.label('wp_nm'),
case([(ARSspd.bank_id!=0,"H2H"),(ARSspd.bank_id==None,"Manual")], case([(ARSspd.bank_id!=0,"H2H"),(ARSspd.bank_id==None,"Manual")],
else_="Semua").label('status') else_="Semua").label('status'),
ARInvoice.pokok.label('pokok'),
ARSspd.bunga.label('bunga'),
ARSspd.bayar.label('jumlah'),
).select_from(ARSspd
).join(ARInvoice ).join(ARInvoice
).order_by(ARInvoice.unit_kode, ).order_by(ARInvoice.unit_kode,
ARInvoice.rek_kode, ARInvoice.rek_kode,
...@@ -1504,9 +1506,7 @@ class ViewLaporan(BaseViews): ...@@ -1504,9 +1506,7 @@ class ViewLaporan(BaseViews):
return response return response
elif url_dict['act']=='Laporan_17' : elif url_dict['act']=='Laporan_17' :
query = DBSession.query(ARSspd.bayar.label('jumlah'), query = DBSession.query(ARSspd.tgl_bayar.label('tgl'),
ARSspd.bunga.label('bunga'),
ARSspd.tgl_bayar.label('tgl'),
ARInvoice.unit_id.label('un_id'), ARInvoice.unit_id.label('un_id'),
ARInvoice.unit_kode.label('un_kd'), ARInvoice.unit_kode.label('un_kd'),
ARInvoice.unit_nama.label('un_nm'), ARInvoice.unit_nama.label('un_nm'),
...@@ -1516,7 +1516,11 @@ class ViewLaporan(BaseViews): ...@@ -1516,7 +1516,11 @@ class ViewLaporan(BaseViews):
ARInvoice.kode.label('kd'), ARInvoice.kode.label('kd'),
ARInvoice.wp_nama.label('wp_nm'), ARInvoice.wp_nama.label('wp_nm'),
case([(ARSspd.bank_id!=0,"H2H"),(ARSspd.bank_id==None,"Manual")], case([(ARSspd.bank_id!=0,"H2H"),(ARSspd.bank_id==None,"Manual")],
else_="Semua").label('status') else_="Semua").label('status'),
ARInvoice.pokok.label('pokok'),
ARSspd.bunga.label('bunga'),
ARSspd.bayar.label('jumlah')
).select_from(ARSspd
).join(ARInvoice ).join(ARInvoice
).order_by(ARInvoice.rek_kode, ).order_by(ARInvoice.rek_kode,
ARInvoice.unit_kode, ARInvoice.unit_kode,
...@@ -3244,7 +3248,8 @@ class lap16Generator(JasperGenerator): ...@@ -3244,7 +3248,8 @@ class lap16Generator(JasperGenerator):
def __init__(self): def __init__(self):
super(lap16Generator, self).__init__() super(lap16Generator, self).__init__()
self.reportname = get_rpath('Lap16.jrxml') self.reportname = get_rpath('Lap16.jrxml')
self.xpath = '/webr/lap16' # self.xpath = '/webr/lap16'
self.xpath = '/tmp'
self.root = ET.Element('webr') self.root = ET.Element('webr')
def generate_xml(self, tobegreeted): def generate_xml(self, tobegreeted):
...@@ -3258,6 +3263,7 @@ class lap16Generator(JasperGenerator): ...@@ -3258,6 +3263,7 @@ class lap16Generator(JasperGenerator):
ET.SubElement(xml_greeting, "rek_nm").text = row.rek_nm ET.SubElement(xml_greeting, "rek_nm").text = row.rek_nm
ET.SubElement(xml_greeting, "kd").text = row.kd ET.SubElement(xml_greeting, "kd").text = row.kd
ET.SubElement(xml_greeting, "wp_nm").text = row.wp_nm ET.SubElement(xml_greeting, "wp_nm").text = row.wp_nm
ET.SubElement(xml_greeting, "pokok").text = unicode(row.pokok)
ET.SubElement(xml_greeting, "bunga").text = unicode(row.bunga) ET.SubElement(xml_greeting, "bunga").text = unicode(row.bunga)
ET.SubElement(xml_greeting, "jumlah").text = unicode(row.jumlah) ET.SubElement(xml_greeting, "jumlah").text = unicode(row.jumlah)
ET.SubElement(xml_greeting, "logo").text = logo_pemda ET.SubElement(xml_greeting, "logo").text = logo_pemda
...@@ -3288,6 +3294,7 @@ class lap17benGenerator(JasperGenerator): ...@@ -3288,6 +3294,7 @@ class lap17benGenerator(JasperGenerator):
ET.SubElement(xml_greeting, "rek_nm").text = row.rek_nm ET.SubElement(xml_greeting, "rek_nm").text = row.rek_nm
ET.SubElement(xml_greeting, "kd").text = row.kd ET.SubElement(xml_greeting, "kd").text = row.kd
ET.SubElement(xml_greeting, "wp_nm").text = row.wp_nm ET.SubElement(xml_greeting, "wp_nm").text = row.wp_nm
ET.SubElement(xml_greeting, "pokok").text = unicode(row.pokok)
ET.SubElement(xml_greeting, "bunga").text = unicode(row.bunga) ET.SubElement(xml_greeting, "bunga").text = unicode(row.bunga)
ET.SubElement(xml_greeting, "jumlah").text = unicode(row.jumlah) ET.SubElement(xml_greeting, "jumlah").text = unicode(row.jumlah)
ET.SubElement(xml_greeting, "logo").text = logo_pemda ET.SubElement(xml_greeting, "logo").text = logo_pemda
......
This diff could not be displayed because it is too large.
...@@ -7,27 +7,27 @@ here = os.path.abspath(os.path.dirname(__file__)) ...@@ -7,27 +7,27 @@ here = os.path.abspath(os.path.dirname(__file__))
README = open(os.path.join(here, 'README.txt')).read() README = open(os.path.join(here, 'README.txt')).read()
CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
# test # test
requires=['pyramid>=1.5a2<=1.6a1', requires=['pyramid==1.5.8',
'SQLAlchemy', 'SQLAlchemy==1.2.10',
'transaction', 'transaction',
'pyramid_tm', 'pyramid_tm',
'pyramid_debugtoolbar', 'pyramid_debugtoolbar',
'zope.sqlalchemy==1.0', 'zope.sqlalchemy==1.0',
'waitress', 'waitress==1.1.0',
'ziggurat-foundations==0.5.6', 'ziggurat-foundations==0.5.6',
'cryptacular==1.4.1', 'cryptacular==1.4.1',
'colander', 'colander==1.4',
'deform>=2.0a2', 'deform>=2.0a2',
'pyramid_chameleon', 'pyramid_chameleon',
'psycopg2', 'psycopg2',
'alembic>=0.3.4', 'alembic>=0.3.4',
'pyramid_beaker', 'pyramid_beaker==0.8',
'pytz', 'pytz',
'sqlalchemy-datatables==0.1.6', 'sqlalchemy-datatables==0.1.6',
'recaptcha-client', 'recaptcha-client',
'pyJasper', 'pyJasper==0.41',
'informixdb==2.5', 'informixdb==2.5',
'z3c.rml', 'z3c.rml==3.5.0',
'xlrd', 'xlrd',
'pyramid_rpc', 'pyramid_rpc',
'requests', 'requests',
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!