Merge branch 'latest' of https://git.opensipkd.com/aa.gusti/opensipkd-base into latest

opensipkd/base/views/widget_os.py

@@ -171,9 +171,15 @@ class BlokKavNoWidget(Widget):
 
             result = "|".join([blok_kav_no, rt, rw])
 
-            if not blok_kav_no or not rt or not rw:
-                raise Invalid(field.schema, "Blok Kav No RT/RW tidak lengkap",
-                              result)
+            if not rt:
+                raise Invalid(field.schema, "RT harus diisi. Minimal 000", result)
+
+            if not rw:
+                raise Invalid(field.schema, "RW harus diisi. Minimal 00", result)
+
+            # if not blok_kav_no or not rt or not rw:
+            #     raise Invalid(field.schema, "Blok Kav No RT/RW tidak lengkap",
+            #                   result)
 
             return result
 

opensipkd/base/views/widgets/blok_kav_no.pt

@@ -6,33 +6,35 @@
                   style style|field.widget.style;">
   ${field.start_mapping()}
   <div class="row">
-    <div class="col-xs-4">
-      <div class="input-group">
-        <span class="input-group-addon">
-          <input type="text" name="blok_kav_no" value="${blok_kav_no}"
-                 class="span2 form-control ${css_class or ''}"
-                 tal:attributes="style style;
-                       blok_kav_no_attributes|field.widget.blok_kav_no_attributes|{};"
-                 maxlength="15" minlength="" placeholder="Blok Kav No"
-                 id="${oid}"/>
-        </span>
-        <span class="input-group-addon">
-          <input type="text" name="rt" value="${rt}"
-                 class="span2 form-control ${css_class or ''}"
-                 tal:attributes="style style;
-             				 rt_attributes|field.widget.rt_attributes|{};"
-                 maxlength="3" minlength="3" placeholder="RT"
-                 id="${oid}-rt"/>
-        </span>
-        <span class="input-group-addon">
-           <input type="text" name="rw" value="${rw}"
-                  class="span2 form-control ${css_class or ''}"
-                  tal:attributes="style style;
-             				 rw_attributes|field.widget.rw_attributes|{};"
-                  maxlength="2" minlength="2" placeholder="RW"
-                  id="${oid}-rw"/>
-        </span>
-      </div>
+    <div class="col-xs-12 col-lg-6">
+        <div class="input-group">
+            <div class="row input-group-addon">
+                <div class="col-xs-6">
+                    <input type="text" name="blok_kav_no" value="${blok_kav_no}"
+                     class="span2 form-control ${css_class or ''}"
+                     tal:attributes="style style;
+                           blok_kav_no_attributes|field.widget.blok_kav_no_attributes|{};"
+                     maxlength="15" minlength="" placeholder="Blok Kav No"
+                     id="${oid}"/>
+                </div>
+                <div class="col-xs-3">
+                    <input type="text" name="rt" value="${rt}"
+                     class="span2 form-control ${css_class or ''}"
+                     tal:attributes="style style;
+                                 rt_attributes|field.widget.rt_attributes|{};"
+                     maxlength="3" minlength="3" placeholder="RT"
+                     id="${oid}-rt"/>
+                </div>
+                <div class="col-xs-3">
+                    <input type="text" name="rw" value="${rw}"
+                      class="span2 form-control ${css_class or ''}"
+                      tal:attributes="style style;
+                                 rw_attributes|field.widget.rw_attributes|{};"
+                      maxlength="2" minlength="2" placeholder="RW"
+                      id="${oid}-rw"/>
+                </div>
+            </div>
+        </div>
     </div>
   </div>
   ${field.end_mapping()}

opensipkd/base/views/widgets/blok_kav_no_old.pt

+<div i18n:domain="deform"
+     tal:omit-tag=""
+     tal:define="oid oid|field.oid;
+                  name name|field.name;
+                  css_class css_class|field.widget.css_class;
+                  style style|field.widget.style;">
+  ${field.start_mapping()}
+  <div class="row">
+    <div class="col-xs-4">
+      <div class="input-group">
+        <span class="input-group-addon">
+          <input type="text" name="blok_kav_no" value="${blok_kav_no}"
+                 class="span2 form-control ${css_class or ''}"
+                 tal:attributes="style style;
+                       blok_kav_no_attributes|field.widget.blok_kav_no_attributes|{};"
+                 maxlength="15" minlength="" placeholder="Blok Kav No"
+                 id="${oid}"/>
+        </span>
+        <span class="input-group-addon">
+          <input type="text" name="rt" value="${rt}"
+                 class="span2 form-control ${css_class or ''}"
+                 tal:attributes="style style;
+             				 rt_attributes|field.widget.rt_attributes|{};"
+                 maxlength="3" minlength="3" placeholder="RT"
+                 id="${oid}-rt"/>
+        </span>
+        <span class="input-group-addon">
+           <input type="text" name="rw" value="${rw}"
+                  class="span2 form-control ${css_class or ''}"
+                  tal:attributes="style style;
+             				 rw_attributes|field.widget.rw_attributes|{};"
+                  maxlength="2" minlength="2" placeholder="RW"
+                  id="${oid}-rw"/>
+        </span>
+      </div>
+    </div>
+  </div>
+  ${field.end_mapping()}
+</div>

opensipkd/base/views/widgets/readonly/blok_kav_no.pt

-<div>
-  <span  class="form-control-static" id="${oid|field.oid}">
-          ${blok_kav_no}</span> <span class="form-control-static">RT: ${rt}</span>
-    <span class="form-control-static">RW: ${rw}</span>
+<div class="form-control-static" id="${oid|field.oid}"
+    tal:define="
+    has_blok blok_kav_no and True or False;
+    has_rt rt and True or False;
+    has_rw rt and True or False;
+    "
+>
+    <span tal:condition="has_blok" style="margin-right:0.25rem;">${blok_kav_no}</span>
+    <span tal:condition="has_rt" style="margin-right:0.25rem;">RT ${rt}</span>
+    <span tal:condition="has_rw" style="margin-right:0.25rem;">RW ${rw}</span>
 </div>

opensipkd/base/views/widgets/readonly/blok_kav_no_old.pt

+<div>
+  <span  class="form-control-static" id="${oid|field.oid}">
+          ${blok_kav_no}</span> <span class="form-control-static">RT: ${rt}</span>
+    <span class="form-control-static">RW: ${rw}</span>
+</div>