Skip to content

Taufik Yulianto / esipkd

Go to a project
Commit 616afc5a by aagusti
Options

Merge branch 'master' of https://git.opensipkd.com/taufik/esipkd

2 parents a3631eeb ab792de3
Inline Side-by-side
Showing 5 changed files with 67 additions and 2 deletions
esipkd/models/isipkd.py
...@@ -158,9 +158,11 @@ class Rekening(NamaModel,Base): ...@@ -158,9 +158,11 @@ class Rekening(NamaModel,Base):
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
kode = Column(String(24), unique=True) kode = Column(String(24), unique=True)
nama = Column(String(128)) nama = Column(String(128))
tahun = Column(Integer)
level_id = Column(SmallInteger) level_id = Column(SmallInteger)
is_summary = Column(SmallInteger) is_summary = Column(SmallInteger)
parent_id = Column(SmallInteger) parent_id = Column(SmallInteger)
status = Column(SmallInteger, default=1)
class UnitRekening(Base): class UnitRekening(Base):
__tablename__ = 'unit_rekenings' __tablename__ = 'unit_rekenings'
......
esipkd/views/rekening.py
...@@ -94,13 +94,17 @@ class AddSchema(colander.Schema): ...@@ -94,13 +94,17 @@ class AddSchema(colander.Schema):
nama = colander.SchemaNode( nama = colander.SchemaNode(
colander.String(), colander.String(),
missing=colander.drop) missing=colander.drop)
tahun = colander.SchemaNode(
colander.Integer())
level_id = colander.SchemaNode( level_id = colander.SchemaNode(
colander.Integer()) colander.Integer())
is_summary = colander.SchemaNode( is_summary = colander.SchemaNode(
colander.Integer(), colander.Integer(),
widget=widget.SelectWidget(values=SUMMARIES), widget=widget.SelectWidget(values=SUMMARIES),
title="Header") title="Header")
status = colander.SchemaNode(
colander.Boolean(),
oid = "status")
class EditSchema(AddSchema): class EditSchema(AddSchema):
id = colander.SchemaNode(colander.Integer(), id = colander.SchemaNode(colander.Integer(),
...@@ -117,9 +121,13 @@ def get_form(request, class_form): ...@@ -117,9 +121,13 @@ def get_form(request, class_form):
def save(values, row=None): def save(values, row=None):
if not row: if not row:
row = Rekening() row = Rekening()
if 'tahun' not in values:
values['tahun'] = datetime.now().year
row.from_dict(values) row.from_dict(values)
#if values['password']: #if values['password']:
# row.password = values['password'] # row.password = values['password']
row.status = 'status' in values and values['status'] and 1 or 0
DBSession.add(row) DBSession.add(row)
DBSession.flush() DBSession.flush()
return row return row
...@@ -233,6 +241,8 @@ def view_act(request): ...@@ -233,6 +241,8 @@ def view_act(request):
columns.append(ColumnDT('nama')) columns.append(ColumnDT('nama'))
columns.append(ColumnDT('level_id')) columns.append(ColumnDT('level_id'))
columns.append(ColumnDT('is_summary')) columns.append(ColumnDT('is_summary'))
columns.append(ColumnDT('tahun'))
columns.append(ColumnDT('status'))
query = DBSession.query(Rekening) query = DBSession.query(Rekening)
rowTable = DataTables(req, Rekening, query, columns) rowTable = DataTables(req, Rekening, query, columns)
return rowTable.output_result() return rowTable.output_result()
......
esipkd/views/templates/rekening/add.pt
...@@ -17,6 +17,19 @@ ...@@ -17,6 +17,19 @@
<div class="col-md-12"> <div class="col-md-12">
<!--kode --> <!--kode -->
<div class="form-group" tal:define="field form['tahun']" id="item-${field.oid}">
<label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
${field.title}<span id="error-${field.oid}" class="text text-danger"
tal:condition="field.required">&nbsp*</span></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}"> <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}"> <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
${field.title}<span id="error-${field.oid}" class="text text-danger" ${field.title}<span id="error-${field.oid}" class="text text-danger"
...@@ -64,6 +77,18 @@ ...@@ -64,6 +77,18 @@
${error}</p> ${error}</p>
</div> </div>
</div> </div>
<!--status -->
<div class="form-group" tal:define="field form['status']" id="item-${field.oid}">
<label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
${field.title}<span id="error-${field.oid}" class="text text-danger"
tal:condition="field.required">&nbsp*</span></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>
<!--Button --> <!--Button -->
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"> <label class="control-label col-md-3">
......
esipkd/views/templates/rekening/edit.pt
...@@ -16,6 +16,18 @@ ...@@ -16,6 +16,18 @@
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<!--tahun -->
<div class="form-group" tal:define="field form['tahun']" id="item-${field.oid}">
<label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
${field.title}<span id="error-${field.oid}" class="text text-danger"
tal:condition="field.required">&nbsp*</span></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 --> <!--kode -->
<div class="form-group" tal:define="field form['kode']" id="item-${field.oid}"> <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}"> <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
...@@ -64,6 +76,18 @@ ...@@ -64,6 +76,18 @@
${error}</p> ${error}</p>
</div> </div>
</div> </div>
<!--status -->
<div class="form-group" tal:define="field form['status']" id="item-${field.oid}">
<label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
${field.title}<span id="error-${field.oid}" class="text text-danger"
tal:condition="field.required">&nbsp*</span></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>
<!--Button --> <!--Button -->
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"> <label class="control-label col-md-3">
......
esipkd/views/templates/rekening/list.pt
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
<th>Uraian</th> <th>Uraian</th>
<th>Level</th> <th>Level</th>
<th>Header</th> <th>Header</th>
<th>Tahun</th>
<th>Status</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -64,7 +66,9 @@ ...@@ -64,7 +66,9 @@
{"sWidth": "50px" }, {"sWidth": "50px" },
null, null,
{"sWidth": "50px", "sClass": "center"}, {"sWidth": "50px", "sClass": "center"},
{"sWidth": "50px", "sClass": "center"} {"sWidth": "50px", "sClass": "center"},
{"sWidth": "50px", "sClass": "center"},
{"sWidth": "50px", "sClass": "center"},
], ],
}); });
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!