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

BATCHCARD ISSUES RESLOVED

Browse Source
This commit is contained in:
velz2020 2018-02-07 11:56:21 +05:30
parent d6c244988d
commit 4ee430c9ba
5 changed files with 253 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/dailyBatchCardListing.php
View File

@ -279,7 +279,7 @@ td{ padding:3px;}
<th colspan="3">Diesel for Bull</th>
<th colspan="3">Diesel for Rotary Dryer</th>
<th colspan="3">Power Consumption</th>
<th colspan="3">No Of Persion Worked</th>
<th colspan="3">No Of Person Worked</th>
<th colspan="4">Maintenance Details</th>
<th colspan="3">Time Taken for Maintenance</th>
<th rowspan="2">Worked Done By</th>

64
application/views/dailybatchcard.php
View File

@ -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();" />
<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');?>" />
</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();" />
<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');?>" />
</div>
<div class="col-md-3">
@ -421,8 +421,6 @@ $('#rdate').datepicker({
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$('#maintenance_time_from').timeEntry({show24Hours: true});
$('#maintenance_time_to').timeEntry({show24Hours: true});
$('#total_burner_running_time').timeEntry({show24Hours: true});
$('#total_feeding_hrs').timeEntry({show24Hours: true});
@ -526,17 +524,67 @@ var start = $('#maintenance_time_from').val();
var stop = $('#maintenance_time_to').val();
//alert(start+'-'+stop);
if(start != '' && stop != '')
{
if(start.length != 5 || stop.length != 5)
{
alert('Please Enter Time in 24 Hrs Format.If time is 9:25,Feed like 09:25');
document.getElementById('maintenance_time_from').value = '';
document.getElementById('maintenance_time_to').value = '';
setTimeout(function(){
$('#maintenance_time_from').focus();},0
);
return false;
}
var atime = '';
start = start.split(":");
stop = stop.split(":");
//console.log(stop);
if(isNaN(start[0]) || isNaN(start[1]) )
{
alert("please Enter Valid Time");
document.getElementById('maintenance_time_from').value = '';
setTimeout(function(){
$('#maintenance_time_from').focus();},0
);
return false;
}
if(isNaN(stop[0]) || isNaN(stop[1]))
{
alert("please Enter Valid Time");
document.getElementById('maintenance_time_to').value = '';
setTimeout(function(){
$('#maintenance_time_to').focus();},0
);
return false;
}
if((start[0] > stop[0]))
{
alert('Enter Valid Time');
document.getElementById('maintenance_time_to').value = start;
document.getElementById('maintenance_time_to').value = '';
setTimeout(function(){
$('#maintenance_time_to').focus();},0
);
return false;
}
if((start[1] > stop[1]))
{
alert('Enter Valid Time');
document.getElementById('maintenance_time_to').value = '';
setTimeout(function(){
$('#maintenance_time_to').focus();},0
);
return false;
}
@ -560,8 +608,8 @@ if(start != '' && stop != '')
//console.log(atime);
$('#maintenance_total_hrs').val((atime));
}
}
</script>

66
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;?>"/>
<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');?>" />
</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;?>"/>
<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');?>" />
</div>
<div class="col-md-3">
@ -430,8 +430,6 @@ $('#rdate').datepicker({
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$('#maintenance_time_from').timeEntry({show24Hours: true});
$('#maintenance_time_to').timeEntry({show24Hours: true});
$('#total_burner_running_time').timeEntry({show24Hours: true});
$('#total_feeding_hrs').timeEntry({show24Hours: true});
$('#approvedby').val('<?php echo $dailydata[0]->approvedby?>') ;
@ -527,24 +525,74 @@ function keyValidate(e)
}
function calculateTime()
function calculateTime()
{
var start = $('#maintenance_time_from').val();
var stop = $('#maintenance_time_to').val();
//alert(start+'-'+stop);
if(start != '' && stop != '')
{
if(start.length != 5 || stop.length != 5)
{
alert('Please Enter Time in 24 Hrs Format.If time is 9:25,Feed like 09:25');
document.getElementById('maintenance_time_from').value = '';
document.getElementById('maintenance_time_to').value = '';
setTimeout(function(){
$('#maintenance_time_from').focus();},0
);
return false;
}
var atime = '';
start = start.split(":");
stop = stop.split(":");
//console.log(stop);
if(isNaN(start[0]) || isNaN(start[1]) )
{
alert("please Enter Valid Time");
document.getElementById('maintenance_time_from').value = '';
setTimeout(function(){
$('#maintenance_time_from').focus();},0
);
return false;
}
if(isNaN(stop[0]) || isNaN(stop[1]))
{
alert("please Enter Valid Time");
document.getElementById('maintenance_time_to').value = '';
setTimeout(function(){
$('#maintenance_time_to').focus();},0
);
return false;
}
if((start[0] > stop[0]))
{
alert('Enter Valid Time');
document.getElementById('maintenance_time_to').value = start;
document.getElementById('maintenance_time_to').value = '';
setTimeout(function(){
$('#maintenance_time_to').focus();},0
);
return false;
}
if((start[1] > stop[1]))
{
alert('Enter Valid Time');
document.getElementById('maintenance_time_to').value = '';
setTimeout(function(){
$('#maintenance_time_to').focus();},0
);
return false;
}
@ -568,8 +616,8 @@ if(start != '' && stop != '')
//console.log(atime);
$('#maintenance_total_hrs').val((atime));
}
}
</script>

116
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();">
<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');?>">
</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();">
<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');?>">
</div>
<div class="col-md-2">
@ -198,30 +198,10 @@ foreach($emplist as $r)
<script>
$(document).ready(function(){
$('#curdate').datepicker({
//minDate : 'year+16',
maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
//$('#usr_time').val('sdkjjdskbk');
// $('#usr_time').timepicker({
// timeFormat: 'h:mm p',
// interval: 30,
// // minTime: '10',
// //maxTime: '6:00pm',
// //defaultTime: '11',
// //startTime: '10:00',
// dynamic: false,
// dropdown: true,
// scrollbar: true
// });
$('#usr_time').timeEntry({show24Hours: true});
$('#auto_start').timeEntry({show24Hours: true});
$('#auto_stop').timeEntry({show24Hours: true});
$('#approvedby').val('<?php echo $batchdata[0]->approvedby;?>')
@ -343,35 +323,6 @@ $('#myForm').submit();
}
function checkExist()
{
//alert();
var bdate = $('#curdate').val();
var btime = $('#usr_time').val();
//var j = 0;
if(bdate != '' && btime != '')
{
$('#save').show();
$('.content').loader('show');
$.ajax({
data:{param1:bdate,param2:btime},
type:"POST",
url:"<?php echo base_url()?>batchcard/checkExistHour",
success:function(data)
{
if(data){
alert(data);
$('#save').hide();
//return j;
}
$('.content').loader('hide');
}
});
}
}
function calculateTime()
@ -381,17 +332,76 @@ var start = $('#auto_start').val();
var stop = $('#auto_stop').val();
//alert(start+'-'+stop);
if(start != '' && stop != '')
{
if(start.length != 5)
{
alert('Please Enter Time in 24 Hrs Format.If time is 9:25,Feed like 09:25');
document.getElementById('auto_start').value="";
setTimeout(function(){
$('#auto_start').focus();},0
);
return false;
}
if(stop.length != 5)
{
alert('Please Enter Time in 24 Hrs Format.If time is 9:25,Feed like 09:25');
document.getElementById('auto_stop').value="";
setTimeout(function(){
$('#auto_stop').focus();},0
);
return false;
}
var atime = '';
start = start.split(":");
stop = stop.split(":");
//console.log(stop);
if(isNaN(start[0]) || isNaN(start[1]) )
{
alert("please Enter Valid Time");
document.getElementById('auto_start').value = '';
setTimeout(function(){
$('#auto_start').focus();},0
);
return false;
}
if(isNaN(stop[0]) || isNaN(stop[1]))
{
alert("please Enter Valid Time");
document.getElementById('auto_stop').value = '';
setTimeout(function(){
$('#auto_stop').focus();},0
);
return false;
}
if((start[0] > stop[0]))
{
alert('Enter Valid Time');
document.getElementById('auto_stop').value = start;
document.getElementById('auto_stop').value = '';
setTimeout(function(){
$('#auto_stop').focus();},0
);
return false;
}
if((start[1] > stop[1]))
{
alert('Enter Valid Time');
document.getElementById('auto_stop').value = '';
setTimeout(function(){
$('#auto_stop').focus();},0
);
return false;
}

94
application/views/hourly_batch_card.php
View File

@ -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;" onkeypress=" return keyValidate(event);" onchange="calculateTime();">
<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');?>">
</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;" onkeypress="return keyValidate(event);" onchange="calculateTime();">
<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');?>">
</div>
<div class="col-md-2">
@ -204,22 +204,10 @@ $(document).ready(function(){
});
//$('#usr_time').val('sdkjjdskbk');
// $('#usr_time').timepicker({
// timeFormat: 'h:mm p',
// interval: 30,
// // minTime: '10',
// //maxTime: '6:00pm',
// //defaultTime: '11',
// //startTime: '10:00',
// dynamic: false,
// dropdown: true,
// scrollbar: true
// });
$('#usr_time').timeEntry({show24Hours: true});
$('#auto_start').timeEntry({show24Hours: true});
$('#auto_stop').timeEntry({show24Hours: true});
@ -372,17 +360,87 @@ var start = $('#auto_start').val();
var stop = $('#auto_stop').val();
//alert(start+'-'+stop);
if(start != '' && stop != '')
{
if(start.length != 5){
alert('Please Enter Time in 24 Hrs Format.If time is 9:25,Feed like 09:25');
document.getElementById('auto_start').value="";
setTimeout(function(){
$('#auto_start').focus();},0
);
return false;
}
if(stop.length != 5){
alert('Please Enter Time in 24 Hrs Format.If time is 9:25,Feed like 09:25');
document.getElementById('auto_stop').value="";
setTimeout(function(){
$('#auto_stop').focus();},0
);
return false;
}
var atime = '';
start = start.split(":");
stop = stop.split(":");
//console.log(stop);
if(isNaN(start[0]) || isNaN(start[1]) )
{
alert("please Enter Valid Time");
document.getElementById('auto_start').value = '';
setTimeout(function(){
$('#auto_start').focus();},0
);
return false;
}
if(isNaN(stop[0]))
{
alert("please Enter Valid Time");
document.getElementById('auto_stop').value = '';
setTimeout(function(){
$('#auto_stop').focus();},0
);
return false;
}
if(isNaN(start[0]))
{
alert("please Enter Valid Time");
document.getElementById('auto_start').value = '';
setTimeout(function(){
$('#auto_start').focus();},0
);
return false;
}
if((start[0] > stop[0]))
{
alert('Enter Valid Time');
document.getElementById('auto_stop').value = start;
document.getElementById('auto_stop').value = '';
setTimeout(function(){
$('#auto_stop').focus();},0
);
return false;
}
if((start[1] > stop[1]))
{
alert('Enter Valid Time');
document.getElementById('auto_stop').value = '';
setTimeout(function(){
$('#auto_stop').focus();},0
);
return false;
}