From d18383d224fddbf4d7f8aa47f05c9eddd061fd4b Mon Sep 17 00:00:00 2001
From: velz2020 <vitvelz@gmail.com>
Date: Thu, 8 Jun 2017 13:26:48 +0530
Subject: [PATCH] Payroll Modified

---
 application/controllers/emppaydate.php |  19 +++-
 application/controllers/payslip.php    |   3 +-
 application/models/payroll_model.php   |   8 +-
 application/views/addemppaydate.php    |  59 +++++++----
 application/views/editOldemppay.php    |  31 +++---
 application/views/editOldmonthly.php   | 135 ++++++++++++++++++++++---
 application/views/includes/header.php  |   6 +-
 7 files changed, 205 insertions(+), 56 deletions(-)

diff --git a/application/controllers/emppaydate.php b/application/controllers/emppaydate.php
index c11a782b..68ae49e2 100755
--- a/application/controllers/emppaydate.php
+++ b/application/controllers/emppaydate.php
@@ -83,15 +83,16 @@ class emppaydate extends BaseController
     {
                    
            
-            //$this->form_validation->set_rules('Pay_Data_ID','Pay_Data_ID','trim|required');
-            $this->form_validation->set_rules('EmpID','EmpID','trim|required');
+            $this->load->library('form_validation');
+			
+            $this->form_validation->set_rules('EmpID','EmpID','required');
             $this->form_validation->set_rules('Basic_Pay','Basic_Pay','trim|required');
             $this->form_validation->set_rules('HRA_Rate','HRA_Rate','trim|required');
             $this->form_validation->set_rules('OT_Rate','OT_Rate','trim|required');
             $this->form_validation->set_rules('Allowances','Allowances','trim|required');
             $this->form_validation->set_rules('PF_Rate','PF_Rate','trim|required');
             $this->form_validation->set_rules('ESI_Rate','ESI_Rate','trim|required');
-            $this->form_validation->set_rules('Food_Allowances','Food_Allowances','trim|requried');
+            $this->form_validation->set_rules('Food_Allowances','Food_Allowances','requried');
 
          
             if($this->form_validation->run() == FALSE)
@@ -116,7 +117,15 @@ class emppaydate extends BaseController
                 $IsActive = '1';
                 
                     
+                 // if(EmpID == -1)
+                // {
+                   // // $this->session->set_flashdata('success', 'New Asset created successfully');
                     
+                     // redirect('emppaydate/addemppaydate','refresh');
+                     // echo "<script>alert('Employee Must be select!');</script>";
+                // }   
+				
+				//else{
                 //$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
                 
                 //$createddt =  $dt->format('Y-m-d H:i:s');
@@ -144,8 +153,8 @@ class emppaydate extends BaseController
                      echo "<script>alert('Employee Pay List Not Created!');</script>";
                 }               
                 
-            }
-        
+            //}
+			}
     }
 
      /**
diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php
index 8817c7c2..4a376800 100755
--- a/application/controllers/payslip.php
+++ b/application/controllers/payslip.php
@@ -31,7 +31,8 @@ class payslip extends BaseController
 		$payon = $this->input->post('payon');
 		$employee = $this->input->post('employee');
 		$result = $this->payroll_model->model_sp($payon,$employee);
-        return TRUE;
+       // $result = $this->db->last_query();
+		return $result;
 		//$this->db->call_function('model_sp');
 
 }
diff --git a/application/models/payroll_model.php b/application/models/payroll_model.php
index ca594491..0ccb40b3 100755
--- a/application/models/payroll_model.php
+++ b/application/models/payroll_model.php
@@ -22,9 +22,10 @@ class Payroll_model extends CI_Model
         //echo "<script>alert('mod');</script>";
         //echo "highlight_file(filename)";
         //die();
-        $this->db->query("call final_payroll_data('".$payon."','".$employee."')") or die(mysql_error());
-        //$result->next_result()
-        return TRUE;
+        $result=$this->db->query("call P_FINAL_PAYROLL_DATA('".$payon."','".$employee."')") or die(mysql_error());
+        //$result->next_result();
+		
+        return $result;
 
 
 
@@ -229,6 +230,7 @@ class Payroll_model extends CI_Model
    {
        $this->db->select('EmpID,FirstName,LastName');
        $this->db->from('T_Employee_Details');
+	   $this->db->where('EmpID NOT IN (SELECT EmpID from T_Emp_Pay_Data)',NULL,FALSE);
        $query = $this->db->get();
        return $query->result();
    }
diff --git a/application/views/addemppaydate.php b/application/views/addemppaydate.php
index 80241a6c..1da2bfb3 100755
--- a/application/views/addemppaydate.php
+++ b/application/views/addemppaydate.php
@@ -1,3 +1,8 @@
+
+
+
+
+
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
@@ -9,7 +14,7 @@
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php base_url() ?>emppayListings" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>emppayListings" class="btn btn-info" value="Back"/>Back</a>
     </div>
     <br>
         <div class="row">
@@ -21,7 +26,7 @@
                    
                     <!-- form start -->
                     
-                     <form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay" method="post"  > 
+                     <form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay" method="post" name="addform" > 
                    
 
                         <div class="box-body">
@@ -54,39 +59,46 @@
                                                 if(!empty($empdetails)){
                                             
                                                   foreach($empdetails as $emp){
-                                                     $empID=$emp->EmpID;
-                                                     $Employee+= array($empID => $emp->EmpID . "-" . $emp->FirstName . "-" . $emp->LastName);
+                                                     $EmpID=$emp->EmpID;
+                                                     $Employee+= array($EmpID => $emp->EmpID . "-" . $emp->FirstName . "-" . $emp->LastName);
                                                      // $Employee = array_merge($Employee,$Employee1);
                                                     }
                                                 }
-                                               echo form_dropdown('EmpID', $Employee,set_value('EmpID'),'id="empID"' ,'class="form-control"');
+											//$data=array('name'=>'EmpID','value'=>$Employee,'id'=>'EmpID','class' => 'form-control');
+											  echo form_dropdown('EmpID', $Employee,set_value('EmpID'),'class="form-control",id="xxx"');
+											  //echo form_dropdown($data);
 
                                             ?>                          
                                        </div>
                                     </div>
                                 </div>
+
                                 <div class="col-md-4">
                                     <div class="form-group">
                                         <label for="Basic_Pay">Basic Pay:</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
-                                         $data = array('name' => 'Basic_Pay','value' => set_value('Basic_Pay'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;');
+                                         
+                                       $data = array('name' => 'Basic_Pay','id' => 'Basic_Pay','value' => set_value('Basic_Pay'),'pattern' => '[0-9]{4,6}', 'class' => 'form-control', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Basic Pay Amount,Minimum Four Digit Positive Number');
                                         echo form_input($data);
                                         ?>   
                                     </div>
                                     </div>
                                 </div>
+                               
+
                             
 
                                   
                                 
                                 <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="HRA_Rate">HRA Rate:</label><font color="Red">*</font>
+                                        <label for="HRA_Rate">HRA Rate(%):</label><font color="Red">*</font>
                                          
                                         <div class="form-group">
                                                 <?php
-                                         $data = array('name' => 'HRA_Rate','value' => set_value('HRA_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;');
+                                         
+                                         $data = array('name' => 'HRA_Rate','id'=>'HRA_Rate','value' => set_value('HRA_Rate'), 'class' => 'form-control','style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the Valid HRA Rate,Minimum 1 digit,Maximum 2 digit','onfocusout'=>'validateHRA();');
                                         echo form_input($data);
                                         ?>   
                                     </div>
@@ -100,8 +112,10 @@
                                         <label for="OT_Rate">OT Rate:</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
-                                         $data = array('name' => 'OT_Rate','value' => set_value('OT_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;');
+                                          
+                                          $data = array('name' => 'OT_Rate','value' => set_value('OT_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'[0-9]{1,4}' ,'title'=>'Enter the Valid OT Rate, Minimum 1 digit, Maximum 4 digit');
                                         echo form_input($data);
+                                        
                                         ?>   
                                     </div>
                                     </div>
@@ -111,7 +125,8 @@
                                         <label for="Allowances">Allowances:</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
-                                         $data = array('name' => 'Allowances','value' => set_value('Allowances'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;');
+                                         
+                                         $data = array('name' => 'Allowances','value' => set_value('Allowances'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'[0-9]{1,4}','title'=>'Enter the Valid Allowances,Minimum 1 digit , Maximum 4 digit ');
                                         echo form_input($data);
                                         ?>   
                                     </div>
@@ -123,11 +138,12 @@
                                 
                                 <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="PF_Rate">PF Rate:</label><font color="Red">*</font>
+                                        <label for="PF_Rate">PF Rate(%):</label><font color="Red">*</font>
                                          
                                         <div class="form-group">
                                                 <?php
-                                         $data = array('name' => 'PF_Rate','value' => set_value('PF_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;');
+                                         
+                                         $data = array('name' => 'PF_Rate','value' => set_value('PF_Rate'),'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the valid PF Rate,Minimum 1 digit,Maximum 2 digit');
                                         echo form_input($data);
                                         ?>   
                                     </div>
@@ -138,10 +154,11 @@
                            <div class="row">
                                 <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="ESI_Rate">ESI Rate:</label><font color="Red">*</font>
+                                        <label for="ESI_Rate">ESI Rate(%):</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
-                                         $data = array('name' => 'ESI_Rate','value' => set_value('ESI_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;');
+                                         
+                                          $data = array('name' => 'ESI_Rate','value' => set_value('ESI_Rate'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)','title'=>'Enter the Valid ESI Rate,Minimum 1 digit,Maximum 2 digit');
                                         echo form_input($data);
                                         ?>   
                                     </div>
@@ -150,10 +167,11 @@
                                 <!--for food allowances-->
                                  <div class="col-md-4">
                                     <div class="form-group">
-                                        <label for="Food_Allowances">Food Allowances:</label>
+                                        <label for="Food_Allowances">Food Allowances:</label><font color="Red">*</font>
                                         <div class="form-group">
                                                 <?php
-                                         $data = array('name' => 'Food_Allowances','value' => set_value('Food_Allowances'), 'class' => 'form-control');
+                                         
+                                         $data = array('name' => 'Food_Allowances','value' => set_value('Food_Allowances'), 'class' => 'form-control','pattern'=>'[0-9]{1,4}','onfocusout'=>'validateFood();', 'title'=>'Enter the Valid Food Allowances,Minimun 1 Digit,Maximum 4 Digit');
                                         echo form_input($data);
                                         ?>   
                                     </div>
@@ -163,7 +181,7 @@
 
                                    
                                <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" value="Submit" />
+                            <input type="submit" class="btn btn-info" value="Submit" onmouseover="empcheck();" />
                             <input type="reset" class="btn btn-info" value="Reset" />
                         </div> 
                                 
@@ -209,4 +227,9 @@
     </section>
     
 </div><!--content-wrapper closed-->
-<script src="<?php echo base_url(); ?>assets/js/addUser.js" type="text/javascript"></script>        
\ No newline at end of file
+<script src="<?php echo base_url(); ?>assets/js/addUser.js" type="text/javascript"></script>      
+
+
+
+
+
diff --git a/application/views/editOldemppay.php b/application/views/editOldemppay.php
index 07fd97ec..2fe2c208 100755
--- a/application/views/editOldemppay.php
+++ b/application/views/editOldemppay.php
@@ -104,8 +104,8 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                        <span for="Basic_Pay">Basic Pay:</span>
-                                        <input type="text" class="form-control requried" id="Basic_Pay" name="Basic_Pay" value="<?php echo $Basic_Pay; ?>">
+                                        <span for="Basic_Pay">Basic Pay:</span><font color="Red">*</font>
+                                        <input type="text" class="form-control requried" id="Basic_Pay" name="Basic_Pay" value="<?php echo $Basic_Pay; ?>" pattern="[0-9]{4,6}" title="Minimum 4 digit,Maximum 6 Digit">
                                     </div>
                                     </div>
                                 </div>
@@ -117,8 +117,8 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                            <span for="HRA_Rate">HRA_Rate:</span>
-                                           <input type="text" class="form-control required" id="HRA_Rate" name="HRA_Rate" value="<?php echo $HRA_Rate; ?>">
+                                            <span for="HRA_Rate">HRA_Rate(%):</span><font color="Red">*</font>
+                                           <input type="text" class="form-control required" id="HRA_Rate" name="HRA_Rate" value="<?php echo $HRA_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
                                         </div>
                                     </div>
                                 </div>
@@ -127,8 +127,8 @@ if(!empty($emppay))
                                   <div class="col-md-4">
                                      <div class="form-group">
                                          <div class="form-group">
-                                           <span for="OT_Rate">OT_Rate:</span>
-                                           <input type="text" class="form-control required" id="OT_Rate" name="OT_Rate" value="<?php echo $OT_Rate; ?>">
+                                           <span for="OT_Rate">OT_Rate:</span><font color="Red">*</font>
+                                           <input type="text" class="form-control required" id="OT_Rate" name="OT_Rate" value="<?php echo $OT_Rate; ?>" pattern="[0-9]{1,4}"title="Minimum 1 digit,Maximum 4 Digit">
                                         </div>
                                     </div>
                                 </div>
@@ -137,8 +137,8 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                            <span for="Allowances">Allowances:</span>
-                                           <input type="text" class="form-control required" id="Allowances" name="Allowances" value="<?php echo $Allowances; ?>">
+                                            <span for="Allowances">Allowances:</span><font color="Red">*</font>
+                                           <input type="text" class="form-control required" id="Allowances" name="Allowances" value="<?php echo $Allowances; ?>" pattern="[0-9]{1,4}" title="Minimum 1 digit,Maximum 4 Digit">
                                         </div>
                                     </div>
                                 </div>
@@ -151,8 +151,8 @@ if(!empty($emppay))
                                   <div class="col-md-4">
                                     <div class="form-group">
                                          <div class="form-group">
-                                           <span for="PF_Rate">PF_Rate:</span>
-                                           <input type="text" class="form-control required" id="PF_Rate" name="PF_Rate" value="<?php echo $PF_Rate; ?>">
+                                           <span for="PF_Rate">PF_Rate(%):</span><font color="Red">*</font>
+                                           <input type="text" class="form-control required" id="PF_Rate" name="PF_Rate" value="<?php echo $PF_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
                                         </div>
                                     </div>
                                 </div>
@@ -161,8 +161,8 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                     <div class="form-group">
                                         <div class="form-group">
-                                            <span for="ESI_Rate">ESI_Rate:</span>
-                                           <input type="text" class="form-control required" id="ESI_Rate" name="ESI_Rate" value="<?php echo $ESI_Rate; ?>">
+                                            <span for="ESI_Rate">ESI_Rate(%):</span><font color="Red">*</font>
+                                           <input type="text" class="form-control required" id="ESI_Rate" name="ESI_Rate" value="<?php echo $ESI_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
                                         </div>
                                     </div>
                                 </div>
@@ -170,8 +170,8 @@ if(!empty($emppay))
                                 <div class="col-md-4">
                                 <div class="form-group">
                                     <div class="form-group">
-                                        <span for ="Food_Allowances">Food Allowances:</span>
-                                         <input type="text" class="form-control" id="Food_Allowances" name="Food_Allowances" value="<?php echo $Food_Allowances; ?>">
+                                        <span for ="Food_Allowances">Food Allowances:</span><font color="Red">*</font>
+                                         <input type="text" class="form-control" id="Food_Allowances" name="Food_Allowances" value="<?php echo $Food_Allowances; ?>" pattern="[0-9]{1,4}" title="Minimum 1 digit,Maximum 4 Digit">  
                                         </div>
                                     </div>
                                 </div>
@@ -260,8 +260,7 @@ if(!empty($emppay))
           </div>
             
            </form> 
-    </section>
-</div>
+    
 <div class="col-md-4">
                 <?php
                     $this->load->helper('form');
diff --git a/application/views/editOldmonthly.php b/application/views/editOldmonthly.php
index c197140d..36dc2c88 100755
--- a/application/views/editOldmonthly.php
+++ b/application/views/editOldmonthly.php
@@ -39,8 +39,120 @@ if(!empty($monthly))
 
 
 ?>
+<script>
 
 
+
+
+function validateLOP(){
+	var x = $("#LOPDays").val();
+    
+	var ck_lopdays = /^[0-9 ]{1,2}$/;
+	if(!(ck_lopdays.test(x) && x<=31)){
+	 
+	 $("#LOPDays").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
+	 
+	 $("#LOPDays").attr("title","0 to 31 Days Only");
+	}
+else{
+	 $("#LOPDays").css({"border-style":"","border-color":"","border-width":"","background-color":""});	
+	}
+}
+
+function validateOTHRS(){
+var x = $("#OT_Hrs_Worked").val();
+    
+	var ck_lopdays = /^[0-9 ]{1,3}$/;
+	if(!(ck_lopdays.test(x) && x<=150)){
+	 
+	 $("#OT_Hrs_Worked").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
+	 $("#OT_Hrs_Worked").attr("title","Three Digits, not more then 150hrs");
+	}
+else{
+	$("#OT_Hrs_Worked").css({"border-style":"","border-color":"","border-width":"","background-color":""});	
+	}
+}
+
+function validateLR(){
+var x = $("#Loan_Recovered").val();
+    
+	var ck_lopdays = /^[0-9 ]{1,6}$/;
+	if(!(ck_lopdays.test(x) && x<=100000)){
+	 
+	$("#Loan_Recovered").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
+	 $("#Loan_Recovered").attr("title","Positive Nos Only,Maximun Six Digits");
+	}
+else{
+	$("#Loan_Recovered").css({"border-style":"","border-color":"","border-width":"","background-color":""});	
+	}
+}
+
+function validateLB(){
+var x = $("#Loan_Balance").val();
+    
+	var ck_lopdays = /^[0-9 ]{1,6}$/;
+	if(!(ck_lopdays.test(x) && x<=100000)){
+	 
+	 $("#Loan_Balance").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
+	 $("#Loan_Balance").attr("title","Positive Nos Only,Maximun Six Digitss");
+	}
+else{
+	$("#Loan_Balance").css({"border-style":"","border-color":"","border-width":"","background-color":""});	
+	}
+}
+
+
+function validateLB(){
+var x = $("#Loan_Balance").val();
+    
+	var ck_lopdays = /^[0-9 ]{1,6}$/;
+	if(!(ck_lopdays.test(x) && x<=100000)){
+	 
+	 $("#Loan_Balance").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
+	 $("#Loan_Balance").attr("title","Positive Nos Only,Maximun Six Digits");
+	}
+else{
+	$("#Loan_Balance").css({"border-style":"","border-color":"","border-width":"","background-color":""});	
+	}
+}
+
+
+function validateINC(){
+var x = $("#Incentives").val();
+    
+	var ck_lopdays = /^[0-9 ]{1,6}$/;
+	if(!(ck_lopdays.test(x))){
+	 
+	 $("#Incentives").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
+	 $("#Incentives").attr("title","Positive Nos Only,Maximun Six Digits");
+	}
+else{
+	$("#Incentives").css({"border-style":"","border-color":"","border-width":"","background-color":""});	
+	}
+}
+
+function validateODD(){
+var x = $("#Other_Deductions").val();
+    
+	var ck_lopdays = /^[0-9 ]{1,6}$/;
+	if(!(ck_lopdays.test(x))){
+	 
+	 $("#Other_Deductions").css({"border-style":"dotted","border-color":"#ff8080","border-width":"2px","background-color":"#ffe6e6"});
+	 $("#Other_Deductions").attr("title","Positive Nos Only,Maximun Six Digits");
+	}
+else{
+	$("#Other_Deductions").css({"border-style":"","border-color":"","border-width":"","background-color":""});	
+	}
+}
+
+function validateAll(){
+	
+	
+
+}
+
+</script>
+
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
@@ -96,20 +208,19 @@ if(!empty($monthly))
                                     <div class="form-group">
                                         <div class="form-group">
                                         <span for="LOP_Days">LOP Days:</span>
-                                        <input type="text" class="form-control requried" id="LOPDays" name="LOP_Days" value="<?php echo $LOP_Days; ?>">
+                                        <input type="text" class="form-control requried" id="LOPDays" onfocusout="validateLOP();" title="lopdays" name="LOP_Days" pattern="[0-9]{1,2}" value="<?php echo $LOP_Days; ?>">
                                     </div>
                                     </div>
                                 </div>
                                 
-
-
+					
                              
                                                           
                                 <div class="col-md-6">
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="OT_Hrs_Worked">OverTime Hours Worked:</span>
-                                           <input type="text" class="form-control required" id="OT_Hrs_Worked" name="OT_Hrs_Worked" value="<?php echo $OT_Hrs_Worked; ?>">
+                                           <input type="text" class="form-control required" id="OT_Hrs_Worked" name="OT_Hrs_Worked" onfocusout="validateOTHRS();" pattern="[0-9 ]{1,3}" value="<?php echo $OT_Hrs_Worked; ?>">
                                         </div>
                                     </div>
                                 </div>
@@ -124,7 +235,7 @@ if(!empty($monthly))
                                     <div class="form-group">
                                          <div class="form-group">
                                            <span for="Loan_Recovered">Loan Recovered:</span>
-                                           <input type="text" class="form-control required" id="Loan_Recovered" name="Loan_Recovered" value="<?php echo $Loan_Recovered; ?>">
+                                           <input type="text" class="form-control required" id="Loan_Recovered" name="Loan_Recovered" onfocusout="validateLR();" pattern="[0-9 ]{1,6}" value="<?php echo $Loan_Recovered; ?>">
                                         </div>
                                     </div>
                                 </div>
@@ -134,7 +245,7 @@ if(!empty($monthly))
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="Loan_Balance">Loan Balance:</span>
-                                           <input type="text" class="form-control required" id="Loan_Balance" name="Loan_Balance" value="<?php echo $Loan_Balance; ?>">
+                                           <input type="text" class="form-control required" id="Loan_Balance" name="Loan_Balance" onfocusout="validateLB();"pattern="[0-9 ]{1,6}" value="<?php echo $Loan_Balance; ?>">
                                         </div>
                                     </div>
                                 </div>
@@ -148,7 +259,7 @@ if(!empty($monthly))
                                     <div class="form-group">
                                          <div class="form-group">
                                            <span for="Incentives">Incentives:</span>
-                                           <input type="text" class="form-control required" id="Incentives" name="Incentives" value="<?php echo $Incentives; ?>">
+                                           <input type="text" class="form-control required" id="Incentives" onfocusout="validateINC();" name="Incentives" pattern="[0-9 ]{1,6}" value="<?php echo $Incentives; ?>">
                                         </div>
                                     </div>
                                 </div>
@@ -158,7 +269,7 @@ if(!empty($monthly))
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="Other_Deductions">Other Deductions:</span>
-                                           <input type="text" class="form-control required" id="Other_Deductions" name="Other_Deductions" value="<?php echo $Other_Deductions; ?>">
+                                           <input type="text" class="form-control required" id="Other_Deductions" onfocusout="validateODD();" name="Other_Deductions" pattern="[0-9 ]{1,6}" value="<?php echo $Other_Deductions; ?>">
                                         </div>
                                     </div>
                                 </div>
@@ -210,19 +321,19 @@ if(!empty($monthly))
                             </div>
                             <div id="content">
                              <div class="box-footer" style="text-align:right">
-                            <input type="submit"  class="btn btn-info" value="Submit"/>
+                            <input type="submit"  class="btn btn-info" value="Submit" onclick="validateAll();"/>
                             <input type="reset" class="btn btn-info" value="Reset" />
                         </div>
                 
                         </div>
                 </div>
+				</form> 
             </div>
         </div>
        
           </div> 
-           </form> 
-    </section>
-</div>
+           
+   
 <div class="col-md-4">
                 <?php
                     $this->load->helper('form');
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 26feb3bf..29b82fb3 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -76,6 +76,10 @@
 	<!-- fullCalendar 2.2.5-->
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.css">
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.print.css" media="print">
+	<!-- fullCalendar 2.2.5-->
+	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.css">
+	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.print.css" media="print">
+	
     <style>
     	.error{
     		color:red;
@@ -369,7 +373,7 @@
 								</li>
 								<li class="treeview">
                                   <a href="<?php echo base_url(); ?>emppayListings" >
-                                    <i class="fa fa-dashboard"></i> <span>Emploee Salary Details</span> 
+                                    <i class="fa fa-dashboard"></i> <span>Employee Salary Details</span> 
                                   </a>
                                 </li>
 								<li class="treeview">