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

trackers issues

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-03-28 09:47:10 +00:00
parent 93316bb4ce
commit d85b7058cf
16 changed files with 355 additions and 870 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Monthlypay_model.php
View File

@ -535,11 +535,13 @@ where Month_Year = ? and att.EmpID in (select EmpID from t_attendance)";
$query = $builder->get();
return $query->getResultArray();
}
public function getheringemployeeinformation(){
public function getheringemployeeinformation(){ //active employee only no driver also.
$builder = $this->db->table("t_employee_details as Emp")
->select("Emp.EmpID,Emp.Designation,Emp.Departmentcode,Dep.DEPCode,Emp.Designation,Emp.Departmentcode,Dep.DEPCode,Dep.DepartmentName as DepartmentNamee,Dep.DepartmentName as DepartmentName")
->select("CONCAT_WS(' ', Emp.FirstName, Emp.LastName) AS FullName")
->join("t_departmentdetails as Dep", "Emp.Departmentcode = Dep.DEPCode", "left")
->where('Emp.is_driver != ', 1)
->where('Emp.IsActive', 1)
->orderBy("Emp.EmpID", "asc");
$query = $builder->get();

4
app/Views/EditservicePurchaseorder.php
View File

@ -1622,8 +1622,8 @@ if (!empty($getlogpodtl)) {
<?php if ($PrePOFile) { ?>
<div id="deletePreviousPurchaseOrderFileDiv">
<div class="form-group col-md-12 px-4">
<label for="deletePreviousPurchaseOrderFile"><a title="previously uploaded PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded purchase order file- </span><small><?= $PrePOFile; ?></small></a></label>
<label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </span><small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
</div>

8
app/Views/accountsDashboard.php
View File

@ -767,9 +767,9 @@
if (typeof item.MasterFile == 'string') {
if (item.MasterFile !== null && item.MasterFile !== undefined && item.MasterFile.trim() !== "") {
modal.find('#MasterFileLabel a').attr('href', '<?php echo base_url() ?>' + 'public/uploads/Igrfiles/' + item.MasterFile);
modal.find('#MasterFileLabel a').attr('title', 'previously uploaded IGR Master File');
modal.find('#MasterFileLabel a').attr('title', 'Previous Upload IGR Master File');
modal.find('#MasterFileLabel a').attr('target', '_blank');
modal.find('#MasterFileLabel a span').text('previously uploaded - ');
modal.find('#MasterFileLabel a span').text('Previous Upload - ');
modal.find('#MasterFileLabel a small').text(item.MasterFile);
modal.find('#MasterFileLabel').show();
}
@ -1294,10 +1294,10 @@
modal.find('#WeightFileLabel').hide();
console.log(typeof fileName);
if (fileName !== 'null' && fileName !== undefined && fileName.trim() !== "") {
modal.find('#WeightFileLabel a').attr('title', 'previously uploaded IGR Weight File');
modal.find('#WeightFileLabel a').attr('title', 'Previous Upload IGR Weight File');
modal.find('#WeightFileLabel a').attr('href', '<?php echo base_url() ?>' + 'public/uploads/Igrfiles/' + fileName);
modal.find('#WeightFileLabel a').attr('target', '_blank');
modal.find('#WeightFileLabel a span').text('previously uploaded - ');
modal.find('#WeightFileLabel a span').text('Previous Upload - ');
modal.find('#WeightFileLabel a small').text(fileName);
modal.find('#WeightFileLabel').show();
}

4
app/Views/editCapitalAmendPO.php
View File

@ -1679,9 +1679,9 @@ if (!empty($POItem) && $CapitalRange == '1') {
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="previously uploaded PO File"
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>previously uploaded purchase order file- </span>
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>

1052
app/Views/editCapitalPo.php
View File

File diff suppressed because it is too large Load Diff

2
app/Views/editEmployeenew.php
View File

@ -247,7 +247,7 @@ if (!empty($EmpDetails)) {
<?php if($Emp->ProfilePic){ ?>
<br/>
<label style="white-space: normal; word-wrap: break-word; overflow-wrap: break-word; width: 100%;"><span>previously uploaded profile picture - </span>
<label style="white-space: normal; word-wrap: break-word; overflow-wrap: break-word; width: 100%;"><span>Previous Upload - </span>
<small><?= $Emp->ProfilePic; ?></small></label>
<?php } ?>

4
app/Views/editImportAmendPO.php
View File

@ -1586,9 +1586,9 @@ if (!empty($RequistionDetails)) {
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="previously uploaded PO File"
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>previously uploaded purchase order file- </span>
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button> -->

40
app/Views/editOldemppay.php
View File

@ -251,49 +251,39 @@ if (!empty($emppay)) {
<h4 class="header-title mt-2 mb-2">Loan Documents</h4>
<!-- Text input-->
<div class="row">
<div class="col-md-4">
<div class="col-md-12">
<div class="form-group">
<label class="d-block" for="request_letter">Request letter</label>
<input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="request_letter" name="request_letter" style="margin-top: 5px;" />
<input type="hidden" id="hidden_request_letter" name="hidden_request_letter" value="<?php echo $request_letter; ?>" />
</div>
</div>
<?php if ($request_letter) { ?>
<div class="col-md-8">
<div class="form-group">
<?php if ($request_letter) { ?>
<div class="mb-1">
<a href="<?php echo base_url() . 'public/uploads/images/' . $request_letter ?>">
<span>Previous Upload - </span><small><?= $request_letter; ?></small>
</a>
</div>
<br>
<u>
<a href="<?php echo base_url() . 'public/uploads/images/' . $request_letter ?>">
<span>Previously Uploaded Document - </span><small><?= $request_letter; ?></small>
</a>
</u>
</div>
<?php } ?>
</div>
<?php } ?>
</div> <!-- 1st row div closed here -->
<div class="row">
<div class="col-md-4">
<div class="col-md-12">
<div class="form-group">
<label class="d-block" for="payment_statement">Payment Receipt</label>
<input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="payment_statement" name="payment_statement" style="margin-top: 5px;" />
<input type="hidden" id="hidden_payment_statement" name="hidden_payment_statement" value="<?php echo $payment_statement; ?>" />
</div>
</div>
<?php if ($payment_statement) { ?>
<div class="col-md-8">
<div class="form-group">
<br>
<u>
<?php if ($request_letter) { ?>
<span class="help-block"><small>
<a href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>">
<span>Previously Uploaded Document - </span><small><?= $payment_statement; ?></small>
<span>Previous Upload - </span><small><?= $payment_statement; ?></small>
</a>
</u>
</div>
</small></span>
<?php } ?>
</div>
<?php } ?>
</div> <!-- 2nd row div closed here -->

4
app/Views/editRevenueAmendPO.php
View File

@ -1639,9 +1639,9 @@ if (!empty($INRSYMBOL)) {
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="previously uploaded PO File"
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>previously uploaded purchase order file- </span>
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>

6
app/Views/editRevenuepurchaseorder.php
View File

@ -2913,9 +2913,9 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="previously uploaded PO File"
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>previously uploaded purchase order file- </span>
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
@ -4340,7 +4340,7 @@ if (!empty($getlogpodtl)) {
<input type="file" size="20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg" id="billimag"
name="images" onChange="filecheck();" />
<br><br>
<p><b>Previously Uploaded PO Bill <span class="text-danger"
<p><b>Previous Upload PO Bill <span class="text-danger"
id="showPreviousPoBill"></span></b> </p>
</div>
</div>

4
app/Views/editServiceAmendPO.php
View File

@ -1369,9 +1369,9 @@ foreach ($PaymentTerms as $TER) {
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="previously uploaded PO File"
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>previously uploaded purchase order file- </span>
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>

19
app/Views/editSupplier.php
View File

@ -378,9 +378,8 @@ if (!empty($supplier)) {
</div>
<?php if ($hidden_Cert_GST) { ?>
<div class="col-md-4">
<u><a title="previously uploaded GST Document"
href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_GST ?>"><span>previously
uploaded GST Document - </span><small><?= $hidden_Cert_GST; ?></small></a></u>
<u><a title="Previous Upload GST Document"
href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_GST ?>"><span>Previous Upload - </span><small><?= $hidden_Cert_GST; ?></small></a></u>
</div>
<?php } ?>
</div>
@ -399,9 +398,8 @@ if (!empty($supplier)) {
</div>
<?php if ($hidden_Cert_PAN) { ?>
<div class="col-md-4">
<u><a title="previously uploaded PAN Document"
href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_PAN ?>"><span>previously
uploaded PAN Document - </span><small><?= $hidden_Cert_PAN; ?></small></a></u>
<u><a title="Previous Upload PAN Document"
href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_PAN ?>"><span>Previous Upload - </span><small><?= $hidden_Cert_PAN; ?></small></a></u>
</div>
<?php } ?>
</div>
@ -418,9 +416,8 @@ if (!empty($supplier)) {
</div>
<?php if ($hidden_Cert_MSME) { ?>
<div class="col-md-3">
<u><a title="previously uploaded GST Document"
href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_MSME ?>"><span>previously
uploaded MSME Document - </span><small><?= $hidden_Cert_MSME; ?></small></a></u>
<u><a title="Previous Upload GST Document"
href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_MSME ?>"><span>Previous Upload - </span><small><?= $hidden_Cert_MSME; ?></small></a></u>
</div>
<?php } ?>
</div>
@ -457,9 +454,9 @@ if (!empty($supplier)) {
<?php if ($hidden_Cert_BANK) { ?>
<div class="col-md-4">
<u>
<a title="Previously uploaded Bank Document"
<a title="Previous Upload Bank Document"
href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_BANK ?>">
<span>Previously uploaded BANK Document - </span>
<span>Previous Upload - </span>
<small><?php echo $hidden_Cert_BANK; ?></small>
</a>
</u>

4
app/Views/editimportpo.php
View File

@ -1313,9 +1313,9 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="previously uploaded PO File"
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>previously uploaded purchase order file- </span>
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>

56
app/Views/employeeLeaveApplicationForm.php
View File

@ -21,7 +21,7 @@
</div>
<a data-toggle="modal" href="#applicationModal" data-id="0" data-name=""
class="btn btn-success">Add Leave Application Form</a>
class="btn btn-success">Add Leave</a>
</div>
</div>
</div><!-- /.end 1st r o w -->
@ -79,6 +79,8 @@
<th>Create Date</th>
<th>Create By</th>
<th>Employee Name</th>
<th>From Date</th>
<th>To Date</th>
<th>Number Of Days</th>
<th>Status</th>
<th>Action</th>
@ -90,25 +92,33 @@
foreach ($leave_info as $d) {
$createdat = new DateTime($d['created_on']);
$crdate = $createdat->format('d-m-Y');
$crtime = $createdat->format('h:i A');
$crtime = $createdat->format('h:i A');
$startat = new DateTime($d['start_date']);
$stdate = $startat->format('d-m-Y');
$endat = new DateTime($d['end_date']);
$eddate = $endat->format('d-m-Y');
?>
<tr>
<td><?= esc($crdate) ?></td>
<td><?= esc($d['creatorFullName']) ?></td>
<td><?= esc($d['employeeFullName']) ?></td>
<td><?= esc($stdate) ?></td>
<td><?= esc($eddate) ?></td>
<td><?= esc($d['no_of_days']) ?></td>
<td><?= esc($d['status']) ?></td>
<td><?php if($d['leave_application_id']){ ?>
<a data-toggle="modal" href="#applicationModal" data-arr='<?php echo json_encode($d); ?>' data-id='<?= esc($d['leave_application_id']) ?>'>
<a data-toggle="modal" href="#applicationModal" data-arr='<?php echo json_encode($d); ?>' data-id='<?= esc($d['leave_application_id']) ?>' data-toggle="tooltip" title="<?php echo $d['emp_id']; ?> - Click here to view Employee Leave Details">
<i class="fas fa-edit"></i>&nbsp;&nbsp;&nbsp;
</a>
<!-- <a onclick="confirmDelete(event)" style="cursor:pointer;" href="<?php echo base_url() . 'deleteLeaveApplicationForm?leave_application_id=' . esc($d['leave_application_id']); ?>" data-toggle="tooltip" title="<?php echo $d['emp_id']; ?> - Click here to delete Employee Leave Details"> -->
<a onclick="confirmDelete(event)" style="cursor:pointer;" href="<?php echo base_url() . 'deleteLeaveApplicationForm?leave_application_id=' . esc($d['leave_application_id']); ?>">
<i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;
</a>
<?php } ?>
<?php if($d['status'] == "APPROVED"){} ?>
<!-- <a style="cursor:pointer;" href="<?php echo base_url() . 'leaveApplicationPDF/' . esc($d['leave_application_id']); ?>" data-toggle="tooltip" title="<?php echo $d['emp_id']; ?> - Click here to download Employee Leave Details"> -->
<a style="cursor:pointer;" href="<?php echo base_url() . 'leaveApplicationPDF/' . esc($d['leave_application_id']); ?>">
<i class="fa fa-download"></i>&nbsp;&nbsp;&nbsp;
@ -152,7 +162,7 @@
<label class="form" for="emp_name">Employee Name</label>
</div>
<div class="col-md-9">
<select class="form-control select2" id="emp_name" name="emp_name" onchange="fetchemployees(this);">
<select class="form-control searchabledropdown" id="emp_name" name="emp_name" onchange="fetchemployees(this);">
<option value="">Select</option>
<?php foreach ($employee_info as $key => $value) { ?>
<option value="<?= $value->EmpID; ?>"
@ -189,19 +199,19 @@
</div>
</div><!--/. r o w 4 -->
<div class="row mt-2">
<div class="col-md-2" style="text-align: end; align-content: center;">
<label class="form" for="No. of days">No. of days </label>
<div class="col-md-2 mt-4" style="text-align: end; align-content: center;">
<label class="form" for="No. of days">Date Range </label>
</div>
<div class="col-md-3">
<label class="form" for="start_date">from Date</label>
<label class="form" for="start_date">From Date</label>
<input type="date" class="form-control" id="start_date" name="start_date" required>
</div>
<div class="col-md-3">
<label class="form" for="end_date">to Date</label>
<label class="form" for="end_date">To Date</label>
<input type="date" class="form-control" id="end_date" name="end_date" required>
</div>
<div class="col-md-3">
<label class="form" for="no_of_days">No's Days </label>
<label class="form" for="no_of_days">No Of Days </label>
<input type="text" class="form-control" id="no_of_days" name="no_of_days">
</div>
</div><!--/. r o w 5 -->
@ -249,12 +259,19 @@
<script>
$(document).ready(function () {
$(".searchabledropdown").select2();
let today = new Date().toISOString().split("T")[0]; // Format: YYYY-MM-DD
$("#start_date").attr("min", today);
$("#end_date").attr("min", today);
$('#start_date, #end_date').change(function() {
const start = new Date($('#start_date').val());
const end = new Date($('#end_date').val());
if (!isNaN(start.getTime())) {
$('#end_date').val("");
let minDate = start.toISOString().split("T")[0]; // Convert Date to YYYY-MM-DD format
$("#end_date").attr("min", minDate); // Set min attribute for end_date
}
if (!isNaN(start) && !isNaN(end)) {
const days = Math.floor((end - start) / 86400000) + 1;
$('#no_of_days').val(days > 0 ? days : 1);
@ -267,28 +284,31 @@
$("#applicationModal").on("shown.bs.modal", function (e) {
var id = $(e.relatedTarget).data('id');
let fields = ['leave_application_id','emp_id','start_date','end_date','no_of_days','reason','status_val','emp_name','department','designation'];
let fields = ['leave_application_id','emp_name','emp_id','start_date','end_date','no_of_days','reason','status_val','department','designation'];
fields.forEach(function(field) {
$("#" + field).val("");
});
if (id == 0) {
$('#applicationformTitle').html("Add Leave Application Form");
$('#emp_name').val("").select2();
$('#applicationformTitle').html("Apply Leave");
$("#leave_application_id").val(0);
} else {
var arr = $(e.relatedTarget).data('arr');
fields.forEach(function(field) {
$("#" + field).val(arr && arr[field] ? arr[field] : "");
if(field == 'emp_name'){
$("#emp_name").val(arr && arr['emp_id']);
}
if(field == 'status_val'){
let empID = arr && arr['emp_id'] ? arr['emp_id'] : "";
$("#emp_name").val(empID).select2();
}else if(field == 'status_val'){
$("#status_val").val(arr && arr['status']);
}else{
$("#" + field).val(arr && arr[field] ? arr[field] : "");
}
});
$('#applicationformTitle').html("Edit Leave Application Form");
$('#applicationformTitle').html("Edit Leave");
}
});
$('#tempClick').click(function () {

6
app/Views/employeeListing.php
View File

@ -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="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>
&nbsp;&nbsp;&nbsp;
<a href="<?php echo base_url() . 'employeedetails/downloadEmployeeDetails/?EmpID=' . $record->EmpID; ?>">
<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">
<i class="fas fa-download"></i>
</a>
&nbsp;&nbsp;&nbsp;
<a href="#" data-toggle="modal" data-target="#accordion-modal" data-emp="<?php echo $record->EmpID ?>">
<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">
<i class="fas fa-history"style="text-align: center;"></i>
</a>

8
app/Views/viewinwardgateregister.php
View File

@ -1212,9 +1212,9 @@
if (typeof item.MasterFile == 'string') {
if (item.MasterFile !== null && item.MasterFile !== undefined && item.MasterFile.trim() !== "") {
modal.find('#MasterFileLabel a').attr('href', '<?php echo base_url() ?>' + 'public/uploads/Igrfiles/' + item.MasterFile);
modal.find('#MasterFileLabel a').attr('title', 'previously uploaded IGR Master File');
modal.find('#MasterFileLabel a').attr('title', 'Previous Upload IGR Master File');
modal.find('#MasterFileLabel a').attr('target', '_blank');
modal.find('#MasterFileLabel a span').text('previously uploaded - ');
modal.find('#MasterFileLabel a span').text('Previous Upload - ');
modal.find('#MasterFileLabel a small').text(item.MasterFile);
modal.find('#MasterFileLabel').show();
}
@ -1809,10 +1809,10 @@
modal.find('#WeightFileLabel').hide();
console.log(typeof fileName);
if (fileName !== 'null' && fileName !== undefined && fileName.trim() !== "") {
modal.find('#WeightFileLabel a').attr('title', 'previously uploaded IGR Weight File');
modal.find('#WeightFileLabel a').attr('title', 'Previous Upload IGR Weight File');
modal.find('#WeightFileLabel a').attr('href', '<?php echo base_url() ?>' + 'public/uploads/Igrfiles/' + fileName);
modal.find('#WeightFileLabel a').attr('target', '_blank');
modal.find('#WeightFileLabel a span').text('previously uploaded - ');
modal.find('#WeightFileLabel a span').text('Previous Upload - ');
modal.find('#WeightFileLabel a small').text(fileName);
modal.find('#WeightFileLabel').show();
}