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

igr module changes-1 vadivel J 17-12-2024

Browse Source
This commit is contained in:
vadivelJ96 2024-12-17 10:12:45 +05:30
parent f7ea0c9eae
commit 3da23bebab
6 changed files with 1850 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/Routes.php
View File

@ -275,6 +275,7 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'EditStoreRequisition', 'Storer
$routes->get('AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working $routes->get('AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working
$routes->get('ViewIGR', 'Inwardgateregister::viewIGR'); // View IGR PAGE - Working $routes->get('ViewIGR', 'Inwardgateregister::viewIGR'); // View IGR PAGE - Working
$routes->post('ViewIGR', 'Inwardgateregister::viewIGR');//for filter purpose $routes->post('ViewIGR', 'Inwardgateregister::viewIGR');//for filter purpose
$routes->get('accountsDashboard', 'Inwardgateregister::accountsDashboard'); // View IGR PAGE - Working
$routes->post('ViewIGRDetails', 'Inwardgateregister::viewIGRDetails'); $routes->post('ViewIGRDetails', 'Inwardgateregister::viewIGRDetails');
$routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails'); $routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails');
$routes->post('SaveIGR', 'Inwardgateregister::SaveIGR');// Save IGR PAGE - Working $routes->post('SaveIGR', 'Inwardgateregister::SaveIGR');// Save IGR PAGE - Working

37
app/Controllers/Inwardgateregister.php
View File

@ -92,6 +92,43 @@ class Inwardgateregister extends BaseController
$this->loadViews("viewinwardgateregister", $this->global, $data, NULL); $this->loadViews("viewinwardgateregister", $this->global, $data, NULL);
} }
function accountsDashboard(){
$toDate = date('Y-m-d');
$fromDate = date('Y-m-d');
$this->global['pageTitle'] = 'Accounts Dashboard';
$result = $this->inwardgateregister_model->ViewigrListing($fromDate, $toDate);
$igrList = $result[0];
foreach ($igrList as &$igr) {
$igrNo = $igr->IGRNO;
$fileDetails = $this->inwardgateregister_model->getAllIgrFileDetails($igrNo);
$igr->isIgrFilePresent = false; // Initialize the key
foreach ($fileDetails as $file) {
if (!empty($file->file)) {
$igr->isIgrFilePresent = true;
break;
}
}
}
// Unset reference to avoid side effects
unset($igr);
$data['IGR'] = $igrList;
$data['IGRDownload'] = $result[1];
$data['userRole'] = $this->session->get('role');
$data['transporter'] = $this->inwardgateregister_model->transporter();
$data['fromDate'] = date('d-m-Y', strtotime($fromDate));
$data['toDate'] = date('d-m-Y', strtotime($toDate));
$this->loadViews("accountsDashboard", $this->global, $data, NULL);
}
function addIGR() function addIGR()
{ {

1792
app/Views/accountsDashboard.php Normal file
View File

File diff suppressed because it is too large Load Diff

19
app/Views/includes/new_header.php
View File

@ -847,17 +847,22 @@
</div> </div>
</li> </li>
<!-- report list module -->
<!-- <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>reports" role="button"
aria-expanded="false">
<i class="ri-keyboard-line mr-1"></i> Report Lists
</a>
</li> -->
<?php }?> <?php }?>
<!-- Accounts Dashboard -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle arrow-none"
href="<?php echo base_url(); ?>accountsDashboard"
role="button" aria-expanded="false">
<i class="fas fa-cubes mr-1"></i> Accounts Dashboard
</a>
</li>
</ul> <!-- end navbar--> </ul> <!-- end navbar-->
</div> <!-- end .collapsed--> </div> <!-- end .collapsed-->
</nav> </nav>

295
app/Views/incomingSandSilicaLabReportDownload.php
View File

@ -1,295 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<style>
#invoice-logo {
max-width: 14em !important;
max-height: 10em !important;
margin-bottom: 1em;
text-align: right
}
.border-color{
border:1.5px solid maroon;
}
@media print{
/* .GST-table table { page-break-inside: avoid !important;} */
/* .item-table { page-break-after: auto !important; } */
} </style>
</head>
<body>
<form action="<?php echo base_url('/downloadLabReportModel')?>" method="POST">
<header class="clearfix">
<div style="text-align: right;"><small>RI/PUR/R 02</small></div>
<div class="row">
<div class="col-5" width="100px;">
<div id="logo" ><?php echo invoice_logo_pdf(); ?></div>
</div>
<div class="col-7">
<h2>Resico India Pvt ltd</h2>
</div>
</div>
</header>
<br><br>
<main>
<table class="side-table " width="100%">
<tbody >
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Supplier Name</th>
<td class="border-color" id="dwnldSupplierNameId"></td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Invoice No</th>
<td class="border-color" id="dwnldInvoiceNoId">8946551665</td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Invoice Date</th>
<td class="border-color" id="dwnldInvoiceDateId">2/12/1996</td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Vehicle No</th>
<td class="border-color" id="dwnldVehicleNoId">Tn 25 bb 6919</td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">IGR No</th>
<td class="border-color" id="dwnldIgrNoId">25126919</td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Igr Date</th>
<td class="border-color" id="dwnldIgrDateId">10/12/2024</td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Quantity</th>
<td class="border-color" id="dwnldQtyId">69199</td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Time</th>
<td contenteditable="true"
class="border-color" id="dwnldTimeId"></td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Grade</th>
<td contenteditable="true"
class="border-color" id="dwnldGradeId">50-60</td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Clay %</th>
<td contenteditable="true"
class="border-color" id="dwnldClayId">20</td>
</tr>
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Moisture %</th>
<td contenteditable="true"
class="border-color" id="dwnldMoistureId">10</td>
</tr>
</tbody>
</table>
<table class="border-color" id="meshTableId" style="border-collapse: collapse;" border="1" width="100%">
<thead>
<tr>
<th rowspan="2" >
<center><?php _trans('MESH SIZE'); ?></center>
</th>
<th rowspan="2" >
<center><?php _trans('SIZE IN M.M'); ?><br /></center>
</th>
<th rowspan="2">
<center><?php _trans('SIZE IN MICRANS'); ?></center>
</th>
<th rowspan="2" >
<center><?php _trans('WEIGH OF SAND'); ?></center>
</th>
<th rowspan="2" >
<center><?php _trans('FACTOR'); ?><br /></center>
</th>
<th rowspan="2" >
<center><?php _trans('TOTAL'); ?><br /></center>
</th>
</tr>
</thead>
<tbody>
<tr>
<td align="center">10</td>
<td align="center">2.0</td>
<td align="center">2000</td>
<td align="right" id="dwnld10MmId"></td>
<td align="center">5</td>
<td align="right" id="dwnld10MmFId"> </td>
</tr>
<tr>
<td align="center">20</td>
<td align="center">0.85</td>
<td align="center">0850</td>
<td align="right" id="dwnld20MmId"></td>
<td align="center">10</td>
<td align="right" id="dwnld20MmFId"></td>
</tr>
<tr>
<td align="center">30</td>
<td align="center">0.60</td>
<td align="center">0600</td>
<td align="right" id="dwnld30MmId"></td>
<td align="center">20</td>
<td align="right" id="dwnld30MmFId"></td>
</tr>
<tr>
<td align="center">40</td>
<td align="center">0.42</td>
<td align="center">0425</td>
<td align="right" id="dwnld40MmId"></td>
<td align="center">30</td>
<td align="right" id="dwnld40MmFId"></td>
</tr>
<tr>
<td align="center">50</td>
<td align="center">0.30</td>
<td align="center">0300</td>
<td align="right" id="dwnld50MmId"></td>
<td align="center">40</td>
<td align="right" id="dwnld50MmFId"></td>
</tr>
<tr>
<td align="center">70</td>
<td align="center">0.21</td>
<td align="center">0212</td>
<td align="right" id="dwnld70MmId"></td>
<td align="center">50</td>
<td align="right" id="dwnld70MmFId"></td>
</tr>
<tr>
<td align="center">100</td>
<td align="center">0.15</td>
<td align="center">0150</td>
<td align="right" id="dwnld100MmId"></td>
<td align="center">70</td>
<td align="right" id="dwnld100MmFId"></td>
</tr>
<tr>
<td align="center">140</td>
<td align="center">0.106</td>
<td align="center">0106</td>
<td align="right" id="dwnld140MmId"></td>
<td align="center">100</td>
<td align="right" id="dwnld140MmFId"></td>
</tr>
<tr>
<td align="center">200</td>
<td align="center">0.075</td>
<td align="center">0075</td>
<td align="right" id="dwnld200MmId"></td>
<td align="center">140</td>
<td align="right" id="dwnld200MmFId"></td>
</tr>
<tr>
<td align="center">300</td>
<td align="center">0.053</td>
<td align="center">0053</td>
<td align="right" id="dwnld300MmId"></td>
<td align="center">200</td>
<td align="right" id="dwnld300MmFId"></td>
</tr>
<tr>
<td align="center">PAN</td>
<td align="center"></td>
<td align="center">PAN</td>
<td align="right" id="dwnldPanId"></td>
<td align="center">300</td>
<td align="right" id="dwnldPanFId"></td>
</tr>
</tbody>
<tfoot>
<tr>&nbsp;
<td style="text-align: right;" colspan="3"><strong>&nbsp;TOTAL </strong></td>
<td class="text-right" id="dwnldWeighOfSand"></td>
<td class="text-right" id="dwnldTotalId" colspan="2"><b></b></td>
</tr>
<tr>&nbsp;
<td class="text-right" colspan="4"><b>AFS </b></td>
<td class="text-right" id="dwnldAfsId" colspan="2"><b></b></td>
</tr>
</tfoot>
</table>
<br><br>
<table class="side-table " width="100%">
<tbody >
<tr class="border-color">
<th style="text-align: left !important; width:25%;">Accepted</th>
<td class="border-color" id="dwnldAcceptedId">OK</td>
</tr>
<tr class="border-color">
<th style="text-align: left !important;">Accepted Under Deviation</th>
<td class="border-color" id="dwnldAcceptedUnderDeviationId"></td>
</tr>
<tr class="border-color">
<th style="text-align: left !important;">Rejected</th>
<td class="border-color" id="dwnldRejectedId"></td>
</tr>
<tr class="border-color">
<th style="text-align: left !important;">Remarks</th>
<td class="border-color"></td>
</tr>
</tbody>
</table>
<br>
<table class="side-table " width="100%">
<tbody >
<tr class="border-color" rowspan="2">
<th contenteditable="true"
style="text-align: center !important;">&nbsp;&nbsp;</th>
<th contenteditable="true"
class="border-color" style="text-align: center !important;">&nbsp;&nbsp;</th>
</tr>
<tr class="border-color" >
<th style="text-align: center !important;">Tested By</th>
<th class="border-color"style="text-align: center !important;">Approved By</th>
</tr>
</tbody>
</table>
<br>
<table width="100%" class="text-center">
<tr>
<td align="left"><b><small> * This is a system generated </small></b> </td>
</tr>
</table>
</main>
<!-- hidden fields section -->
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Save changes</button>
</div>
</form>
</body>
</html>

25
app/Views/incomingSilicaSandDetails.php
View File

@ -726,7 +726,7 @@
<div id="logo" style="margin:0 !important;"><?php echo invoice_logo_pdf(); ?></div> <div id="logo" style="margin:0 !important;"><?php echo invoice_logo_pdf(); ?></div>
</div> </div>
<div class="col-9"> <div class="col-9">
<h1 style="font-family: 'Times New Roman', Georgia, serif; color:maroon;">RESICO (INDIA) PVT.LTD.</h1> <h2 style="font-family: 'Times New Roman', Georgia, serif; color:maroon;">RESICO (INDIA) PVT.LTD.</h>
</div> </div>
</div> </div>
@ -738,12 +738,9 @@
</div> </div>
</div> </div>
</header> </header>
<br> <main>
<main>
<table class="side-table" border="1" width="100%"> <table class="side-table" border="1" width="100%">
<thead> <thead>
@ -934,7 +931,7 @@
</tfoot> </tfoot>
</table> </table>
<br><br> <br>
<table class="side-table " border="1" width="100%"> <table class="side-table " border="1" width="100%">
<tbody > <tbody >
@ -975,15 +972,9 @@
</tbody> </tbody>
</table> </table>
<br> <b><small> * This is a system generated </small></b>
</main>
<table width="100%" class="text-center"> </div>
<tr>
<td align="left"><b><small> * This is a system generated </small></b> </td>
</tr>
</table>
</main>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button> <button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button>
@ -1014,7 +1005,7 @@
const opt = { const opt = {
margin: 1, margin: 1,
filename: 'report.pdf', filename: 'report.pdf',
image: { type: 'jpeg', quality: 1 }, image: { type: 'jpeg', quality: 0.98 },
html2canvas: { scale: 2 }, html2canvas: { scale: 2 },
jsPDF: { unit: 'in', format: 'A4', orientation: 'portrait' } jsPDF: { unit: 'in', format: 'A4', orientation: 'portrait' }
}; };