Fixed form for walkin when JO is loaded from View All. #347
This commit is contained in:
parent
5ab6514a86
commit
cbd9f429d4
1 changed files with 25 additions and 12 deletions
|
|
@ -341,9 +341,11 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group m-form__group row">
|
<div class="form-group m-form__group row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<label name="hub" data-field="hub">Click on a row to select a hub
|
{% if mode != 'view-all' %}
|
||||||
<span style="color:red"> *</span>
|
<label name="hub" data-field="hub">Click on a row to select a hub
|
||||||
</label>
|
<span style="color:red"> *</span>
|
||||||
|
</label>
|
||||||
|
{% endif %}
|
||||||
<div class="form-control-feedback hide" data-field="hub"></div>
|
<div class="form-control-feedback hide" data-field="hub"></div>
|
||||||
<input type="hidden" id="hub-field" name="hub_id" value="">
|
<input type="hidden" id="hub-field" name="hub_id" value="">
|
||||||
<div class="table-frame" data-name="hub">
|
<div class="table-frame" data-name="hub">
|
||||||
|
|
@ -358,14 +360,23 @@
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="nearest_hubs">
|
<tbody id="nearest_hubs">
|
||||||
{% for hub in hubs %}
|
{% if mode == 'view-all' %}
|
||||||
<tr data-id="{{ hub.getID }}"{{ obj.getHub and obj.getHub.getID == hub.getID ? ' class="m-table__row--primary"' }}>
|
<tr data-id="{{ obj.getHub.getID }}"{{ obj.getHub.getID }}>
|
||||||
<td>{{ hub.getName }}</td>
|
<td>{{ obj.getHub.getName }}</td>
|
||||||
<td>{{ hub.getBranch }}</td>
|
<td>{{ obj.getHub.getBranch }}</td>
|
||||||
<td>{{ hub.getContactNumbers }}</td>
|
<td>{{ obj.getHub.getContactNumbers }}</td>
|
||||||
<td></span></td>
|
<td></span></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
{% endfor %}
|
{% else %}
|
||||||
|
{% for hub in hubs %}
|
||||||
|
<tr data-id="{{ hub.getID }}"{{ obj.getHub and obj.getHub.getID == hub.getID ? ' class="m-table__row--primary"' }}>
|
||||||
|
<td>{{ hub.getName }}</td>
|
||||||
|
<td>{{ hub.getBranch }}</td>
|
||||||
|
<td>{{ hub.getContactNumbers }}</td>
|
||||||
|
<td></span></td>
|
||||||
|
<td></td>
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -495,9 +506,11 @@
|
||||||
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
|
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<button type="submit" class="btn btn-success">Submit</button>
|
{% if mode != 'view-all' %}
|
||||||
{% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
|
<button type="submit" class="btn btn-success">Submit</button>
|
||||||
<a href="{{ url('jo_cancel', {'id': obj.getID}) }}" class="btn btn-danger btn-cancel-job-order">Cancel Job Order</a>
|
{% if ftags.set_map_coordinate and is_granted('joborder.cancel') and not obj.isCancelled %}
|
||||||
|
<a href="{{ url('jo_cancel', {'id': obj.getID}) }}" class="btn btn-danger btn-cancel-job-order">Cancel Job Order</a>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{{ return_url }}" class="btn btn-secondary">Back</a>
|
<a href="{{ return_url }}" class="btn btn-secondary">Back</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue