SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PermissionSlip timepicker issue fixed

Browse Source
This commit is contained in:
venbatechnologies 2017-12-23 15:10:09 +05:30
parent e61dabdbbc
commit 524663924e
2 changed files with 59 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/monthlypay.php
View File

@ -471,6 +471,7 @@ class monthlypay extends BaseController
$mpdf=new mPDF('utf-8','A4-P',10, 10,10, 10, 10, 38, 4, 6); $mpdf=new mPDF('utf-8','A4-P',10, 10,10, 10, 10, 38, 4, 6);
$mpdf->SetDisplayMode('fullpage'); $mpdf->SetDisplayMode('fullpage');
$mpdf->SetHTMLHeader($HtmlHeading); $mpdf->SetHTMLHeader($HtmlHeading);
$mpdf->SetTitle('PermissionSlip');
$html = $this->load->view('permissionpdf',$data,true); $html = $this->load->view('permissionpdf',$data,true);
$mpdf->SetDisplayMode('fullpage'); $mpdf->SetDisplayMode('fullpage');
//$mpdf->setFooter($HTMLFooter . "Page {PAGENO} of {nb}"); //$mpdf->setFooter($HTMLFooter . "Page {PAGENO} of {nb}");

78
application/views/permission.php
View File

@ -1267,7 +1267,7 @@
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Permission Time</label> <label>Permission Time(Hours : Min)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Pretime','value' => set_value('Pretime',''),'id'=>'Pretime', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'Pretime','value' => set_value('Pretime',''),'id'=>'Pretime', 'class' => 'form-control' ,'readonly' => 'true');
@ -1311,13 +1311,13 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$('#timepicker1').timepicker({ $('#timepicker1').timepicker({
minuteStep: 1, minuteStep: 5,
defaultTime:'current' defaultTime:'current'
}); });
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
$('#timepicker2').timepicker({ $('#timepicker2').timepicker({
minuteStep: 1, minuteStep: 5,
defaultTime:'current' defaultTime:'current'
}); });
</script> </script>
@ -1360,16 +1360,42 @@ function calculateTime() {
var valuestart = $("#timepicker1").val(); var valuestart = $("#timepicker1").val();
var valuestop = $("#timepicker2").val(); var valuestop = $("#timepicker2").val();
//create date format
var timeStart = new Date("01/01/2007 " + valuestart); var timeStart = new Date("01/01/2007 " + valuestart);
var timeEnd = new Date("01/01/2007 " + valuestop); var timeEnd = new Date("01/01/2007 " + valuestop);
var hourDiff = timeEnd - timeStart; var hourDiff = timeEnd-timeStart;
var minites = hourDiff/ 60/ 60 /1000; var minites = hourDiff/ 60/ 60 /1000;
minites = minites.toFixed(2);
// alert(minites); minites = minites.toFixed(2);
$("#Pretime").val(minites); //console.log(minites);
var resstr = minites.split(".");
var hrs = resstr[0];
var min = resstr[1];
var min1 =min * 60 / 100;
min1 = Math.round(min1);
//console.log(hrs+'-'+min);
//console.log(hrs+'-'+min1);
if (minites< 0) {
alert('Please enter a invalid time');
$("#Pretime").val(0);
} else{
$("#Pretime").val(hrs+':'+min1);
}
} }
@ -1380,10 +1406,21 @@ function calculateTime() {
}); });
$("#save").click(function(){ $("#save").click(function(){
var emp = $("#emp").val(); var emp = $("#emp").val();
var shift = $("#shift").val(); var shift = $("#shift").val();
var res = $("#Reason").val();//alert(emp); var res = $("#Reason").val();//alert(emp);
var time1=$('#timepicker1').val();
var time2=$('#timepicker2').val();
if(emp == '-1'){ if(emp == '-1'){
alert('Please Select Employee'); alert('Please Select Employee');
@ -1391,18 +1428,19 @@ $("#save").click(function(){
}else{ }else{
return true; return true;
} }
// if(!$.trim(shift) ==""){
// alert('Please Enter the Shift'); if(time1 != time2)
// return false; {
// }else{ alert('Please Select To Time');
// return true; return false;
// } }
// if(res === 0){ else{
// alert('Please Enter The Reason'); return true;
// return false; }
// }else{
// return true;
// }
}); });
</script> </script>