git_admin/nemo_encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit api

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/batch_line_items/_search.html.erb
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>

16
app/views/batch_line_items/index.html.erb
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=""

3
app/views/batch_line_items/search.js.erb
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');

8
app/views/clients/_form.html.erb
View File

@@ -28,13 +28,7 @@
<div class ="form-group" >
<label for="address" class="string optional control-label">Address:</label>
<%= f.input :address,:error=>false,:label =>false,:placeholder =>'Please enter client address',input_html: { class: "form-control" } %>
</div>
<div class ="form-group" >
<label for="product_type" class="string optional control-label">Product Type:</label>
<%= f.select :product_type,options_for_select([['CARD','card'],['TICKET','ticket']], params[:product_type]),
{}, { :class => 'form-control' } %>
<%= f.error :product_type ,style: 'color: red' %>
</div>
</div>
<div class ="form-group" >
<label></label>
<div class="actions">

8
app/views/clients/index.html.erb
View File

@@ -21,8 +21,7 @@
<th>Name</th>
<th>Email</th>
<th>Phone</th>
<th>Address</th>
<th>Product Type</th>
<th>Address</th>
<th>Created At </th>
<th>Action</th>
</tr>
@@ -33,15 +32,14 @@
<td><%= client.name rescue '' %></td>
<td><%= client.email rescue '' %></td>
<td><%= client.phone rescue '' %></td>
<td><%= client.address rescue '' %></td>
<td><%= client.product_type rescue '' %></td>
<td><%= client.address rescue '' %></td>
<td><%= client.created_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
<td>
<%= link_to 'Detail',
client_path(client), :class => 'btn btn-primary btn-sm' %>
<%= link_to 'Edit',
edit_client_path(client), :class => 'btn btn-primary btn-sm' %>
<%= link_to 'Delete', clients_path(client), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-primary btn-sm' %>
<%= link_to 'Delete', client_path(client), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-primary btn-sm' %>
</td>
</tr>
<% end %>