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

update report and inventory layout design

Browse Source
This commit is contained in:
Aung Myo
2017-10-25 14:03:15 +06:30
parent 0eea755acd
commit da6d85eaf5
25 changed files with 693 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/reports/dailysale/_shift_sale_report_filter.html.erb
View File

@@ -1,9 +1,10 @@
<div class="p-l-15">
<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<% if period_type != false %>
<div class="row">
<div class="col-lg-2 col-md-2 col-sm-2">
<label>Select Period</label>
<label class="font-14">Select Period</label>
<select name="period" id="sel_period" class="form-control">
<option value="">Select Period</option>
<option value="0">Today</option>
@@ -22,14 +23,15 @@
<div class="col-lg-3 col-md-3 col-sm-3">
<!-- <label class="">Select Shift Period</label> -->
<label class="">From</label>
<label class="font-14">From</label>
<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date">
</div>
<div class="col-lg-3 col-md-3 col-sm-3">
<label class="">To</label>
<label class="font-14">To</label>
<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date">
</div>
<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
<label></label><br>
<input type="submit" value="Generate Report" class='btn btn-primary'>
</div>
</div>
@@ -84,7 +86,8 @@
</div>
</div>
<% end %>
<% end %>
</div>
<script type="text/javascript">
$(function(){

39
app/views/reports/dailysale/index.html.erb
View File

@@ -1,33 +1,22 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item active">Daily Sale Report</li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
</span>
</ol>
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item active">Daily Sale Report</li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-md-12">
<div class="col-md-12 col-lg-12 col-sm-12 ">
<!-- <div class="row">
<div class="col-md-12 col-lg-12"> -->
<!-- <div class="container"> -->
<%= render :partial=>'shift_sale_report_filter',
:locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
<hr />
<!-- </div> -->
<!-- </div>
</div> -->
<!-- <div class="row"> -->
<!-- <div class="container"> -->
<div class=" text-right">
<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
</div>
<!-- </div> -->
<!-- </div> -->
<%= render :partial=>'shift_sale_report_filter',
:locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
<hr />
<div class=" text-right">
<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-info wave-effects">Export to Excel</a>
</div>
<div class="row">
<div class="col-md-12 col-lg-12">