merge with august sprint for commission

This commit is contained in:
Yan
2017-08-29 18:44:31 +06:30
26 changed files with 3377 additions and 788 deletions

View File

@@ -14,10 +14,10 @@
<label>Commissioner Name:</label>
<%= f.collection_select :commissioner_ids, Commissioner.all, :id, :name, {prompt: 'Select Commissioner'}, {class: 'form-control'} %><br/><br/>
<label>In time</label>
<%= f.text_field :in_time, :value=>'',:class=>"form-control datepicker"%><br/>
<label>Out time</label>
<%= f.text_field :out_time, :value=>'',:class=>"form-control datepicker"%>
<%= f.input :in_time, :placeholder => "From Date" , :class => "form-control", :as => :datetime_picker%>
<%= f.input :out_time, :placeholder => "From Date" , :class => "form-control", :as => :datetime_picker%>
</div><br>
<div class="form-group">
@@ -31,20 +31,16 @@
<script type="text/javascript">
$(function() {
$('.datepicker').datepicker({
format : 'yyyy-mm-dd',
autoclose: true
});
$('.datepicker').attr('ReadOnly','true');
$('.datepicker').css('cursor','pointer');
});
$('#reset').click(function() {
$(document).ready(function(){
// $('#in_juty_in_time').datetimepicker();
// $('#in_juty_out_time').datetimepicker();
$('#reset').click(function() {
// window.location.href = '/origami/assign_in_juty/'+ table_id;
location.reload();
return false;
});
});
</script>