From c12bee54c4484a9374f68678e7bfc02e3a490f5d Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Wed, 12 Apr 2017 23:13:10 +0530
Subject: [PATCH] Material Master and Supplier list issue fixed

---
 application/views/addemployee.php     |  2 +-
 application/views/addsupplier.php     | 16 +++++++--------
 application/views/editEmployee.php    |  2 +-
 application/views/editSupplier.php    | 14 +++++++-------
 application/views/supplierListing.php | 28 ++++++++++++++++++---------
 5 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/application/views/addemployee.php b/application/views/addemployee.php
index 0d997f07..b4bc5bf4 100644
--- a/application/views/addemployee.php
+++ b/application/views/addemployee.php
@@ -489,7 +489,7 @@ function onlyAlphabets(evt) {
               <input type="text" id="accountno" onkeypress="return event.charCode >= 48 && event.charCode <= 57" maxlength="20"  name="accountno" class="form-control">
             </div>
             <div class="col-md-3"><span>IFSC Code</span> 
-              <input type="text" id="ifsccode" name="ifsccode" maxlength="10" class="form-control">
+              <input type="text" id="ifsccode" name="ifsccode" maxlength="12" class="form-control">
             </div>
             <div class="col-md-3"><span>Bank Branch Name</span> 
               <input type="text" id="bankbranchname" maxlength="200" name="bankbranchname"  class="form-control">
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php
index c5ce51c0..203abd68 100644
--- a/application/views/addsupplier.php
+++ b/application/views/addsupplier.php
@@ -222,12 +222,12 @@ function onlyAlphabets(evt) {
              
             <div class="col-md-3 pad">
 				<span for="ContactNumber">Contact Number</span><span class="badge">*</span>             
-				<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required pattern="(.){10,10}" maxlength="10"  class="form-control">
+				<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required pattern="(.){10,10}" maxlength="10"  class="form-control" title="Please Enter 10 digit Number">
             </div>
 			
 			<div class="col-md-3 pad"> 
 				<span for="AlternateContactNumber">Alternate Contact Number</span>
-				<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="AlternateContactNumber"  pattern="(.){10,10}" maxlength="10"  class="form-control">
+				<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="AlternateContactNumber"  pattern="(.){10,10}" maxlength="10"  class="form-control" title="Please Enter 10 digit Number">
             </div>
 			
 			<div class="col-md-3 pad">
@@ -256,20 +256,20 @@ function onlyAlphabets(evt) {
          
 		    <div class="col-md-3 pad">
 			   <span for="PAN">PAN</span> <span class="badge">*</span>
-                <input type="text" id="panno"  maxlength="10" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}"  name="panno" required  onchange="validatePAN();" class="form-control">
+                <input type="text" id="panno"  maxlength="10" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}"  name="panno" required  onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format">
 		    </div>
 			 <div class="col-md-3 pad">
 			<span for="TIN">TIN</span><span class="badge">*</span>
-                <input type="text"  class="form-control required" pattern="(.){11,11}"  id="TIN" name="TIN" minlength="11" maxlength="11" onkeypress="return event.charCode >= 48 && event.charCode <= 57">
+                <input type="text"  class="form-control required" pattern="(.){11,11}"  id="TIN" name="TIN" minlength="11" maxlength="11" onkeypress="return event.charCode >= 48 && event.charCode <= 57" title="Please Enter 11 digit Number">
             </div>	
 			<div class="col-md-3 pad">			
 			    <span for="UANumber">UA Number</span>
-                <input type="text"  class="form-control" pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12">
+                <input type="text"  class="form-control" pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12" title="Please Enter 12 digit Number" >
             </div>
 			
             <div class="col-md-3 pad">			
 			<span for="Exciseregistration">Excise Registration</span>
-                <input type="text"  class="form-control required"  onchange="validateECCNumber();" id="Exciseregistration" name="Exciseregistration" minlength="15" maxlength="15" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}">
+                <input type="text"  class="form-control required"  onchange="validateECCNumber();" id="Exciseregistration" name="Exciseregistration" minlength="15" maxlength="15" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}" title="Please enter PAN Number and EM/ED option and 3 digit Numbers format">
             </div>
 			
            </div>
@@ -332,8 +332,8 @@ function onlyAlphabets(evt) {
           <div class="form-group">
             <div class="col-md-3 col-md-offset-9">
               <div class="pull-right">
-               <input type="reset" id="reset" onclick="resetphoto();"  class="btn btn-info" value="Reset" />
-                <input type="submit" onclick="validate();"   class="btn btn-primary">
+               <input type="reset" id="reset"  class="btn btn-info" value="Reset" />
+                <input type="submit" onclick="validate();" class="btn btn-primary">
               </div>
             </div>
           </div>
diff --git a/application/views/editEmployee.php b/application/views/editEmployee.php
index d81e38d9..88646dec 100644
--- a/application/views/editEmployee.php
+++ b/application/views/editEmployee.php
@@ -648,7 +648,7 @@ function ValidatePassport()
               <input type="text" id="accountno" onkeypress="return event.charCode >= 48 && event.charCode <= 57" maxlength="20"  name="accountno" placeholder="Account Number" class="form-control" value="<?php echo $BankAccountNo  ; ?>">
             </div>
             <div class="col-md-3"><span>IFSC Code</span> 
-              <input type="text" id="ifsccode" name="ifsccode" placeholder="IFSC Code" maxlength="10" class="form-control" value="<?php echo $IFSCCode ; ?>">
+              <input type="text" id="ifsccode" name="ifsccode" placeholder="IFSC Code" maxlength="12" class="form-control" value="<?php echo $IFSCCode ; ?>">
             </div>
             <div class="col-md-3"><span>Bank Branch Name</span> 
               <input type="text" id="bankbranchname" maxlength="200" name="bankbranchname" placeholder="Bank Branch Name" class="form-control" value="<?php echo $BankBranchName  ; ?>">
diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php
index 4699e136..406c2a8a 100644
--- a/application/views/editSupplier.php
+++ b/application/views/editSupplier.php
@@ -282,12 +282,12 @@ function onlyAlphabets(evt) {
              
             <div class="col-md-2 pad">
 				<span for="ContactNumber">Contact Number</span><span class="badge">*</span>             
-				<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required pattern="(.){10,10}" maxlength="10"  class="form-control" value="<?php echo $ContactNumber;?>">
+				<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="ContactNumber" required pattern="(.){10,10}" maxlength="10"  class="form-control" value="<?php echo $ContactNumber;?>" title="Please Enter 10 digit Number">
             </div>
 			
 			<div class="col-md-2 pad"> 
 				<span for="AlternateContactNumber">Alternate Contact Number</span>
-				<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="AlternateContactNumber"  pattern="(.){10,10}" maxlength="10"  class="form-control" value="<?php echo $AlternateContactNumber;?>" >
+				<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" id="AlternateContactNumber"  pattern="(.){10,10}" maxlength="10"  class="form-control" value="<?php echo $AlternateContactNumber;?>"  title="Please Enter 10 digit Number">
             </div>
 			
 			<div class="col-md-2 pad">
@@ -313,20 +313,20 @@ function onlyAlphabets(evt) {
          
 		    <div class="col-md-3 pad">
 			   <span for="PAN">PAN</span> <span class="badge">*</span>
-                <input type="text" id="panno"  maxlength="10"  name="panno" required  onchange="validatePAN();" class="form-control" value="<?php echo $PAN;?>">
+                <input type="text" id="panno"  maxlength="10"  name="panno" required   pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}" onchange="validatePAN();" class="form-control" value="<?php echo $PAN;?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format">
 		    </div>
 			 <div class="col-md-3 pad">
 			<span for="TIN">TIN</span><span class="badge">*</span>
-                <input type="text"  class="form-control required"  value="<?php echo $TIN;?>"   pattern="(.){11,11}" id="TIN" name="TIN" minlength="11" maxlength="11"  onkeypress="return event.charCode >= 48 && event.charCode <= 57">
+                <input type="text"  class="form-control required"  value="<?php echo $TIN;?>"   pattern="(.){11,11}" id="TIN" name="TIN" minlength="11" maxlength="11"  onkeypress="return event.charCode >= 48 && event.charCode <= 57" title="Please Enter 11 digit Number">
             </div>
 			<div class="col-md-3 pad">			
 			    <span for="UANumber">UA Number</span>
-                <input type="text"  class="form-control" pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12" value="<?php echo $UANumber;?>">
+                <input type="text"  class="form-control" pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12" value="<?php echo $UANumber;?>" title="Please Enter 12 digit Number">
             </div>
 			
             <div class="col-md-3 pad">			
 			<span for="Exciseregistration">Excise Registration</span>
-                <input type="text"  class="form-control required"  onchange="validateECCNumber();" id="Exciseregistration" name="Exciseregistration" minlength="15" maxlength="15" value="<?php echo $Exiseregistration;?>">
+                <input type="text"  class="form-control required"  onchange="validateECCNumber();" id="Exciseregistration" name="Exciseregistration" minlength="15" maxlength="15" value="<?php echo $Exiseregistration;?>" title="Please enter PAN Number and EM/ED option and 3 digit Numbers format" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}">
             </div>	
             <div class="col-md-3">
 			<span for="GSTNo">GST Number</span>
@@ -385,7 +385,7 @@ function onlyAlphabets(evt) {
           <div class="form-group">
             <div class="col-md-3 col-md-offset-9">
               <div class="pull-right">
-               <input type="reset" id="reset" onclick="resetphoto();"  class="btn btn-info" value="Reset" />
+               <input type="reset" id="reset"  class="btn btn-info" value="Reset" />
                 <input type="submit" onclick="validate();"   class="btn btn-primary">
               </div>
             </div>
diff --git a/application/views/supplierListing.php b/application/views/supplierListing.php
index e5a35b07..9718df2a 100644
--- a/application/views/supplierListing.php
+++ b/application/views/supplierListing.php
@@ -1,3 +1,13 @@
+<script>
+$(document).ready(function() {
+
+$('table').tableSort( {
+animation :'slide',
+speed:500
+} );
+});  
+ 
+</script>
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
@@ -30,21 +40,21 @@
                         </form>
                     </div>
                 </div><!-- /.box-header -->
-                <div class="box-body table-responsive no-padding">
-                  <table class="table table-hover">
-                    <tr>
-                      <th>Supplier ID</th>
+                <div class="box-body table-responsive no-padding" >
+                  <table id="datatable" class="table table-hover tableSorter" >
+                    <tr bgcolor="steelblue"  >
+                      <th >Supplier ID</th>
                       <th>Supplier Name</th>
                       <th>Address</th>
                       <th>Contact Number</th>
                       <th>Email Address</th>
-                      <th>Exiseregistration</th>
+                      <th>Excise Registration</th>
                       <th>TIN</th>
                       <th>PAN</th>
-                      <th>GSTNO</th>
-                      <th>GSTRange</th>
-                      <th>UANumber</th>
-                      <th>PaymentTerms</th>
+                      <th>GST Number</th>
+                      <th>GST Range</th>
+                      <th>UA Number</th>
+                      <th>Payment Terms</th>
                     </tr>
                     <?php
                     if(!empty($userRecords))