Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
aadhavan valli
commit
825d56b4df
@ -174,7 +174,7 @@ class Monthlypay extends BaseController
|
||||
foreach ($phpdata as $data) {
|
||||
|
||||
|
||||
$EmpID = $data['Employee ID'];
|
||||
$EmpID = $data['EmpID'];
|
||||
$W1H = $data['1W'];
|
||||
$W1OT = $data['1OT'];
|
||||
$W2H = $data['2W'];
|
||||
|
||||
@ -36,6 +36,22 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
|
||||
<style>
|
||||
|
||||
|
||||
|
||||
|
||||
/* Custom width for the modal */
|
||||
.modal-dialog {
|
||||
width: 100%; /* You can adjust this percentage to your needs */
|
||||
max-width: 1200px; /* Optional: This ensures the modal doesn't grow too large on large screens */
|
||||
}
|
||||
|
||||
/* Ensure content inside the modal scales properly */
|
||||
.modal-content {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
.txtSpcialInstruction{
|
||||
background-color: #f4f9fb;
|
||||
}
|
||||
@ -44,10 +60,7 @@ if (!empty($INRSYMBOL)) {
|
||||
z-index: 1080 !important;
|
||||
}
|
||||
|
||||
#submitmodel {
|
||||
margin-top: 200px;
|
||||
z-index: 1080 !important;
|
||||
}
|
||||
|
||||
|
||||
#freightmodel {
|
||||
margin-top: 200px;
|
||||
@ -69,9 +82,7 @@ if (!empty($INRSYMBOL)) {
|
||||
z-index: 1080 !important;
|
||||
}
|
||||
|
||||
.modal {
|
||||
padding-right: 30% ! important;
|
||||
}
|
||||
|
||||
|
||||
.form-control {
|
||||
text-align: left;
|
||||
@ -2763,17 +2774,17 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
<!-- Modal for Packing Calculation -->
|
||||
|
||||
<div id="submitmodel" class="modal fade" data-backdrop-limit="1" role="dialog"
|
||||
<div id="submitmodel" class="modal fade" role="dialog"
|
||||
aria-labelledby="myModalLabel">
|
||||
<div class="modal-dialog">
|
||||
|
||||
<!-- Modal content-->
|
||||
<div class="modal-content" style="margin-left: 210px;">
|
||||
<div class="modal-content" style="">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Material has been Received<span id="WeightTitle"></span></h4>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="modal-body " style="padding:0px; max-height: 400px; overflow-y: auto;">
|
||||
<form>
|
||||
<div class="modal-body p-4">
|
||||
<div class="form-group row">
|
||||
@ -2798,147 +2809,92 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="filemodel" class="modal fade" data-backdrop-limit="1" role="dialog"
|
||||
aria-labelledby="myModalLabel">
|
||||
<div class="modal-dialog">
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="filemodel" class="modal fade " tabindex="-1" data-backdrop="true" role="dialog" aria-labelledby="myModalLabel">
|
||||
<div class="modal-dialog modal-dialog-scrollable " role="document">
|
||||
<!-- Modal content-->
|
||||
<div class="modal-content" style="width:950px;">
|
||||
<div class="modal-content" >
|
||||
<div class="modal-header">
|
||||
|
||||
<h4 class="modal-title">Add Bill Details</h4>
|
||||
</div>
|
||||
<div class="modal-body" style="padding:0px;">
|
||||
<!-- <div class="col-md-4 pad"><strong>Select Item Code</strong>
|
||||
<select id="emergencyitemcode" name="emergencyitemcode" class = "form-control select2">
|
||||
<!-- <option value="1"> select material code</option>
|
||||
</select>
|
||||
|
||||
</div>-->
|
||||
<div class="col-md-4 pad"><strong>Delivery Challan /Inv No</strong>
|
||||
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12"
|
||||
class="form-control" value="" required onkeypress="return isNumberKey(event)">
|
||||
</div>
|
||||
<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong>
|
||||
<!-- <input type="Date" name="Date1" onkeypress="return onlyAlphabets(event);" maxlength="100" id="Date1" class="form-control" required value="2"> -->
|
||||
<?php
|
||||
$data = array('name' => 'Date1', 'value' => set_value('Date1', $CurrentDate), 'id' => 'Date1', 'class' => 'form-control num', 'required' => 'true');
|
||||
echo form_input($data); ?>
|
||||
</div>
|
||||
<div class="col-md-4 pad"> <strong>Material Received Date</strong>
|
||||
<?php
|
||||
$data = array('name' => 'MRC', 'value' => set_value('MRC', $CurrentDate), 'id' => 'MRC', 'class' => 'form-control num', 'required' => 'true');
|
||||
echo form_input($data); ?>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<!-- <div class="col-md-4 pad"><strong>Advise Quantity</strong>
|
||||
<input type="text" name="AQuantity" id="AQuantity" maxlength="12" class="form-control" value="" required>
|
||||
</div> -->
|
||||
|
||||
|
||||
|
||||
|
||||
<input type="hidden" id="tablevalues" value="sample" name="tablevalues" />
|
||||
|
||||
<input type="hidden" id="splrow" value="sample" name="splrow" />
|
||||
|
||||
<div class="col-md-4 pad"><strong>Vehicle No</strong>
|
||||
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13"
|
||||
class="form-control" value="" required>
|
||||
</div>
|
||||
<div class="col-md-4 pad"><strong>Courier No</strong>
|
||||
<input type="text" name="CourierNo" id="CourierNo" maxlength="12"
|
||||
class="form-control" value="" required>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4" id="QualityChecked"><strong>Is Quality Check Required</strong>
|
||||
<div class="radio">
|
||||
<label><input type="radio" name="Quality" checked="checked" value='0'
|
||||
id="Quality">Yes</label>
|
||||
<div class="modal-body ">
|
||||
<form action="">
|
||||
<div class="row">
|
||||
<div class="col-md-4 "><strong>Delivery Challan /Inv No</strong>
|
||||
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="" required onkeypress="return isNumberKey(event)">
|
||||
</div>
|
||||
<div class="col-md-4 "><strong>Delivery Challan /Inv Date</strong>
|
||||
<?php
|
||||
$data = array('name' => 'Date1', 'value' => set_value('Date1', $CurrentDate), 'id' => 'Date1', 'class' => 'form-control num', 'required' => 'true');
|
||||
echo form_input($data); ?>
|
||||
</div>
|
||||
<div class="col-md-4 "><strong>Material Received Date</strong>
|
||||
<?php
|
||||
$data = array('name' => 'MRC', 'value' => set_value('MRC', $CurrentDate), 'id' => 'MRC', 'class' => 'form-control num', 'required' => 'true');
|
||||
echo form_input($data); ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="radio">
|
||||
<label><input type="radio" name="Quality" id="Quality" value='1'>No</label>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4 mt-2 "><strong>Vehicle No</strong>
|
||||
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="" required>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 mt-2 "><strong>Courier No</strong>
|
||||
<input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="" required>
|
||||
</div>
|
||||
<div class="col-md-4 mt-2" id="QualityChecked"><strong>Is Quality Check Required</strong>
|
||||
<div class="radio m-2">
|
||||
<input type="radio" name="Quality" checked="checked" value='0' id="QualityChecktrue"
|
||||
style="cursor: default;">
|
||||
<label for="QualityChecktrue">Yes</label>
|
||||
|
||||
<input type="radio" name="Quality" id="QualityCheckFalse" value='1'
|
||||
style="cursor: default;">
|
||||
<label for="QualityCheckFalse">No</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row" >
|
||||
<div class="col-md-12">
|
||||
<input type="button" class="btn btn-success" id="addmorebutton" value=" + ADD FILES..">
|
||||
<div id="newdiv"></div><!-- this div for add more section-->
|
||||
</div>
|
||||
|
||||
|
||||
<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
|
||||
<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
|
||||
</div>
|
||||
|
||||
<!-- <div class="col-md-5">
|
||||
<input type = "file" size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg" id="imag" name="images" onChange="filecheck();"/>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<label for="images">Select file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
|
||||
</div> -->
|
||||
<div class="col-md-10">
|
||||
|
||||
<!-- <legend>Multiple File</legend> -->
|
||||
<div class="col-md-offset-10 col-md-1">
|
||||
<input type="button" class="btn btn-success" id="addmorebutton"
|
||||
value=" + ADD FILES..">
|
||||
<div class="col-md-12 " align="right">
|
||||
<a class="btn btn-danger" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
|
||||
<a class="btn btn-success ok" ID="ExciseOption12" onclick="rfilealert();"> <span class="bold">Submit</span></a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
|
||||
<div id="newdiv"></div><!-- this div for add more section-->
|
||||
<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
|
||||
<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- Add more fields if needed -->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<table id="specialtable" class="table table-hover table-bordered"
|
||||
style="background-color:#fff;font-size:12px;">
|
||||
|
||||
|
||||
<!--<thead>
|
||||
<tr>
|
||||
<th>MaterialCode1</th>
|
||||
<th>DeliveryChallanDate</th>
|
||||
<th>DeliveryChallanNo</th>
|
||||
<th>VehicleNo</th>
|
||||
<th>CourierNo</th>
|
||||
<th>Quantity12</th>
|
||||
<th>File</th>
|
||||
</tr>
|
||||
</thead>-->
|
||||
|
||||
<tbody id="specialappend">
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="modal-footer">
|
||||
<div class="col-md-12 text-right">
|
||||
<!-- <div class="col-md-4">
|
||||
<a class="btn btn-success Add" onclick="addtable();"><span class="bold">Add table</span></a>
|
||||
</div> -->
|
||||
|
||||
|
||||
<div class="col-md-4 col-md-offset-8">
|
||||
<a class="btn btn-cancel" data-dismiss="modal"
|
||||
onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
|
||||
<a class="btn btn-success ok" ID="ExciseOption12"
|
||||
onclick="rfilealert();"> <span class="bold">Submit</span></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- </form> -->
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="servicemodel" class="modal fade" data-backdrop-limit="1" role="dialog"
|
||||
aria-labelledby="myModalLabel">
|
||||
<div class="modal-dialog">
|
||||
@ -8119,11 +8075,6 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
$("#addmorebutton").click(function () {
|
||||
|
||||
|
||||
|
||||
|
||||
//alert('sda');
|
||||
|
||||
if (counter > 4) {
|
||||
alert("You have to upload five files only"); //this allows only 5 files;
|
||||
return false;
|
||||
@ -8135,24 +8086,29 @@ if (!empty($INRSYMBOL)) {
|
||||
var div = document.createElement('div');
|
||||
div.id = "divid" + counter;
|
||||
div.className = "row";
|
||||
div.innerHTML = '<div class="col-md-12">' +
|
||||
div.innerHTML =
|
||||
|
||||
'<div class="col-md-4">' +
|
||||
'<label><br></label>' +
|
||||
'<div class="col-md-3">' +
|
||||
'<label>Select File</label>' +
|
||||
'<input type="file" name="browseFiles' + counterConstant + '" id="imag" onchange="Copyfilename(this.name); "><br>' +
|
||||
|
||||
'</div>' +
|
||||
|
||||
|
||||
'<div class="col-md-3" style="margin-top:1.0%; ">' +
|
||||
'<button style="margin-right:2px;" class="btn btn-success" type="button" onclick="addRow(' + counter + ')"id="addbtn1" ><i class="fa fa-plus-square"></i></button> '+
|
||||
'<button class="btn btn-danger remove remove_this" id="removebtn' + counter + '" onclick="removeRow(this.id)"><i class="fa fa-minus-square"></i> </button>'
|
||||
|
||||
+
|
||||
'</div>' +
|
||||
|
||||
'<div class="col-md-3" style="margin-top:1.8%; ">' +
|
||||
|
||||
|
||||
'<div class="col-md-3" > '+
|
||||
'</div> '+
|
||||
'</div><br>';
|
||||
|
||||
'<div class="col-md-1" style="margin-top:-3%;">' +
|
||||
'<label><br><br></label>' +
|
||||
'<button class="btn btn-success" type="button" onclick="addRow(' + counter + ')"id="addbtn1" ><i class="fa fa-plus-square"></i></button></div>' +
|
||||
|
||||
'<div class="col-md-1" style="margin-top:-3%;">' +
|
||||
'<label><br><br></label>' +
|
||||
'<button class="btn btn-danger remove remove_this" id="removebtn' + counter + '" onclick="removeRow(this.id)"><i class="fa fa-minus-square"></i> </button></div>' +
|
||||
|
||||
|
||||
'</div>';
|
||||
$('#newdiv').append(div);
|
||||
|
||||
|
||||
@ -8214,28 +8170,31 @@ if (!empty($INRSYMBOL)) {
|
||||
//alert("count"+counterConstants);
|
||||
var div = document.createElement('div');
|
||||
div.id = "divid" + counter;
|
||||
|
||||
div.className = "row";
|
||||
div.innerHTML = '<div class="col-md-12">' +
|
||||
div.innerHTML =
|
||||
|
||||
'<div class="col-md-4">' +
|
||||
'<label><br></label>' +
|
||||
'<div class="col-md-3">' +
|
||||
'<label><br></label>'+
|
||||
'<input type="file" name="browseFiles' + counterConstant + '" id="imag" onchange="Copyfilename(this.name); "><br>' +
|
||||
|
||||
'</div>' +
|
||||
|
||||
|
||||
'<div class="col-md-3" style="margin-top:1.0%; ">' +
|
||||
'<button style="margin-right:2px;" class="btn btn-success" type="button" onclick="addRow(' + counter + ')"id="addbtn1" ><i class="fa fa-plus-square"></i></button> '+
|
||||
'<button class="btn btn-danger remove remove_this" id="removebtn' + counter + '" onclick="removeRow(this.id)"><i class="fa fa-minus-square"></i> </button>'
|
||||
|
||||
+
|
||||
'</div>' +
|
||||
|
||||
|
||||
|
||||
'<div class="col-md-1" style="margin-top:-3%;">' +
|
||||
'<label><br><br></label>' +
|
||||
'<button class="btn btn-success" type="button" id="addbtn' + counter + '" onclick="addRow(' + counter + ')"><i class="fa fa-plus-square"></i></button></div>' +
|
||||
|
||||
'<div class="col-md-1" style="margin-top:-3%;">' +
|
||||
'<label><br><br></label>' +
|
||||
'<button class="btn btn-danger remove remove_this" id="removebtn' + counter + '" onclick="removeRow(this.id)"><i class="fa fa-minus-square"></i> </button></div>' +
|
||||
'</div>' +
|
||||
|
||||
|
||||
|
||||
'<div class="col-md-3" style="margin-top:1.8%; ">' +
|
||||
|
||||
|
||||
'<div class="col-md-3" > '+
|
||||
'</div> '+
|
||||
'</div>';
|
||||
|
||||
$('#newdiv').append(div);
|
||||
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ $currentday = date('d');
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
/*table-layout: fixed; Algoritmo de distribucion fijo */
|
||||
/*white-space:nowrap; Impide los saltos de l<>nea autom<6F>ticos */
|
||||
white-space:nowrap;
|
||||
}
|
||||
|
||||
.fht-table th,
|
||||
@ -213,6 +213,7 @@ $currentday = date('d');
|
||||
title='click here for load attendance for specified month' style="margin-top:0px;">
|
||||
</div>
|
||||
</div>
|
||||
<?php echo form_close(); ?>
|
||||
|
||||
<?php
|
||||
|
||||
@ -239,14 +240,14 @@ $currentday = date('d');
|
||||
<div class="table-responsive">
|
||||
|
||||
|
||||
<table id="attendance" class="fht-table table table-striped">
|
||||
<table id="attendance" class="fht-table table table-striped" style="font-size: small;">
|
||||
<thead>
|
||||
|
||||
<tr>
|
||||
|
||||
<th class="celda_encabezado_general">S.NO</th>
|
||||
<th class="celda_encabezado_general" >Employee ID</th>
|
||||
<th style="background-color: #00a65a;color:#fff;border:5px">Employee Name</th>
|
||||
<th class="celda_encabezado_general" >EmpID</th>
|
||||
<th class="celda_encabezado_general">Employee Name</th>
|
||||
<?php
|
||||
|
||||
for ($col = 1; $col <= $monthdays; $col++) {
|
||||
@ -470,7 +471,7 @@ $currentday = date('d');
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php echo form_close(); ?>
|
||||
|
||||
</div> <!-- End card-body -->
|
||||
</div> <!-- End card -->
|
||||
</div> <!-- End col -->
|
||||
|
||||
@ -207,7 +207,7 @@
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<div class="col-md-12">
|
||||
<a class="btn btn-info" data-dismiss="modal" value="Cancel">Ok</a>
|
||||
<a class="btn btn-info" data-dismiss="modal" value="Cancel" style="float: right;">Ok</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1812,7 +1812,7 @@ if (!empty($EmpDetails)) {
|
||||
|
||||
console.log('Form submitted successfully:', response == 'true');
|
||||
if (response == 'true') {
|
||||
// window.location.href = '<?php echo base_url("employeeListing"); ?>';
|
||||
window.location.href = '<?php echo base_url("employeeListing"); ?>';
|
||||
} else {
|
||||
alert('Employee details Not Update...');
|
||||
}
|
||||
|
||||
@ -81,7 +81,17 @@ td {
|
||||
|
||||
.th-Sno{
|
||||
text-align:center !important;
|
||||
width:15%;
|
||||
width:5%;
|
||||
}
|
||||
|
||||
.th-uom{
|
||||
text-align:center !important;
|
||||
width:10%;
|
||||
}
|
||||
|
||||
.th-status{
|
||||
text-align:center !important;
|
||||
width:10%;
|
||||
}
|
||||
|
||||
</style>
|
||||
@ -194,10 +204,10 @@ td {
|
||||
<th class="th th-Sno" >SNo</th>
|
||||
<th class="th th-materialCode">Material Code</th>
|
||||
<th class="th th-materialName">Material Name</th>
|
||||
<th class="th">Uom</th>
|
||||
<th class="th th-uom">Uom</th>
|
||||
<th class="th th-requestedQuantity">RequestedQuantity</th>
|
||||
<th class="th th-PoQuantity">PoQuantity</th>
|
||||
<th class="th">Status</th>
|
||||
<th class="th th-status">Status</th>
|
||||
<th class="th">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -216,10 +226,10 @@ td {
|
||||
<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'tes' . $index ?>" value="<?php echo $record->Quantity; ?>" />
|
||||
<td align="center"><?php echo $record->MaterialCode; ?></td>
|
||||
<td align="left"><?php echo $record->MaterialName; ?></td>
|
||||
<td align="left"><?php echo $record->UOM; ?></td>
|
||||
<td align="center"><?php echo $record->UOM; ?></td>
|
||||
<td align="center"><?php echo $record->Quantity; ?></td>
|
||||
<td align="center"><?php echo $record->POQTY; ?></td>
|
||||
<td align="left"><?php echo $record->StatusName; ?></td>
|
||||
<td align="center"><?php echo $record->StatusName; ?></td>
|
||||
<input type="hidden" name="<?php echo 'materialdesc' . $index ?>" id="<?php echo 'materialdesc' . $index ?>" value="<?php echo isset($record->MaterialDescription) ? $record->MaterialDescription : ''; ?>" />
|
||||
<td>
|
||||
<a data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-target='#edit-req-modal' data-toggle="modal" href="#edit-req-modal"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->MaterialCode; ?> Material details"></i> </a> <a onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $record->MaterialCode; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user