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

change report filter UI and check focus for datepicker

Browse Source
This commit is contained in:
phyusin
2017-11-28 14:16:25 +06:30
parent ec26c353d2
commit 785541e438
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/application.js
View File

@@ -107,7 +107,7 @@ $(document).ready(function() {
} }
}); });
$('form:first *:input[type!=hidden]:first').focus(); $('form:first *input[data-behaviour!=datepicker]:input[type!=hidden]:first').focus();
// $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ // $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
// $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); // $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});

6
app/views/reports/commission/_commission_report_filter.html.erb
View File

@@ -14,15 +14,15 @@
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<!-- <label class="">Select Shift Period</label> --> <!-- <label class="">Select Shift Period</label> -->
<label class="font-14"><%= t("views.right_panel.detail.from") %></label> <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<label class="font-14"><%= t("views.right_panel.detail.to") %></label> <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14"><%= t :commissioner %></label> <label class="font-14"><%= t :commissioner %></label>
<select class="form-control" name="commissioner" id="commissioner"> <select class="form-control" name="commissioner" id="commissioner" style="height: 37px;">
<option value=""></option> <option value=""></option>
<% @commissioner.each do |c| %> <% @commissioner.each do |c| %>
<% if @com_id == c.id %> <% if @com_id == c.id %>

6
app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
View File

@@ -22,15 +22,15 @@
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<!-- <label class="">Select Shift Period</label> --> <!-- <label class="">Select Shift Period</label> -->
<label class="font-20">From</label> <label class="font-20">From</label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label class="font-20">To</label> <label class="font-20">To</label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label class="font-20">All Shift</label> <label class="font-20">All Shift</label>
<select class="form-control select" name="shift_name" id="shift_name" > <select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;">
</select> </select>
</div> </div>
<div class="form-group col-md-1 "> <div class="form-group col-md-1 ">

6
app/views/reports/payment_method/_shift_sale_report_filter.html.erb
View File

@@ -27,15 +27,15 @@
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<!-- <label class="">Select Shift Period</label> --> <!-- <label class="">Select Shift Period</label> -->
<label class="font-14"><%= t("views.right_panel.detail.from") %></label> <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3 from" name="from" id="from" type="text" placeholder="From date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3 from" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14"><%= t("views.right_panel.detail.to") %></label> <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3 to" name="to" id="to" type="text" placeholder="To date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3 to" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label> <label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
<select class="form-control select" name="shift_name" id="shift_name" > <select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;" >
</select> </select>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20"> <div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">

6
app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
View File

@@ -27,15 +27,15 @@
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<!-- <label class="">Select Shift Period</label> --> <!-- <label class="">Select Shift Period</label> -->
<label class="font-14"><%= t("views.right_panel.detail.from") %></label> <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 33.5px;">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14"><%= t("views.right_panel.detail.to") %></label> <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 33.5;">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label> <label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
<select class="form-control select" name="shift_name" id="shift_name" > <select class="form-control select" name="shift_name" id="shift_name" style="height: 36px;" >
</select> </select>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20"> <div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">

6
app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
View File

@@ -21,15 +21,15 @@
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<!-- <label class="font-14">Select Shift Period</label> --> <!-- <label class="font-14">Select Shift Period</label> -->
<label class="font-14"><%= t("views.right_panel.detail.from") %></label> <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<label class="font-14"><%= t("views.right_panel.detail.to") %></label> <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label> <label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
<select class="form-control select" name="shift_name" id="shift_name" > <select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;" >
</select> </select>
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20"><br> <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20"><br>

4
app/views/reports/stock_check/_stock_check_report_filter.html.erb
View File

@@ -14,11 +14,11 @@
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<!-- <label class="">Select Shift Period</label> --> <!-- <label class="">Select Shift Period</label> -->
<label class="font-14">From</label> <label class="font-14">From</label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 35px;">
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<label class="font-14">To</label> <label class="font-14">To</label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 35px;">
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label class="font-14">Definition Item</label> <label class="font-14">Definition Item</label>

6
app/views/reports/void_sale/_shift_sale_report_filter.html.erb
View File

@@ -22,15 +22,15 @@
<div class="form-group col-lg-2 col-md-2 col-sm-2"> <div class="form-group col-lg-2 col-md-2 col-sm-2">
<!-- <label class="">Select Shift Period</label> --> <!-- <label class="">Select Shift Period</label> -->
<label class="font-20"><%= t("views.right_panel.detail.from") %></label> <label class="font-20"><%= t("views.right_panel.detail.from") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
</div> </div>
<div class="form-group col-lg-2 col-md-2 col-sm-2"> <div class="form-group col-lg-2 col-md-2 col-sm-2">
<label class="font-20"><%= t("views.right_panel.detail.to") %></label> <label class="font-20"><%= t("views.right_panel.detail.to") %></label>
<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date"> <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
</div> </div>
<div class="form-group col-lg-3 col-md-3 col-sm-3"> <div class="form-group col-lg-3 col-md-3 col-sm-3">
<label class="font-20"><%= t("views.right_panel.detail.all_shift") %></label> <label class="font-20"><%= t("views.right_panel.detail.all_shift") %></label>
<select class="form-control select" name="shift_name" id="shift_name" > <select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;">
</select> </select>
</div> </div>
<div class=" col-lg-1 col-md-1 col-sm-1 margin-top-20"> <div class=" col-lg-1 col-md-1 col-sm-1 margin-top-20">