diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php
index 5ca339bc..ef5aaba1 100644
--- a/app/Views/editrequisitionform.php
+++ b/app/Views/editrequisitionform.php
@@ -42,7 +42,27 @@ if (!empty($ReqPOType)) {
}
?>
+
-->
@@ -27,8 +28,33 @@
y.addClass('active');
y.parent().addClass('active');
+
+
+
+
+
-->
+
+
+
+
diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php
index 930f88a3..2c61feb6 100644
--- a/app/Views/requisitionform.php
+++ b/app/Views/requisitionform.php
@@ -21,6 +21,18 @@ if (!empty($Emp)) {
.num {
text-align: right;
}
+ #MaterialCode~.select2 .select2-selection--single{
+ height: auto;
+ max-height: 45px;
+ padding: 5px 3px;
+ line-height: normal;
+ }
+ #MaterialCode~.select2 .select2-selection__rendered{
+ overflow: visible;
+ text-overflow: ellipsis;
+ white-space: pre-wrap;
+ line-height: normal;
+ }
@@ -34,12 +46,35 @@ if (!empty($Emp)) {
+
+
+
+
+
+
*
+
+ 'Select Requested By');
+ if (!empty($RequestBy)) {
+ foreach ($RequestBy as $EID) :
+ $RequestByOpt[$EID->EmpID] = $EID->Full_Name;
+ endforeach;
+ }
+ echo form_dropdown('EmpID', $RequestByOpt, set_value('EmpID'), 'id="EmpID"', 'class = "form-control select2"', 'required="true"');
+ // $data = array('name' => 'EmpID', 'value' => set_value('EmpID', $FirstName), 'id' => 'EmpID', 'class' => 'form-control', 'readonly' => 'true');
+ // echo form_input($data);
+ ?>
+
+
+
+
-
+
*
'Select Request Type');
@@ -61,23 +96,7 @@ if (!empty($Emp)) {
-
-
-
- 'Select Requested By');
- if (!empty($RequestBy)) {
- foreach ($RequestBy as $EID) :
- $RequestByOpt[$EID->EmpID] = $EID->Full_Name;
- endforeach;
- }
- echo form_dropdown('EmpID', $RequestByOpt, set_value('EmpID'), 'id="EmpID"', 'class = "form-control select2"', 'required="true"');
- // $data = array('name' => 'EmpID', 'value' => set_value('EmpID', $FirstName), 'id' => 'EmpID', 'class' => 'form-control', 'readonly' => 'true');
- // echo form_input($data);
- ?>
-
-
-
+
@@ -99,7 +118,7 @@ if (!empty($Emp)) {
-
+
*
'Select Cost Center Name');
@@ -112,7 +131,7 @@ if (!empty($Emp)) {
endforeach;
}
- echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter"', 'class = "form-control"');
+ echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter"', 'class = "form-control select2"');
?>
@@ -127,7 +146,7 @@ if (!empty($Emp)) {
?>
-
+
@@ -160,7 +179,7 @@ if (!empty($Emp)) {
$ServiceOptions[$SerOption->ConfigValue] = $SerOption->ConfigValue;
endforeach;
}
- echo form_dropdown('ServiceOptions', $ServiceOptions, set_value('ServiceOptions'), 'id="ServiceOptions"', 'class = "form-control"');
+ echo form_dropdown('ServiceOptions', $ServiceOptions, set_value('ServiceOptions'), 'id="ServiceOptions"', 'class = "form-control select2"');
?>
@@ -208,25 +227,14 @@ if (!empty($Emp)) {
$options[$MID->MaterialCode] = $MID->MaterialCode . ' ' . ' - ' . ' ' . $MID->MaterialName;
endforeach;
}
- echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control select2"');
+ echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control select2" ');
?>
-
-
-
- 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true');
- echo form_input($data);
-
-
-
- ?>
-
-
-
+
+
-
+
-
+
+
+
+
+ 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true','style' => 'max-height: 50px;');
+ echo form_textarea($data);
+ ?>
+
+
@@ -289,16 +307,8 @@ if (!empty($Emp)) {
-
-
-
- 'EditDescription', 'value' => set_value('EditDescription'), 'id' => 'EditDescription', 'class' => 'form-control', 'readonly' => 'true');
- echo form_input($data);
- ?>
-
-
-
+
+
-
+
-
+
+
+
+
+ 'EditDescription', 'value' => set_value('EditDescription'), 'id' => 'EditDescription', 'class' => 'form-control', 'readonly' => 'true');
+ echo form_input($data);
+ ?>
+
+
@@ -365,9 +385,10 @@ if (!empty($Emp)) {
@@ -401,6 +422,8 @@ if (!empty($Emp)) {
$("#CostCenter").select2();
$("#RequestType").select2();
$("#MaterialCode").select2();
+ $("#EmpID").select2();
+ $("#ScheduleType").select2();
$('#CostCenter').change(function() {
@@ -453,7 +476,11 @@ if (!empty($Emp)) {
$('#txtDeletedRow').val('');
$("#Description").val('');
$("#UOM").val('');
- $('#CostCenter').val("-1");
+ // Get the ID of the first option
+ var firstOptionId = $('#CostCenter option:first').val();
+ // Reset the Select2 dropdown to the first option
+ $('#CostCenter').val(firstOptionId).select2('data', { id: firstOptionId, text: $('#CostCenter option:selected').text() });
+
removeHiddenRows($('#Items').find('tr').length);
$('#tempAppend').empty();
@@ -661,10 +688,10 @@ if (!empty($Emp)) {