Merge branch 'master' of bitbucket.org:code2lab/nemo_encoder

This commit is contained in:
nandar
2017-02-11 13:22:24 +06:30
8 changed files with 39 additions and 29 deletions

View File

@@ -79,7 +79,7 @@ $(document).ready(function(){
client_id=$(this).val()
get_batch(client_id)
});
function get_batch(client_id){
function get_batch(client_id){
$('#batch').multiselect('disable');
$.ajax({
type: "GET",
@@ -110,7 +110,7 @@ $(document).ready(function(){
filter(client,batch);
});
function filter(client,batch){
function filter(client,batch){
if (batch==null){
batch=""
}
@@ -130,6 +130,7 @@ $(document).ready(function(){
}
});
}
$("ul.multiselect-container > li> a > label").attr("style","padding-left:10px");
})
</script>

View File

@@ -18,7 +18,8 @@
<th>Qty Processing</th>
<th>Qty Success</th>
<th>Qty Fail</th>
<th>Export Count</th>
<th>Export Count</th>
<th>Exported By</th>
<th>Creatd At</th>
</tr>
</thead>
@@ -30,7 +31,8 @@
<td><%= batch.qty_processing rescue '' %></td>
<td><%= batch.qty_success rescue '' %></td>
<td><%= batch.qty_fail rescue '' %></td>
<td><%= batch.export_count %></td>
<td><%= batch.export_count %></td>
<td><%= batch.exported_by %></td>
<td><%= batch.created_at.strftime("%e,%b %Y %I:%M %p") rescue '' %></td>
</tr>
<% end %>