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

edit

Browse Source
This commit is contained in:
Sunandar
2017-01-24 18:10:39 +06:30
parent 2893f33a23
commit cfb738e479
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/style.css
View File

@@ -256,4 +256,5 @@ hr
} }
.container ul.nav>.nav-item:first-child{ .container ul.nav>.nav-item:first-child{
padding-left: 80px; padding-left: 80px;
} }

4
app/controllers/api/batch_line_items_controller.rb
View File

@@ -16,6 +16,7 @@ class Api::BatchLineItemsController < ApplicationController
user_id=find_user.id user_id=find_user.id
end end
if !encrypt_key.nil? if !encrypt_key.nil?
serial_no=BatchLineItem.generate_serial_no(user_id.to_s)
str="manufacture_uid="+manufacture_uid.to_s+"&serial_no="+serial_no.to_s str="manufacture_uid="+manufacture_uid.to_s+"&serial_no="+serial_no.to_s
digest_data= Digest::MD5.hexdigest(str) digest_data= Digest::MD5.hexdigest(str)
@@ -24,8 +25,7 @@ class Api::BatchLineItemsController < ApplicationController
wristband_code=hex_str[0..15] wristband_code=hex_str[0..15]
check_manufacture = BatchLineItem.find_by_manufacture_uid_and_wristband_code(manufacture_uid,wristband_code) check_manufacture = BatchLineItem.find_by_manufacture_uid_and_wristband_code(manufacture_uid,wristband_code)
if check_manufacture.nil? if check_manufacture.nil?
serial_no=BatchLineItem.generate_serial_no(user_id.to_s)
batchLineItem=BatchLineItem.new batchLineItem=BatchLineItem.new
batchLineItem.wristband_code=wristband_code batchLineItem.wristband_code=wristband_code

2
app/views/users/index.html.erb
View File

@@ -39,7 +39,7 @@
<td><%= user.created_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td> <td><%= user.created_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
<td> <td>
<%= link_to 'Detail', <%= link_to 'Detail',
user_path(user), :class => 'btn btn-primary btn-sm' %> user_path(user), :class => 'btn btn-primary btn-sm ' %>
<%= link_to t('.edit', :default => t("helpers.links.edit")), <%= link_to t('.edit', :default => t("helpers.links.edit")),
edit_user_path(user), :class => 'btn btn-primary btn-sm' %> edit_user_path(user), :class => 'btn btn-primary btn-sm' %>
<%= link_to 'Delete', user_path(user), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-primary btn-sm' %> <%= link_to 'Delete', user_path(user), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-primary btn-sm' %>