From c84f99473c1ae97368fc962d5c1e80990864cc6b Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 31 Aug 2017 13:52:12 +0530
Subject: [PATCH] Ui in material master screen

---
 application/logs/log-2017-08-31.php      | 50 ++++++++++++++++++++++++
 application/views/rawmaterialListing.php | 24 ++++++------
 application/views/requisitionform.php    |  2 +-
 3 files changed, 63 insertions(+), 13 deletions(-)
 create mode 100644 application/logs/log-2017-08-31.php

diff --git a/application/logs/log-2017-08-31.php b/application/logs/log-2017-08-31.php
new file mode 100644
index 00000000..e42494af
--- /dev/null
+++ b/application/logs/log-2017-08-31.php
@@ -0,0 +1,50 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-08-31 09:38:08 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:38:08 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:38:08 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:38:08 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:38:08 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:38:08 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:38:08 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:38:08 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:40:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:40:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:40:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:40:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:40:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:40:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:40:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:40:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:43:24 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:43:24 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:43:24 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:43:24 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:43:24 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:43:24 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:43:24 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:43:24 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:47:01 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:47:01 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:47:01 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:47:01 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:47:01 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:47:01 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:47:01 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:47:01 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:04 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:04 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:04 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:04 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:04 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:04 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:04 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:04 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
+ERROR - 2017-08-31 09:49:46 --> Severity: Notice  --> Undefined index: RequisitionStatus /opt/lampp/htdocs/31aug/siddharth_application/application/views/requisitionlistapproval.php 33
diff --git a/application/views/rawmaterialListing.php b/application/views/rawmaterialListing.php
index 53573de9..3b33c291 100755
--- a/application/views/rawmaterialListing.php
+++ b/application/views/rawmaterialListing.php
@@ -24,10 +24,10 @@
                       <!--<th>Raw Material Code</th>-->
                       <th>Material Description</th>
                       <th>Type of Material</th>
-                      <th>Unit Of Measurement</th> 
+                      <th>UOM</th> 
                       <th>Material Category</th>
                       <th>Conversion Factor</th>
-                      <th>Conversion Factor UOM</th>
+                      <th>Con Factor UOM</th>
                       <th>Asset Code</th>
                       <th>Cost Center Code</th>
                       <th>HSN Code</th>                     
@@ -44,17 +44,17 @@
                     <tr>
 
                       
-            <td><u><a  href="<?php echo base_url().'rawmaterialdetails/viewRawmaterial?RID='.$record->MaterialCode.'&MType='.$record->MaterialType.'&UOM='.$record->UOM ?>" data-toggle="tooltip" title="<?php echo $record->MaterialCode; ?>  -  Click here to view Material details"><?php echo $record->MaterialCode ?> </a></u></td>
+            <td style="width:9%;"><u><a  href="<?php echo base_url().'rawmaterialdetails/viewRawmaterial?RID='.$record->MaterialCode.'&MType='.$record->MaterialType.'&UOM='.$record->UOM ?>" data-toggle="tooltip" title="<?php echo $record->MaterialCode; ?>  -  Click here to view Material details"><?php echo $record->MaterialCode ?> </a></u></td>
                 <!--<td><u><a  href="<?php echo base_url().'rawmaterialdetails/viewRawmaterial?RID='.$record->RMCode.'&MType='.$record->MaterialType.'&UOM='.$record->UOM ?>" data-toogle="tooltip" title="<?php echo $record->RMCode; ?> -  Click here to view Material details"><?php echo $record->RMCode ?> </a></u></td>-->
-                      <td><?php echo $record->MaterialName ?></td>
-                      <td><?php echo $record->MaterialType ?></td>
-                      <td><?php echo $record->UOM ?></td>
-                      <td><?php echo $record->Category ?></td>
-                      <td><?php echo $record->ConversionFactorUnit ?></td> 
-                      <td><?php echo $record->ConversionFactorUOM ?></td>
-                      <td><?php echo $record->assetcode ?></td>
-                      <td><?php echo $record->CostCenterCode ?></td> 
-                      <td><?php echo $record->HSNCODE ?></td>                    
+                      <td style="width:12%;"><?php echo $record->MaterialName ?></td>
+                      <td style="width:10%;"<?php echo $record->MaterialType ?></td>
+                      <td style="width:7%;"><?php echo $record->UOM ?></td>
+                      <td style="width:11%;"><?php echo $record->Category ?></td>
+                      <td style="width:11%;"><?php echo $record->ConversionFactorUnit ?></td> 
+                      <td style="width:11%;"><?php echo $record->ConversionFactorUOM ?></td>
+                      <td style="width:8%;"><?php echo $record->assetcode ?></td>
+                      <td style="width:12%;"><?php echo $record->CostCenterCode ?></td> 
+                      <td style="width:8%;"><?php echo $record->HSNCODE ?></td>                    
                      
                     </tr>
                     <?php
diff --git a/application/views/requisitionform.php b/application/views/requisitionform.php
index 62bfb221..dfce8983 100755
--- a/application/views/requisitionform.php
+++ b/application/views/requisitionform.php
@@ -363,7 +363,7 @@ if(!empty($Emp))
    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
   <a class="btn btn-primary Save"  ID="Save" onclick="Save()" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
  
-  <input type="submit" class="btn btn-primary" >
+  <input type="submit" value="submit" class="btn btn-primary" >
   <input type="reset" class="btn btn-primary">
    
   </div>