RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_Merge With Gowtham Code in CI4-Application Branch

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-08-01 05:30:10 +00:00
commit 32f1652261
10 changed files with 781 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/Routes.php
View File

@ -258,6 +258,7 @@ $routes->post('UpdateIGR', 'Inwardgateregister::UpdateIGR');
$routes->post('updateIGRWeight', 'Inwardgateregister::updateIGRWeight');
$routes->post('UpdateIGRLineItem', 'Inwardgateregister::updateIGRLineItem');
$routes->post('ViewIGRHistory', 'Inwardgateregister::ViewIGRHistory');
$routes->post('getCostCenterData', 'Inwardgateregister::getCostCenterData');
$routes->post('ViewIGRfile', 'Inwardgateregister::ViewIGRfile');
$routes->post('inwardgateregister/addloadfile', 'Inwardgateregister::addloadfile');
$routes->post('inwardgateregister/edituploadfile', 'Inwardgateregister::edituploadfile');

7
app/Controllers/Inwardgateregister.php
View File

@ -580,6 +580,13 @@ function viewIGRDetails()
$result = $this->inwardgateregister_model->ViewIGRHistory($IGRNO);
return $this->response->setJSON($result);
}
function getCostCenterData()
{
$pono = $this->request->getPost('pono');
$result = $this->inwardgateregister_model->getCostCenterData($pono);
return $this->response->setJSON($result);
}
function UpdateIGR()

18
app/Models/Inwardgateregister_model.php
View File

@ -916,4 +916,22 @@ class Inwardgateregister_model extends Model
$query = $result->get();
return $query->getResult();
}
public function getCostCenterData($pono)
{
$builder = $this->db->table('t_purchaseorder_lineitem');
$builder->select('t_purchaseorder_lineitem.ReqNo,reqMaster.CostCenterCode,CSMaster.CostCenterName');
$builder->join('t_requestion_master reqMaster', 't_purchaseorder_lineitem.ReqNo = reqMaster.ReqNo', 'left');
$builder->join('t_costcenter_master CSMaster', 'reqMaster.CostCenterCode = CSMaster.CostCenterCode', 'left');
$builder->where('PONO', $pono);
$builder->groupBy('t_purchaseorder_lineitem.ReqNo');
$query = $builder->get();
$result = $query->getResult();
return $result;
}
}

46
app/Views/createPOfromRequistion.php
View File

@ -26,6 +26,13 @@
{
min-height: 733px;
}
#REQLIST_filter{
float: inline-end;
}
#REQLIST_wrapper .row .col-sm-4{
flex-basis: 50%;
float: inline-end;
}
</style>
<div class="content-wrapper">
<?php
@ -228,10 +235,10 @@
<thead style="background-color: #ddd !important;">
<tr>
<th>Select</th>
<th>Requested Date</th>
<th>Requistion Number</th>
<th>Requistion Type </th>
<th>Requested By</th>
<th>Requested Date</th>
<th>Tot. No. Of Line Items</th>
<th>Po Created Line Items</th>
<th>Partial PO Created Line Items</th>
@ -251,14 +258,17 @@
?>
<tr id="<?php echo $index; ?>">
<td><input type="checkbox" name="chk<?php echo $index; ?>" id="chk<?php echo $index; ?>" onclick="selectReqNo(<?php echo $index; ?>)" />&nbsp;</td>
<td><a data-toggle="modal" data-target="#myModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td>
<td><?php echo $record->ReqType; ?></td>
<td><?php echo $record->FirstName; ?></td>
<td align="right"><?php
$dt = new DateTime($record->ReqDate);
<td align="right">
<?php
$dt = new DateTime($record->ReqDate);
$RequestedDate = $dt->format('d-m-Y');
echo $RequestedDate;
?></td>
?>
</td>
<td><a data-toggle="modal" data-target="#myModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td>
<td><?php echo $record->ReqType; ?></td>
<td><?php echo $record->FirstName; ?></td>
<td align="right"><?php echo $record->TotalNoofLineItems; ?></td>
<td align="right"><?php echo $record->PolineItems; ?></td>
<td align="right"><?php echo $record->PartilallyLineItems; ?></td>
@ -367,7 +377,7 @@ function selectReqNo(rowId)
if(!ckb )
{
var removeItem = cellval[1].innerText;
var removeItem = cellval[2].innerText;
$.each(RequistionList.Req, function(i, el){
@ -389,13 +399,13 @@ function selectReqNo(rowId)
if(RequistionList.Req.length > 0)
{
if(Type == cellval[2].innerText )
if(Type == cellval[3].innerText )
{
RequistionList.Req.push({
"ReqNo" : cellval[1].innerText,
"ReqType" : cellval[2].innerText,
"ReqBy" : cellval[3].innerText,
"ReqNo" : cellval[2].innerText,
"ReqType" : cellval[3].innerText,
"ReqBy" : cellval[4].innerText,
});
@ -413,11 +423,11 @@ function selectReqNo(rowId)
RequistionList.Req.push({
"ReqNo" : cellval[1].innerText,
"ReqType" : cellval[2].innerText,
"ReqBy" : cellval[3].innerText,
"ReqNo" : cellval[2].innerText,
"ReqType" : cellval[3].innerText,
"ReqBy" : cellval[4].innerText,
});
Type =cellval[2].innerText;
Type =cellval[3].innerText;
}
@ -477,8 +487,8 @@ $(function () {
"paging": true,
"lengthChange": true,
"searching": true,
"columnDefs" : [{"targets":4, "type":"date-eu"}],
"aaSorting": [[ 4, "desc" ]],
"columnDefs" : [{"targets":1, "type":"date-eu"}],
"aaSorting": [[ 2, "desc" ]],
"ordering": true,
"info": true,
"autoWidth": true

58
app/Views/editrequisitionform.php
View File

@ -42,7 +42,27 @@ if (!empty($ReqPOType)) {
}
?>
<style type="text/css">
.select2 {
width: 100% ! important;
}
.num {
text-align: right;
}
#drpMaterial~.select2 .select2-selection--single{
height: auto;
max-height: 45px;
padding: 5px 3px;
line-height: normal;
}
#drpMaterial~.select2 .select2-selection__rendered{
overflow: visible;
text-overflow: ellipsis;
white-space: pre-wrap;
line-height: normal;
}
</style>
<script type="text/javascript">
window.onload = function() {
var serviceScheduleType = '<?php echo $serviceSchedule; ?>';
@ -79,8 +99,8 @@ if (!empty($ReqPOType)) {
echo form_open(base_url() . 'EditRequisition', $attributes); ?>
<div class="row">
<div class="col-md-12">
<div class="row" align="right">
<a class="btn btn-success" href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Back</span></a>
<div class="row" align="right" style="padding-right:31px">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Back</span></a>
</div>
<div class="col-md-3">
<label>Request Type</label>
@ -141,7 +161,7 @@ if (!empty($ReqPOType)) {
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"');
?>
</div>
@ -156,7 +176,7 @@ if (!empty($ReqPOType)) {
</div>
</div>
<div class="col-md-2" id="DisplayScheduleDiv" style="display:none;">
<div class="col-md-3" id="DisplayScheduleDiv" style="display:none;">
<label>Select Service Schedule Type</label>
<div class="form-group">
<?php
@ -250,7 +270,7 @@ if (!empty($ReqPOType)) {
$options[$MID->MaterialCode] = $MID->MaterialCode . ' ' . ' - ' . ' ' . $MID->MaterialName;
endforeach;
}
echo form_dropdown('drpMaterial', $options, set_value('drpMaterial'), 'id="drpMaterial"', 'class="form-control"');
echo form_dropdown('drpMaterial', $options, set_value('drpMaterial'), 'id="drpMaterial"', 'class="form-control select2"');
?>
</div>
</div>
@ -297,8 +317,9 @@ if (!empty($ReqPOType)) {
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">cancel</a>
<a class="btn btn-success font addClick" ID="addClick"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">cancel</a>
</div>
</div>
</div>
@ -377,8 +398,9 @@ if (!empty($ReqPOType)) {
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditClick" ID="EditClick"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
@ -452,17 +474,16 @@ if (!empty($ReqPOType)) {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $RowCount; ?>" />
<?php if ($Status == REQ_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save</span></a>
<a class="btn btn-primary submit" ID="submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Update</span></a>
<a class="btn btn-success submit" ID="submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Update & Approve</span></a>
<input type="reset" class="btn btn-success">
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<a class="btn btn-success submit" ID="submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-approved submit" ID="submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<input type="reset" class="btn btn-reset">
<?php } else if ($Status == REQ_PENDING_APPROVAL) { ?>
<!--<a class="btn btn-success" ID="update" onclick="update()" >&nbsp;&nbsp;<span class="bold">Update</span></a>
<a class="btn btn-success" href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Cancel</span></a> -->
<a class="btn btn-success Save" ID="submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Update</span></a>
<a class="btn btn-success submit" ID="submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Update & Approve</span></a>
<input type="reset" class="btn btn-success">
<a class="btn btn-success Save" ID="submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-approved submit" ID="submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<input type="reset" class="btn btn-reset">
<?php } ?>
@ -474,6 +495,13 @@ if (!empty($ReqPOType)) {
</div>
<script>
$( document ).ready(function() {
// $("#CostCenter").select2();
// $("#drpMaterial").select2();
// $("#EditMaterialCode").select2();
});
function isNumberKey(evt) {
var charCode = (evt.which) ? evt.which : evt.keyCode;
if (charCode != 46 && charCode > 31 &&

28
app/Views/includes/footer.php
View File

@ -8,7 +8,8 @@
<strong><?php echo generateCopyrightNotice(); ?><a class="a-tag-link" href="<?php echo base_url(); ?>">RESICO</a>.</strong> All rights reserved.
</footer>
<!-- jQuery UI 1.11.2 -->
<!-- <script src="http://code.jquery.com/ui/1.11.2/jquery-ui.min.js" type="text/javascript"></script> -->
<!-- Resolve conflict in jQuery UI tooltip with Bootstrap tooltip -->
@ -27,8 +28,33 @@
y.addClass('active');
y.parent().addClass('active');
</script>
<!-- toster cdn start -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js"></script>
<!-- toster cdn end -->
<script>
$(document).ready(function() {
// Toastr settings
toastr.options = {
"closeButton": true,
"debug": false,
"newestOnTop": false,
"progressBar": true,
"positionClass": "toast-top-right",
"preventDuplicates": false,
"onclick": null,
"showDuration": "300",
"hideDuration": "1000",
"timeOut": "5000",
"extendedTimeOut": "1000",
"showEasing": "swing",
"hideEasing": "linear",
"showMethod": "fadeIn",
"hideMethod": "fadeOut"
};
$('.dataTables-example').dataTable({
responsive: true,
"dom": 'T<"clear">lfrtip',

739
app/Views/includes/header.php
View File

@ -15,6 +15,10 @@
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<!-- Bootstrap 3.3.4 -->
<link href="<?php echo base_url(); ?>public/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<!-- For Bootstrap 5 -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/5.1.3/css/bootstrap.min.css">
<!-- FontAwesome 4.3.0 -->
<link href="<?php echo base_url(); ?>public/assets/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<!-- Ionicons 2.0.0 -->
@ -85,6 +89,15 @@
});
</script> -->
<link rel="icon" href="<?php echo base_url(); ?>public/assets/dist/img/RI_favicon.png"/>
<!-- toster cdn start -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css" rel="stylesheet">
<!-- toster cdn end -->
<style>
/* Custom CSS to increase font size */
.toast-message {
font-size: 16px !important; /* Adjust font size as needed */
}
</style>
<style>
.off-screen {
@ -131,6 +144,49 @@
/* ::-webkit-scrollbar {
display: none;
} */
.btn-reset{
border-color: #696a6c;
color: #ffffff;
background-color: #a08686;
}
.btn-cancel{
color: #fff;
background-color: #6c757d;
border-color: #6c757d;
}
.btn-cancel:hover {
color: #fff;
background-color: #5a6268;
border-color: #545b62;
}
.btn-approved{
color: #fff;
background-color: #37b83d !important;
border-color: #008d4c;
}
.toast-success {
background-color: #28a745; /* Change this to your preferred background color */
border: 1px solid #155724; /* Change this to your preferred border color */
}
::-webkit-scrollbar {
width: 5px;
height: 5px;
background-color: #f5f5f5;
}
::-webkit-scrollbar-thumb {
background-color: #797a7c;
border-radius: 15px;
height: 5px;
}
::-webkit-scrollbar-track {
background-color: #797a7c;
}
</style>
@ -281,31 +337,10 @@
<!-- Dashboard Ends -->
<?php } ?>
<!-- Complaint starts -->
<li class="treeview">
<a href="">
<i class="fa fa-thumb-tack"></i>
<span>Complaint</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<li><a href="<?php echo base_url(); ?>purchaseorder/AddComplaint">
<i class="fa fa-arrow-circle-up"></i>
<span>Add Complaint</span>
</a>
</li>
<li><a href="<?php echo base_url(); ?>purchaseorder/Nonconfirmativelist">
<i class="fa fa-arrow-circle-up"></i>
<span>Complaint List</span>
</a>
</li>
</ul><!-- @295 closed -->
</li><!-- 287 closed -->
<!-- Complanit ends -->
<p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">PURCHASE</p>
<!-- Requisition Starts Ends -->
<?php if ($DEPCode != HR) { ?>
<?php if ($DEPCode != SECURITY) { ?>
@ -435,8 +470,318 @@
<!-- <li><a href="<?php echo base_url(); ?>shortagematerialListing" >
<i class="fa fa-files-o"></i><span>Reorder Level</span>
</a></li>-->
<!-- Purchase order starts here -->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == PURCHASE ||
$DEPCode == FINANCE ||
$DEPCode == MANAGEMENT ||
$DEPCode == ADMIN) { ?>
<li class="treeview">
<a href="">
<i class="fa fa-first-order"></i>
<span>Purchase order</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>purchaseorderListing">
<i class="fa fa-list"></i>
<span>Purchase Order List</span>
</a>
</li>
<?php if ($DEPCode == FINANCE) { ?>
<!-- <li>
<a href="<?php echo base_url(); ?>POApproval">
<i class="fa fa-users"></i>
<span>Approve Purchase Order</span>
</a>
</li> -->
<?php } ?>
<?php if ($DEPCode == MANAGEMENT) { ?>
<li>
<a href="<?php echo base_url(); ?>PORelease">
<i class="fa fa-history"></i>
<!-- <span>Release Purchase Order's</span> -->
<span>Approve Purchase Order</span>
</a>
</li>
<?php } ?>
<?php if ($DEPCode == PURCHASE) { ?>
<li>
<a href="<?php echo base_url(); ?>EmergencyPO">
<i class="fa fa-ambulance"></i>
<span>Emergency Purchase Order </span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>Report_pending_purchase">
<i class="fa fa-align-left"></i>
<span>Pending Purchase Order</span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>amendmentpurchaseorder">
<i class="fa fa-ambulance"></i>
<span>Amendment Purchase Order </span>
</a>
</li>
<?php } ?>
</ul>
</li>
<?php } ?>
<?php if ($DEPCode == PURCHASE) { ?>
<!-- <li>
<a href="<?php echo base_url(); ?>AdvanceRequest">
<i class="fa fa-dashboard"></i> <span>Advance Request</span>
</a>
</li> -->
<?php } ?>
<?php } else {$check = 0; ?>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
if (
$assd == PURCHASE ||
$assd == FINANCE ||
$assd == MANAGEMENT ||
$DEPCode == PURCHASE ||
$DEPCode == FINANCE ||
$DEPCode == MANAGEMENT
) {
$check = $check + 1; ?>
<li class="treeview">
<a href="">
<i class="fa fa-first-order"></i>
<span>Purchase order</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>purchaseorderListing">
<i class="fa fa-list"></i>
<span>Purchase Order List</span>
</a>
</li>
<!-- <li>
<a href="<?php echo base_url(); ?>POApproval">
<i class="fa fa-users"></i>
<span>Approve Purchase Order</span>
</a>
</li> -->
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
$check1 = 1;
?>
<?php
if ($assd == MANAGEMENT || $DEPCode == MANAGEMENT) {
$check1 = 2; ?>
<li>
<a href="<?php echo base_url(); ?>PORelease">
<i class="fa fa-history"></i>
<!-- <span>Release Purchase Orders</span> -->
<span>Approve Purchase Order</span>
</a>
</li>
<?php
}
if ($check1 == 2) {
break;
}
?>
<?php } ?>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
$check1 = 1;
?>
<?php
if ($assd == PURCHASE || $DEPCode == PURCHASE) {
$check1 = 2; ?>
<li>
<a href="<?php echo base_url(); ?>EmergencyPO">
<i class="fa fa-ambulance"></i>
<span>Emergency Purchase Order </span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>Report_pending_purchase">
<i class="fa fa-align-left"></i>
<span>Pending Purchase Order</span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>amendmentpurchaseorder">
<i class="fa fa-ambulance"></i>
<span>Amendment Purchase Order </span>
</a>
</li>
<?php
}
if ($check1 == 2) {
break;
}
?>
<?php } ?>
</ul>
</li>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
$check1 = 1;
?>
<?php
if ($assd == PURCHASE || $DEPCode == PURCHASE) {
$check1 = 2; ?>
<!-- <li>
<a href="<?php echo base_url(); ?>AdvanceRequest">
<i class="fa fa-dashboard"></i> <span>Advance Request</span>
</a>
</li> -->
<?php
}
if ($check1 == 2) {
break;
}
?>
<?php } ?>
<?php } ?>
<?php if ($check == 1) {
break;
}
} ?>
<?php } ?>
<!-- Purchase order menu ends here -->
<!-- Inspection now changed into inward menu starts here -->
<?php if (empty($DepAccesslist)) {
if (
$DEPCode == STORE ||
$DEPCode == QUALITY ||
$DEPCode == SECURITY
) { ?>
<li class="treeview">
<a href="">
<i class="fa fa-check-square-o"></i>
<span> Old Inspection</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<?php if (
$DEPCode == STORE ||
$DEPCode == QUALITY ||
$DEPCode == SECURITY
) { ?>
<li>
<a href="<?php echo base_url(); ?>AddIGR">
<i class="fa fa-upload"></i>
<span>Inward Gate Register Entry</span>
</a>
</li>
<li>
<?php $link = ($DEPCode == SECURITY) ? base_url() . 'ViewigrDetails' : base_url() . 'Viewigr'; ?>
<a href="<?php echo $link; ?>">
<i class="fa fa-upload"></i>
<span>View Inward Gate Register 5</span>
</a>
</li>
<?php } ?>
</ul>
</li>
<?php } ?>
<?php } else {?>
<?php $check81 = 0; ?>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
//echo $assd;
if (
$assd == STORE ||
$DEPCode == QUALITY ||
$assd == QUALITY ||
$DEPCode == STORE ||
$DEPCode == SECURITY ||
$assd == SECURITY
) {
$check81 = $check81 + 1; ?>
<li class="treeview">
<a href="">
<i class="fa fa-check-square-o"></i>
<span> Inward</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>AddIGR">
<i class="fa fa-upload"></i>
<span>Inward Gate Register Entry</span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>ViewIGR">
<i class="fa fa-eye"></i>
<span>View Inward Gate Register</span>
</a>
</li>
</ul>
</li>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep; ?>
<?php
}
}
?>
<?php if ($check81 == 1) { break;}
}
} ?>
<!-- Inspection now changed into inward menu ends here -->
<p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">INVENTORY</p>
<!--STOCK -->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == PRODUCTION) { ?>
@ -550,6 +895,22 @@
}} ?>
<!--STOCK ends here-->
<p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">PRODUCTION</p>
<!-- INPROCESS MODULE-->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == QUALITY) { ?>
@ -623,7 +984,10 @@
} ?>
<?php } ?>
<!-- INPROCESS MODULE END-->
<!-- BATCH CARD MODULE-->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == PRODUCTION) { ?>
@ -713,7 +1077,11 @@
<?php }if ($check == 1) {break;}} ?>
<?php } ?>
<!-- BATCH CARD MODULE END-->
<!-- RESIN BATCH CARD MODULE-->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == PRODUCTION) { ?>
@ -783,6 +1151,19 @@
<?php } ?>
<!-- RESIN BATCH CARD MODULE END-->
<p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">OTHERS</p>
<!-- Master Menus starts -->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == FINANCE ||
@ -1060,6 +1441,9 @@
<?php } ?> <!-- @872 closed here -->
<!-- Master Menus closed here -->
<!-- Enquiry and Order menu strts -->
<?php if (!empty($DepAccesslist)) { ?>
<?php foreach ($DepAccesslist as $dep) {
@ -1092,192 +1476,10 @@
}} ?>
<!-- Enquiry and Order menu ends -->
<!-- Purchase order starts here -->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == PURCHASE ||
$DEPCode == FINANCE ||
$DEPCode == MANAGEMENT ||
$DEPCode == ADMIN) { ?>
<li class="treeview">
<a href="">
<i class="fa fa-first-order"></i>
<span>Purchase order</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>purchaseorderListing">
<i class="fa fa-list"></i>
<span>Purchase Order List</span>
</a>
</li>
<?php if ($DEPCode == FINANCE) { ?>
<!-- <li>
<a href="<?php echo base_url(); ?>POApproval">
<i class="fa fa-users"></i>
<span>Approve Purchase Order</span>
</a>
</li> -->
<?php } ?>
<?php if ($DEPCode == MANAGEMENT) { ?>
<li>
<a href="<?php echo base_url(); ?>PORelease">
<i class="fa fa-history"></i>
<!-- <span>Release Purchase Order's</span> -->
<span>Approve Purchase Order</span>
</a>
</li>
<?php } ?>
<?php if ($DEPCode == PURCHASE) { ?>
<li>
<a href="<?php echo base_url(); ?>EmergencyPO">
<i class="fa fa-ambulance"></i>
<span>Emergency Purchase Order </span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>Report_pending_purchase">
<i class="fa fa-align-left"></i>
<span>Pending Purchase Order</span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>amendmentpurchaseorder">
<i class="fa fa-ambulance"></i>
<span>Amendment Purchase Order </span>
</a>
</li>
<?php } ?>
</ul>
</li>
<?php } ?>
<?php if ($DEPCode == PURCHASE) { ?>
<!-- <li>
<a href="<?php echo base_url(); ?>AdvanceRequest">
<i class="fa fa-dashboard"></i> <span>Advance Request</span>
</a>
</li> -->
<?php } ?>
<?php } else {$check = 0; ?>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
if (
$assd == PURCHASE ||
$assd == FINANCE ||
$assd == MANAGEMENT ||
$DEPCode == PURCHASE ||
$DEPCode == FINANCE ||
$DEPCode == MANAGEMENT
) {
$check = $check + 1; ?>
<li class="treeview">
<a href="">
<i class="fa fa-first-order"></i>
<span>Purchase order</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>purchaseorderListing">
<i class="fa fa-list"></i>
<span>Purchase Order List</span>
</a>
</li>
<!-- <li>
<a href="<?php echo base_url(); ?>POApproval">
<i class="fa fa-users"></i>
<span>Approve Purchase Order</span>
</a>
</li> -->
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
$check1 = 1;
?>
<?php
if ($assd == MANAGEMENT || $DEPCode == MANAGEMENT) {
$check1 = 2; ?>
<li>
<a href="<?php echo base_url(); ?>PORelease">
<i class="fa fa-history"></i>
<!-- <span>Release Purchase Orders</span> -->
<span>Approve Purchase Order</span>
</a>
</li>
<?php
}
if ($check1 == 2) {
break;
}
?>
<?php } ?>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
$check1 = 1;
?>
<?php
if ($assd == PURCHASE || $DEPCode == PURCHASE) {
$check1 = 2; ?>
<li>
<a href="<?php echo base_url(); ?>EmergencyPO">
<i class="fa fa-ambulance"></i>
<span>Emergency Purchase Order </span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>Report_pending_purchase">
<i class="fa fa-align-left"></i>
<span>Pending Purchase Order</span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>amendmentpurchaseorder">
<i class="fa fa-ambulance"></i>
<span>Amendment Purchase Order </span>
</a>
</li>
<?php
}
if ($check1 == 2) {
break;
}
?>
<?php } ?>
</ul>
</li>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
$check1 = 1;
?>
<?php
if ($assd == PURCHASE || $DEPCode == PURCHASE) {
$check1 = 2; ?>
<!-- <li>
<a href="<?php echo base_url(); ?>AdvanceRequest">
<i class="fa fa-dashboard"></i> <span>Advance Request</span>
</a>
</li> -->
<?php
}
if ($check1 == 2) {
break;
}
?>
<?php } ?>
<?php } ?>
<?php if ($check == 1) {
break;
}
} ?>
<?php } ?>
<!-- Purchase order menu ends here -->
<!-- Banking menu starts here -->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == FINANCE) { ?>
@ -1672,99 +1874,13 @@
}
} ?>
<!-- Inspection menu ends here -->
<!-- Inspection now changed into inward menu starts here -->
<?php if (empty($DepAccesslist)) {
if (
$DEPCode == STORE ||
$DEPCode == QUALITY ||
$DEPCode == SECURITY
) { ?>
<li class="treeview">
<a href="">
<i class="fa fa-check-square-o"></i>
<span> Old Inspection</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<?php if (
$DEPCode == STORE ||
$DEPCode == QUALITY ||
$DEPCode == SECURITY
) { ?>
<li>
<a href="<?php echo base_url(); ?>AddIGR">
<i class="fa fa-upload"></i>
<span>Inward Gate Register Entry</span>
</a>
</li>
<li>
<?php $link = ($DEPCode == SECURITY) ? base_url() . 'ViewigrDetails' : base_url() . 'Viewigr'; ?>
<a href="<?php echo $link; ?>">
<i class="fa fa-upload"></i>
<span>View Inward Gate Register 5</span>
</a>
</li>
<?php } ?>
</ul>
</li>
<?php } ?>
<?php } else {?>
<?php $check81 = 0; ?>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep;
//echo $assd;
if (
$assd == STORE ||
$DEPCode == QUALITY ||
$assd == QUALITY ||
$DEPCode == STORE ||
$DEPCode == SECURITY ||
$assd == SECURITY
) {
$check81 = $check81 + 1; ?>
<li class="treeview">
<a href="">
<i class="fa fa-check-square-o"></i>
<span> Inward</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<li>
<a href="<?php echo base_url(); ?>AddIGR">
<i class="fa fa-upload"></i>
<span>Inward Gate Register Entry</span>
</a>
</li>
<li>
<a href="<?php echo base_url(); ?>ViewIGR">
<i class="fa fa-eye"></i>
<span>View Inward Gate Register</span>
</a>
</li>
</ul>
</li>
<?php foreach ($DepAccesslist as $dep) {
$assd = $dep->AssDep; ?>
<?php
}
}
?>
<?php if ($check81 == 1) { break;}
}
} ?>
<!-- Inspection now changed into inward menu ends here -->
<!-- Inspection now changed into outward menu starts here -->
<?php if (empty($DepAccesslist)) {
if (
@ -2155,6 +2271,31 @@
} ?>
<?php } ?>
<!-- ReportList menu ends here -->
<!-- Complaint starts -->
<li class="treeview">
<a href="">
<i class="fa fa-thumb-tack"></i>
<span>Complaint</span>
<span class="pull-right-container">
<span class="fa fa-angle-down pull-right"></span>
</span>
</a>
<ul class="treeview-menu">
<li><a href="<?php echo base_url(); ?>purchaseorder/AddComplaint">
<i class="fa fa-arrow-circle-up"></i>
<span>Add Complaint</span>
</a>
</li>
<li><a href="<?php echo base_url(); ?>purchaseorder/Nonconfirmativelist">
<i class="fa fa-arrow-circle-up"></i>
<span>Complaint List</span>
</a>
</li>
</ul><!-- @295 closed -->
</li><!-- 287 closed -->
<!-- Complanit ends -->
<!-- Attendance menu start here -->
<?php if (empty($DepAccesslist)) { ?>

157
app/Views/requisitionform.php
View File

@ -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;
}
</style>
<div class="content-wrapper" style="min-height:537px;">
@ -34,12 +46,35 @@ if (!empty($Emp)) {
<div class="row">
<div class="col-md-12">
<div align="right" style="padding-right:11px">
<a class="btn btn-success" href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Back</span></a>
<a class="btn btn-cancel" href="<?php echo base_url(); ?>Requisition" ID="cancel">&nbsp;&nbsp;<span class="bold">Back</span></a>
</div>
</div>
<div class="col-md-12">
<div class="col-md-3">
<label>Requested By</label><span style="color:red;">*</span>
<div>
<?php
$RequestByOpt = array("-1" => '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);
?>
<!-- <input type="hidden" name="EmpID" id="EmpID" value=<?php //echo $EmpID ?> /> -->
</div>
</div>
<div class="col-md-3">
<label>Request Type</label>
<label>Request Type</label><span style="color:red;">*</span>
<div>
<?php
$options = array("-1" => 'Select Request Type');
@ -61,23 +96,7 @@ if (!empty($Emp)) {
</div>
</div>
<div class="col-md-3">
<label>Requested By</label>
<div>
<?php
$RequestByOpt = array("-1" => '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);
?>
<!-- <input type="hidden" name="EmpID" id="EmpID" value=<?php //echo $EmpID ?> /> -->
</div>
</div>
<div class="col-md-3">
<label>Department Name</label>
<div class="form-group">
@ -99,7 +118,7 @@ if (!empty($Emp)) {
</div>
<div class="col-md-12">
<div class="col-md-3">
<label>Cost Center Name</label>
<label>Cost Center Name</label><span style="color:red;">*</span>
<div>
<?php
$Costs = array("-1" => '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)) {
?>
</div>
</div>
<div class="col-md-2" id="DisplayScheduleDiv" style="display:none;">
<div class="col-md-3" id="DisplayScheduleDiv" style="display:none;">
<label>Service Schedule Type</label>
<div class="form-group">
<?php
@ -141,7 +160,7 @@ if (!empty($Emp)) {
endforeach;
}
echo form_dropdown('ScheduleType', $SchType, set_value('ScheduleType'), 'id="ScheduleType"', 'class = "form-control"');
echo form_dropdown('ScheduleType', $SchType, set_value('ScheduleType'), 'id="ScheduleType"', 'class = "form-control select2"');
?>
</div>
@ -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"');
?>
</div>
@ -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" ');
?>
</div>
</div>
<div class="col-md-12" style="padding: 5px;">
<div class="col-md-4">
<label>Description</label>
<div class="form-group">
<?php
$data = array('name' => 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-4" id="otherDescription" style="display:none;">
<div class="col-md-6" id="otherDescription" style="display:none;">
<label>Other Description</label>
<div class="form-group">
<?php
@ -235,7 +243,7 @@ if (!empty($Emp)) {
?>
</div>
</div>
<div class="col-md-4">
<div class="col-md-6">
<label>UOM</label>
<div>
<?php
@ -245,7 +253,7 @@ if (!empty($Emp)) {
</div>
</div>
<div class="col-md-4">
<div class="col-md-6">
<label>Quantity</label>
<div class="form-group">
<?php
@ -254,12 +262,22 @@ if (!empty($Emp)) {
?>
</div>
</div>
<div class="col-md-12">
<label>Description</label>
<div class="form-group">
<?php
$data = array('name' => 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true','style' => 'max-height: 50px;');
echo form_textarea($data);
?>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font addClick"><span class="bold">Add</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">cancel</a>
</div>
</div>
</div>
@ -289,16 +307,8 @@ if (!empty($Emp)) {
</div>
</div>
<div class="col-md-12" style="padding: 5px;">
<div class="col-md-4">
<label>Description</label>
<div class="form-group">
<?php
$data = array('name' => 'EditDescription', 'value' => set_value('EditDescription'), 'id' => 'EditDescription', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-4" id="EditotherDescription">
<div class="col-md-6" id="EditotherDescription">
<label>Other Description</label>
<div class="form-group">
<?php
@ -307,7 +317,7 @@ if (!empty($Emp)) {
?>
</div>
</div>
<div class="col-md-4">
<div class="col-md-6">
<label>UOM</label>
<div>
<?php
@ -317,7 +327,7 @@ if (!empty($Emp)) {
</div>
</div>
<div class="col-md-4">
<div class="col-md-6">
<label>Quantity</label>
<div class="form-group">
<?php
@ -326,14 +336,24 @@ if (!empty($Emp)) {
?>
</div>
</div>
<div class="col-md-12">
<label>Description</label>
<div class="form-group">
<?php
$data = array('name' => 'EditDescription', 'value' => set_value('EditDescription'), 'id' => 'EditDescription', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditClick" ID="EditClick"><span class="bold">Edit</span></a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
@ -365,9 +385,10 @@ if (!empty($Emp)) {
<div align="right" style="padding-right:10px">
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<a class="btn btn-success Save" ID="Save" onclick="Save()">&nbsp;&nbsp;<span class="bold">Save</span></a>
<input type="submit" value="Approved" class="btn btn-success">
<input type="reset" value="Reset" class="btn btn-success" onclick="window.location.reload();">
<input type="reset" value="Reset" class="btn btn-reset" onclick="window.location.reload();">
<a class="btn btn-success Save" ID="Save" onclick="Save()">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<input type="submit" class="btn btn-approved" value="Approved" >
</div>
<br>
@ -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)) {
<script>
function validate() {
if ($("option:selected", $("#RequestType")).val() == '-1') {
alert('Please Select ReqType Names');
alert('Please Select Request Type ');
return false;
} else if ($("option:selected", $("#EmpID")).val() == '-1') {
alert('Please Select Reqby');
alert('Please Select Request by');
return false;
} else if ($("#txtRowCount").val().length < 1) {
alert('Please Add Line Item');
@ -704,14 +731,14 @@ if (!empty($Emp)) {
$('.addClick').click(function() {
if ($("#MaterialCode option:selected").val() == '-1') {
alert('Please Select the MaterialCode ');
alert('Please Select The MaterialCode ');
return false;
}
var qty = parseInt(document.getElementById('Quantity').value);
if (isNaN(qty) || qty < 1) {
// if (document.getElementById('Quantity').value == '') {
alert('Please Enter the Vaild Quantity');
alert('Please Enter The Vaild Quantity');
return false;
}
@ -765,6 +792,9 @@ if (!empty($Emp)) {
addHidden(theForm, "otherD" + temp, materialdescription);
$('#txtRowCount').val(temp);
$('#myModal1').modal('hide');
toastr.success('Line Item Added!', 'Success');
}
@ -833,7 +863,8 @@ if (!empty($Emp)) {
$('#UOM' + userid).val(editUOM);
$('#Quantity' + userid).val(editQuantity);
$('#EditItem').modal('hide');
toastr.success('Line Item Updated!', 'Success');
}
});

82
app/Views/requisitionlisting.php
View File

@ -11,7 +11,30 @@
}
//echo $ReqNo;
}?>
<style>
#Requisition_filter{
float: inline-end;
}
#Requisition_wrapper .row .col-sm-4{
flex-basis: 50%;
float: inline-end;
}
#Requisition_paginate .pagination {
flex-basis: 50%;
float: inline-end;
margin:0 0 15px;
}
#Requisition_wrapper .row:nth-child(3), #Requisition_wrapper .row:nth-child(1){
padding: 0 15px;
}
#Requisition_info{
margin-top: 5px;
}
.dataTables_wrapper{
padding-bottom: 0;
}
</style>
<script>
@ -50,7 +73,9 @@
span.highlight {
background-color: yellow;
}
</style>
<div class="content-wrapper">
<section class="content">
@ -62,11 +87,11 @@ span.highlight {
<center><b><h3 class="box-title">Requisition Listing</h3></b></center>
</div><!-- /.box-header -->
<?php if($DraftCount > 0 ) {?><p>
<span class="highlight">The Requisition No <b><?php echo $ReqNo;?></b> is in Draft status.</span> Please act on the requisition.<span class="highlight">Then only you can raise New Requisition. </span>
<?php if($DraftCount > 0 ) {?><p style="text-align: center;">
<span class="highlight">The Requisition No <b><?php echo $ReqNo;?></b> is in Draft status.</span> Please act on the requisition.<span class="highlight">Then only you can raise New Requisition. </span>
</p> <?php } ?>
<div class="row">
<div class="col-md-12 text-right" style="margin-bottom:-3%;">
<div class="col-md-12 text-right" style="margin-left:-2%;">
<div class="form-group">
<?php if($DraftCount == 0)
{ ?>
@ -78,6 +103,7 @@ span.highlight {
<table id="Requisition" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<thead style="background-color: #ddd;">
<tr>
<th>Requisted Date</th>
<th>Requisition No</th>
<th>Requisition Type</th>
<th>Tot No.OfLineItem </th>
@ -85,7 +111,6 @@ span.highlight {
<th>Partially PoCreatedLineItem</th>
<th>NewLine Item</th>
<th>Status</th>
<th>Requisted Date</th>
<th>Action</th>
</tr>
@ -101,6 +126,10 @@ span.highlight {
{ //print_r($record);
?>
<tr>
<td> <?php $Pdt = new DateTime($record->CreatedDate );
$PODate = $Pdt->format('d-m-Y');
echo $PODate ?>
</td>
<td><?php echo $record->ReqNo ?></td>
<td><?php echo $record->ReqType ?></td>
<td><?php echo $record->TotalNoofLineItems ?></td>
@ -110,10 +139,7 @@ span.highlight {
<td><?php echo $record->StatusName ?></td>
<td><?php $Pdt = new DateTime($record->CreatedDate );
$PODate = $Pdt->format('d-m-Y');
echo $PODate
?></td>
<td> <a data-toggle="tooltip" href="<?php echo base_url().'EditRequisitionForm?ReqNo='.$record->ReqNo.'&ReqType='.$record->ReqType; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?> - Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )" ><span class="glyphicon glyphicon-trash" title="<?php echo $record->ReqNo; ?> - Click here to Delete Requisition details"></span></a> </td>
</tr>
@ -133,18 +159,34 @@ span.highlight {
<script>
$(function () {
$('#Requisition').DataTable({
"paging": true,
"lengthChange": true,
"searching": true,
"ordering": true,
"columnDefs" : [{"targets":7, "type":"date-eu"}],
// $('#Requisition').DataTable({
// "paging": true,
// "lengthChange": true,
// "searching": true,
// "ordering": true,
// "columnDefs": [{"targets": 0, "type": "date-eu"}],
// "aaSorting": [[1, "desc"]],
// "info": true,
// "autoWidth": true,
// "pageLength": 10
// });
$(document).ready(function() {
$('#Requisition').DataTable({
"paging": true, // Enable pagination
"lengthChange": true, // Enable the option to change the number of rows per page
"searching": true, // Enable searching
"ordering": true, // Enable column ordering
"columnDefs": [{"targets": 0, "type": "date-eu"}], // Column definitions for date formatting
"aaSorting": [[1, "desc"]], // Default sorting: sort by the 2th column (index 1) in descending order
"info": true, // Show pagination info
"autoWidth": true, // Enable automatic column width adjustment
"pageLength": 10, // Set the default number of rows per page to 10
"lengthMenu": [10, 25, 50, 100] // Options for the number of rows per page in the dropdown
});
});
"aaSorting": [[ 7, "desc" ]],
"info": true,
"autoWidth": true
});
});
</script>

62
app/Views/viewinwardgateregister.php
View File

@ -106,7 +106,7 @@
$createddate = new DateTime($record->CreatedDate);
echo $createddate->format('d-m-Y h:i A'); ?></td>
<td><a data-toggle="modal" data-target="#Igrshow" data-id="<?php echo $index;?>" data-inx="<?php echo $index;?>" data-userid="<?php echo $record->IGRNO ?>" data-igrstatus="<?php echo $record->IGRStatus ?>"> <u><?php echo $record->IGRNO ?></u></a></td>
<td><?php echo $record->PONO ?></td>
<td><a target="_blank" data-toggle="modal" data-target="#CostCentershow" data-id="<%=index%>" title="Cost Center" data-igrno="<?php echo $record->IGRNO ?>" data-pono="<?php echo $record->PONO ?>"><u><?php echo $record->PONO ?></u></a></td>
<td><?php echo $record->SupplierName ?></td>
<td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td>
<td align="right"><?php
@ -125,7 +125,9 @@
<a target="_blank" data-toggle="modal" data-target="#Historyshow" data-id="<%=index%>" title="IGR History" data-igrno="<?php echo $record->IGRNO ?>" data-pono="<?php echo $record->PONO ?>">
<i class="fa fa-history" style="text-align: center;"></i>
</a>
&nbsp;
<!-- <a class="a_tag_for_mrir" href="<?php echo base_url().'MRIRcontroller/igrdatavalues?IGRNO='.$record->IGRNO; ?>" target="_blank" data-id="<%=index%>" title="Generate MRIR"><i class="fa fa-external-link" style="text-align: center;"></i></a> -->
</td>
</tr>
@ -370,6 +372,27 @@
</div>
</div>
<!-- History modal fade closed-->
<!-- CostCenter modal fade -->
<div class="modal fade" id="CostCentershow" role="dialog">
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content" style="width:800px;">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<center>
<h4>Cost Center List <span id="CCTitle"></span></h4>
</center> <!-- IGR number should display here-->
</div>
<div style="margin:20px;" id="CCStatement"></div>
<div style="text-align: right; margin:5px;">
<a class="btn btn-success" data-dismiss="modal" value="Close">Close</a>
</div>
<br />
</div>
</div>
</div>
<!-- CostCenter modal fade closed-->
<!-- File modal -->
<div class="modal fade" id="Fileshow" role="dialog">
<div class="modal-dialog">
@ -801,6 +824,43 @@
$("#HisStatement").html(output);
}
});
$("#CostCentershow").on("shown.bs.modal", function(e) {
var pono = $(e.relatedTarget).data('pono');
$('#CCTitle').text(" (" + pono + ") ");
$("#CCStatement").empty();
if (pono !== "") {
$.ajax({
data: { pono: pono },
type: "POST",
url: "<?php echo base_url() ?>getCostCenterData",
success: function(data) {
var output = '';
if (data && data.length > 0) {
data.forEach(function(record) {
output += '<p style="font-size:16px;"> <strong>' + record.ReqNo + '</strong> : ' + record.CostCenterName + '-' + record.CostCenterCode +' </p>';
});
} else {
output = '<p style="text-align: center;">No Cost Center Data Available</p>';
}
$("#CCStatement").html(output);
},
error: function(xhr, status, error) {
var output = '<p style="text-align: center;">No Data Available</p>';
$("#CCStatement").html(output);
console.error('AJAX Error: ' + status + error);
}
});
} else {
var output = '<p style="text-align: center;">No Data Available</p>';
$("#CCStatement").html(output);
}
});
});
function constructSentence(record) {