diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php index 435b8987..0e0ec453 100644 --- a/app/Views/editrequisitionform.php +++ b/app/Views/editrequisitionform.php @@ -28,478 +28,404 @@ if (!empty($ReqDetails)) { $noOfService = $Req->NumberOfService; } } - -//echo $ReqType; - - $description = ''; - - if (!empty($ReqPOType)) { - $strReqPOType = $ReqPOType; } - ?> - -
-
-

-
-
- 'form-label-left requistion ', 'name' => 'requistion', 'id' => 'requistion'); - echo form_open(base_url() . 'EditRequisition', $attributes); ?> -
-
-
-   Back -
-
- -
- - 'RequestType', 'value' => set_value('RequestType', $ReqType), 'id' => 'RequestType', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - - ?> - - +
+
+ +
+ +
+
+
+
+
+
+

+
+
-
-
- -
+ + + 'form-label-left requistion ', 'name' => 'requistion', 'id' => 'requistion'); + echo form_open(base_url() . 'EditRequisition', $attributes); + ?> +
+
- 'EmpID', 'value' => set_value('EmpID', $FirstName), 'id' => 'EmpID', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - - ?> + + 'EmpID', 'value' => set_value('EmpID', $FirstName), 'id' => 'EmpID', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'RequestType', 'value' => set_value('RequestType', $ReqType), 'id' => 'RequestType', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> + +
+
+ + 'DeptName', 'value' => set_value('DeptName', $DepartmentName), 'id' => 'DeptName', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'Designation', 'value' => set_value('Designation', $Designation), 'id' => 'Designation', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
-
-
- -
- 'DeptName', 'value' => set_value('DeptName', $DepartmentName), 'id' => 'DeptName', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); +
+
+ + $CostCenterCode); + if (!empty($CostCenter)) { + foreach ($CostCenter as $SID) : + $Costs[$SID->CostCenterCode] = $SID->CostCenterCode . '-' . $SID->CostCenterName; + endforeach; + } + echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter" class = "form-control"'); + + ?> + +
+ + -
-
- -
- 'Designation', 'value' => set_value('Designation', $Designation), 'id' => 'Designation', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); +
+ +
-
-
-
-
- -
- $CostCenterCode); - //print_r( $options); - - if (!empty($CostCenter)) { - foreach ($CostCenter as $SID) : - // echo $SID->ConfigValue; - $Costs[$SID->CostCenterCode] = $SID->CostCenterCode . '-' . $SID->CostCenterName; - - endforeach; - } - echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter"', 'class = "form-control select2"'); - - ?> +
+
+ + Add Line Item + +
-
- -
- -
-
- - Add Line Item - -
- - - - - - - - - - - - - - - MaterialDescription) ? $record->MaterialDescription : ""; - //echo $materialdesc; - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SNoMaterial CodeMaterial NameUomRequestedQuantityPoQuantityStatusAction
MaterialCode; ?>MaterialName; ?>UOM; ?>Quantity; ?>POQTY; ?>StatusName; ?> -     - - -
- -
- - - - - -   Save As Draft -   Submit -   Approve - - - -   Submit -   Approve - +
+
+
+ + 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ + +
+
+
+
+
+
+ - + + \ No newline at end of file diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index d6331f0a..53db80eb 100644 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -12,7 +12,7 @@ - + @@ -29,6 +29,7 @@ + diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php index 2c61feb6..32acd623 100644 --- a/app/Views/requisitionform.php +++ b/app/Views/requisitionform.php @@ -13,389 +13,320 @@ if (!empty($Emp)) { } } ?> - - -
-
-

+
+
+
-
- 'form-label-left requistion ', 'name' => 'requistion', 'id' => 'requistion'); - echo form_open(base_url() . 'Requisitionform::SearchRequistList', $attributes); ?> +
-
-   Back - -
-
-
- -
- - - - * -
- '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); +
+
+
+
+

+
+ +
+ + + 'form-label-left requistion ', 'name' => 'requistion', 'id' => 'requistion'); + echo form_open(base_url() . 'Requisitionform::SearchRequistList', $attributes); ?> - +
+
+ + + '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" data-toggle="select2" required="true"'); + ?> +
+
+ + 'Select Request Type'); + if (!empty($RequestType)) { + foreach ($RequestType as $RID) : + $options[$RID->ConfigValue] = $RID->ConfigValue; + endforeach; + } + echo form_dropdown('RequestType', $options, set_value('ConfigValue'), 'id="RequestType" class = "form-control" data-toggle="select2"', 'required="true"'); + ?> + +
+
+ + 'DeptName', 'value' => set_value('DeptName', $DepartmentName), 'id' => 'DeptName', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ + 'Designation', 'value' => set_value('Designation', $Designation), 'id' => 'Designation', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+ + 'Select Cost Center Name'); + if (!empty($CostCenter)) { + foreach ($CostCenter as $SID) : + $Costs[$SID->CostCenterCode] = $SID->CostCenterCode . '-' . $SID->CostCenterName; + endforeach; + } + echo form_dropdown( + 'CostCenter', + $Costs, + set_value('CostCenter'), + 'class="form-control" id="CostCenter" data-toggle="select2"' + ); + ?> + +
+ + + +
+
+
+ Add Line Item +
+
+
+
+ + + + + + + + + + + + +
SNoMaterial CodeMaterial NameUomQuantityAction
+
+
+
+ + + + +
+
+    +   Save As Draft   + +
+
-
-
- * -
- 'Select Request Type'); - - //print_r( $options); - - if (!empty($RequestType)) { - foreach ($RequestType as $RID) : - - - $options[$RID->ConfigValue] = $RID->ConfigValue; - - endforeach; - } - - echo form_dropdown('RequestType', $options, set_value('ConfigValue'), 'id="RequestType"', 'class = "form-control select2"', 'required="true"'); - - ?> - -
-
- -
- -
- 'DeptName', 'value' => set_value('DeptName', $DepartmentName), 'id' => 'DeptName', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
- -
- 'Designation', 'value' => set_value('Designation', $Designation), 'id' => 'Designation', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- * -
- 'Select Cost Center Name'); - //print_r( $options); - - if (!empty($CostCenter)) { - foreach ($CostCenter as $SID) : - // echo $SID->ConfigValue; - $Costs[$SID->CostCenterCode] = $SID->CostCenterCode . '-' . $SID->CostCenterName; - - endforeach; - } - echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter"', 'class = "form-control select2"'); - - ?> - -
-
- - - -
-
-
- -
-
- - Add Line Item -
- - - - - - - - - - - - - - - - -
SNoMaterial CodeMaterial NameUomQuantityAction
- -
- - - -   Save As Draft - - - -
-
-
-
+
+ + - + + + + }); +