SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BATCH CARD ISSUES FIXED

Browse Source
This commit is contained in:
velz2020 2018-02-08 15:58:50 +05:30
parent b7184f7a66
commit 3d3b55c679
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/batchcard.php
View File

@ -406,6 +406,9 @@ class batchcard extends BaseController
$this->excel->getActiveSheet()->setCellValue('J' . (string)($i),$row['Physical Stock']);
$this->excel->getActiveSheet()->getStyle('J'.(string)($i))->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
$this->excel->getActiveSheet()->setCellValue('K' . (string)($i),$row['Difference']);
$this->excel->getActiveSheet()->getStyle('K'.(string)($i))->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
//$this->excel->getActiveSheet()->setCellValue('A6','HI');

10
application/views/dailybatchcard.php
View File

@ -76,7 +76,7 @@ foreach($emplist as $r)
<div class="col-md-3">
<label>Less Break down hours</label>
<input type="text" id="less_break_down_hrs" name="less_break_down_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);"/>
<input type="text" id="less_break_down_hrs" name="less_break_down_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" title="Enter 24 Hrs Format"/>
</div>
<div class="col-md-3">
@ -330,12 +330,12 @@ foreach($emplist as $r)
<legend>Time Taken for Maintenance</legend>
<div class="col-md-3">
<label>From</label>
<input type="text" id="maintenance_time_from" name="maintenance_time_from" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>" />
<input type="text" id="maintenance_time_from" name="maintenance_time_from" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format"/>
</div>
<div class="col-md-3">
<label>To</label>
<input type="text" id="maintenance_time_to" name="maintenance_time_to" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>" />
<input type="text" id="maintenance_time_to" name="maintenance_time_to" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format"/>
</div>
<div class="col-md-3">
@ -421,8 +421,8 @@ $('#rdate').datepicker({
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$('#total_burner_running_time').timeEntry({show24Hours: true});
$('#total_feeding_hrs').timeEntry({show24Hours: true});
// $('#total_burner_running_time').timeEntry({show24Hours: true});
// $('#total_feeding_hrs').timeEntry({show24Hours: true});

8
application/views/editDailyData.php
View File

@ -339,12 +339,12 @@ foreach($emplist as $r)
<legend>Time Taken for Maintenance</legend>
<div class="col-md-3">
<label>From</label>
<input type="text" id="maintenance_time_from" name="maintenance_time_from" class="form-control" style="text-align:right;" onchange="calculateTime();" value="<?php echo $dailydata[0]->maintenance_from_hrs;?>" placeholder="<?php echo date('h:i');?>" />
<input type="text" id="maintenance_time_from" name="maintenance_time_from" class="form-control" style="text-align:right;" onchange="calculateTime();" value="<?php echo $dailydata[0]->maintenance_from_hrs;?>" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format"/>
</div>
<div class="col-md-3">
<label>To</label>
<input type="text" id="maintenance_time_to" name="maintenance_time_to" class="form-control" style="text-align:right;" onchange="calculateTime();" value="<?php echo $dailydata[0]->maintenance_to_hrs;?>" placeholder="<?php echo date('h:i');?>" />
<input type="text" id="maintenance_time_to" name="maintenance_time_to" class="form-control" style="text-align:right;" onchange="calculateTime();" value="<?php echo $dailydata[0]->maintenance_to_hrs;?>" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format"/>
</div>
<div class="col-md-3">
@ -430,8 +430,8 @@ $('#rdate').datepicker({
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$('#total_burner_running_time').timeEntry({show24Hours: true});
$('#total_feeding_hrs').timeEntry({show24Hours: true});
//$('#total_burner_running_time').timeEntry({show24Hours: true});
//$('#total_feeding_hrs').timeEntry({show24Hours: true});
$('#approvedby').val('<?php echo $dailydata[0]->approvedby?>') ;

4
application/views/edit_hourly_batch_card.php
View File

@ -77,12 +77,12 @@ foreach($emplist as $r)
<div class="row">
<div class="col-md-2">
<label>Auto Start</label>
<input type="text" id="auto_start" value="<?php echo $batchdata[0]->auto_start?>" name="myData[auto_start]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>">
<input type="text" id="auto_start" value="<?php echo $batchdata[0]->auto_start?>" name="myData[auto_start]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format">
</div>
<div class="col-md-2">
<label>Auto Stop</label>
<input type="text" id="auto_stop" value="<?php echo $batchdata[0]->auto_stop?>" name="myData[auto_stop]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>">
<input type="text" id="auto_stop" value="<?php echo $batchdata[0]->auto_stop?>" name="myData[auto_stop]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format">
</div>
<div class="col-md-2">

6
application/views/hourly_batch_card.php
View File

@ -50,7 +50,7 @@ foreach($emplist as $r)
<div class="col-md-2">
<label>Batch Time</label></br>
<input type="text" name="myData[usr_time]" id="usr_time" class="form-control" style="text-align:right;" onblur="checkExist();">
<input type="text" name="myData[usr_time]" id="usr_time" class="form-control" style="text-align:right;" onblur="checkExist();" title="Enter 24 Hrs Format">
</div>
<div class="col-md-2">
@ -75,12 +75,12 @@ foreach($emplist as $r)
<div class="row">
<div class="col-md-2">
<label>Auto Start</label>
<input type="text" id="auto_start" name="myData[auto_start]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>">
<input type="text" id="auto_start" name="myData[auto_start]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format">
</div>
<div class="col-md-2">
<label>Auto Stop</label>
<input type="text" id="auto_stop" name="myData[auto_stop]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>">
<input type="text" id="auto_stop" name="myData[auto_stop]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format">
</div>
<div class="col-md-2">