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

esipkd/views/daftar.py

@@ -162,12 +162,13 @@ def daftar_jabatan():
 @colander.deferred
 def deferred_unit(node, kw):
     values = kw.get('daftar_unit',[])
-    return widget.SelectWidget(values=values)
+    return widget.Select2Widget(values=values)
 
 def daftar_unit():
     #rows = DBSession.query(Unit).filter_by(level_id=4).all()
     rows = DBSession.query(Unit
-                   ).filter(Unit.level_id.in_([3,4])
+                   # ).filter(Unit.level_id.in_([3,4])
+                   ).filter(Unit.level_id >= 3
                    ).all()
     r=[]
     d = (0,'Pilih OPD')
@@ -200,7 +201,7 @@ def daftar_rekening():
 @colander.deferred
 def deferred_rekening1(node, kw):
     values = kw.get('daftar_rekening1',[])
-    return widget.SelectWidget(values=values)
+    return widget.Select2Widget(values=values)
 
 def daftar_rekening1():
     #rows = DBSession.query(Rekening).filter_by(is_summary=0).all()
@@ -218,7 +219,7 @@ def daftar_rekening1():
 @colander.deferred
 def deferred_rekening2(node, kw):
     values = kw.get('daftar_rekening2',[])
-    return widget.SelectWidget(values=values)
+    return widget.Select2Widget(values=values)
 
 def daftar_rekening2():
     rows = DBSession.query(Rekening

esipkd/views/templates/pajak/add.pt

@@ -2,6 +2,8 @@
 <div metal:fill-slot="content" class="form-550">
 <h4>Tambah Tarif</h4>
 <hr>
+<link href="${request.route_url('home')}deform_static/select2/select2.css" rel="stylesheet">
+<script src="${request.route_url('home')}deform_static/select2/select2.js"></script>
 <!--div tal:content="structure form"/-->
 <form id="deform" method="POST" enctype="multipart/form-data" accept-charset="utf-8"
       class="form-horizontal">

esipkd/views/templates/rekeningunit/add.pt

@@ -2,6 +2,8 @@
 <div metal:fill-slot="content" class="form-550">
 <h4>Tambah Rekening OPD</h4>
 <hr>
+<link href="${request.route_url('home')}deform_static/select2/select2.css" rel="stylesheet">
+<script src="${request.route_url('home')}deform_static/select2/select2.js"></script>
 <!--div tal:content="structure form"/-->
 <form id="deform" method="POST" enctype="multipart/form-data" accept-charset="utf-8"
       class="form-horizontal">