From ce44c0bd7530a8898d1aadbc67fb6dcd42ac3651 Mon Sep 17 00:00:00 2001
From: venbatechnologies <venbatechnologies@gmail.com>
Date: Mon, 30 Apr 2018 18:18:33 +0530
Subject: [PATCH] EDIT PDF Resinbatch card

---
 application/views/editresinbatchcard.php | 64 +++++++++++++++++-------
 application/views/newresinbatchcard.php  | 51 +++++++++++++------
 2 files changed, 83 insertions(+), 32 deletions(-)

diff --git a/application/views/editresinbatchcard.php b/application/views/editresinbatchcard.php
index 602557c9..4defa1df 100644
--- a/application/views/editresinbatchcard.php
+++ b/application/views/editresinbatchcard.php
@@ -1029,21 +1029,47 @@ console.log(listopsforstore+'-'+oldops);
   var productid = $('#product').val();
   var customerid = $('#customer').val();
   var batchdate =  $('#batchdate').val(); 
+
+
+   if(batchdate =='')
+   {
+	     alert("Please Enter Batchdate");
+	     return false;
+   }
+
   var plantname =  $('#plantname').val();
+   if(plantname =='')
+   {
+	     alert("Please Enter Shiftname");
+	     return false;
+   }
   var machines =  $('#machines').val();
+     if(machines == -1)
+   {
+	     alert("Please Select  Machines");
+	     return false;
+   }
+
+
   var trpbatchcardno =  $('#trpbatchnos').val();
+
+      if(trpbatchcardno == -1)
+   {
+	     alert("Please Select Trpbatchcardno");
+	     return false;
+   }
+
   var igrnos =  $('#igrnos').val();
   var igrlinenos =  $('#igrlinenos').val();
       if(igrnos == -1 && igrlinenos == -1 )
    {
 	   igrnos = "";
-	   igrlinenos="";
-   }
+	      }
 
     if(igrnos != -1 && igrlinenos == -1 )
    {
-	     alert("Please Select Freshsandlineno");
-	     return false;
+	     igrlinenos="";
+
    }
 
   var remarks = $('#remarks').val();
@@ -1059,12 +1085,13 @@ console.log(listopsforstore+'-'+oldops);
    {
 	    Resinigrnos = "";
 	    Resinigrlinenos="";
+	    
    }
    if(Resinigrnos != -1 &&  Resinigrlinenos == -1 )
    {
-	   alert("Please Select Resinigrlinenos");
-	   return false;
+	  Resinigrlinenos="";
    }
+
   var Hexamineigrnos =  $('#Hexamineigrnos').val();
   var Hexamineigrlinenos =  $('#Hexamineigrlinenos').val();
 
@@ -1072,11 +1099,11 @@ console.log(listopsforstore+'-'+oldops);
    {
 	  Hexamineigrnos = "";
 	   Hexamineigrlinenos="";
+	  
    }
    if(Hexamineigrnos != -1 && Hexamineigrlinenos == -1 )
    {
-	 alert("Please Select Hexamineigrlinenos");
-	 return false;
+	  Hexamineigrlinenos="";
    }
 
 
@@ -1091,8 +1118,7 @@ console.log(listopsforstore+'-'+oldops);
 
    if(CSigrnos != -1 && CSigrlinenos == -1 )
    {
-	  alert("Please Select CSigrlinenos");
-	  return false;
+	   CSigrlinenos="";
    }
 
 
@@ -1107,8 +1133,7 @@ console.log(listopsforstore+'-'+oldops);
 
    if(Catalystigrnos != -1 && Catalystigrlinenos == -1 )
    {
-	 alert("Please Select Catalystigrlinenos");
-	 return false;
+	  Catalystigrlinenos="";
    }
 
   
@@ -1124,8 +1149,7 @@ console.log(listopsforstore+'-'+oldops);
 
    if(bagsigrnos  != -1 && bagsigrlinenos  == -1 )
    {
-	alert("Please Select  bagsigrlinenos");
-	return false;
+	bagsigrlinenos="";
    }
    var tonigrnos =  $('#tonigrnos').val();
    var tonigrlinenos =  $('#tonigrlinenos').val();
@@ -1137,10 +1161,16 @@ console.log(listopsforstore+'-'+oldops);
    }
    if(tonigrnos != -1 && tonigrlinenos  == -1 )
    {
-	alert("Please Select  tonigrlinenos");
-	return false;
+	tonigrlinenos="";
    }
    var resinname =$('#resinname').val();
+
+
+     if(resinname  =='')
+   {
+	     alert("Please Enter Resinname ");
+	     return false;
+   }
   
   if(approvedby == -1 || listopsforstore.length == 0 || operatedby == -1)
   {
@@ -1286,7 +1316,7 @@ console.log(listopsforstore+'-'+oldops);
 					//opstoinsert.push(val);
 					locali++;
 				}
-			});
+			}); 
 		   if(locali != 0)
 		   {
 			   opstoinsert.push(val);
diff --git a/application/views/newresinbatchcard.php b/application/views/newresinbatchcard.php
index e4de7bb3..51a3831b 100644
--- a/application/views/newresinbatchcard.php
+++ b/application/views/newresinbatchcard.php
@@ -1182,10 +1182,39 @@ listopsforstore = [];
   var productid = $('#product').val();
   var customerid = $('#customer').val();
   var batchdate =  $('#batchdate').val(); 
+    if(batchdate =='')
+   {
+	     alert("Please Enter Batchdate");
+	     return false;
+   }
   var plantname =  $('#plantname').val();
+     if(plantname =='')
+   {
+	     alert("Please Enter Shiftname");
+	     return false;
+   }
   var resinname =  $('#resinname').val();
+  
+     if(resinname  =='')
+   {
+	     alert("Please Enter Resinname ");
+	     return false;
+   }
+  
+
   var macinecode =  $('#machines').val();
+   if(macinecode  == -1)
+   {
+	     alert("Please Select  Machines");
+	     return false;
+   }
   var trpbatchcard =  $('#trpbatchnos').val();
+
+        if(trpbatchcard  == -1)
+   {
+	     alert("Please Select Trpbatchcardno");
+	     return false;
+   }
   var igrnos =  $('#igrnos').val();
   var igrlinenos =  $('#igrlinenos').val();
    if(igrnos == -1 && igrlinenos == -1 )
@@ -1195,8 +1224,7 @@ listopsforstore = [];
    }
    if(igrnos != -1 && igrlinenos == -1 )
    {
-     alert('Please select  Igrlinenos');
-     return false;
+    igrlinenos = "";
    }
 
   var Resinigrnos =  $('#Resinigrnos').val();
@@ -1208,8 +1236,7 @@ listopsforstore = [];
    }
     if(Resinigrnos != -1 && Resinigrlinenos== -1 )
    {
-   	  alert('Please select  Resinigrlinenos');
-   	  return false;
+   	    Resinigrlinenos = "";
    }
 
   var Hexamineigrnos =  $('#Hexamineigrnos').val();
@@ -1222,8 +1249,7 @@ listopsforstore = [];
    }
     if(Hexamineigrnos != -1 && Hexamineigrlinenos == -1 )
    {
-     alert('Please select Hexamineigrlinenos');
-     return false;
+     Hexamineigrlinenos  = "";
    }
 
 
@@ -1238,8 +1264,7 @@ listopsforstore = [];
    }
     if(CSigrnos != -1 && CSigrlinenos == -1 )
    {
-	  alert('Please select CSigrlinenos');
-	  return false;
+	  CSigrlinenos = "";
    }
 
   var Catalystigrnos =  $('#Catalystigrnos').val();
@@ -1252,8 +1277,7 @@ listopsforstore = [];
    }
     if(Catalystigrnos != -1 && Catalystigrlinenos== -1 )
    {
-	    alert('Please select Catalystigrlinenos');
-	    return false;
+	 Catalystigrlinenos = "";
       
    }
 
@@ -1269,8 +1293,7 @@ listopsforstore = [];
    }
    if(bagsigrnos != -1 && bagsigrlinenos== -1 )
    {
-      alert('Please select  bagsigrlinenos ');
-      return false;
+         bagsigrlinenos = "";
    }
   var tonigrnos =  $('#tonigrnos').val();
   var tonigrlinenos =  $('#tonigrlinenos').val();
@@ -1281,9 +1304,7 @@ listopsforstore = [];
    }
     if(tonigrnos!= -1 && tonigrlinenos== -1 )
    {
-	   alert('Please select tonigrlinenos ');
-	   return false;
-   }
+	     tonigrlinenos = "";   }