From 8fbbfc5aa1b9092f887a29af5bc495980064f72e Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Thu, 6 Apr 2017 15:05:08 +0530
Subject: [PATCH] Employee detail screen updated

---
 application/views/employeeListing.php | 38 +++++++++++++--------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/application/views/employeeListing.php b/application/views/employeeListing.php
index c4b5f7a7..f49f4d14 100644
--- a/application/views/employeeListing.php
+++ b/application/views/employeeListing.php
@@ -2,7 +2,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <CENTER>EMPLOYEE LIST</CENTER>
+        <CENTER>Siddharth Industries Employee List</CENTER>
        
       </h1>
     </section>
@@ -10,7 +10,7 @@
         <div class="row">
             <div class="col-xs-12 text-right">
                 <div class="form-group">
-                    <a class="btn btn-primary" href="<?php echo base_url(); ?>addemployee">Add New</a>
+                    <a class="btn btn-primary" href="<?php echo base_url(); ?>addemployee">Add New Employee</a>
                 </div>
             </div>
         </div>
@@ -18,7 +18,7 @@
             <div class="col-xs-12">
               <div class="box">
                 <div class="box-header">
-                    <CENTER><h3 class="box-title">Employee List</h3></CENTER>
+                    <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">
@@ -31,17 +31,15 @@
                     </div>
                 </div><!-- /.box-header -->
                 <div class="box-body table-responsive no-padding">
-                  <table class="table table-hover">
-                    <tr>
+                  <table class="table table-hover " >
+                    <tr bgcolor="steelblue">
                       <th>Emp ID</th>
-					  <th>Name</th>
-					   
+					  <th>Employee Name</th>   
 					   
 					  <th>Contact Number</th>
-					  <th>Email ID</th>
-					  
-					  <th>Role</th>
-					  <th>Action</th>
+					  <th>Email ID</th>					  
+					  <th>Designation</th>	
+						<th>Department</th>						  
                       
                     </tr>
                     <?php
@@ -51,21 +49,17 @@
                         {
                     ?>
                     <tr>
-					<td><a href="<?php echo base_url().'employeedetails/viewemployee/'.$record->EmpID; ?>"><?php echo $record->EmpID ?> </a></td>
-                      
-                      <td><?php echo $record->FirstName ?></td>
+					<td><u><a   href="<?php echo base_url().'employeedetails/viewemployee/'.$record->EmpID; ?>" data-toggle="tooltip" title="<?php echo $record->EmpID; ?>  -  Click here to view Employee details"><?php echo $record->EmpID ?> </a></u></td>
                       
+                      <td><?php echo $record->FirstName .' , '. $record->LastName; ?></td>           
                       
                       <td><?php echo $record->ContactNumber ?></td>
                       <td><?php echo $record->EmailId ?></td>
                        
                       <td><?php echo $record->role ?></td>
+					   <td><?php echo $record->DepartmentName ?></td>
                        
-                      <td>
-                          <a href="<?php echo base_url().'employeedetails/editOldemployee/'.$record->EmpID; ?>"><i class="fa fa-pencil"></i>&nbsp;&nbsp;&nbsp;</a>
-						  <a href="<?php echo base_url().'employeedetails/viewemployee/'.$record->EmpID; ?>"><i class="fa fa-eye"></i>&nbsp;&nbsp;&nbsp;</a>
-                         <!-- <a href="#" data-userid="<?php echo $record->userId; ?>" class="deleteUser"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>-->
-                      </td>
+                     
                     </tr>
                     <?php
                         }
@@ -74,7 +68,7 @@
                   </table>
                   
                 </div><!-- /.box-body -->
-                <div class="box-footer clearfix">
+                <div class="box-footer clearfix" >
                     <?php echo $this->pagination->create_links(); ?>
                 </div>
               </div><!-- /.box -->
@@ -92,5 +86,9 @@
             jQuery("#searchList").attr("action", baseURL + "employeeListing/" + value);
             jQuery("#searchList").submit();
         });
+		
+		$(document).ready(function(){
+    $('[data-toggle="tooltip"]').tooltip(); 
+});
     });
 </script>