From f0b17aafa6e8182046e070dd0667f9a6a658a7a7 Mon Sep 17 00:00:00 2001
From: saravanakumar_kandasami
 <https://saravanakumar_kandasami@bitbucket.org/venbainformationtechnology/unave-marundhu.git>
Date: Mon, 7 Aug 2017 17:53:40 +0530
Subject: [PATCH] listing screen Ui and material master changes

---
 application/models/assetdetails_model.php   | 2 +-
 application/views/AmendPOlist.php           | 6 +++---
 application/views/POlist.php                | 2 +-
 application/views/assetListing.php          | 2 +-
 application/views/costListing.php           | 2 +-
 application/views/editOldcost.php           | 2 +-
 application/views/employeeListing.php       | 2 +-
 application/views/rawmaterialListing.php    | 2 +-
 application/views/serviceporeport.php       | 2 +-
 application/views/supplierListing.php       | 2 +-
 application/views/users.php                 | 2 +-
 application/views/viewfullpurchaseorder.php | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/application/models/assetdetails_model.php b/application/models/assetdetails_model.php
index 6d0e8b44..8e225683 100755
--- a/application/models/assetdetails_model.php
+++ b/application/models/assetdetails_model.php
@@ -245,7 +245,7 @@ function addNewasset($asset)
 		
 		$this->db->select('det.*,dep.DepartmentName as DEPCode,sup.SupplierName,MM.MaterialName,emp.firstname,emp1.firstname as Updated_By');
 		$this->db->join('tbl_users as tbl',' det.createdby = tbl.userid','left');
-		$this->db->join('T_DepartmentDetails as dep','dep.DEPCode=det.DEPCode');
+		$this->db->join('T_DepartmentDetails as dep','dep.DEPCode=det.DEPCode','left');
 		$this->db->join('T_Employee_Details as emp', 'emp.empid=tbl.empid','left');
 		$this->db->join('T_SupplierDetailsN as sup', 'sup.SupplierID=det.SupplierCode','left');
 		$this->db->join('T_MaterialMaster MM ', 'MM.MaterialCode = det.MaterialCode','left');
diff --git a/application/views/AmendPOlist.php b/application/views/AmendPOlist.php
index 61723c37..11176a94 100755
--- a/application/views/AmendPOlist.php
+++ b/application/views/AmendPOlist.php
@@ -15,13 +15,13 @@
         <div class="col-xs-12">
           <div class="box">
             <div class="box-header">
-              <center><h3 class="box-title"><b>Siddharth Industries - Amendment Purchase Order List<b></h3></center>
+              <center><h3 class="box-title"> Siddharth Industries - Amendment Purchase Order List </h3></center>
             </div>
             <!-- /.box-header -->
-            <div class="box-body">
+            <div class="box-body" style="font-size:12px;">
               <table id="example1" class="table table-bordered table-hover editableTable">
                 <thead>
-                <tr bgcolor="LightSlateGray ">
+                <tr style="background-color:#ddf">
 				<th>#</th>
 				<th>PONO#</th>	
 				<th>PO Type</th>
diff --git a/application/views/POlist.php b/application/views/POlist.php
index b55f345f..8bfd92d6 100755
--- a/application/views/POlist.php
+++ b/application/views/POlist.php
@@ -20,7 +20,7 @@
             <div class="box-body">
               <table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
                 <thead>
-                <tr bgcolor="LightSlateGray ">
+                <tr style="background-color:#ddf">
 				<th>#</th>
 				<th>PONO#</th>	
 				<th>PO Type</th>
diff --git a/application/views/assetListing.php b/application/views/assetListing.php
index fe9baef4..b64b249c 100755
--- a/application/views/assetListing.php
+++ b/application/views/assetListing.php
@@ -19,7 +19,7 @@
             <div class="col-xs-12">
                  
                   <table class="table table-bordered table-hover" id="datatable" style="background-color:#fff;font-size:12px;" >
-				  <thead>
+				  <thead style="background-color:#ddf">
                     <tr>
                       <th>Asset Code</th>
                       <th>Asset Name</th>
diff --git a/application/views/costListing.php b/application/views/costListing.php
index 8be81196..747b3e5f 100755
--- a/application/views/costListing.php
+++ b/application/views/costListing.php
@@ -18,7 +18,7 @@
         <div class="row">
             <div class="col-xs-12"> 
                  <table id="datatable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;" >
-					<thead>
+					<thead style="background-color:#ddf">
 						<tr>
 						 <th>Cost Center Code</th>
                           <th>Cost Center Name</th>
diff --git a/application/views/editOldcost.php b/application/views/editOldcost.php
index 79f0ed29..d47c58f6 100755
--- a/application/views/editOldcost.php
+++ b/application/views/editOldcost.php
@@ -194,7 +194,7 @@ $(function() {
                                         <label for="Description">Cost Center Name </label><font color="Red">*</font>
                                        	<div class="form-group">
 												<?php
-										 $data = array('name' => 'CostName','value' => set_value('CostName',$CostCenterName),'id'=>'CostName',  'class' => 'form-control' ,'required' => 'true','style'=>'text-transform:uppercase;','maxlength'=>'20');
+										 $data = array('name' => 'CostName','value' => set_value('CostName',$CostCenterName),'id'=>'CostName',  'class' => 'form-control' ,'required' => 'true','style'=>'text-transform:uppercase;','maxlength'=>'100');
 										echo form_input($data);
 										?>   
 									</div>
diff --git a/application/views/employeeListing.php b/application/views/employeeListing.php
index 89432325..a7fb69b1 100755
--- a/application/views/employeeListing.php
+++ b/application/views/employeeListing.php
@@ -19,7 +19,7 @@
             <div class="col-xs-12">
                
                   <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
-				  <thead>
+				  <thead style="background-color:#ddf">
                     <tr>
                       <th>Emp ID</th>
 					  <th>Employee Name</th>   					   
diff --git a/application/views/rawmaterialListing.php b/application/views/rawmaterialListing.php
index 5c2d63c6..ea25f5f4 100755
--- a/application/views/rawmaterialListing.php
+++ b/application/views/rawmaterialListing.php
@@ -18,7 +18,7 @@
         <div class="row">
             <div class="col-xs-12"> 
                   <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
-          <thead>
+          <thead style="background-color:#ddf">
                     <tr>
                       <th>Material Code</th>
                       <!--<th>Raw Material Code</th>-->
diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php
index 0bb1f532..1c539625 100755
--- a/application/views/serviceporeport.php
+++ b/application/views/serviceporeport.php
@@ -33,7 +33,7 @@ $Adv='';
 			<div class="box-body">
               <table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
                 <thead>
-                <tr bgcolor="LightSlateGray ">
+                <tr style="background-color:#ddf">
 				<th>SNO#</th>
 				<th>PONO#</th>	
 				<th>SupplierName</th>	
diff --git a/application/views/supplierListing.php b/application/views/supplierListing.php
index 80010d68..b9815c72 100755
--- a/application/views/supplierListing.php
+++ b/application/views/supplierListing.php
@@ -19,7 +19,7 @@
             <div class="col-xs-12">
                 
                   <table class="table table-bordered table-hover" id="datatable" style="background-color:#fff;font-size:11px;" >
-				  <thead>
+				  <thead style="background-color:#ddf">
                     <tr>
                       <th>Supplier ID</th>
                       <th>Supplier Name</th>
diff --git a/application/views/users.php b/application/views/users.php
index 023bb204..815e1e2d 100755
--- a/application/views/users.php
+++ b/application/views/users.php
@@ -19,7 +19,7 @@
             <div class="col-xs-12">
                
                   <table class="table table-hover table-bordered" id="datatable" style="background-color:#fff;font-size:12px;" >
-				  <thead>
+				  <thead style="background-color:#ddf">
                     <tr>
                       <th>User Id</th>
                       <th>User Name</th>
diff --git a/application/views/viewfullpurchaseorder.php b/application/views/viewfullpurchaseorder.php
index 5796fa26..9b8966aa 100755
--- a/application/views/viewfullpurchaseorder.php
+++ b/application/views/viewfullpurchaseorder.php
@@ -20,7 +20,7 @@
             <div class="box-body">
               <table id="viewfullpo" class="table table-bordered table-hover editablTable">
                 <thead>
-                <tr bgcolor="LightSlateGray ">
+                <tr style="background-color:#ddf">
 				<th>#</th>
 				<th>PONO#</th>	
 				<th>Request By</th>