Commit d383e944 by iqbal

pembaruan

1 parent b91e3966
...@@ -41,7 +41,7 @@ class AddSchema(colander.Schema): ...@@ -41,7 +41,7 @@ class AddSchema(colander.Schema):
oid="kode") oid="kode")
nama = colander.SchemaNode(colander.String(), nama = colander.SchemaNode(colander.String(),
validator=colander.Length(max=64), validator=colander.Length(max=128),
oid="nama") oid="nama")
......
...@@ -30,7 +30,8 @@ def get_departemen_list(): ...@@ -30,7 +30,8 @@ def get_departemen_list():
@colander.deferred @colander.deferred
def departemen_widget(node, kw): def departemen_widget(node, kw):
values = kw.get('departemen_list', []) values = kw.get('departemen_list', [])
return widget.Select2Widget(values=values, placeholder="Pilih Departemen") return widget.CheckboxChoiceWidget(values=values, placeholder='Pilih Departemen')
def departemen_widget_form(): def departemen_widget_form():
...@@ -319,7 +320,8 @@ class ViewDepartemen(BaseView): ...@@ -319,7 +320,8 @@ class ViewDepartemen(BaseView):
return r return r
def get_bindings(self, row=None): def get_bindings(self, row=None):
return {"company_list": ResCompany.get_list()} return {"company_list": ResCompany.get_list(),
"departemen_list":get_departemen_list()}
@view_config(route_name='departemen-add', renderer='templates/form.pt', @view_config(route_name='departemen-add', renderer='templates/form.pt',
permission='departemen') permission='departemen')
......
...@@ -51,7 +51,9 @@ class AddSchema(colander.Schema): ...@@ -51,7 +51,9 @@ class AddSchema(colander.Schema):
widget=widget.SelectWidget(values=kategori_desa), widget=widget.SelectWidget(values=kategori_desa),
validator=colander.Length(max=32), oid="kode") validator=colander.Length(max=32), oid="kode")
nama = colander.SchemaNode(colander.String(), oid="nama") nama = colander.SchemaNode(colander.String(),
validator=colander.Length(max=128),
oid="nama")
class EditSchema(AddSchema): class EditSchema(AddSchema):
......
...@@ -127,7 +127,7 @@ class Views(BaseView): ...@@ -127,7 +127,7 @@ class Views(BaseView):
def view_view(self): def view_view(self):
return super().view_view() return super().view_view()
@view_config(route_name='eselon-delete', renderer='templates/form_input.pt', @view_config(route_name='eselon-delete', renderer='templates/form.pt',
permission='eselon') permission='eselon')
def view_delete(self): def view_delete(self):
return super().view_delete() return super().view_delete()
......
...@@ -28,13 +28,13 @@ def permissions_widget(node, kw): ...@@ -28,13 +28,13 @@ def permissions_widget(node, kw):
class AddSchema(colander.Schema): class AddSchema(colander.Schema):
group_name = colander.SchemaNode( group_name = colander.SchemaNode(
colander.String(), colander.String(),
validator=colander.Length(max=32)) validator=colander.Length(max=128))
description = colander.SchemaNode( description = colander.SchemaNode(
colander.String(), colander.String(),
validator=colander.Length(max=32), validator=colander.Length(max=256),
missing=colander.drop) missing=colander.drop)
permissions = colander.SchemaNode( permissions = colander.SchemaNode(
colander.Set(), widget=permissions_widget, title='Hak akses') colander.Set(), widget=permissions_widget, title='Hak akses', missing=colander.drop)
class EditSchema(AddSchema): class EditSchema(AddSchema):
...@@ -139,13 +139,12 @@ class Views(BaseView): ...@@ -139,13 +139,12 @@ class Views(BaseView):
def view_edit(self): def view_edit(self):
return super(Views, self).view_edit() return super(Views, self).view_edit()
def delete_msg(self, row): #def delete_msg(self, row):
data = dict(group_name=row.group_name) #data = dict(group_name=row.group_name)
ts = _( #ts = _('group-deleted',
'group-deleted', #default='{group_name} group has been deleted.',
default='{group_name} group has been deleted.', #mapping=data)
mapping=data) #self.ses.flash(ts)
self.ses.flash(ts)
@view_config( @view_config(
route_name='group-delete', renderer='templates/form.pt', route_name='group-delete', renderer='templates/form.pt',
......
...@@ -72,7 +72,7 @@ class ListSchema(colander.Schema): ...@@ -72,7 +72,7 @@ class ListSchema(colander.Schema):
width="100pt") width="100pt")
nama = colander.SchemaNode( nama = colander.SchemaNode(
colander.String(), colander.String(),
validator=colander.Length(max=64), validator=colander.Length(max=128),
oid="nama") oid="nama")
email = colander.SchemaNode( email = colander.SchemaNode(
......
...@@ -77,7 +77,7 @@ class NamaSchema(colander.Schema): ...@@ -77,7 +77,7 @@ class NamaSchema(colander.Schema):
width="100pt") width="100pt")
nama = colander.SchemaNode( nama = colander.SchemaNode(
colander.String(), colander.String(),
validator=colander.Length(max=64), validator=colander.Length(max=128),
oid="nama") oid="nama")
mobile = colander.SchemaNode( mobile = colander.SchemaNode(
colander.String(), colander.String(),
...@@ -86,7 +86,7 @@ class NamaSchema(colander.Schema): ...@@ -86,7 +86,7 @@ class NamaSchema(colander.Schema):
email = colander.SchemaNode( email = colander.SchemaNode(
colander.String(), colander.String(),
validator=colander.Length(max=32), validator=colander.Length(max=40),
oid="email") oid="email")
...@@ -188,7 +188,7 @@ class PartnerSchema(NamaSchema): ...@@ -188,7 +188,7 @@ class PartnerSchema(NamaSchema):
oid="mobile") oid="mobile")
website = colander.SchemaNode( website = colander.SchemaNode(
colander.String(), colander.String(),
validator=colander.Length(max=128), validator=colander.Length(max=64),
missing=colander.drop, missing=colander.drop,
oid="website") oid="website")
status = colander.SchemaNode( status = colander.SchemaNode(
......
...@@ -4,7 +4,17 @@ from pyramid.view import view_config ...@@ -4,7 +4,17 @@ from pyramid.view import view_config
from . import BaseView from . import BaseView
from ...models import User, DepartemenUser, Departemen from ...models import User, DepartemenUser, Departemen
from .departemen import departemen_widget, get_departemen_list from .departemen import get_departemen_list
from .user import user_widget, user_select, user_list
from pyramid.i18n import TranslationStringFactory
_=TranslationStringFactory('departemen')
@colander.deferred
def departemen_widget(node, kw):
values = kw.get ('departemen_list',[])
return widget.CheckboxChoiceWidget(values=values, Placeholder='Pilih Departemen')
class ListSchema(colander.Schema): class ListSchema(colander.Schema):
id = colander.SchemaNode( id = colander.SchemaNode(
...@@ -19,12 +29,14 @@ class ListSchema(colander.Schema): ...@@ -19,12 +29,14 @@ class ListSchema(colander.Schema):
departemen_name = colander.SchemaNode( departemen_name = colander.SchemaNode(
colander.String(), colander.String(),
field=Departemen.nama) field=Departemen.nama)
class AddSchema(colander.Schema): class AddSchema(colander.Schema):
user_id = colander.SchemaNode( user_id = colander.SchemaNode(
colander.Integer(), colander.Integer(),
widget=widget.RadioChoiceWidget(values=User.get_list()), # Menggunakan CheckboxChoiceWidget widget=widget.RadioChoiceWidget(values=User.get_list()), # Menggunakan CheckboxChoiceWidget
#widget=user_widget,
oid="user_id", oid="user_id",
title="User", title="User",
) )
...@@ -65,7 +77,9 @@ class Views(BaseView): ...@@ -65,7 +77,9 @@ class Views(BaseView):
return super().view_act() return super().view_act()
def get_bindings(self, row=None): def get_bindings(self, row=None):
return {"departemen_list": get_departemen_list()} return {"departemen_list": get_departemen_list(),
"user_list": user_list()
}
@view_config(route_name='user-departemen-add', renderer='templates/form.pt', @view_config(route_name='user-departemen-add', renderer='templates/form.pt',
permission='user-edit') permission='user-edit')
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!