diff --git a/application/views/reportslink.php b/application/views/reportslink.php
index 97c07f97..7179fe49 100755
--- a/application/views/reportslink.php
+++ b/application/views/reportslink.php
@@ -55,7 +55,7 @@
                     <h4><span class="fa fa-money ">&nbsp; Finance Reports  </span></h4>
                     <a href="<?php echo base_url(); ?>Report_costcenter" target="_blank"  > Cost Center <p class="uk-text uk-margin-remove"></p></a>
 
-                     <a href="<?php echo base_url(); ?>productionsalary" target="_blank"  > SalaryCostforTonProduction <p class="uk-text uk-margin-remove"></p></a>
+                     <a href="<?php echo base_url(); ?>productionsalary" target="_blank"  > Production Salary Cost <p class="uk-text uk-margin-remove"></p></a>
                 </div>
             <div class="col-xs-3">
                     <h4><span class="fa fa-inr">&nbsp; Cashbook  </span></h4>
diff --git a/application/views/salarycostforproduction.php b/application/views/salarycostforproduction.php
index 599d42f5..1d1b6708 100644
--- a/application/views/salarycostforproduction.php
+++ b/application/views/salarycostforproduction.php
@@ -1,99 +1,37 @@
-<!--  <?php
-
-		$datatablesdate = '';
-		if(!empty($productionsalary))
-{
-    foreach ($productionsalary as $psc)
-    {
-		$datatablesdate = $psc->date;
-		$date = date("d-m-Y",strtotime($datatablesdate));
-	}
-	//print_r($date);
-}
-
-//print_r($date);
-
-?> -->
-
-
-<!-- <script>
-$('#datepick').datepicker()
- if('#datepicker' = $datatablesdate){
-
-
-
- }
-
-
-
-
-
-</script> -->
-
-
-
 <script src="<?php echo base_url()?>assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
 <script src="<?php echo base_url()?>assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
 <script>
-// $( function()
-// {
-// $('#datepick').datepicker({maxDate: 'Date', dateFormat: 'dd-mm-yy' });
-// //$('#datepicker').datepicker({maxDate: 'Date', dateFormat: 'dd-mm-yy' });
-// // $('#todate').datepicker({maxDate: 'Date', dateFormat: 'dd-mm-yy' });
-// // .datepicker('setDate',new Date())
-
-
-
-
-// } );
-
-
-
-
 $(function() {
-  $('#datepick').datepicker({
-     dateFormat: "dd-mm-yy",
-    maxDate: +0,
-  });
+$('#datepick').datepicker({
+dateFormat: "dd-mm-yy",
+maxDate: +0,
+});
 });
-
 $(function() {
-  $('#datepi').datepicker({
-  maxDate: +0,
-    dateFormat: "mm-yy",
-    changeMonth: true,
-    changeYear: true,
-    showButtonPanel: false,
-     // dateFormat: 'mm-yy',
-
-        // onClose: function(dateText, inst) { 
-        //     $(this).datepicker('setDate', new Date(inst.selectedYear, inst.selectedMonth, 1));
-
-
-                onClose: function(dateText, inst) {  
-            var month = $("#ui-datepicker-div .ui-datepicker-month :selected").val(); 
-            var year = $("#ui-datepicker-div .ui-datepicker-year :selected").val(); 
-            $(this).val($.datepicker.formatDate('mm-yy', new Date(year, month, 1)));
-        }
-
-  });
-
-  $(".monthPicker").focus(function () {
-        $(".ui-datepicker-calendar").hide();
-        $("#ui-datepicker-div").position({
-            my: "center top",
-            at: "center bottom",
-            of: $(this)
-        });    
-    });
-
+$('#datepi').datepicker({
+maxDate: +0,
+dateFormat: "mm-yy",
+changeMonth: true,
+changeYear: true,
+showButtonPanel: false,
+// dateFormat: 'mm-yy',
+// onClose: function(dateText, inst) {
+//     $(this).datepicker('setDate', new Date(inst.selectedYear, inst.selectedMonth, 1));
+onClose: function(dateText, inst) {
+var month = $("#ui-datepicker-div .ui-datepicker-month :selected").val();
+var year = $("#ui-datepicker-div .ui-datepicker-year :selected").val();
+$(this).val($.datepicker.formatDate('mm-yy', new Date(year, month, 1)));
+}
+});
+$(".monthPicker").focus(function () {
+$(".ui-datepicker-calendar").hide();
+$("#ui-datepicker-div").position({
+my: "center top",
+at: "center bottom",
+of: $(this)
+});
+});
 });
-
-
-
-
-
-
 </script>
 <link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
 <style>
@@ -117,13 +55,16 @@ $(function() {
 							background-color: #3c8dbc;
 								border-color: #3c8dbc;
 							}
- /*#datepick-datepicker-calendar {
+/*#datepick-datepicker-calendar {
 					display: none;
 					} */
 					#datepi>.ui-datepi-calendar
 					{
 						display:none;
 					}
+				span .hights {
+background-color: green;
+}
 .edit{
 background-color:#eeffcc ! important;
 }
@@ -136,14 +77,14 @@ th{
 	<!-- Content Header (Page header) -->
 	<section class="content-header">
 		<h1>
-		<center> Siddharth Industries - Production Salary Cost</center>
+		<center>Siddharth Industries - Production Salary Cost</center>
 		</h1>
 	</section>
 	</br>
 	</br>
 	<section  class="content" id="loadingcontent">
 		
-		
+		<h4><span style="background-color: #FFFF00">Make sure attendance entry made  before entering data in the screen</span></h4>
 		<div class="row">
 			<div class="col-xs-12">
 				<div class="box">
@@ -157,9 +98,7 @@ th{
 							
 							
 							<div class="box-body">
-								<!--   <div class="row">
-								</div>
-								<hr> -->
+								
 								
 								
 								<div class="row">
@@ -175,7 +114,7 @@ th{
 										
 										<div class="col-md-2">
 											<label>Production/Ton</label>
-					                     <input type="text" id="pton" name="pton" class="form-control" onkeyup="cal();">
+											<input type="text" id="pton" name="pton" class="form-control" onkeyup="cal();">
 										</div>
 										
 										<div class="col-md-2">
@@ -208,320 +147,233 @@ th{
 								</div>
 								<hr>
 								<div class="row">
-
-
-
-
-                               <form method="post" id="psc" action="<?php echo base_url() ?>monthlypay/salarycost" enctype="multipart/form-data"> 
-
-									
-
-                                     <div class="col-md-2"><br>
-								
-
-									<input type="text" class="form-control monthPicker"  style="z-index: 100"  id="datepi" name="datepi" >
-									</div>
-
-
-
-
-
-
-									<div class="col-md-2"><br>
-										<input type="submit" class="btn btn-success" name="btn_submit"
-										value="View Report"   id= "btn">
+									<form method="post" id="psc" action="<?php echo base_url() ?>monthlypay/salarycost" enctype="multipart/form-data">
 										
-									</div>
+										<div class="col-md-2"><br>
+											
+											<input type="text" class="form-control monthPicker"  style="z-index: 100"  id="datepi" name="datepi" >
+										</div>
+										<div class="col-md-2"><br>
+											<input type="submit" class="btn btn-success" name="btn_submit"
+											value="View Report"   id= "btn">
+											
+										</div>
 									</form>
 								</div>
 								<hr>
-								
-								<center>
-								<small>&nbsp;
+								<!-- <div id="table"> -->
+								<center ><h5>
 								<?php
+								if($this->input->post('datepi')){
+								$date = $this->input->post('datepi');
+								$a=substr($date,0,2);
+								$monthName = date('F', mktime(0, 0, 0, $a, 10));
 								
-								if($this->input->post('month')){
-								$month = $this->input->post('month');
-								echo '('.$month.')';
+								$year=substr($date,3,6);
+								
+								echo  'Production Salary Cost'.'('.$monthName.'-'.$year.')';
 								
 								}
-								?></small>
+								?>
 								
-								<!--   </h3> -->
+								</h5>
 								</center>
-								<br/>
-								<table id="testreport" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;text-align:center;">
-									<thead style="background-color:#ddf;">
-										<tr>
-											
-											<th>SNo</th>
-											<th>Date</th>
-											<th>Production/Ton</th>
-											<th>EmployeePresent</th>
-											<th>TotalSalaryCost</th>
-											<th>SalaryCostPerTon</th>
-											<th id="act">Action</th>
-											
-											
-										</tr>
-									</thead>
-									<tbody id="databaseAppend">
-										<?php
-										if(!empty($productionsalary))
-										{
-										//print_r($productionsalary);
-										foreach($productionsalary as $key => $ps){
-										?>
-										<tr>
-											<td id="sno<?php echo $key?>"><?php echo $ps->sno ?></td>
-
-
-											<td id="datepick<?php echo $key?>"><?php
-												if($ps->date !='0000-00-00'){
-												$date = date("d-m-Y",strtotime($ps->date));
-												}else{
-												$date = '';
-												}
-												echo $date;
-												?>
-											</td>
-											
-											<!-- <td id="datepick<?php echo $key?>"><?php echo $ps->date?></td> -->
-											<td contenteditable='true' onkeyup="changeInput(<?php echo $key?>)" id="pton<?php echo $key?>"><?php echo $ps->production ?></td>
-											<td id ="today_abs<?php echo $key?>"><?php echo $ps->emppresent ?></td>
-											<td  id="today_salary<?php echo $key?>"><?php
-												echo  number_format($ps->totalsalary , 0, '.', '');
-											?></td>
-											<td id="salary<?php echo $key?>"><?php echo  number_format($ps->salaryton);?></td>
-											<!-- <td ><i class ="glyphicon glyphicon-file  id="edit<?php echo $key?>" onclick ="edit(<?php echo $key?>);"></i></td> -->
-
-
-
-											<td><button type="button" class="btn btn-default" aria-label="Left Align"  id="edit<?php echo $key?>" onclick ="edit(<?php echo $key?>);" value=""><u>Save</u>
- 
-                                           </button></td>
-											<!-- class ="glyphicon glyphicon-file"  -->
-
-										</tr>
-										<?php
-										}
-										}
-										?>
-										
-									</tbody>
-								</table>
-								<p>&nbsp;</p>
-								<hr>
 								
-								
-								
-								
-							</div>
-						</div>
-					</section>
-				</div>
-				<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
-				<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
-				<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-				<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
-				<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
-				<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
-
-
-			
-				<script>
-				$(document).ready(function() {
-				table = $('#testreport').DataTable( {
-					 
-				"dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" + 
-				"<'row'<'col-md-6'><'col-md-6'>>" +
-				"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
-				buttons: [
-				
-				{
-				extend: 'excelHtml5',
-								footer: 'true',
-								//messageTop: $('h3').text(),
-								title: $('h1').text(),
-				exportOptions: {
-				//columns: ':visible'
-				columns: ':lt(6)', orthogonal: 'export'
+								<div class="table-responsive">
+									<div id="panel-recent-invoices" class="panel panel-default">
+										<body>
+											
+											<table id="testreport" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;text-align:center;">
+												<thead style="background-color:#ddf;">
+													<tr>
+														
+														<th>SNo</th>
+														<th>Date</th>
+														<th>Production/Ton</th>
+														<th>EmployeePresent</th>
+														<th>TotalSalaryCost</th>
+														<th>SalaryCostPerTon</th>
+														<th id="act">Action</th>
+														
+														
+													</tr>
+												</thead>
+												<tbody id="databaseAppend">
+													<?php
+													if(!empty($productionsalary))
+													{
+													//print_r($productionsalary);
+													foreach($productionsalary as $key => $ps){
+													?>
+													<tr>
+														<td id="sno<?php echo $key?>"><?php echo $ps->sno ?></td>
+														<td id="datepick<?php echo $key?>"><?php
+															if($ps->date !='0000-00-00'){
+															$date = date("d-m-Y",strtotime($ps->date));
+															}else{
+															$date = '';
+															}
+															echo $date;
+															?>
+														</td>
+														
+														<!-- <td id="datepick<?php echo $key?>"><?php echo $ps->date?></td> -->
+														<td contenteditable='true' onkeyup="changeInput(<?php echo $key?>)" id="pton<?php echo $key?>"><?php echo $ps->production ?></td>
+														<td id ="today_abs<?php echo $key?>"><?php echo $ps->emppresent ?></td>
+														<td  id="today_salary<?php echo $key?>"><?php
+															echo  number_format($ps->totalsalary , 0, '.', '');
+														?></td>
+														<td id="salary<?php echo $key?>"><?php echo  number_format($ps->salaryton);?></td>
+													
+														<td><button type="button" class="btn btn-default" aria-label="Left Align"  id="edit<?php echo $key?>" onclick ="edit(<?php echo $key?>);" value=""><u>Save</u>
+															
+														</button></td>
+														<!-- class ="glyphicon glyphicon-file"  -->
+													</tr>
+													<?php
+													}
+													}
+													?>
+													
+												</tbody>
+											</table>
+										</body>
+									</div></div>
+									<p>&nbsp;</p>
+									<hr>
 									
-				}
-				},
-				'colvis'
-				]
-				} );
-				} );
-
-
-
-// 
-
-
-					function changeInput(id)
-				{
-				
-				//alert (id);
-				var first =parseFloat(document.getElementById('pton'+id).textContent);
-				//alert(first);
-				var second =parseInt(document.getElementById('today_salary'+id).textContent);
-				//alert(second);
-				var cal =second/first;
-			
-				var cals =(cal).toFixed(0);
-			
-				document.getElementById("salary"+id).innerHTML = cals;
-				}
-
-
-
-
-				$('#datepick').change(function() {
-				// var datepick = $('#emp').val();
-				var lastChoose = localStorage.getItem("lastChoose");
-				if(lastChoose === $(this).val() ) {
-					alert('Already Choosen')
-				}else {
-
-
-				localStorage.setItem("lastChoose", $(this).val() );
-				var id = $(this).val();
-				//alert(id);
-				$.ajax({
-				data:{id:id},
-				dataType: 'json',
-				type:"POST",
-				url:"<?php echo base_url();?>monthlypay/dateFunctionChangeVales",
-				success:function(json) {
-				
-				$("#today_abs").val(json.today);
-				
-				$("#today_salary").val(json.employeeSalary);
-				
-				}
-				});
-				}
-			
-				});
-
-
-//var temparr=[];
-
-
-
-// 				$('#btn').click(function() {
-
-
-// 					var da = $("#datepi").val();
-
-// 					//alert(da);
-
-// 					$.ajax({
-// 				data:{term:da},
-// 				dataType: 'json',
-// 				type:"POST",
-// 				url:"<?php echo base_url();?>monthlypay/forreport",
-// 				success:function(json) {
-				
-// 				console.log (json);
-
-
-
- 				//$("#databaseAppend").html("");
-				//$("#act").hide();
-				
-// 				json.forEach(function(obj) {
-// 				$('#databaseAppend').append('<tr>'+
-// 					    '<td>'+obj.sno+'</td>'+
-
-// 					    // var date = date('Y-m-d',strtotime($date))+
-// 					    '<td>'+obj.date+'</td>'+
-
-
-
-// // '<td contenteditable="true" onkeyup="changeInput('+obj.sno+')" id="pton'+obj.sno+'">'+obj.production+'</td>'+
-// 					    '<td>'+obj.production+'</td>'+
-// 					    '<td>'+obj.emppresent+'</td>'+
-// 					    '<td>'+obj.totalsalary+'</td>'+
-
-// 					    // '<td  id="today_salary'+obj.sno+'">'+obj.totalsalary+'</td>'+
-
-
-// 					    // '<td id="salary'+obj.sno+'">'+obj.salaryton+'</td>'+
-// 					     '<td>'+obj.salaryton+'</td>'+
-// 					    // '<td ><i class ="glyphicon glyphicon-file" id="edit'+obj.sno+'" onclick ="edit('+obj.sno+');"></i></td>'+		
-// 					    		'</tr>');		
-// 				});									-
-				
-// 				}
-
-// 					//alert( da);
-
-
-// 				});
-// 				});
-				</script>
-			
-				<script>
-				// var index="1";
-				function validate()
-				{
-					// if(!empty('#datepick'))
-					// {
-				if($('#datepick').val().length < 1)
+									
+									
+									
+								</div>
+							</div></b></div></div>
+						</section>
+					</div>
+					<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
+					<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+					<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
+					<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+					<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
+					<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
+					
+					<script>
+					$(document).ready(function() {
+					table = $('#testreport').DataTable( {
+						
+					"dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +
+					"<'row'<'col-md-6'><'col-md-6'>>" +
+					"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
+					buttons: [
+					
 					{
-						alert('Please Enter the Date');
-						$("#datepick").focus();
-						return false;
+					extend: 'excelHtml5',
+									footer: 'true',
+									//messageTop: $('h3').text(),
+									title:$('h5').text(),
+					exportOptions: {
+					//columns: ':visible'
+					columns: ':lt(6)', orthogonal: 'export'
+										
 					}
-				// }
-				if($('#pton').val().length < 1)
+					},
+					'colvis'
+					]
+					} );
+					} );
+					//
+						function changeInput(id)
 					{
-						alert('Please Enter the Production');
-						$("#pton").focus();
-						return false;
-					}
-					return true;
-				
-				}
-
-
-				function cal(){
-				var a= $("#pton").val();
-				var b= $("#today_salary").val();
-				var calc=Math.round(b/a);
-				//alert(calc);
-				$("#calc").val(calc)	;
-				}
-
-
-
-				function edit(id){
-
+					
 					//alert (id);
-				var sno =parseFloat(document.getElementById('sno'+id).textContent);
-
-				var date =document.getElementById('datepick'+id).innerText;
-				var  prod=parseFloat(document.getElementById('pton'+id).textContent);
-				var pra =parseFloat(document.getElementById('today_abs'+id).textContent);
-				var sal =parseFloat(document.getElementById('today_salary'+id).textContent);
-				var ast =parseInt(document.getElementById('salary'+id).textContent);
-				//alert(ast);
-				$.ajax({
-				data:{sno:sno,date:date,prod:prod,pra:pra,sal:sal,ast:ast},
-				type:"POST",
-				url:"<?php echo base_url() ?>monthlypay/edited",
+					var first =parseFloat(document.getElementById('pton'+id).textContent);
+					//alert(first);
+					var second =parseInt(document.getElementById('today_salary'+id).textContent);
+					//alert(second);
+					var cal =second/first;
+					
+					var cals =(cal).toFixed(0);
+					
+					document.getElementById("salary"+id).innerHTML = cals;
+					}
+					$('#datepick').change(function() {
+					// var datepick = $('#emp').val();
+					var lastChoose = localStorage.getItem("lastChoose");
+					if(lastChoose === $(this).val() ) {
+						alert('Already Choosen')
+					}else {
+					localStorage.setItem("lastChoose", $(this).val() );
+					var id = $(this).val();
+					//alert(id);
+					$.ajax({
+					data:{id:id},
+					dataType: 'json',
+					type:"POST",
+					url:"<?php echo base_url();?>monthlypay/dateFunctionChangeVales",
+					success:function(json) {
+					
+					$("#today_abs").val(json.today);
+					
+					$("#today_salary").val(json.employeeSalary);
+					
+					}
+					});
+					}
+					
+					});
 				
-				success:function(data){
-				$('#loadingcontent').loader('hide');
-				alert(data);
-				 // window.location.href="monthlypay/productionsalary";
-                window.location.reload(); 
-
-				}//success function closed
-				
-				});//ajax function closed
-				
-				}
-				</script>
\ No newline at end of file
+					</script>
+					
+					<script>
+					// var index="1";
+					function validate()
+					{
+						// if(!empty('#datepick'))
+						// {
+					if($('#datepick').val().length < 1)
+						{
+							alert('Please Enter the Date');
+							$("#datepick").focus();
+							return false;
+						}
+					// }
+					if($('#pton').val().length < 1)
+						{
+							alert('Please Enter value in Ton');
+							$("#pton").focus();
+							return false;
+						}
+						return true;
+					
+					}
+					function cal(){
+					var a= $("#pton").val();
+					var b= $("#today_salary").val();
+					var calc=Math.round(b/a);
+					//alert(calc);
+					$("#calc").val(calc);
+					}
+					function edit(id){
+						//alert (id);
+					var sno =parseFloat(document.getElementById('sno'+id).textContent);
+					var date =document.getElementById('datepick'+id).innerText;
+					var  prod=parseFloat(document.getElementById('pton'+id).textContent);
+					var pra =parseFloat(document.getElementById('today_abs'+id).textContent);
+					var sal =parseFloat(document.getElementById('today_salary'+id).textContent);
+					var ast =parseInt(document.getElementById('salary'+id).textContent);
+					//alert(ast);
+					$.ajax({
+					data:{sno:sno,date:date,prod:prod,pra:pra,sal:sal,ast:ast},
+					type:"POST",
+					url:"<?php echo base_url() ?>monthlypay/edited",
+					
+					success:function(data){
+					$('#loadingcontent').loader('hide');
+					alert(data);
+					// window.location.href="monthlypay/productionsalary";
+					window.location.reload();
+					}//success function closed
+					
+					});//ajax function closed
+					
+					}
+					</script>
\ No newline at end of file