From e6c116b6ebbafd3752d17c1eee8ef8f997cadf2b Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Thu, 27 Apr 2017 15:47:32 +0530
Subject: [PATCH] Payslip Production changes

---
 application/views/dashboard.php       | 22 +++++--
 application/views/payslipgenerate.php | 85 +++++++++++++++------------
 2 files changed, 64 insertions(+), 43 deletions(-)

diff --git a/application/views/dashboard.php b/application/views/dashboard.php
index 843d4f17..c127964f 100644
--- a/application/views/dashboard.php
+++ b/application/views/dashboard.php
@@ -1,3 +1,14 @@
+<?php
+$Empcnt = '';
+
+if(!empty($EmpCount))
+{
+    foreach ($EmpCount as $Emp)
+    {
+		$Empcnt  = $Emp->EmpCount;
+	}
+}
+?>
 <div class="content-wrapper">
     <section class="content">
 	<!-- Dashboard for Account department-->
@@ -22,18 +33,17 @@
             <span class="info-box-icon bg-yellow"><i class="ion ion-ios-people-outline"></i></span>
             <div class="info-box-content">
               <span class="info-box-text">Employees</span>
-              <span class="info-box-number">33</span>
+              <span class="info-box-number"><?php echo $Empcnt ?></span>
             </div>            
           </div>          
         </div>
       </div>
 	  </center>
 	  <div>
-		  <center>
-		  <h1><b>Guidiness:</b></h1><h3> # PaySlip menu in header has two sub menu ( 1.Upload Salary , 2.PaySlip Generator)<br/>
-		  # Upload salary menu is to upload the salary excel file in database<br/>
-		  # Payslip generator menu is to generate the salary details for indivigual or all employee</h3>
-		  </center>	 
+		  <marquee direction="up" scrollamount="2" height="150px;"> <font color="Brown"> <h1><b>Guidelines:</b></h1><h3> # PaySlip menu in header has two sub menu ( 1.Upload Salary , 2.PaySlip Generator)<br/><br/>
+		  # Upload salary menu is used to upload the Salary Excel file into the database<br/><br/>
+		  # Payslip generator menu is to generate the salary slip for individual Employess or All Employees</h3>
+		  </center>	 </font></marquee>	 
 	  </div>
 	</section>
   </div>
diff --git a/application/views/payslipgenerate.php b/application/views/payslipgenerate.php
index 9479c82d..5abb4498 100644
--- a/application/views/payslipgenerate.php
+++ b/application/views/payslipgenerate.php
@@ -1,4 +1,6 @@
 
+
+
 <script> 
 
 $(function() {
@@ -37,6 +39,7 @@ $(function() {
 			success:function(result) {
 				if(result)
 				{
+$("#Employee").empty();	
 				$('#content').loader('hide'); 
 				$("#Employee").append(result);
 				 
@@ -59,56 +62,64 @@ $(function() {
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
-      <h1><center>Siddharth Industries - PaySlip Generator</center>        </h1>
+      <h1>
+       <center>Siddharth Industries - PaySlip Generator</center>
+        
+      </h1>
     </section>
     <section class="content">
 	<div class="row" style="border:2px dotted; padding:5%">
 	 <form id="PayslipGenerator" action="<?php echo base_url() ?>PrintPdf" method="post" role="form" > 
         <div class="row"  >
-			<div class="col-md-4">		
-					<span for="selectmonth">Select Month</span>
-						<select id="PayOn" name="PayOn"   class="form-control select2" style="width: 100%;">
-								<option  value="-1">Select Payon Month</option>
-									<?php	
-												if(!empty($Payon))
-												{
-													foreach ($Payon as $rl)
+		<div class="col-md-4">
+	
+				<span for="selectmonth">Select Month</span>
+					<select id="PayOn" name="PayOn"   class="form-control select2" style="width: 100%;">
+							<option  value="-1">Select Payon Month</option>
+								<?php	
+                                            if(!empty($Payon))
+                                            {
+                                                foreach ($Payon as $rl)
+                                                {
+													 $Pay =$rl->PayOn;
+                                                  													
+													if ($_POST['PayOn'] == $Pay) 
 													{
-														 $Pay =$rl->PayOn;
-																										
-														if ($_POST['PayOn'] == $Pay) 
-														{
 
-													echo "<option value=\"".$Pay."\" selected=\"selected\">".$Pay."</option>"; 
-														}
-														else 
-														{
-														echo "<option value=\"".$Pay."\">".$Pay."</option>";       
-														}		
-														
+												echo "<option value=\"".$Pay."\" selected=\"selected\">".$Pay."</option>"; 
 													}
-												}
-									?>
+													else 
+													{
+													echo "<option value=\"".$Pay."\">".$Pay."</option>";       
+													}		
+                                                    
+                                                }
+                                            }
+                                            ?>
 						</select>
 			</div>
-			<div id="content"></div>
-			<div class="col-md-4 col-md-offset-2">				
-					<div class="row">
+				<div id="content"></div>
+			<div class="col-md-4 col-md-offset-2">
+				
+					
 						<span>Employee</span>
 						<select id="Employee" name="Employee"  class="form-control select2" type="text"  class="form-control">
-							<option value="-1">Select Employee</option> 							
-						</select>
+							<option value="-1">Select Employee</option> 
+							
+								</select>
 					</div>
-					<div class="row">
 					<input type="checkbox" name="All" id="All"   > Select All<br>
-					</div>
-			</div>					
-		</div>
+			</div>
+			
+			
+			 
+			</div>
+			 <div class="row"  >
+			  
 			<div  class="col-md-4 col-md-offset-6" align = "right">
 			<input type="submit" class="btn btn-info" value="Generate" />
-			</div>			 
-	</div>
-			 <div class="row">				
+				</div>
+				
 				 <?php
                     $this->load->helper('form');
                     $error = $this->session->flashdata('error');
@@ -137,9 +148,9 @@ $(function() {
                     </div>
                 </div>
             </div>
-			      
+        </div>
+		
+         
     </section>
 </div>
-		
-