labstaff
This commit is contained in:
parent
c5be0825f1
commit
f8ce413fa0
@ -995,9 +995,9 @@ function viewIGRDetails()
|
||||
|
||||
$to_email_addr = "";
|
||||
for ($i = 0; $i < count($result_for_email['to_mails']); $i++) {
|
||||
// $to_email_addr .= $result_for_email['to_mails'][$i]->email . " , ";
|
||||
$to_email_addr .= $result_for_email['to_mails'][$i]->email . " , ";
|
||||
}
|
||||
$to_email_addr .= "sanjeev.p@venbainfotech.com,gowtham.m@venbainfotech.com";
|
||||
// $to_email_addr .= "sanjeev.p@venbainfotech.com,gowtham.m@venbainfotech.com";
|
||||
$to_email_addr = rtrim($to_email_addr, " ,");
|
||||
$email_response = $notification->sendEmail([
|
||||
'recipient_email' => $to_email_addr,
|
||||
@ -1438,9 +1438,9 @@ function updateIGRWeight(){
|
||||
|
||||
$to_email_addr = '';
|
||||
for ($i = 0; $i < count($result_for_email['to_mails']); $i++) {
|
||||
// $to_email_addr .= $result_for_email['to_mails'][$i]->email . " , ";
|
||||
$to_email_addr .= $result_for_email['to_mails'][$i]->email . " , ";
|
||||
}
|
||||
$to_email_addr = " venbalap08@gmail.com , sanjeev.p@venbainfotech.com";
|
||||
// $to_email_addr = " venbalap08@gmail.com , sanjeev.p@venbainfotech.com";
|
||||
$to_email_addr = rtrim($to_email_addr, " ,");
|
||||
|
||||
$content = 'A new remark was created by '.$result_for_email['full_name'].' against IGR no '.$IGRNo.',</br></br> "'.$remark.'"';
|
||||
|
||||
@ -1020,7 +1020,7 @@ class User extends BaseController
|
||||
|
||||
// Validation passed
|
||||
$EmpID = $this->request->getPost('EmpList');
|
||||
$roleId = '2';
|
||||
$roleId = !empty($this->request->getPost('role')) ? $this->request->getPost('role') : '2' ;
|
||||
$password = (string)$this->request->getPost('password');
|
||||
$Createddt = date('Y-m-d H:i:s');
|
||||
$email = $this->request->getPost('MailID');
|
||||
|
||||
@ -1975,12 +1975,12 @@ if (!empty($INRSYMBOL)) {
|
||||
}
|
||||
|
||||
if (isChecked) {
|
||||
if (PO == 'REVENUE') {
|
||||
if (POTy == 'REVENUE') {
|
||||
//alert('normalemergency');
|
||||
$('#txtSpecial').val(0);
|
||||
// $('#content').loader('show');
|
||||
RevenueSave(1)
|
||||
} else if (PO == 'SERVICE') {
|
||||
} else if (POTy == 'SERVICE') {
|
||||
///alert('normal SERVICE emergency');
|
||||
$('#txtSpecialservice').val(0);
|
||||
Save(1)
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
<td>
|
||||
<?php if($record->is_driver){ ?>
|
||||
|
||||
<a title="Trip Details" style="cursor:pointer;" href="<?= base_url() . 'loadDriverAttendance?drv_id=' . $record->EmpID; ?>">
|
||||
<a class="tooltip-trigger" title="Click here to View <?php echo $record->FirstName; ?> Trip Details" style="cursor:pointer;" href="<?= base_url() . 'loadDriverAttendance?drv_id=' . $record->EmpID; ?>">
|
||||
<i class="fa fa-truck"></i>
|
||||
</a>
|
||||
<?php } ?>
|
||||
@ -122,6 +122,7 @@
|
||||
</div><!-- /.modal -->
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$('.tooltip-trigger').tooltip();
|
||||
$("#ddwizard").on("shown.bs.modal", function (e) {
|
||||
var id = $(e.relatedTarget).data('id');
|
||||
var name = $(e.relatedTarget).data('name');
|
||||
|
||||
@ -136,14 +136,14 @@
|
||||
$cdate = date('d-m-Y', strtotime($record->Created_date));
|
||||
} ?>
|
||||
<td>
|
||||
<a class="a_tag_link" href="<?php echo base_url() . 'employeedetails/ViewEmployee/?EmpID=' . $record->EmpID; ?>" data-toggle="tooltip" title="<?php echo $record->EmpID; ?> - Click here to view Employee Details"><?php echo $record->EmpID ?> </a></u>
|
||||
<a class="tooltip-trigger a_tag_link" href="<?php echo base_url() . 'employeedetails/ViewEmployee/?EmpID=' . $record->EmpID; ?>" title="<?php echo $record->EmpID; ?> - Click here to view Employee Details"><?php echo $record->EmpID ?> </a></u>
|
||||
|
||||
|
||||
<a href="<?php echo base_url() . 'employeedetails/downloadEmployeeDetails/?EmpID=' . $record->EmpID; ?>" data-toggle="tooltip" title="<?php echo $record->EmpID; ?> - Click here to Download Employee Details">
|
||||
<a href="<?php echo base_url() . 'employeedetails/downloadEmployeeDetails/?EmpID=' . $record->EmpID; ?>" class="tooltip-trigger" title="<?php echo $record->EmpID; ?> - Click here to Download Employee Details">
|
||||
<i class="fas fa-download"></i>
|
||||
</a>
|
||||
|
||||
<a href="#" data-toggle="modal" data-target="#accordion-modal" data-emp="<?php echo $record->EmpID ?>" data-toggle="tooltip" title="<?php echo $record->EmpID; ?> - Click here to view Employee History">
|
||||
<a href="#" data-toggle="modal" data-target="#accordion-modal" data-emp="<?php echo $record->EmpID ?>" class="tooltip-trigger" title="<?php echo $record->EmpID; ?> - Click here to View Employee History">
|
||||
<i class="fas fa-history"style="text-align: center;"></i>
|
||||
</a>
|
||||
|
||||
@ -245,6 +245,7 @@
|
||||
});
|
||||
});
|
||||
$(document).ready(function() {
|
||||
$('.tooltip-trigger').tooltip();
|
||||
$("#accordion-modal").on("shown.bs.modal", function(e) {
|
||||
var emp = $(e.relatedTarget).data('emp');
|
||||
var noData = '<p style="text-align: center;">No History Data Available</p>';
|
||||
|
||||
@ -78,7 +78,9 @@
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
<a id="addExpense" class="btn btn-success" data-toggle="modal" data-target="#expenseModal" href="">Add New Expense</a>
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Auditor'){?>
|
||||
<a id="addExpense" class="btn btn-success" data-toggle="modal" data-target="#expenseModal" href="">Add New Expense</a>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -184,7 +186,9 @@
|
||||
<button title="Download FIle" class="download_button" onclick="downloadFile('<?php echo $record['id']; ?>', '<?php echo $record['transporter_file']; ?>')" style="border: none;background-color: white;color: #02a8b5;">
|
||||
<i class="fas fa-file-download"></i>
|
||||
</button>
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Auditor'){?>
|
||||
<button title="Delete File" id="deleteFile" class="delete_button" data-value="<?php echo $record['id'] ?>" data-id="<?php echo $record['id'] ?>" data-file="<?php echo $record['transporter_file'] ?>"><i class="fas fa-trash"></i></button>
|
||||
<?php } ?>
|
||||
|
||||
<?php } ?>
|
||||
<button title="Edit" class="edit-button" data-toggle="modal" data-target="#expenseModal" data-id="<?php echo $record['id']; ?>" style="border: none;background-color: white;color: #02a8b5;">
|
||||
@ -332,7 +336,9 @@
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary waves-effect" data-dismiss="modal">Cancel</button>
|
||||
<button type="button" class="btn btn-info waves-effect waves-light tempClick" id="tempClick">Submit</button>
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Auditor'){?>
|
||||
<button type="button" class="btn btn-info waves-effect waves-light tempClick" id="tempClick">Submit</button>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -363,7 +369,7 @@ dateInput.addEventListener('change', function () {
|
||||
|
||||
|
||||
$(document).on('click', '.edit-button', function() {
|
||||
|
||||
var roleText = '<?php echo session()->get('roleText') ?>';
|
||||
$('.modal-title').html('Edit Expense');
|
||||
var expenseId = $(this).data('id');
|
||||
var supplier_list = [<?php echo $supplier_list; ?>];
|
||||
@ -414,7 +420,11 @@ dateInput.addEventListener('change', function () {
|
||||
var deleteButton = '<button id="deleteFile" class="delete_button" data-value="' + expense.id + '" data-id="' + expense.id + '" data-file="' + expense.transporter_file + '"><i class="fas fa-trash"></i></button>';
|
||||
|
||||
// Add the file link and delete button
|
||||
$('#transporterfile').after(fileLink + ' ' + deleteButton);
|
||||
if(roleText == 'System Administrator' ||roleText == 'Security' ||roleText == 'Auditor'){
|
||||
$('#transporterfile').after(fileLink + ' ' + deleteButton);
|
||||
}else{
|
||||
$('#transporterfile').after(fileLink);
|
||||
}
|
||||
} else {
|
||||
$('#transporterfile_name').val(''); // Clear hidden input if no file
|
||||
}
|
||||
|
||||
@ -718,7 +718,7 @@
|
||||
<!-- IGR module -->
|
||||
|
||||
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Stock Handler'){?>
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Stock Handler' || session()->get('roleText') == 'Lab Staff'){?>
|
||||
<!-- Inward Module -->
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-purchase" role="button"
|
||||
@ -740,13 +740,15 @@
|
||||
View Inward Gate Register</a>
|
||||
</div>
|
||||
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Auditor'){?>
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Lab Staff'){?>
|
||||
<div class="">
|
||||
<a href="<?php echo base_url(); ?>ListIGR" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>
|
||||
Non IGR / Expense</a>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Stock Handler'){?>
|
||||
<div class="dropdown" >
|
||||
|
||||
<a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-po"
|
||||
@ -761,7 +763,7 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
</div>
|
||||
</li>
|
||||
<?php } ?>
|
||||
@ -881,7 +883,7 @@
|
||||
|
||||
<!-- Stock module -->
|
||||
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Stock Handler'){?>
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Stock Handler' || session()->get('roleText') == 'Lab Staff'){?>
|
||||
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-stock" role="button"
|
||||
|
||||
@ -641,8 +641,10 @@
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary waves-effect"
|
||||
data-dismiss="modal" value="Cancel">Cancel</button>
|
||||
<?php if(session()->get('roleText') == 'System Administrator' || session()->get('roleText') == 'Security' || session()->get('roleText') == 'Auditor'){?>
|
||||
<button type="button"
|
||||
class="btn btn-info waves-effect waves-light" onclick="modalSave()">Save</button>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -1082,6 +1084,7 @@
|
||||
var inx = $(e.relatedTarget).data('id');
|
||||
var igr = $(e.relatedTarget).data('userid');
|
||||
var igrstatus = $(e.relatedTarget).data('igrstatus');
|
||||
var roleText = '<?php echo session()->get('roleText') ?>';
|
||||
|
||||
// alert(igrstatus);
|
||||
var buttonContainer = $(".buttonContainer");
|
||||
@ -1295,10 +1298,9 @@
|
||||
}
|
||||
|
||||
}
|
||||
// userrole is security based on status we show and here (else if)
|
||||
// other userrole(except admin). based on status we show and here (else if)
|
||||
else if (userRole !== 1) {
|
||||
|
||||
|
||||
|
||||
if (igrstatus === "ST074") {
|
||||
$("#pendingQuantityHeader").css("display", "table-cell");
|
||||
trIGRHTML += '<tr>' +
|
||||
@ -1306,15 +1308,26 @@
|
||||
'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
|
||||
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
|
||||
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
|
||||
'<td style="width: 100px;" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
|
||||
'<td style="width: 100px;" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ',' + isOpenOrder + ')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '" value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
|
||||
'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</td>' +
|
||||
'<td style="width: 100px;" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>';
|
||||
if (userRole == 5) { // 5 - lab staff
|
||||
trIGRHTML += '<td style="width: 100px;"> ' + parseInt(item.QuantityAsPerInvoice) + ' </td>';
|
||||
} else {
|
||||
trIGRHTML += '<td style="width: 100px;" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ',' + isOpenOrder + ')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '" value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>';
|
||||
}
|
||||
trIGRHTML += '<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</td>' +
|
||||
'<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
|
||||
'<td style="width: 50px;" id="amount' + i + '">' + amount + '</td>' +
|
||||
'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>' +
|
||||
'<td style="width: 100px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;" value="'+item.Remarks+'"> </td>' +
|
||||
'<td style="width: 25px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +
|
||||
'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>';
|
||||
if (userRole == 5) {
|
||||
trIGRHTML += '<td style="width: 100px;"> ' + item.Remarks + ' </td>';
|
||||
} else {
|
||||
trIGRHTML += '<td style="width: 100px;">' +
|
||||
'<input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" ' +
|
||||
'onchange="SetRemarks(' + i + ')" style="width: 75px;" value="' + item.Remarks + '">' +
|
||||
'</td>';
|
||||
}
|
||||
trIGRHTML += '<td style="width: 25px;">' + '<a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" ' + 'data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus="' + igrstatus + '">' + '<i class="fa fa-solid fa-truck" style="text-align: center;"></i></a>' + '</td>' +
|
||||
'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
|
||||
'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
|
||||
'<input type="hidden" id="txtQuantityAsPerInvoice' + i + '" name="txtQuantityAsPerInvoice' + i + '" value="' + item.QuantityAsPerInvoice + '">' +
|
||||
@ -1341,6 +1354,7 @@
|
||||
}else{
|
||||
trIGRHTML +='</tr>';
|
||||
}
|
||||
|
||||
|
||||
if ((item.Quantity - item.QuantityAsPerInvoice) == 0.00) {
|
||||
$('#QuantityAsPerInvoice' + i).attr('readonly', 'true');
|
||||
@ -1354,13 +1368,25 @@
|
||||
'<td style="width: 100px;" name="MaterialName" id="MaterialCode" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
|
||||
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
|
||||
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
|
||||
'<td style="width: 100px;" name="Quantity">' + item.Quantity + '</td>' +
|
||||
'<td style="width: 100px;" data-name="sel" >' + item.QuantityAsPerInvoice + '</td>' +
|
||||
'<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 100px;" name="Quantity">' + item.Quantity + '</td>' ;
|
||||
if (userRole == 5) { // 5 - lab staff
|
||||
trIGRHTML += '<td style="width: 100px;"> ' + Number(item.QuantityAsPerInvoice).toFixed(2) + ' </td>';
|
||||
} else {
|
||||
trIGRHTML += '<td style="width: 100px;" data-name="sel" >' + item.QuantityAsPerInvoice + '</td>';
|
||||
}
|
||||
trIGRHTML += '<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
|
||||
'<td style="width: 50px;" id="amount' + i + '">' + amount + '</td>' +
|
||||
'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>' +
|
||||
'<td style="width: 25px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +
|
||||
'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>';
|
||||
if (userRole == 5) {
|
||||
trIGRHTML += '<td style="width: 100px;"> ' + item.Remarks + ' </td>';
|
||||
} else {
|
||||
trIGRHTML += '<td style="width: 100px;">' +
|
||||
'<input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" ' +
|
||||
'onchange="SetRemarks(' + i + ')" style="width: 75px;" value="' + item.Remarks + '">' +
|
||||
'</td>';
|
||||
}
|
||||
trIGRHTML += '<td style="width: 25px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +
|
||||
'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
|
||||
'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
|
||||
'<input type="hidden" id="txtQuantityAsPerInvoice' + i + '" name="txtQuantityAsPerInvoice' + i + '" value="' + item.QuantityAsPerInvoice + '">' +
|
||||
@ -1387,6 +1413,7 @@
|
||||
}else{
|
||||
trIGRHTML +='</tr>';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user