git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updating oqs

Browse Source
This commit is contained in:
Yan
2017-06-23 19:00:49 +06:30
parent 3a0e26b2ea
commit e9fb90d8a0
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/OQS.js
View File

@@ -67,6 +67,10 @@ $(document).ready(function(){
$(this).addClass('selected-item'); $(this).addClass('selected-item');
}); });
$(".order-item-edit").on('click', function(){
});
// complete for queue item // complete for queue item
$('.order-complete').on('click',function(e){ $('.order-complete').on('click',function(e){
//e.preventDefault(); //e.preventDefault();

6
app/assets/stylesheets/OQS.scss
View File

@@ -19,3 +19,9 @@
color: #fff !important; color: #fff !important;
background-color: blue; background-color: blue;
} }
.order-item {
width: 49%;
font-size: 18px;
margin: 0px 0px 5px 0px;
}

3
app/views/oqs/home/index.html.erb
View File

@@ -117,7 +117,8 @@
<p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p> <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
</div> </div>
<div class="card-footer"> <div class="card-footer">
<button id=<%= 'assigned_queue_' + qid.assigned_order_item_id.to_s %> class="btn btn-primary btn-lg btn-block order-complete">COMPLETE</button> <button id=<%= 'edit_' + qid.assigned_order_item_id.to_s %> class="btn btn-warning order-item order-item-edit">EDIT</button>
<button id=<%= 'assigned_queue_' + qid.assigned_order_item_id.to_s %> class="btn btn-primary order-item order-complete">COMPLETE</button>
</div> </div>
</div> </div>
<% <%