From 638c23db1668cfba894c3f06a57aa2d8dd92b8ff Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 12 Sep 2024 12:13:25 +0530
Subject: [PATCH] employee module label namee bug fix  - vadivel J

---
 app/Views/addEmployeenew.php     |  2 +-
 app/Views/editEmployeenew.php    |  2 +-
 app/Views/editServiceAmendPO.php | 20 ++++++++++++--------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php
index e6d47b59..f8f47c6c 100755
--- a/app/Views/addEmployeenew.php
+++ b/app/Views/addEmployeenew.php
@@ -397,7 +397,7 @@
                                     <a href="#first" data-toggle="tab" class="nav-link active">
                                         <!-- <a data-toggle="tab" class="nav-link active"> -->
                                         <span class="number">1</span>
-                                        <span class="d-none d-sm-inline">Personal & Address</span>
+                                        <span class="d-none d-sm-inline">Personal Information</span>
                                     </a>
                                 </li>
                                 <li class="nav-item" data-target-form="#profileForm">
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php
index 26e0c15e..b0031ffe 100755
--- a/app/Views/editEmployeenew.php
+++ b/app/Views/editEmployeenew.php
@@ -164,7 +164,7 @@ if (!empty($EmpDetails)) {
                                     <a href="#first" data-toggle="tab" class="nav-link active">
                                         <!-- <a data-toggle="tab" class="nav-link active"> -->
                                         <span class="number">1</span>
-                                        <span class="d-none d-sm-inline">Personal & Address</span>
+                                        <span class="d-none d-sm-inline">Personal Information</span>
                                     </a>
                                 </li>
                                 <li class="nav-item" data-target-form="#profileForm">
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 47cc49c9..faf6c2b0 100755
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -738,7 +738,7 @@ foreach ($PaymentTerms as $TER) {
 											endforeach;
 										}
 
-										echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier"', 'required="true"', 'class="form-control select2');
+										echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2');
 
 										?>
 
@@ -775,7 +775,7 @@ foreach ($PaymentTerms as $TER) {
 												}
 											endforeach;
 										}
-										echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus" required="true" class="form-control select2');
+										echo form_dropdown(data: 'workstatus', options: $optionsWork, selected: set_value(field: 'workstatus'), extra: 'id="workstatus" required="true" class="form-control select2" ');
 										?>
 									</div>
 									<div class="form-group col-md-3">
@@ -893,7 +893,7 @@ foreach ($PaymentTerms as $TER) {
 												endforeach;
 											}
 
-											echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control select2');
+											echo form_dropdown(data: 'PoTypeOptions', options: $optionsPO, selected: set_value(field: 'PoTypeOptions'), extra: 'id="PoTypeOptions" required="true" class="form-control select2"');
 
 
 											?>
@@ -923,7 +923,7 @@ foreach ($PaymentTerms as $TER) {
 											endforeach;
 										}
 
-										echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2');
+										echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms" required="true" class="form-control select2');
 										?>
 									</div>
 									<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
@@ -1077,13 +1077,13 @@ foreach ($PaymentTerms as $TER) {
 													
 													<div class="form-row px-3">
 														<div class="form-group col-md-3">
-															<label>Item Code<span class="text-danger">*</span></label>*</span></label>
+															<label>Item Code<span class="text-danger">*</span></label>
 															<div>
 																<?php
 																$options = array("0" => 'Item Code');
 																//print_r(  $options);
 
-																echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
+																echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
 
 																?>
 															</div>
@@ -1141,7 +1141,9 @@ foreach ($PaymentTerms as $TER) {
 													<div class="form-row px-3">
 
 														<div class="form-group col-md-3">
-															<label>Quantity<span class="text-danger">*</span></label>*</span></label>
+															<label>Quantity
+																<span class="text-danger">*</span>
+															</label>
 															<div class="form-group">
 																<?php
 																$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
@@ -1150,7 +1152,9 @@ foreach ($PaymentTerms as $TER) {
 															</div>
 														</div>
 														<div class="form-group col-md-3">
-															<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>*</span></label>
+															<label><?php echo "Rate ($INRSYM)"; ?>
+															<span class="text-danger">*</span>
+														</label>
 															<div class="form-group">
 																<?php
 																$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');