diff --git a/application/controllers/monthlypay.php b/application/controllers/monthlypay.php
index 15357da6..e0c205c3 100755
--- a/application/controllers/monthlypay.php
+++ b/application/controllers/monthlypay.php
@@ -471,6 +471,7 @@ class monthlypay extends BaseController
$mpdf=new mPDF('utf-8','A4-P',10, 10,10, 10, 10, 38, 4, 6);
$mpdf->SetDisplayMode('fullpage');
$mpdf->SetHTMLHeader($HtmlHeading);
+ $mpdf->SetTitle('PermissionSlip');
$html = $this->load->view('permissionpdf',$data,true);
$mpdf->SetDisplayMode('fullpage');
//$mpdf->setFooter($HTMLFooter . "Page {PAGENO} of {nb}");
diff --git a/application/views/permission.php b/application/views/permission.php
index 09cec796..3cfadadd 100755
--- a/application/views/permission.php
+++ b/application/views/permission.php
@@ -1267,7 +1267,7 @@
-
+
'Pretime','value' => set_value('Pretime',''),'id'=>'Pretime', 'class' => 'form-control' ,'readonly' => 'true');
@@ -1311,13 +1311,13 @@
@@ -1359,17 +1359,43 @@ function calculateTime() {
//get values
var valuestart = $("#timepicker1").val();
var valuestop = $("#timepicker2").val();
+
+
- //create date format
var timeStart = new Date("01/01/2007 " + valuestart);
var timeEnd = new Date("01/01/2007 " + valuestop);
- var hourDiff = timeEnd - timeStart;
+ var hourDiff = timeEnd-timeStart;
+
var minites = hourDiff/ 60/ 60 /1000;
- minites = minites.toFixed(2);
- // alert(minites);
- $("#Pretime").val(minites);
+
+ minites = minites.toFixed(2);
+ //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(){
var emp = $("#emp").val();
var shift = $("#shift").val();
var res = $("#Reason").val();//alert(emp);
+ var time1=$('#timepicker1').val();
+ var time2=$('#timepicker2').val();
+
+
if(emp == '-1'){
alert('Please Select Employee');
@@ -1391,18 +1428,19 @@ $("#save").click(function(){
}else{
return true;
}
- // if(!$.trim(shift) ==""){
- // alert('Please Enter the Shift');
- // return false;
- // }else{
- // return true;
- // }
- // if(res === 0){
- // alert('Please Enter The Reason');
- // return false;
- // }else{
- // return true;
- // }
+
+ if(time1 != time2)
+ {
+ alert('Please Select To Time');
+ return false;
+ }
+ else{
+ return true;
+ }
+
+
+
+
});