From 9ef77d9f4d91d78501e838b79458503f4c857279 Mon Sep 17 00:00:00 2001
From: saravanakumar_kandasami
 <https://saravanakumar_kandasami@bitbucket.org/venbainformationtechnology/unave-marundhu.git>
Date: Fri, 9 Jun 2017 17:20:51 +0530
Subject: [PATCH] inwardgateregister screen and new design listing

---
 application/views/assetListing.php       |  73 ++---
 application/views/costListing.php        |  88 +++---
 application/views/employeeListing.php    |  79 ++---
 application/views/includes/header.php    |  20 +-
 application/views/inwardgateregister.php | 353 ++++++++++++-----------
 application/views/rawmaterialListing.php |  74 ++---
 application/views/supplierListing.php    |  74 ++---
 application/views/users.php              |  72 ++---
 8 files changed, 379 insertions(+), 454 deletions(-)

diff --git a/application/views/assetListing.php b/application/views/assetListing.php
index f7570607..bed84bc0 100755
--- a/application/views/assetListing.php
+++ b/application/views/assetListing.php
@@ -1,19 +1,14 @@
-
-<script>
-$(document).ready(function() {
-
-$('table').tableSort( {
-animation :'slide',
-speed:500
-} );
-});  
- 
-</script>
+  <script>
+ (function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
+ </script>
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center>Siddharth industries Asset Details</center>
+       <center>Siddharth industries - Asset Details</center>
        
       </h1>
     </section>
@@ -28,23 +23,10 @@ speed:500
         </div>
         <div class="row">
             <div class="col-xs-12">
-              <div class="box">
-                <div class="box-header">
-                    <center><h3 class="box-title"><div class="box-tools">
-                        <form action="<?php echo base_url() ?>assetListing" method="POST" id="searchList">
-                            <div class="input-group">
-                              <input type="text" name="searchText" value="<?php echo $searchText; ?>" class="form-control input-sm pull-right" style="width: 150px;" placeholder="Search"/>
-                              <div class="input-group-btn">
-                                <button class="btn btn-sm btn-default searchList"><i class="fa fa-search"></i></button>
-                              </div>
-                            </div>
-                        </form>
-                    </div></h3></center>
-                    
-                </div><!-- /.box-header -->
-                <div class="box-body table-responsive no-padding tableSorter">
-                  <table class="table table-hover">
-                    <tr bgcolor="steelblue">
+                 
+                  <table class="table table-bordered table-hover" id="datatable" style="background-color:#fff;font-size:12px;" >
+				  <thead>
+                    <tr>
                       <th>Asset Code</th>
                       <th>Asset Name</th>
                       <th>Description</th>
@@ -58,6 +40,8 @@ speed:500
                      
                       
                     </tr>
+					</thead>
+					<tbody>
                     <?php
                     if(!empty($userRecords))
                     {
@@ -84,26 +68,27 @@ speed:500
                         }
                     }
                     ?>
+					</tbody>
                   </table>
                   
-                </div><!-- /.box-body -->
-                <div class="box-footer clearfix">
-                    <?php echo $this->pagination->create_links(); ?>
-                </div>
-              </div><!-- /.box -->
             </div>
         </div>
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
-<script type="text/javascript">
-    jQuery(document).ready(function(){
-        jQuery('ul.pagination li a').click(function (e) {
-            e.preventDefault();            
-            var link = jQuery(this).get(0).href;            
-            var value = link.substring(link.lastIndexOf('/') + 1);
-            jQuery("#searchList").attr("action", baseURL + "assetListing/" + value);
-            jQuery("#searchList").submit();
-        });
-    });
+  <script type="text/javascript">
+   
+	$(function () {
+   
+    $('#datatable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	
 </script>
diff --git a/application/views/costListing.php b/application/views/costListing.php
index 04cb197d..20cc131a 100755
--- a/application/views/costListing.php
+++ b/application/views/costListing.php
@@ -1,18 +1,14 @@
-<script>
-$(document).ready(function() {
-
-$('table').tableSort( {
-animation :'slide',
-speed:500
-} );
-});  
- 
-</script>
+ <script>
+ (function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
+ </script>
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center>COST LIST</center>       
+       <center>Siddharth Industries - Cost Details</center>       
       </h1>
     </section>
     <section class="content">
@@ -20,35 +16,23 @@ speed:500
             <div class="col-xs-12 text-right">
                 <div class="form-group">
                     <a class="btn btn-primary" href="<?php echo base_url(); ?>CostCenter/addCostCenter">Add New Cost List</a>
-					<a class="btn btn-primary" href="<?php echo base_url(); ?>costcenter/export_cost">Export Asset Details <i class="fa fa-download"aira-hidden="true"></i></a>
+					<a class="btn btn-primary" href="<?php echo base_url(); ?>costcenter/export_cost">Export Cost Details <i class="fa fa-download"aira-hidden="true"></i></a>
                 </div>
             </div>
         </div>
         <div class="row">
-            <div class="col-xs-12">
-              <div class="box">
-                <div class="box-header">
-                     
-                    <div class="box-tools">
-                        <form action="<?php echo base_url() ?>CostCenter/costListing" method="POST" id="searchList">
-                            <div class="input-group">
-                              <input type="text" name="searchText" value="<?php echo $searchText; ?>" class="form-control input-sm pull-right" style="width: 150px;" placeholder="Search"/>
-                              <div class="input-group-btn">
-                                <button class="btn btn-sm btn-default searchList"><i class="fa fa-search"></i></button>
-                              </div>
-                            </div>
-                        </form>
-                    </div>
-                </div><!-- /.box-header -->
-                 <div class="box-body table-responsive no-padding" >
-                 <table id="datatable" class="table table-hover tableSorter" >
-                       <tr bgcolor="steelblue">
-                      <th>Cost Center ID</th>
-                      <th>Cost Name</th>
-                      <th>Description</th>
-                      <th>Create Date</th>
-                      <th>Action</th>                      
-                    </tr>
+            <div class="col-xs-12"> 
+                 <table id="datatable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;" >
+					<thead>
+						<tr>
+						  <th>Cost Center ID</th>
+						  <th>Cost Name</th>
+						  <th>Description</th>
+						  <th>Create Date</th>
+						  <th>Action</th>                      
+						</tr>
+					</thead>
+					<tbody>
                     <?php
                     if(!empty($userRecords))
                     {
@@ -73,26 +57,28 @@ speed:500
                         }
                     }
                     ?>
+					</tbody>
                   </table>
                   
-                </div><!-- /.box-body -->
-                <div class="box-footer clearfix">
-                    <?php echo $this->pagination->create_links(); ?>
-                </div>
-              </div><!-- /.box -->
+                 
             </div>
         </div>
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
-<script type="text/javascript">
-    jQuery(document).ready(function(){
-        jQuery('ul.pagination li a').click(function (e) {
-            e.preventDefault();            
-            var link = jQuery(this).get(0).href;            
-            var value = link.substring(link.lastIndexOf('/') + 1);
-            jQuery("#searchList").attr("action", baseURL + "costListing/" + value);
-            jQuery("#searchList").submit();
-        });
-    });
+  <script type="text/javascript">
+   
+	$(function () {
+   
+    $('#datatable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	
 </script>
diff --git a/application/views/employeeListing.php b/application/views/employeeListing.php
index 317e6c76..6aeeb123 100755
--- a/application/views/employeeListing.php
+++ b/application/views/employeeListing.php
@@ -1,19 +1,14 @@
-<script>
-$(document).ready(function() {
-
-$('table').tableSort( {
-animation :'slide',
-speed:500
-} );
-});  
- 
-</script>
- 
+  <script>
+ (function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
+ </script>
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <CENTER>Siddharth Industries Employee List</CENTER>
+        <CENTER>Siddharth Industries - Employee Details</CENTER>
        
       </h1>
     </section>
@@ -28,23 +23,10 @@ speed:500
         </div>
         <div class="row">
             <div class="col-xs-12">
-              <div class="box">
-                <div class="box-header">
-                    <CENTER><h3 class="box-title"></h3></CENTER>
-                    <div class="box-tools">
-                        <form action="<?php echo base_url() ?>employeeListing" method="POST" id="searchList">
-                            <div class="input-group">
-                              <input type="text" name="searchText" value="<?php echo $searchText; ?>" class="form-control input-sm pull-right" style="width: 150px;" placeholder="Search"/>
-                              <div class="input-group-btn">
-                                <button class="btn btn-sm btn-default searchList"><i class="fa fa-search"></i></button>
-                              </div>
-                            </div>
-                        </form>
-                    </div>
-                </div><!-- /.box-header -->
-                <div class="box-body table-responsive no-padding" >
-                  <table id="datatable" class="table table-hover tableSorter" >
-                    <tr bgcolor="steelblue">
+               
+                  <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
+				  <thead>
+                    <tr>
                       <th>Emp ID</th>
 					  <th>Employee Name</th>   					   
 					  <th>Contact Number</th>
@@ -52,6 +34,8 @@ speed:500
 					  <th>Designation</th>	
 					  <th>Department</th>						                       
                     </tr>
+					</thead>
+					<tbody>
                     <?php
                     if(!empty($userRecords))
                     {
@@ -70,30 +54,29 @@ speed:500
                         }
                     }
                     ?>
+					</tbody>
                   </table>
                   
-                </div><!-- /.box-body -->
-                <div class="box-footer clearfix" >
-                    <?php echo $this->pagination->create_links(); ?>
-                </div>
-              </div><!-- /.box -->
+                 
+               
             </div>
         </div>
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
-<script type="text/javascript">
-    jQuery(document).ready(function(){
-        jQuery('ul.pagination li a').click(function (e) {
-            e.preventDefault();            
-            var link = jQuery(this).get(0).href;            
-            var value = link.substring(link.lastIndexOf('/') + 1);
-            jQuery("#searchList").attr("action", baseURL + "employeeListing/" + value);
-            jQuery("#searchList").submit();
-        });
-		
-		$(document).ready(function(){
-    $('[data-toggle="tooltip"]').tooltip(); 
-});
-    });
+ <script type="text/javascript">
+   
+	$(function () {
+   
+    $('#datatable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	
 </script>
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 39a17059..8cae9571 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -255,7 +255,7 @@
 								?>
 						<li class="treeview">
 								  <a href="<?php echo base_url(); ?>Requisition">
-									<i class="fa fa-users"></i>
+									<i class="fa fa-arrow-circle-up"></i>
 									<span>Raise Requisition </span>
 								  </a>
 								</li>
@@ -267,7 +267,7 @@
 								?>
 								<li class="treeview">
 								  <a href="<?php echo base_url(); ?>ApproveRequisition">
-									<i class="fa fa-users"></i>
+									<i class="fa fa-thumbs-o-up"></i>
 									<span>Approve Requisition </span>
 								  </a>
 								</li>
@@ -281,7 +281,7 @@
 								
 								<li class="treeview">
 								  <a href="<?php echo base_url(); ?>CreatePO">
-									<i class="fa fa-users"></i>
+									<i class="fa fa-empire"></i>
 									<span>Purchase Order From Requisition</span>
 								  </a>
 								</li>
@@ -299,7 +299,7 @@
 						?>
 						 
 						<li class="treeview">
-              <span id="menu" data-toggle="dropdown"><i class="fa fa-thumb-tack"></i> Purchase order<span class="caret"></span></span> 
+              <span id="menu" data-toggle="dropdown"><i class="fa fa-first-order"></i> Purchase order<span class="caret"></span></span> 
 			  	<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
 				<?php
 						if($DEPCode == FINANCE)
@@ -307,7 +307,7 @@
 						?>
 				<li class="treeview">
 						  <a href="<?php echo base_url(); ?>EmergencyPO">
-							<i class="fa fa-users"></i>
+							<i class="fa fa-ambulance"></i>
 							<span>Emergency Purchase Order  </span>
 						  </a>
 						</li>
@@ -321,7 +321,7 @@
 						?>
 						<li class="treeview">
 								  <a href="<?php echo base_url(); ?>purchaseorderListing">
-									<i class="fa fa-users"></i>
+									<i class="fa fa-list"></i>
 									<span>Purchase Order List  </span>
 								  </a>
 								</li>
@@ -356,7 +356,7 @@
 								</li>
 								<li class="treeview">
 								  <a href="<?php echo base_url(); ?>ExcelUpload2">
-									<i class="fa fa-upload"></i>
+									<i class="fa fa-keyboard-o"></i>
 									<span>Monthly Salary Inputs</span>
 								  </a>
 								</li>
@@ -368,17 +368,17 @@
 								</li>
 								<li class="treeview">
 								  <a href="<?php echo base_url(); ?>payslip/updatepayroll" >
-									<i class="fa fa-dashboard"></i> <span>Payslip</span> 
+									<i class="fa fa-credit-card-alt"></i> <span>Payslip</span> 
 								  </a>
 								</li>
 								<li class="treeview">
                                   <a href="<?php echo base_url(); ?>emppayListings" >
-                                    <i class="fa fa-dashboard"></i> <span>Employee Salary Details</span> 
+                                    <i class="fa fa-credit-card"></i> <span>Employee Salary Details</span> 
                                   </a>
                                 </li>
 								<li class="treeview">
 								  <a href="<?php echo base_url(); ?>monthlyListings" >
-									<i class="fa fa-dashboard"></i> <span>Employee Monthly Payment</span> 
+									<i class="fa fa-table"></i> <span>Employee Monthly Payment</span> 
 								  </a>
 								</li>
 								
diff --git a/application/views/inwardgateregister.php b/application/views/inwardgateregister.php
index dc8a8115..50ab34ab 100644
--- a/application/views/inwardgateregister.php
+++ b/application/views/inwardgateregister.php
@@ -1,10 +1,10 @@
  <script>
 
  $(document).ready(function(){
-
-          $("#purchaseorderno").select2();
-	 
-         $("#InvoiceDate").datepicker({
+ 
+        $("#PurchaseOrderNo").select2();
+		$("#PurchaseOrderNoview").select2();
+        $("#InvoiceDate").datepicker({
             //minDate : d,
             maxDate : 'now',
             dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
@@ -12,7 +12,13 @@
  
 
     });
+	// For table 
+	(function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
  </script>
+ 
  <style>
     .modal
 	{
@@ -30,36 +36,50 @@
         <center>Siddharth Industries - Inward Gate Register </center>        
       </h1>	  	  	 
     </section>    
-    <section class="content"><br/>    
-        <div class="row">
-		<div class="col-xs-12">
-            <div class="box">
-				<div style="text-align:right;">
-					<a data-toggle="modal" data-target="#inwadgateregister" class="btn btn-primary" data-dismiss="modal" >Add IGR</a>
-				</div>				  
+    <section class="content"><br/>  
+	<div class="row" style="padding-bottom:5%">
+		<div class="col-md-12">
+			  <div class="col-md-3">								 
+						<label>Enter Purchase Order NO </label>	
+						<div>								 									 
+							 <?php
+									$options = array("0"=>'Purchase Order No');     
+															
+						
+									echo form_dropdown('PurchaseOrderNoview', $options,set_value('PurchaseOrderNoview'),'id="PurchaseOrderNoview"' ,'class="form-control select2"' , 'required="true"' );
+
+									?>	
+						</div> 
+					</div>
+					<div class="col-md-3">	<br/>
+						<a class="btn btn-primary" type="submit" data-toggle="modal" data-target="#Poshow"  data-dismiss="modal" >PO Details</a>
+					</div> 
+		</div>
+	</div>		
+        <div class="row"> 
+		<div class="col-md-12">
+            								
 				<table id="Inwardgateregistertable"  class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
 					<thead style="background-color:#ddf">
 						<tr>
-						  <th>Documentation No</th>
-						  <th>S.NO</th>
-						  <th>Date</th> 
+						<th>S.NO</th>
+						  <th>IGR No</th>
 						  <th>PO NO</th>					  
 						  <th>Supplier name</th>
 						  <th>Invoice No</th>					  
 						  <th>Date of Invoice</th>	
 						  <th>Item Code</th>
 						  <th>Material</th>
-						  <th>Quantity</th>
+						  <th>Ordered Quantity</th>
 						  <th>Vechicle No</th>
-						 <th>Signature</th>
+						  <th>Date</th> 
 						</tr>
 					</thead>
 					<tbody>
 					<tr>
-						<td>DOC0001</td>
-						<td>1</td>
-						<td>2/6/2017</td>
-						<td><a data-toggle="modal" data-target="#Poshow"  data-dismiss="modal" >PO0034</a></td>
+					<td>1</td>
+						<td><a data-toggle="modal" data-target="#Igrshow"  data-dismiss="modal" >IGR0001</a></td>
+						<td>PO0034</td>
 						<td>DR Enterprises</td>
 						<td>Inv123232</td>
 						<td>8/6/2017</td>
@@ -67,13 +87,12 @@
 						<td>wast sand</td>
 						<td>1000kgs</td>
 						<td>TN 34 G 5434</td>
-						<td>DREN</td>
+						<td>2/6/2017</td>
 					</tr>
 					<tr>
-						<td>DOC0002</td>
-						<td>2</td>
-						<td>6/6/2017</td>
-						<td><a data-toggle="modal" data-target="#Poshow"  data-dismiss="modal" >PO0035</a></td>
+					<td>2</td>
+						<td><a data-toggle="modal" data-target="#Igrshow"  data-dismiss="modal" >IGR0002</a></td>
+						<td>PO0035</td>
 						<td>DR Enterprises</td>
 						<td>Inv123255</td>
 						<td>15/6/2017</td>
@@ -81,94 +100,14 @@
 						<td>wast sand</td>
 						<td>1000kgs</td>
 						<td>TN 34 G 5434</td>
-						<td>DREN</td>
+						<td>6/6/2017</td> 
 					</tr>
 					</tbody>					
 				</table>
-			</div>
+			</div> 
 		</div>
         </div>  
-			<div class="modal fade" id="inwadgateregister" role="dialog">
-				<div class="modal-dialog">
-					<!-- Modal content-->
-					<form>
-						<div class="modal-content" style="width:900px;">
-							<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
-								<button type="button" class="close" data-dismiss="modal">&times;</button>
-								<center><h4>Add Inward Gate Register</h4></center>
-							</div>
-							<div class="col-md-12"> 
-							<div class="col-md-4">								 
-								Purchase order NO  	<div>								 									 
-									 <?php
-											$options = array("0"=>'Purchase Order No');     
-																	
-								
-											echo form_dropdown('PurchaseOrderNo', $options,set_value('PurchaseOrderNo'),'id="PurchaseOrderNo"' ,'class="form-control select2"' , 'required="true"' );
-
-											?>	</div> 
-							 
-								</div>
-								<div class="col-md-4">
-								Invoice NO
-								<?php
-									 $data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo',  'class' => 'form-control', 'required'=>'true' );
-									echo form_input($data);
-									?> 
-								</div>
-								<div class="col-md-4">
-								Invoice Date
-								<?php
-									 $data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate',  'class' => 'form-control', 'required'=>'true' );
-									echo form_input($data);
-									?> 
-								</div>									
-							</div>
-							<div class="col-md-12">
-								<div class="col-md-4">
-								NO of Item Received 
-								<?php
-									 $data = array('name' => 'ItemReceived','value' => set_value('ItemReceived'),'id'=>'ItemReceived',  'class' => 'form-control', 'required'=>'true' );
-									echo form_input($data);
-									?>
-								</div>
-								<div class="col-md-4">
-								Qurier NO
-								<?php
-									 $data = array('name' => 'QurierNo','value' => set_value('QurierNo'),'id'=>'QurierNo',  'class' => 'form-control', 'required'=>'true' );
-									echo form_input($data);
-									?>
-								</div>
-								<div class="col-md-4">
-								Vechicle NO
-								<?php
-									 $data = array('name' => 'VechicleNo','value' => set_value('VechicleNo'),'id'=>'VechicleNo',  'class' => 'form-control', 'required'=>'true' );
-									echo form_input($data);
-									?>
-								</div>
-							</div>
-							<div class="col-md-12">
-							<div class="col-md-4">
-								Signature
-								<?php
-									 $data = array('name' => 'Signature','value' => set_value('Signature'),'id'=>'Signature',  'class' => 'form-control', 'required'=>'true' );
-									echo form_input($data);
-									?>
-							</div>
-							<div class="col-md-4 col-md-offset-4"align="right;">
-							<br/>
-								<a class="btn btn-info"  id="save"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">save</span></a>
-								<a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
-							</div>
-							</div>
-							<div class="modal-footer">
-								
-
-							</div>
-						</div>
-					</form>
-				</div>
-			</div>	
+			 
 			<div class="modal fade" id="Poshow" role="dialog">
 				<div class="modal-dialog">
 					<!-- Modal content-->
@@ -186,66 +125,143 @@
 									PO0034
 								</div>
 								<div class="col-md-3">
-								<label>Supplier :</label> 
-								</div>
-								<div class="col-md-3">
-									D.R Enterprises
-								</div>
-							</div>
-							<div class="col-md-12">
-								<div class="col-md-3">
-									<label>Purchase Order Type :</label>
-								</div>
-								<div class="col-md-3">
-									SERVICE
-								</div>
-								<div class="col-md-3">
-								<label>Purchase Order Date :</label>
-								</div>
-								<div class="col-md-3">
-									4/6/2017
-								</div>								
-							</div>
-							<div class="col-md-12">
-								 <div class="col-md-3">
-								<label>	Delivery Address :</label>
-								</div>
-								<div class="col-md-3">
-								Survey NO: 168/1C3,Pennalur Pet Road,Goonipalyam village,Uthukottai Taluk,Tiruvallur Dist,Chennai,Tamilnadu,Pin code : 602026.
-								</div>
-								<div class="col-md-3">
-								<label>Supplier Address :</label>
-								</div>
-								<div class="col-md-3">
-									153/233,Uthukottai Taluk, Tiruvallur Dist,Chennai,Tamilnadu,Pin code : 602026.
-								</div>								 
-							</div>
-							<div class="col-md-12">
-								 <div class="col-md-3">
-								<label>	Requested By :</label>
-								</div>
-								<div class="col-md-3">
-									kasiraman
-								</div>
-								<div class="col-md-3">
-								<label>Requested Department :</label>
-								</div>
-								<div class="col-md-3">
-									Admin
-								</div>
-							</div>
-							<div class="col-md-12">
-								 <div class="col-md-3">
 								<label>	Delivery Date :</label>
 								</div>
 								<div class="col-md-3">
 									9/6/2017
 								</div>
+							</div> 
+							<div class="col-md-12">								
+								<div class="col-md-3">
+								<label>Supplier and Address :</label> 
+								</div>
+								<div class="col-md-3">
+									D.R Enterprises ,153/233,Uthukottai Taluk, Tiruvallur Dist,Chennai,Tamilnadu,Pin code : 602026.
+								</div>
 								<div class="col-md-3">
 								<label>Comments Of Special Instructions :</label>
 								</div>
 								<div class="col-md-3">
-									raw Sand ordered 
+									raw Sand , resin ordered 
+								</div>
+							</div>
+								<div class="col-md-12" style="padding:2%;"> 
+								<div class="col-md-4">
+								Invoice NO
+								<?php
+									 $data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo',  'class' => 'form-control', 'required'=>'true' );
+									echo form_input($data);
+									?> 
+								</div>
+								<div class="col-md-4">
+								Invoice Date
+								<?php
+									 $data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate',  'class' => 'form-control', 'required'=>'true' );
+									echo form_input($data);
+									?> 
+								</div>
+								<div class="col-md-4">
+								Vechicle NO / Courier NO
+								<?php
+									 $data = array('name' => 'vechorCourNo','value' => set_value('vechorCourNo'),'id'=>'vechorCourNo',  'class' => 'form-control', 'required'=>'true' );
+									echo form_input($data);
+									?>
+								</div>								
+							</div>
+							 
+							<div>
+							<!-- Table to show the line item of po -->
+							<table class="table table-bordered">
+								<thead>
+									<tr>								 
+										<th>SNo</th>
+										<th>Item Code</th>
+										<th>Item Description</th>
+										<th>UOM</th>
+										<th>Ordred Quantity</th>
+										<th>Received Quantity</th>	<!-- It should be editable for gate keeper -->									
+									</tr>
+								</thead>								
+								<tbody id="tbleAppend">
+									<tr>
+										<td>1</td>
+										<td>RM002</td>
+										<td>Raw sand</td>
+										<td>Kgs</td>
+										<td>10000</td>
+										<td>10000</td><!-- This value will be  given by gate keeper once item received-->	
+									</tr>	
+									<tr>
+										<td>2</td>
+										<td>RM003</td>
+										<td>Resin</td>
+										<td>Ltr</td>
+										<td>100</td>
+										<td></td><!-- This value will be  given by gate keeper once item received-->	
+									</tr>	
+								</tbody> 
+								</table>
+								<div class="col-md-2 col-md-offset-10">
+								<a class="btn btn-info" type="submit" align="right">submit</a>
+								</div>
+							</div> 
+							<div class="modal-footer">
+								 
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>	
+			<div class="modal fade" id="Igrshow" role="dialog">
+				<div class="modal-dialog">
+					<!-- Modal content-->
+					<form>
+						<div class="modal-content" style="width:900px;">
+							<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
+								<button type="button" class="close" data-dismiss="modal">&times;</button>
+								<center><h4>Inward Gate Register Details</h4></center> 
+							</div>
+							<div class="col-md-12"> 
+								<div class="col-md-3">
+							 	<label>IGR Number :</label>
+								</div>	
+								<div class="col-md-3">
+									IGR0001
+								</div>
+								<div class="col-md-3">
+								<label>	Purchase Order Number:</label>
+								</div>
+								<div class="col-md-3">
+									PO0034
+								</div>
+							</div> 
+							<div class="col-md-12"> 
+								<div class="col-md-3">
+							 	<label>Invoice Number :</label>
+								</div>	
+								<div class="col-md-3">
+									Inv12353
+								</div>
+								<div class="col-md-3">
+								<label>Invoice Date:</label>
+								</div>
+								<div class="col-md-3">
+									6/9/2017
+								</div>
+							</div> 
+							 
+							<div class="col-md-12">								
+								<div class="col-md-3">
+								<label>Supplier and Address :</label> 
+								</div>
+								<div class="col-md-3">
+									D.R Enterprises ,153/233,Uthukottai Taluk, Tiruvallur Dist,Chennai,Tamilnadu,Pin code : 602026.
+								</div>
+								<div class="col-md-3">
+								<label>Comments Of Special Instructions :</label>
+								</div>
+								<div class="col-md-3">
+									raw Sand , resin ordered 
 								</div>
 							</div>
 							<!-- Table to show the line item of po -->
@@ -270,12 +286,7 @@
 										<td>10000</td><!-- This value will be  given by gate keeper once item received-->	
 									</tr>										
 								</tbody>
-								<tfoot>
-									 <tr><td>
-									  <a class="btn btn-info" type="submit" align="right">submit</a>
-									 </td></tr>
-								</tfoot>
- 							</table>
+  							</table>
 							 
 							<div class="modal-footer">
 								<a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
@@ -283,19 +294,19 @@
 						</div>
 					</form>
 				</div>
-			</div>			
+			</div>
 		</section>
 	</div>
  <script>
 <!-- script for table , It works under the datatable plugin-->
  $(function () { 
     $('#Inwardgateregistertable').DataTable({
-      "paging": false,
-      "lengthChange": false,
+      "paging": true,
+      "lengthChange": true,
       "searching": true,
-      "ordering": false,
-      "info": false,
-      "autoWidth": false
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
 	   
     }); 
   });
diff --git a/application/views/rawmaterialListing.php b/application/views/rawmaterialListing.php
index aabfd292..bb677e33 100755
--- a/application/views/rawmaterialListing.php
+++ b/application/views/rawmaterialListing.php
@@ -1,13 +1,9 @@
-<script>
-$(document).ready(function() {
-
-$('table').tableSort( {
-animation :'slide',
-speed:500
-} );
-});  
- 
-</script>
+  <script>
+ (function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
+ </script>
 <div class="content-wrapper">
     
     <section class="content-header">
@@ -25,30 +21,18 @@ speed:500
             </div>
         </div>
         <div class="row">
-            <div class="col-xs-12">
-              <div class="box">
-                <div class="box-header">
-                    <CENTER><h3 class="box-title"></h3><CENTER>
-                    <div class="box-tools">
-                        <form action="<?php echo base_url() ?>rawmaterialdetails/rawmaterialListing" method="POST" id="searchList">
-                            <div class="input-group">
-                              <input type="text" name="searchText" value="<?php echo $searchText; ?>" class="form-control input-sm pull-right" style="width: 150px;" placeholder="Search"/>
-                              <div class="input-group-btn">
-                                <button class="btn btn-sm btn-default searchList"><i class="fa fa-search"></i></button>
-                              </div>
-                            </div>
-                        </form>
-                    </div>
-                </div><!-- /.box-header -->
-               <div class="box-body table-responsive no-padding" >
-                  <table id="datatable" class="table table-hover tableSorter" >
-                    <tr bgcolor="steelblue"  >
+            <div class="col-xs-12"> 
+                  <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
+				  <thead>
+                    <tr>
                       <th>Material Code</th>
                       <th>Material Description</th>
                       <th>Type of Material</th>
                       <th>Unit Of Measurement</th>                      
                                        
                     </tr>
+					</thead>
+					<tbody>
                     <?php
                     if(!empty($userRecords))
                     {
@@ -67,26 +51,26 @@ speed:500
                         }
                     }
                     ?>
+					</tbody>
                   </table>
-                  
-                </div><!-- /.box-body -->
-                <div class="box-footer clearfix">
-                    <?php echo $this->pagination->create_links(); ?>
-                </div>
-              </div><!-- /.box -->
-            </div>
+                 
         </div>
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
-<script type="text/javascript">
-    jQuery(document).ready(function(){
-        jQuery('ul.pagination li a').click(function (e) {
-            e.preventDefault();            
-            var link = jQuery(this).get(0).href;            
-            var value = link.substring(link.lastIndexOf('/') + 1);
-            jQuery("#searchList").attr("action", baseURL + "rawmaterialListing/" + value);
-            jQuery("#searchList").submit();
-        });
-    });
+ <script type="text/javascript">
+   
+	$(function () {
+   
+    $('#datatable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	
 </script>
diff --git a/application/views/supplierListing.php b/application/views/supplierListing.php
index 5736e38b..8462017e 100755
--- a/application/views/supplierListing.php
+++ b/application/views/supplierListing.php
@@ -1,18 +1,14 @@
-<script>
-$(document).ready(function() {
-
-$('table').tableSort( {
-animation :'slide',
-speed:500
-} );
-});  
- 
-</script>
+ <script>
+ (function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
+ </script>
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center>Siddharth Industries Supplier Details</center>
+       <center>Siddharth Industries -Supplier Details</center>
         
       </h1>
     </section>
@@ -27,23 +23,10 @@ speed:500
         </div>
         <div class="row">
             <div class="col-xs-12">
-              <div class="box">
-                <div class="box-header">
-                    <center><h3 class="box-title"></h3></center>
-                    <div class="box-tools">
-                        <form action="<?php echo base_url() ?>supplierListing" method="POST" id="searchList">
-                            <div class="input-group">
-                              <input type="text" name="searchText" value="<?php echo $searchText; ?>" class="form-control input-sm pull-right" style="width: 150px;" placeholder="Search"/>
-                              <div class="input-group-btn">
-                                <button class="btn btn-sm btn-default searchList"><i class="fa fa-search"></i></button>
-                              </div>
-                            </div>
-                        </form>
-                    </div>
-                </div><!-- /.box-header -->
-                <div class="box-body table-responsive no-padding" >
-                  <table id="datatable" class="table table-hover tableSorter" >
-                    <tr bgcolor="steelblue"  >
+                
+                  <table class="table table-bordered table-hover" id="datatable" style="background-color:#fff;font-size:12px;" >
+				  <thead>
+                    <tr>
                       <th >Supplier ID</th>
                       <th>Supplier Name</th>
                       <th>Address</th>
@@ -57,6 +40,8 @@ speed:500
                       <th>UA Number</th>
                       <th>Payment Terms</th>
                     </tr>
+					</thead>
+					<tbody>
                     <?php
                     if(!empty($userRecords))
                     {
@@ -84,26 +69,27 @@ speed:500
                         }
                     }
                     ?>
+					</tbody>
                   </table>
                   
-                </div><!-- /.box-body -->
-                <div class="box-footer clearfix">
-                    <?php echo $this->pagination->create_links(); ?>
-                </div>
-              </div><!-- /.box -->
-            </div>
+             </div>
         </div>
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
-<script type="text/javascript">
-    jQuery(document).ready(function(){
-        jQuery('ul.pagination li a').click(function (e) {
-            e.preventDefault();            
-            var link = jQuery(this).get(0).href;            
-            var value = link.substring(link.lastIndexOf('/') + 1);
-            jQuery("#searchList").attr("action", baseURL + "supplierListing/" + value);
-            jQuery("#searchList").submit();
-        });
-    });
+ <script type="text/javascript">
+   
+	$(function () {
+   
+    $('#datatable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	
 </script>
diff --git a/application/views/users.php b/application/views/users.php
index 57015601..58afe9e6 100755
--- a/application/views/users.php
+++ b/application/views/users.php
@@ -1,10 +1,15 @@
-
+ <script>
+ (function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
+ </script>
 
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>USER MANAGEMENT</center>
+        <center>Siddharth Industries - User Management</center>
         
       </h1>
     </section>
@@ -18,23 +23,10 @@
         </div>
         <div class="row">
             <div class="col-xs-12">
-              <div class="box">
-                <div class="box-header">
-                    <center><h3 class="box-title">User Management List</h3></center>
-                    <div class="box-tools">
-                        <form action="<?php echo base_url() ?>userListing" method="POST" id="searchList">
-                            <div class="input-group">
-                              <input type="text" name="searchText" value="<?php echo $searchText; ?>" class="form-control input-sm pull-right" style="width: 150px;" placeholder="Search"/>
-                              <div class="input-group-btn">
-                                <button class="btn btn-sm btn-default searchList"><i class="fa fa-search"></i></button>
-                              </div>
-                            </div>
-                        </form>
-                    </div>
-                </div><!-- /.box-header -->
-                <div class="box-body table-responsive no-padding tableSorter">
-                  <table class="table table-hover">
-                    <tr bgcolor="steelblue">
+               
+                  <table class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
+				  <thead>
+                    <tr>
                       <th>User Id</th>
                       <th>User Name</th>
                       <th>Email</th>
@@ -44,6 +36,8 @@
 						<th>Role Name</th>
                       <th>Actions</th>
                     </tr>
+					</thead>
+					<tbody>
                     <?php
                     if(!empty($userRecords))
                     {
@@ -67,35 +61,31 @@
                         }
                     }
                     ?>
+					</tbody>
                   </table>
-                  
-                </div><!-- /.box-body -->
-                <div class="box-footer clearfix">
-                    <?php echo $this->pagination->create_links(); ?>
-                </div>
-              </div><!-- /.box -->
+                   
             </div>
         </div>
     </section>
 </div>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/common.js" charset="utf-8"></script>
 <script type="text/javascript">
-$(document).ready(function() {
-
-$('table').tableSort( {
-animation :'slide',
-speed:500
-} );
-}); 
-    jQuery(document).ready(function(){
-        jQuery('ul.pagination li a').click(function (e) {
-            e.preventDefault();            
-            var link = jQuery(this).get(0).href;            
-            var value = link.substring(link.lastIndexOf('/') + 1);
-            jQuery("#searchList").attr("action", baseURL + "userListing/" + value);
-            jQuery("#searchList").submit();
-        });
-    });
+ 
+   
+	$(function () {
+   
+    $('#datatable').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": true
+	   
+    }); 
+  });
+	
+ 
 	
 	function deleteUser(userid)
 	{