From 2da6b49102c0d6ccc4b097c89e5276b3f8347ba4 Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Tue, 4 Jul 2017 14:48:53 +0530
Subject: [PATCH] 'Approvalflowissuefixed'

---
 application/views/inwardgateregister.php | 18 +++-------
 application/views/poapproval_view.php    | 45 ++++++++++--------------
 application/views/porelease_view.php     |  6 ++--
 3 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/application/views/inwardgateregister.php b/application/views/inwardgateregister.php
index 2cc829d9..153ea631 100755
--- a/application/views/inwardgateregister.php
+++ b/application/views/inwardgateregister.php
@@ -3,22 +3,14 @@
  $(document).ready(function(){
  
         $("#PONO").select2();
-    	//$("#generateIGR").modal('show');
-		//$("#PurchaseOrderNoview").select2();
+    	
 		
         $("#InvoiceDate").datepicker({
-            //minDate : d,
+          
             maxDate : 'now',
             dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
         });
-    //     $("#Inwardgateregistertable").validate({
-    //     rules: {
-    //         QuantityAsPerInvoice: "required"
-    //     },
-    //     messages: {
-    //         QuantityAsPerInvoice: "Please specify your name"
-    //     }
-    // })
+   
    });
    
 </script>
@@ -141,7 +133,7 @@
 			<div class="col-md-3">
 			<label>Vechicle NO</label>
 			<?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);
 				?>
 				<span pattern="" required="true"></span>
@@ -149,7 +141,7 @@
 			<div class="col-md-3">
 			<label>Courier NO</label>
 			<?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);
 				?>
 			</div>								
diff --git a/application/views/poapproval_view.php b/application/views/poapproval_view.php
index e5a6af58..888ca888 100755
--- a/application/views/poapproval_view.php
+++ b/application/views/poapproval_view.php
@@ -79,35 +79,26 @@ if(empty($Status))
 						echo  $CreatedDate;
 						?></td>
 						<td><?php echo $record->StatusName ?></td>
-						<?php 
-						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>
+						<td><?php  if($record->StatusCode == PO_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED  ){					?>						
 					
 					<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">Approve</option>
         				        <option value="2">OnHold</option>
 						    </select>
-							</td> 
+							
 						
-						<?php }?>
+						<?php }
+						else
+						{ 					
+						?>
+						
+						-
+						
+						<?php }	?>
+						</td>  
+					
+					
 						     <td contenteditable="true" id="remarks<?php echo $index ; ?>"> <?php 
 							 
 							 
@@ -138,8 +129,8 @@ if(empty($Status))
 		var curtremarks = curtremarks.trim();
 		//var lower = str.toLowerCase();
 		
-		alert("already"+Remark);
-		alert("Current"+curtremarks);
+		//alert("already"+Remark);
+		//alert("Current"+curtremarks);
 		//var curtremarks="CUR"
 		var PO=PONO;
 		//var val=value;
@@ -148,16 +139,16 @@ if(empty($Status))
 		
 		if((curtremarks == '<br>' || curtremarks == '')  && Remark == ''){
 			Remarks='';
-			alert("To Store both empty" + Remarks)
+			//alert("To Store both empty" + Remarks)
 		}
 		else if(curtremarks == '<br>')
 		{
 		Remarks=Remark;
-		alert("To Store current empty" + Remarks)
+		//alert("To Store current empty" + Remarks)
 		}
 		else{
 		Remarks=Remark+"||"+curtremarks;
-		alert("To Store both" + Remarks)
+		//alert("To Store both" + Remarks)
 		}
 		//alert(Remarks);
 		var StatusCode='';
diff --git a/application/views/porelease_view.php b/application/views/porelease_view.php
index 9db14efc..684926f7 100755
--- a/application/views/porelease_view.php
+++ b/application/views/porelease_view.php
@@ -129,16 +129,16 @@ if(empty($Status))
 		
 		if(curtremarks == '<br>' && Remark == ''){
 			Remarks='';
-			alert("To Store both empty" + Remarks)
+			//alert("To Store both empty" + Remarks)
 		}
 		else if(curtremarks == '<br>')
 		{
 		Remarks=Remark;
-		alert("To Store current empty" + Remarks)
+		//alert("To Store current empty" + Remarks)
 		}
 		else{
 		Remarks=Remark+"||"+curtremarks;
-		alert("To Store both hahve" + Remarks)
+		//alert("To Store both hahve" + Remarks)
 		}
 		//alert(PO+"-"+Status+"-"+StatusCode);
 		if(Status != '-1'){