SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'Approvalflowissuefixed'

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-07-04 14:48:53 +05:30
parent 29834d1cd4
commit 2da6b49102
3 changed files with 26 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/views/inwardgateregister.php
View File

@ -3,22 +3,14 @@
$(document).ready(function(){ $(document).ready(function(){
$("#PONO").select2(); $("#PONO").select2();
//$("#generateIGR").modal('show');
//$("#PurchaseOrderNoview").select2();
$("#InvoiceDate").datepicker({ $("#InvoiceDate").datepicker({
//minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
// $("#Inwardgateregistertable").validate({
// rules: {
// QuantityAsPerInvoice: "required"
// },
// messages: {
// QuantityAsPerInvoice: "Please specify your name"
// }
// })
}); });
</script> </script>
@ -141,7 +133,7 @@
<div class="col-md-3"> <div class="col-md-3">
<label>Vechicle NO</label> <label>Vechicle NO</label>
<?php <?php
$data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'),'pattern=>"^[A-Z]{2}\s[0-9]{2}\s[A-Z]{2}\s[0-9]{4}$"','id'=>'VehicleNo', 'class' => 'form-control num', 'required'=>'true','onchange'=>'validate_Vechicle();' ); $data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'),'pattern=>"^[A-Z]{2}\s[0-9]{2}\s[A-Z]{2}\s[0-9]{4}$"','id'=>'VehicleNo', 'class' => 'form-control', 'required'=>'true','onchange'=>'validate_Vechicle();' );
echo form_input($data); echo form_input($data);
?> ?>
<span pattern="" required="true"></span> <span pattern="" required="true"></span>
@ -149,7 +141,7 @@
<div class="col-md-3"> <div class="col-md-3">
<label>Courier NO</label> <label>Courier NO</label>
<?php <?php
$data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo', 'class' => 'form-control num', 'required'=>'true' ); $data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo', 'class' => 'form-control', 'required'=>'true' );
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>

45
application/views/poapproval_view.php
View File

@ -79,35 +79,26 @@ if(empty($Status))
echo $CreatedDate; echo $CreatedDate;
?></td> ?></td>
<td><?php echo $record->StatusName ?></td> <td><?php echo $record->StatusName ?></td>
<?php <td><?php if($record->StatusCode == PO_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED ){ ?>
if($record->StatusName == 'PO APPROVED' or $record->StatusName == 'PO RELEASED')
{
?>
<td>
<!-- <select disabled name="selectId" id="selectId" title="You Can't Select Here">
<option value="-1" >Select Option</option>
<option value="1">Approve</option>
<option value="2">OnHold</option>
</select> --> <center>-</center>
</td>
<?php
}elseif($record->StatusName == 'ON HOLD' or $record->StatusName == 'PO CREATED' or $record->StatusName == 'EMERGENCY PO' or $record->StatusName == 'AMENDMENT PO' or $record->StatusName == 'AWAITING RELEASE'){
?>
<td>
<select name="selectId" id="selectId" title="Select Your Option" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index ; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');"> <select name="selectId" id="selectId" title="Select Your Option" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index ; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');">
<option value="-1" >Select Option</option> <option value="-1" >Select Option</option>
<option value="1">Approve</option> <option value="1">Approve</option>
<option value="2">OnHold</option> <option value="2">OnHold</option>
</select> </select>
</td>
<?php }?> <?php }
else
{
?>
-
<?php } ?>
</td>
<td contenteditable="true" id="remarks<?php echo $index ; ?>"> <?php <td contenteditable="true" id="remarks<?php echo $index ; ?>"> <?php
@ -138,8 +129,8 @@ if(empty($Status))
var curtremarks = curtremarks.trim(); var curtremarks = curtremarks.trim();
//var lower = str.toLowerCase(); //var lower = str.toLowerCase();
alert("already"+Remark); //alert("already"+Remark);
alert("Current"+curtremarks); //alert("Current"+curtremarks);
//var curtremarks="CUR" //var curtremarks="CUR"
var PO=PONO; var PO=PONO;
//var val=value; //var val=value;
@ -148,16 +139,16 @@ if(empty($Status))
if((curtremarks == '<br>' || curtremarks == '') && Remark == ''){ if((curtremarks == '<br>' || curtremarks == '') && Remark == ''){
Remarks=''; Remarks='';
alert("To Store both empty" + Remarks) //alert("To Store both empty" + Remarks)
} }
else if(curtremarks == '<br>') else if(curtremarks == '<br>')
{ {
Remarks=Remark; Remarks=Remark;
alert("To Store current empty" + Remarks) //alert("To Store current empty" + Remarks)
} }
else{ else{
Remarks=Remark+"||"+curtremarks; Remarks=Remark+"||"+curtremarks;
alert("To Store both" + Remarks) //alert("To Store both" + Remarks)
} }
//alert(Remarks); //alert(Remarks);
var StatusCode=''; var StatusCode='';

6
application/views/porelease_view.php
View File

@ -129,16 +129,16 @@ if(empty($Status))
if(curtremarks == '<br>' && Remark == ''){ if(curtremarks == '<br>' && Remark == ''){
Remarks=''; Remarks='';
alert("To Store both empty" + Remarks) //alert("To Store both empty" + Remarks)
} }
else if(curtremarks == '<br>') else if(curtremarks == '<br>')
{ {
Remarks=Remark; Remarks=Remark;
alert("To Store current empty" + Remarks) //alert("To Store current empty" + Remarks)
} }
else{ else{
Remarks=Remark+"||"+curtremarks; Remarks=Remark+"||"+curtremarks;
alert("To Store both hahve" + Remarks) //alert("To Store both hahve" + Remarks)
} }
//alert(PO+"-"+Status+"-"+StatusCode); //alert(PO+"-"+Status+"-"+StatusCode);
if(Status != '-1'){ if(Status != '-1'){