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-02-07 18:04:06 +06:30
parent 6fa89a9e75
commit 264debf89a
13 changed files with 185 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/.DS_Store vendored
View File

Binary file not shown.

BIN
app/assets/.DS_Store vendored
View File

Binary file not shown.

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

@@ -257,4 +257,7 @@ hr
.container ul.nav>.nav-item:first-child{
padding-left: 80px;
}
.show_image{
padding-top: 30px;
}

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

@@ -10,7 +10,7 @@ class Api::BatchLineItemsController < ApplicationController
check_member= Member.authenticate_session_token(session_token)
if !check_member.nil?
encrypt_key=""
wristband_code=""
asset_identity=""
find_batch = Batch.find_by_id(batch_id)
if !find_batch.nil?
@@ -31,19 +31,19 @@ class Api::BatchLineItemsController < ApplicationController
digest_data= Digest::MD5.hexdigest(str)
hex_data=digest_data.hex
hex_str=hex_data.to_s
wristband_code=hex_str[0..15]
check_wirstband=BatchLineItem.find_by_asset_identity(wristband_code)
asset_identity=hex_str[0..15]
check_asset=BatchLineItem.find_by_asset_identity(asset_identity)
if check_wirstband.nil?
@out=create_product(wristband_code,serial_no,batch_id,manufacture_uid,card_type)
if check_asset.nil?
@out=create_product(asset_identity,serial_no,batch_id,manufacture_uid,card_type)
else
@out=false,'Wristband is already registered!'
@out=false,'Asset Identity is already registered!'
end
elsif product_type=="card"
@out=create_product(wristband_code,serial_no,batch_id,manufacture_uid,card_type)
@out=create_product(asset_identity,serial_no,batch_id,manufacture_uid,card_type)
end
else
@out=false,'Wristband is already registered!'
@out=false,'Manufacture UID is already registered!'
end
else
@out=false,'Invalid User!'
@@ -58,9 +58,9 @@ class Api::BatchLineItemsController < ApplicationController
@out=false,'Sorry!Unauthorized user!'
end
end
def create_product(wristband_code,serial_no,batch_id,manufacture_uid,card_type)
def create_product(asset_identity,serial_no,batch_id,manufacture_uid,card_type)
batchLineItem=BatchLineItem.new
batchLineItem.asset_identity=wristband_code
batchLineItem.asset_identity=asset_identity
batchLineItem.serial_no=serial_no
batchLineItem.batch_id=batch_id
batchLineItem.manufacture_uid = manufacture_uid

30
app/controllers/api/batches_controller.rb
View File

@@ -11,18 +11,23 @@ class Api::BatchesController < ApplicationController
adult_or_child=params[:adult_or_child]
client_id=params[:client_id]
user_id=check_member.user_id
batch = Batch.create_batch(created_by,date,order_ref,card_qty,user_id,adult_or_child,client_id)
if !batch.nil?
@out=true,batch.id
else
@out=false,'Error occurs in creating batch!'
end
else
@out = false, "Sorry!Unauthorized user!"
find_client=Client.find_by_id(client_id)
if !find_client.nil?
user_id=check_member.user_id
batch = Batch.create_batch(created_by,date,order_ref,card_qty,user_id,adult_or_child,client_id)
if !batch.nil?
@out=true,batch.id
else
@out=false,'Error occurs in creating batch!'
end
else
@out = false, "Client does not exist!"
end
else
@out = false, "Sorry!Unauthorized user!"
end
end
def batch_end
end
def batch_end
session_token=params[:session_token]
batch_id=params[:batch_id]
@@ -66,8 +71,7 @@ class Api::BatchesController < ApplicationController
session_token=params[:session_token]
created_by=params[:created_by]
check_member= Member.authenticate_session_token(session_token)
check_member= Member.authenticate_session_token(session_token)
if !check_member.nil?
if !created_by.nil?
batches = Batch.where('batch_end is null and created_by=?', created_by)

59
app/controllers/batch_line_items_controller.rb
View File

@@ -2,18 +2,46 @@ class BatchLineItemsController < ApplicationController
require "csv"
skip_before_filter :verify_authenticity_token
before_action :authenticate_member!
# respond_to :json, :html,:csv
def index
user_id=current_member.user_id
@clients=Client.all.order('id desc')
find_client=Client.select(:id).order('id desc').first
if !find_client.nil?
client_id=find_client.id
user_id=current_member.user_id
sub_query="(select * from batches where user_id="+user_id.to_s+" and client_id="+client_id.to_s+")"
@batchLineItems=BatchLineItem.joins('inner join '+sub_query+' as batches on batches.id=batch_line_items.batch_id')
.select('batch_line_items.*,batches.order_ref as batch_name').page(params[:page]).per(10)
else
sub_query="(select * from batches where user_id="+user_id.to_s+")"
@batchLineItems=BatchLineItem.joins('inner join '+ sub_query + ' as batches on batches.id=batch_line_items.batch_id')
.select('batch_line_items.*,batches.order_ref as batch_name').page(params[:page]).per(10)
end
end
def search
user_id=current_member.user_id
batch_list=params[:batch]
client_id=params[:client]
@clients=Client.all
@batchLineItems=nil
@batches=Batch.where('user_id=?',user_id)
@batchLineItems=BatchLineItem.joins('inner join batches on batches.id=batch_line_items.batch_id')
.where('batches.user_id=?',user_id)
.select('batch_line_items.*,batches.order_ref as batch_name').page(params[:page])
if !batch_list.empty?
sub_query="(select * from batches where id in ("+batch_list+") and user_id="+user_id.to_s+" and client_id="+client_id.to_s+")"
@batchLineItems=BatchLineItem.joins('inner join '+ sub_query +' as batches on batches.id=batch_line_items.batch_id')
.select('batch_line_items.*,batches.order_ref as batch_name').page(params[:page])
else
sub_query="(select * from batches where user_id="+user_id.to_s+" and client_id="+client_id.to_s+")"
@batchLineItems=BatchLineItem.joins('inner join '+ sub_query +'as batches on batches.id=batch_line_items.batch_id')
.select('batch_line_items.*,batches.order_ref as batch_name').page(params[:page])
end
# if @batchLineItems.nil?
# @message="No search found!"
# end
end
def get_batch
client_id=params[:client_id]
@@ -27,25 +55,34 @@ class BatchLineItemsController < ApplicationController
end
def export
batch_list=""
@batchLineItems=""
@batchLineItems=nil
user_id=current_member.user_id
@clients=Client.all
@batches=Batch.where('user_id=?',user_id)
client_id=params[:client]
if params[:batch].present?
batch_list=params[:batch]
end
client_id=params[:client]
if !batch_list.empty?
Batch.where("client_id=? and id in (?)",client_id,batch_list).update_all("export_count = export_count + 1")
@batchLineItems = BatchLineItem.where('batch_id in (?)',batch_list).select("*,'' as secret_token")
else
Batch.where("client_id=? ",client_id).update_all("export_count = export_count + 1")
sub_query="(select * from batches where client_id ="+client_id+" and user_id="+user_id.to_s+")"
@batchLineItems = BatchLineItem.joins('inner join '+sub_query+' as batches on batches.id=batch_line_items.batch_id').select("*,'' as secret_token")
end
if !@batchLineItems.empty?
respond_to do |format|
format.html
format.csv { send_data @batchLineItems.to_csv(client_id), filename: "encoder-#{Date.today}.csv" }
end
end
end
else
flash[:notice] = "No data to export."
redirect_to batch_line_items_path
end
end
end

1
app/models/batch_line_item.rb
View File

@@ -77,6 +77,7 @@ class BatchLineItem < ApplicationRecord
return encrypted
end
# def self.encrypted(data,encrypt_key)
# crypt = ActiveSupport::MessageEncryptor.new(encrypt_key)
# encrypted_data = crypt.encrypt_and_sign(data)

2
app/models/member.rb
View File

@@ -12,7 +12,7 @@ class Member < ApplicationRecord
else
mem = Member.find_by_session_token(token)
if mem.nil?
return false
return nil
else
return mem
end

0
app/views/batch_line_items/export.csv.erb
View File

60
app/views/batch_line_items/export.html.erb
View File

@@ -1,60 +0,0 @@
<div class="row ">
<nav class="breadcrumb">
<a class="breadcrumb-item active" href="<%= dashboard_path %>">Home</a>
<a class="breadcrumb-item active" href="#">Batch Line Item List</a>
<a class="breadcrumb-item active" href="#">Export CSV</a>
</nav>
</div>
<div class="row content">
<div class="card">
<div class="card-header">
<strong>Export CSV</strong>
</div>
<div class="card-block">
<%= form_tag export_path(:format => :csv),:method => :post do%>
<div class="col-lg-4">
<label><strong>Select Client:</strong></label>
<%= select_tag "client", options_from_collection_for_select(@clients, "id", "name"),:class => 'form-control'%>
</div>
<div class="col-lg-6">
<label><strong>Select Batch:</strong></label><br>
<select class='selectpicker' id='batch' name='batch[]' multiple= "multiple"></select> &nbsp; &nbsp;
<%= button_tag "Export CSV",:class =>'btn btn-primary btn-sm',:id =>"btnexport" %>
</div>
<% end %>
</div>
<div class="spacer-30"></div>
</div>
</div>
<script>
$(document).ready(function(){
client_id=$("#client").val();
get_batch(client_id)
$('#client').on('change', function() {
client_id=$(this).val()
get_batch(client_id)
});
function get_batch(client_id){
$('#batch').multiselect('disable');
$.ajax({
type: "GET",
url: '<%= get_batch_path %>',
dataType: "json",
data : {'client_id':client_id },
success: function(result){
if (result.status){
$('#batch').multiselect('enable');
$("#batch").empty();
$.each(result.data, function (i, item){
$("#batch").append("<option value="+item.id+">"+ item.order_ref +"</option>")
});
$('#batch').multiselect("refresh");
$("#batch").multiselect('rebuild');
}
}
});
}
})
</script>

93
app/views/batch_line_items/index.html.erb
View File

@@ -4,14 +4,38 @@
<a class="breadcrumb-item active" href="#">Batch Line Item List</a>
</nav>
</div>
<div class="row content">
<%= form_tag export_path(:format => :csv),:method => :post do%>
<div class="col-lg-4">
<label><strong>Select Client:</strong></label>
<%= select_tag "client", options_from_collection_for_select(@clients, "id", "name"), :class => 'form-control'%>
</div>
<div class="col-lg-6">
<label><strong>Select Batch:</strong></label><br>
<select class='selectpicker' id='batch' name='batch[]' multiple= "multiple"></select> &nbsp; &nbsp;
<%= button_tag "Export csv?",:class =>'btn btn-primary btn-sm',:id =>"btnexport" %>
</div>
<% end %>
</div>
<div class="row show_image">
<div class="col-lg-6"></div>
<div class="col-lg-4" id="loading">
<img src="<%= asset_path( 'spinner.gif' ) %>" />
</div>
</div>
<div class="row content">
<div class="card">
<div class="card-header">
<strong>Batch Line Item List</strong>
</div>
<div class="card-block">
<% flash.each do |key, value| %>
<div class="alert alert-danger center">
<a class="close" data-dismiss="alert">×</a>
<%= value %>
</div>
<% end %>
<div id ="filterrific_results">
<table class="table" style="border-top:none">
<thead>
<tr>
@@ -40,6 +64,71 @@
</tbody>
</table>
<%=paginate @batchLineItems %>
<div>
</div>
</div>
</div>
<script>
$(document).ready(function(){
$('#loading').hide();
client_id=$("#client").val();
get_batch(client_id)
$('#client').on('change', function() {
client_id=$(this).val()
get_batch(client_id)
});
function get_batch(client_id){
$('#batch').multiselect('disable');
$.ajax({
type: "GET",
url: '<%= get_batch_path %>',
dataType: "json",
data : {'client_id':client_id },
success: function(result){
if (result.status){
$('#batch').multiselect('enable');
$("#batch").empty();
$.each(result.data, function (i, item){
$("#batch").append("<option value="+item.id+">"+ item.order_ref +"</option>")
});
$('#batch').multiselect("refresh");
$("#batch").multiselect('rebuild');
}
}
});
}
$("#client" ).on('change', function(){
client=$(this).val();
batch=$("#batch").val();
filter(client,batch);
})
$('#batch').change(function(){
client=$("#client").val();
batch=$(this).val();
filter(client,batch);
});
function filter(client,batch){
if (batch==null){
batch=""
}
paramlist='client='+client+"&batch="+batch
$.ajax({
type:'GET',
url: '<%= filter_path %>',
data:paramlist,
beforeSend: function(){
$('#loading').show();
},
complete: function(){
$('#loading').hide();
},
success: function(data) {
}
});
}
})
</script>

10
app/views/layouts/_navigation.html.erb
View File

@@ -12,14 +12,7 @@
<%= link_to "Batches",batches_path, :class => "nav-link" %>
</li>
<li class="nav-item">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Batch Line Item</a>
<div class="dropdown-menu">
<%= link_to "List", batch_line_items_path, :class => "dropdown-item" %>
<%= link_to "Export CSV", export_path, :class => "dropdown-item" %>
</div>
</li>
<%= link_to "Batch Line Item", batch_line_items_path, :class => "nav-link" %>
</li>
<li class="nav-item">
<%= link_to "User",users_path, :class => "nav-link" %>
@@ -27,7 +20,6 @@
<li class="nav-item">
<%= link_to "Client",clients_path, :class => "nav-link" %>
</li>
</ul>
<div class="float-xs-right">
<ul class="nav navbar-nav right">

4
config/routes.rb
View File

@@ -8,9 +8,11 @@ Rails.application.routes.draw do
resources :batches,:only =>[:index]
devise_for :members
resources :batch_line_items,:only =>[:index,:create]
resources :batch_line_items,:only =>[:index]
resources :users
# #batchlineitems
get "batch_line_items/search" =>'batch_line_items#search',:as =>'filter'
#users
get 'check_registered_email' => "users#check_registered_email"
#Encoder