From a02bb5e21bbdfd413d3dac6ed31e21a644e72a1e Mon Sep 17 00:00:00 2001
From: velz2020 <velmurugan.s@venbainfotech.com>
Date: Sat, 24 Feb 2018 20:01:21 +0530
Subject: [PATCH] HEADER CHANGED FOR INPROCESS MODULE

---
 application/views/includes/header.php        | 146 ++++++++++++++-----
 application/views/viewindinwardreportpdf.php |  12 +-
 application/views/viewindreportpdf.php       |  12 +-
 3 files changed, 130 insertions(+), 40 deletions(-)

diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 6e31e732..0ab9f7fe 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -265,32 +265,7 @@ $(function() {
 					<?php if(empty($DepAccesslist)){?>
 					<?php if($DEPCode == STORE || $DEPCode == FINANCE || $DEPCode == MANAGEMENT || $DEPCode == QUALITY || $DEPCode == PRODUCTION){?>
 					 
-						<li class="treeview">
-							<a href="<?php echo base_url(); ?>batchcard/HourlyListing">
-								<i class="fa fa-upload"></i>
-								<span>Batchcard - HourlyListing</span>
-							</a>
-						</li>
-
-						<li class="treeview">
-							<a href="<?php echo base_url(); ?>batchcard/dailyListing">
-								<i class="fa fa-upload"></i>
-								<span>Batchcard - DailyListing</span>
-							</a>
-					    </li>
-
-					    <li class="treeview">
-						    <a href="<?php echo base_url(); ?>batchcard/getStockDetails">
-								<i class="fa fa-upload"></i>
-								<span>Batchcard - StockDetails</span>
-							</a>
-					    </li>
-							<li class="treeview">
-							<a href="<?php echo base_url(); ?>batchcard/getMaintListing">
-								<i class="fa fa-upload"></i>
-								<span>Batchcard - Maintenance/Breakdown</span>
-							</a>
-							</li>
+						
 					    <?php if($DEPCode == STORE){?>
 					    <li class="treeview">
 							<a href="<?php echo base_url(); ?>storerequisitionlisting">
@@ -352,8 +327,8 @@ $(function() {
 		   
 		   <!-- INPROCESS MODULE-->
 		   
-			<?php if($DEPCode != HR){?>
-			<?php if($DEPCode != SECURITY){?>
+			<?php if($DEPCode == QUALITY){?>
+			
            <li class="treeview">
             <span id="menu" data-toggle="dropdown" ><i class="fa fa fa-first-order"></i> In Process Inspection<span class="caret"></span></span> 
             <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
@@ -364,7 +339,7 @@ $(function() {
 
 
 					<?php if(empty($DepAccesslist)){?>
-					<?php if($DEPCode == STORE || $DEPCode == FINANCE || $DEPCode == MANAGEMENT || $DEPCode == QUALITY || $DEPCode == PRODUCTION){?>
+					<?php if($DEPCode == QUALITY){?>
 					 
 						
 						<li class="treeview">
@@ -398,7 +373,7 @@ $(function() {
 
 						<?php $assd=$dep->AssDep; 
 
-						if($assd == STORE || $assd == QUALITY || $DEPCode == STORE || $DEPCode == QUALITY || $DEPCode == PRODUCTION || $assd == PRODUCTION){ $check =1;?>
+						if($assd == QUALITY || $DEPCode == QUALITY){ $check =1;?>
 
 						<li class="treeview">
 							  <a href="<?php echo base_url(); ?>inprocess">
@@ -430,10 +405,107 @@ $(function() {
 
 			</ul>
            </li>
-           <?php }?>
+           
 		    <?php }?>
            
 		   <!-- INPROCESS MODULE-->
+		   
+		   
+		    <!-- BATCH CARD MODULE-->
+		   
+			<?php if($DEPCode == PRODUCTION){?>
+			
+           <li class="treeview">
+            <span id="menu" data-toggle="dropdown" ><i class="fa fa-clone"></i> TRP Batch card<span class="caret"></span></span> 
+            <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
+
+							
+							
+
+
+
+					<?php if(empty($DepAccesslist)){?>
+					<?php if($DEPCode == PRODUCTION){?>
+					 
+						
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/HourlyListing">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - HourlyListing</span>
+							</a>
+						</li>
+
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/dailyListing">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - DailyListing</span>
+							</a>
+					    </li>
+
+					    <li class="treeview">
+						    <a href="<?php echo base_url(); ?>batchcard/getStockDetails">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - StockDetails</span>
+							</a>
+					    </li>
+							<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/getMaintListing">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - Maintenance/Breakdown</span>
+							</a>
+							</li>
+							
+					    <?php }?>
+
+					
+
+                    <?php }
+                    else{ $check = 0;?>
+                    <?php foreach($DepAccesslist as $dep){?>
+
+						<?php $assd=$dep->AssDep; 
+
+						if($assd == PRODUCTION || $DEPCode == PRODUCTION){ $check =1;?>
+
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/HourlyListing">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - HourlyListing</span>
+							</a>
+						</li>
+
+						<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/dailyListing">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - DailyListing</span>
+							</a>
+					    </li>
+
+					    <li class="treeview">
+						    <a href="<?php echo base_url(); ?>batchcard/getStockDetails">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - StockDetails</span>
+							</a>
+					    </li>
+							<li class="treeview">
+							<a href="<?php echo base_url(); ?>batchcard/getMaintListing">
+								<i class="fa fa-upload"></i>
+								<span>Batchcard - Maintenance/Breakdown</span>
+							</a>
+							</li>
+
+                                 
+                    <?php } if($check == 1){break;} }?>
+
+                    <?php }?>   
+
+
+			</ul>
+           </li>
+           
+		    <?php }?>
+           
+		   <!-- BATCH CARD MODULE-->
 
 <!--         <?php print_r($DepAccesslist)?>  -->
           <?php if(empty($DepAccesslist)){ ?>
@@ -945,8 +1017,9 @@ $(function() {
 							  </a>
 							</li>
 
-							
+							  <?php }?>
 
+							   <?php if($DEPCode == QUALITY){?>
 							<li class="treeview">
 							  <a href="<?php echo base_url(); ?>quality">
 								<i class="fa fa-list-alt"></i>
@@ -966,8 +1039,8 @@ $(function() {
 								<span>Inward Material Test Report</span>
 							  </a>
 							</li> 
-
-                         <?php }?>
+							<?php }?>
+                       
                            
 				           <!--  <li class="treeview">
 							  <a href="<?php echo base_url(); ?>ViewigrDetails">
@@ -1018,7 +1091,7 @@ $(function() {
 
                     	//echo $assd;
 
-                    if($assd == STORE || $DEPCode == QUALITY || $assd == QUALITY || DEPCode == STORE || $DEPCode == SECURITY || $assd == SECURITY){ $check = $check+1;?>
+                    if($assd == STORE || $DEPCode == QUALITY || $assd == QUALITY || $DEPCode == STORE || $DEPCode == SECURITY || $assd == SECURITY){ $check = $check+1;?>
                     <li class="treeview">
                     <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Inspection<span class="caret"></span></span> 
 				        <ul class="dropdown-menu" role="menu" aria-labelledby="menu1">
@@ -1036,6 +1109,7 @@ $(function() {
 								<span>View Material Inspection Report</span>
 							  </a>
 							</li>
+							  <?php if($DEPCode == QUALITY){?>
 							<li class="treeview">
 							  <a href="<?php echo base_url(); ?>quality">
 								<i class="fa fa-list-alt"></i>
@@ -1048,7 +1122,7 @@ $(function() {
 								<span>Product Test Report</span>
 							  </a>
 							</li>
-							
+							  <?php } ?>
 							<li class="treeview">
 							  <a href="<?php echo base_url(); ?>qualityreportlistinward">
 								<i class="fa fa-hand-o-down"></i>
diff --git a/application/views/viewindinwardreportpdf.php b/application/views/viewindinwardreportpdf.php
index 8eb98b12..8395a32b 100755
--- a/application/views/viewindinwardreportpdf.php
+++ b/application/views/viewindinwardreportpdf.php
@@ -122,10 +122,18 @@ $index = 0;
 					{
 						$index++;
 						?>
+					
+					
+					<?php if($master->description == 'AFS'){?>
+					
+					<tr> <td><?php echo $index;?></td> <td style="text-align:left;"><?php echo $master->description;?></td><td><?php if($master->min == 0 || $master->min == '') { echo "-"; } else { echo $master->min;} ?></td> <td><?php if($master->max == 0 || $master->max == '') { echo '-'; } else { echo $master->max; }?></td> <td><?php echo $master->UOM;?></td>
+					<td colspan="3"><?php if(!empty($master->act1)){ echo $master->act1; }else {echo '0.00';}?></td><td><?php echo $master->average;?></td> <td><?php echo $master->result;?></td> <td style="text-align:left;"><?php echo $master->remarks;?></td> </tr>
+					<?php }else{ ?>
+					
 					<tr> <td><?php echo $index;?></td> <td style="text-align:left;"><?php echo $master->description;?></td><td><?php if($master->min == 0 || $master->min == '') { echo "-"; } else { echo $master->min;} ?></td> <td><?php if($master->max == 0 || $master->max == '') { echo '-'; } else { echo $master->max; }?></td> <td><?php echo $master->UOM;?></td><td><?php if(!empty($master->act1)){ echo $master->act1; }else {echo '0.00';}?></td><td><?php if(!empty($master->act2)){ echo $master->act2; } else {echo '0.00';}?></td> <td><?php if(!empty($master->act3)){ echo $master->act3; } else {echo '0.00';}?></td> <td><?php echo $master->average;?></td> <td><?php echo $master->result;?></td> <td style="text-align:left;"><?php echo $master->remarks;?></td> </tr>
 						<?php
 					}
-					
+					}
 					?> 
 </tbody>
 </table>
@@ -134,7 +142,7 @@ $index = 0;
 <table style="border-collapse: collapse;border-left-style:hidden;" border="1" cellspacing="0" cellpadding="0">
 <tbody>
 <tr><th rowspan="2">S.NO</th><th width="160">HEATING TIME</th><th width="110">TEMP</th><th width="115">CRUCIBLE WEIGHT</th><th>BEFORE HEATING WEIGHT</th><th>AFTER HEATING WEIGHT</th> <th rowspan="2">L.O.I (%)</th><th rowspan="2">Remarks</th> </tr> 
-<tr><th>START TIME - END TIME</th><th>*C</th> <th>W1(g)</th> <th>W2(g)</th> <th>W3(g)</th></tr>
+<tr><th>START TIME - END TIME</th><th>°C</th> <th>W1(g)</th> <th>W2(g)</th> <th>W3(g)</th></tr>
 <?php
 								$indexx = 0;
 								foreach($reportdata['masterreportloi'] as $loi)
diff --git a/application/views/viewindreportpdf.php b/application/views/viewindreportpdf.php
index ba6ea415..c1b7a8b5 100755
--- a/application/views/viewindreportpdf.php
+++ b/application/views/viewindreportpdf.php
@@ -114,10 +114,18 @@ $index = 0;
 					{
 						$index++;
 						?>
+					
+					
+					<?php if($master->description == 'AFS'){?>
+					
+					<tr> <td><?php echo $index;?></td> <td style="text-align:left;"><?php echo $master->description;?></td><td><?php if($master->min == 0 || $master->min == '') { echo "-"; } else { echo $master->min;} ?></td> <td><?php if($master->max == 0 || $master->max == '') { echo '-'; } else { echo $master->max; }?></td> <td><?php echo $master->UOM;?></td>
+					<td colspan="3"><?php if(!empty($master->act1)){ echo $master->act1; }else {echo '0.00';}?></td><td><?php echo $master->average;?></td> <td><?php echo $master->result;?></td> <td style="text-align:left;"><?php echo $master->remarks;?></td> </tr>
+					<?php }else{ ?>
+					
 					<tr> <td><?php echo $index;?></td> <td style="text-align:left;"><?php echo $master->description;?></td><td><?php if($master->min == 0 || $master->min == '') { echo "-"; } else { echo $master->min;} ?></td> <td><?php if($master->max == 0 || $master->max == '') { echo '-'; } else { echo $master->max; }?></td> <td><?php echo $master->UOM;?></td><td><?php if(!empty($master->act1)){ echo $master->act1; }else {echo '0.00';}?></td><td><?php if(!empty($master->act2)){ echo $master->act2; } else {echo '0.00';}?></td> <td><?php if(!empty($master->act3)){ echo $master->act3; } else {echo '0.00';}?></td> <td><?php echo $master->average;?></td> <td><?php echo $master->result;?></td> <td style="text-align:left;"><?php echo $master->remarks;?></td> </tr>
 						<?php
 					}
-					
+					}
 					?> 
 </tbody>
 </table>
@@ -126,7 +134,7 @@ $index = 0;
 <table style="border-collapse: collapse;border-left-style:hidden;" border="1" cellspacing="0" cellpadding="0">
 <tbody>
 <tr><th rowspan="2">S.NO</th><th width="160">HEATING TIME</th><th width="110">TEMP</th><th width="115">CRUCIBLE WEIGHT</th><th>BEFORE HEATING WEIGHT</th><th>AFTER HEATING WEIGHT</th> <th rowspan="2">L.O.I (%)</th><th rowspan="2">Remarks</th> </tr> 
-<tr><th>START TIME - END TIME</th><th>*C</th> <th>W1(g)</th> <th>W2(g)</th> <th>W3(g)</th></tr>
+					<tr><th>START TIME - END TIME</th><th>°C</th> <th>W1(g)</th> <th>W2(g)</th> <th>W3(g)</th></tr>
 <?php
 								$indexx = 0;
 								foreach($reportdata['masterreportloi'] as $loi)