Commit 452ce94c by aagusti

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

2 parents bb6a6518 63871500
...@@ -171,9 +171,15 @@ class BlokKavNoWidget(Widget): ...@@ -171,9 +171,15 @@ class BlokKavNoWidget(Widget):
result = "|".join([blok_kav_no, rt, rw]) result = "|".join([blok_kav_no, rt, rw])
if not blok_kav_no or not rt or not rw: if not rt:
raise Invalid(field.schema, "Blok Kav No RT/RW tidak lengkap", raise Invalid(field.schema, "RT harus diisi. Minimal 000", result)
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 return result
......
...@@ -6,32 +6,34 @@ ...@@ -6,32 +6,34 @@
style style|field.widget.style;"> style style|field.widget.style;">
${field.start_mapping()} ${field.start_mapping()}
<div class="row"> <div class="row">
<div class="col-xs-4"> <div class="col-xs-12 col-lg-6">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"> <div class="row input-group-addon">
<div class="col-xs-6">
<input type="text" name="blok_kav_no" value="${blok_kav_no}" <input type="text" name="blok_kav_no" value="${blok_kav_no}"
class="span2 form-control ${css_class or ''}" class="span2 form-control ${css_class or ''}"
tal:attributes="style style; tal:attributes="style style;
blok_kav_no_attributes|field.widget.blok_kav_no_attributes|{};" blok_kav_no_attributes|field.widget.blok_kav_no_attributes|{};"
maxlength="15" minlength="" placeholder="Blok Kav No" maxlength="15" minlength="" placeholder="Blok Kav No"
id="${oid}"/> id="${oid}"/>
</span> </div>
<span class="input-group-addon"> <div class="col-xs-3">
<input type="text" name="rt" value="${rt}" <input type="text" name="rt" value="${rt}"
class="span2 form-control ${css_class or ''}" class="span2 form-control ${css_class or ''}"
tal:attributes="style style; tal:attributes="style style;
rt_attributes|field.widget.rt_attributes|{};" rt_attributes|field.widget.rt_attributes|{};"
maxlength="3" minlength="3" placeholder="RT" maxlength="3" minlength="3" placeholder="RT"
id="${oid}-rt"/> id="${oid}-rt"/>
</span> </div>
<span class="input-group-addon"> <div class="col-xs-3">
<input type="text" name="rw" value="${rw}" <input type="text" name="rw" value="${rw}"
class="span2 form-control ${css_class or ''}" class="span2 form-control ${css_class or ''}"
tal:attributes="style style; tal:attributes="style style;
rw_attributes|field.widget.rw_attributes|{};" rw_attributes|field.widget.rw_attributes|{};"
maxlength="2" minlength="2" placeholder="RW" maxlength="2" minlength="2" placeholder="RW"
id="${oid}-rw"/> id="${oid}-rw"/>
</span> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
<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>
<div> <div class="form-control-static" id="${oid|field.oid}"
<span class="form-control-static" id="${oid|field.oid}"> tal:define="
${blok_kav_no}</span> <span class="form-control-static">RT: ${rt}</span> has_blok blok_kav_no and True or False;
<span class="form-control-static">RW: ${rw}</span> 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> </div>
<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>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!