perbaikan jabatan

opensipkd/base/views/jabatan.py

@@ -12,7 +12,7 @@ from opensipkd.tools.report import csv_response, open_rml_pdf, open_rml_row, \
 from pyramid.i18n import TranslationStringFactory
 from pyramid.i18n import TranslationStringFactory
 from pyramid.view import (view_config, )
 from pyramid.view import (view_config, )
 
 
-from ..views import BaseView, deferred_jenis
+from ..views import BaseView
 
 
 _ = TranslationStringFactory("opensipkd")
 _ = TranslationStringFactory("opensipkd")
 SESS_ADD_FAILED = 'Tambah jabatan gagal'
 SESS_ADD_FAILED = 'Tambah jabatan gagal'
@@ -33,6 +33,11 @@ def deferred_eselon(node, kw):
     return widget.SelectWidget(values=values)
     return widget.SelectWidget(values=values)
 
 
 
 
+@colander.deferred
+def deferred_jenis(node, kw):
+    values = kw.get('daftar_jenis', [])
+    return widget.SelectWidget(values=values)
+
 class AddSchema(colander.Schema):
 class AddSchema(colander.Schema):
     kode = colander.SchemaNode(
     kode = colander.SchemaNode(
         colander.String(),
         colander.String(),
@@ -40,6 +45,7 @@ class AddSchema(colander.Schema):
         oid="kode")
         oid="kode")
     nama = colander.SchemaNode(
     nama = colander.SchemaNode(
         colander.String(),
         colander.String(),
+        validator=colander.Length(max=32),
         oid="nama")
         oid="nama")
     nama_pendek = colander.SchemaNode(
     nama_pendek = colander.SchemaNode(
         colander.String(),
         colander.String(),
@@ -65,6 +71,7 @@ class AddSchema(colander.Schema):
         default=1,
         default=1,
         oid="status")
         oid="status")
 
 
+
 class EditSchema(AddSchema):
 class EditSchema(AddSchema):
     id = colander.SchemaNode(colander.String(),
     id = colander.SchemaNode(colander.String(),
                              missing=colander.drop,
                              missing=colander.drop,
@@ -85,7 +92,8 @@ class ListSchema(colander.Schema):
         oid="nama")
         oid="nama")
     status = colander.SchemaNode(
     status = colander.SchemaNode(
         colander.Integer(),
         colander.Integer(),
-        widget=widget.CheckboxWidget(),
+        widget=widget.CheckboxWidget(true_val='1', false_val='0'),
+        default=1,
         oid="status")
         oid="status")
 
 
 
 
@@ -102,7 +110,7 @@ class ViewJabatan(BaseView):
         # self.list_buttons = (btn_view, btn_add, btn_edit, btn_delete, btn_close)
         # self.list_buttons = (btn_view, btn_add, btn_edit, btn_delete, btn_close)
 
 
     def get_bindings(self, row=None):
     def get_bindings(self, row=None):
-        return dict(jenis=JENIS,
+        return dict(daftar_jenis=JENIS,
                     daftar_eselon=daftar_eselon())
                     daftar_eselon=daftar_eselon())
 
 
     @view_config(route_name='jabatan', renderer='templates/table.pt',
     @view_config(route_name='jabatan', renderer='templates/table.pt',
@@ -275,7 +283,6 @@ class ViewJabatan(BaseView):
                 err_nama()
                 err_nama()
         elif found:
         elif found:
             err_nama()
             err_nama()
-            
 
 
 
 
 def query_reg(request):
 def query_reg(request):
@@ -284,4 +291,3 @@ def query_reg(request):
                            Jabatan.status, ). \
                            Jabatan.status, ). \
         filter(Jabatan.status == 1). \
         filter(Jabatan.status == 1). \
         order_by(Jabatan.id)
         order_by(Jabatan.id)
-