This commit is contained in:
Sunandar
2017-02-08 17:35:37 +06:30
parent 0b4e69d1be
commit 26d42631c7
14 changed files with 140 additions and 95 deletions

View File

@@ -2,10 +2,10 @@
<thead>
<tr>
<th>Serail No</th>
<th>Wristband Code</th>
<th>Asset Identity</th>
<th>Manufacture UID</th>
<th>Batch No</th>
<th>Card Type</th>
<th>Asset Type</th>
<th>Created At </th>
<th>Update At </th>
@@ -15,10 +15,10 @@
<% @batchLineItems.each do |item| %>
<tr>
<td><%= item.serial_no rescue '' %></td>
<td><%= item.wristband_code rescue '' %></td>
<td><%= item.asset_identity rescue '' %></td>
<td><%= item.manufacture_uid rescue '' %></td>
<td><%= item.batch_name rescue '' %></td>
<td><%= item.card_type rescue '' %></td>
<td><%= item.asset_type rescue '' %></td>
<td><%= item.created_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
<td><%= item.updated_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
</tr>

View File

@@ -29,10 +29,12 @@
<strong>Batch Line Item List</strong>
</div>
<div class="card-block">
<% flash.each do |key, value| %>
<% flash.each do |key, value| %>
<% if key =='message' %>
<div class="alert alert-danger center">
<a class="close" data-dismiss="alert">×</a>
<%= value %>
<%= value %>
<% end %>
</div>
<% end %>
<div id ="filterrific_results">
@@ -40,10 +42,10 @@
<thead>
<tr>
<th>Serail No</th>
<th>Wristband Code</th>
<th>Asset Identity</th>
<th>Manufacture UID</th>
<th>Batch No</th>
<th>Card Type</th>
<th>Asset Type</th>
<th>Created At </th>
<th>Update At </th>
@@ -53,10 +55,10 @@
<% @batchLineItems.each do |item| %>
<tr>
<td><%= item.serial_no rescue '' %></td>
<td><%= item.wristband_code rescue '' %></td>
<td><%= item.asset_identity rescue '' %></td>
<td><%= item.manufacture_uid rescue '' %></td>
<td><%= item.batch_name rescue '' %></td>
<td><%= item.card_type rescue '' %></td>
<td><%= item.asset_type rescue '' %></td>
<td><%= item.created_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
<td><%= item.updated_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
</tr>
@@ -108,7 +110,7 @@ $(document).ready(function(){
batch=$(this).val();
filter(client,batch);
});
});
function filter(client,batch){
if (batch==null){
batch=""

View File

@@ -2,4 +2,5 @@
render(partial: 'batch_line_items/search', locals: { batchLineItems: @batchLineItems })
) %>
$("#filterrific_results").html("<%= js %>");
$("#filterrific_results").html("<%= js %>");
$('.pagination a').attr('data-remote', 'true');