CHANGE_TRACKER_ISSUE_5_CONFLICT
This commit is contained in:
aadhavan valli
commit
bb07cb8dbb
@ -562,7 +562,11 @@
|
||||
<div class="col-md-4 pad" style="margin-top: 18px;">
|
||||
|
||||
<input type="checkbox" id="checksame" name="sameaddress"
|
||||
> Current address same as permanent address
|
||||
>
|
||||
<label for="checksame">
|
||||
Current address same as permanent address
|
||||
</label>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4 pad">
|
||||
<label>Permanent Address</label><span
|
||||
@ -748,14 +752,16 @@
|
||||
|
||||
<div class="col-md-3" style="margin-top: 18px;">
|
||||
<div class="form-group">
|
||||
<span
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">Management
|
||||
Team</span>
|
||||
|
||||
<label class="switch">
|
||||
<input type="checkbox" name="is_management_team" value="0"
|
||||
onchange="updateSwitchValue(this)" />
|
||||
<span class="slider"></span>
|
||||
</label>
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">Management
|
||||
Team
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
@ -931,27 +937,35 @@
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI
|
||||
Applicable</label>
|
||||
|
||||
<label class="switch">
|
||||
<input type="checkbox" name="esi_applicable" value="0"
|
||||
onchange="updateSwitchValue(this)" />
|
||||
<span class="slider"></span>
|
||||
</label>
|
||||
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI
|
||||
Applicable</label>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF
|
||||
Applicable</label>
|
||||
|
||||
<label class="switch">
|
||||
<input type="checkbox" name="pf_applicable" value="0"
|
||||
onchange="updateSwitchValue(this)" />
|
||||
<span class="slider"></span>
|
||||
</label>
|
||||
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF
|
||||
Applicable</label>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -307,21 +307,21 @@
|
||||
foreach ($ReqList as $record) {
|
||||
?>
|
||||
<tr id="<?php echo $index; ?>">
|
||||
<td><input type="checkbox" name="chk<?php echo $index; ?>" id="chk<?php echo $index; ?>" onclick="selectReqNo(<?php echo $index; ?>)" /> </td>
|
||||
<td align="right">
|
||||
<td align="center"><input type="checkbox" name="chk<?php echo $index; ?>" id="chk<?php echo $index; ?>" onclick="selectReqNo(<?php echo $index; ?>)" /> </td>
|
||||
<td align="center">
|
||||
<?php
|
||||
$dt = new DateTime($record->ReqDate);
|
||||
$RequestedDate = $dt->format('d-m-Y');
|
||||
echo $RequestedDate;
|
||||
?>
|
||||
</td>
|
||||
<td><a data-toggle="modal" data-target="#RequisitionDtlsModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td>
|
||||
<td><?php echo $record->ReqType; ?></td>
|
||||
<td align="center"><a data-toggle="modal" data-target="#RequisitionDtlsModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td>
|
||||
<td align="center"><?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>
|
||||
<td align="right"><?php echo $record->newLineItem; ?></td>
|
||||
<td align="center"><?php echo $record->TotalNoofLineItems; ?></td>
|
||||
<td align="center"><?php echo $record->PolineItems; ?></td>
|
||||
<td align="center"><?php echo $record->PartilallyLineItems; ?></td>
|
||||
<td align="center"><?php echo $record->newLineItem; ?></td>
|
||||
<td><?php echo $record->StatusName; ?></td>
|
||||
<td><?php echo $record->DepartmentName; ?></td>
|
||||
<td><?php echo $record->Designation; ?></td>
|
||||
|
||||
@ -207,27 +207,29 @@ if (!empty($EmpDetails)) {
|
||||
|
||||
<div class="col-md-2">
|
||||
|
||||
<div class="row">
|
||||
<div class="form-row">
|
||||
<div class="box-header">
|
||||
|
||||
<img id="profilepicture"
|
||||
src="<?php echo base_url() . $ProfilePic; ?>" alt="your image"
|
||||
style="width: 139px;" />
|
||||
<br />
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<br/>
|
||||
|
||||
<div class="form-row">
|
||||
|
||||
<label for="photo">Select profile picture<br /><small>(only .jpg or
|
||||
.png)</small>
|
||||
</label>
|
||||
|
||||
<br>
|
||||
|
||||
|
||||
<input type='file' onchange="readURL(this);" id="photo"
|
||||
value="<?php echo base_url() . $ProfilePic; ?>" name="photo" />
|
||||
|
||||
@ -254,10 +256,14 @@ if (!empty($EmpDetails)) {
|
||||
class="form-control w-50" readonly>
|
||||
</div>
|
||||
|
||||
<div class="row" style="margin-top: 18px;">
|
||||
<br>
|
||||
<div class="form-row" >
|
||||
|
||||
<input type="checkbox" id="isactive" <?php echo $IsActive; ?>
|
||||
name="isactive" value="1"> Is Active
|
||||
<input type="checkbox" id="isactive" <?php echo $IsActive; ?>
|
||||
name="isactive" value="1">
|
||||
<label style="margin-top:8px;" >
|
||||
Is Active
|
||||
</label>
|
||||
</div>
|
||||
|
||||
|
||||
@ -279,7 +285,7 @@ if (!empty($EmpDetails)) {
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 pad">
|
||||
<label>Father / Husband Name</lab><span class="badge">*</span>
|
||||
<label>Father / Husband Name</label><span class="badge">*</span>
|
||||
<input type="text" name="FatherName" id="FatherName"
|
||||
maxlength="200" value="<?php echo $FatherName; ?>"
|
||||
placeholder="Father / Husband Name" class="form-control"
|
||||
@ -336,7 +342,7 @@ if (!empty($EmpDetails)) {
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 pad">
|
||||
<label>Age</l><span class="badge">*</span>
|
||||
<label>Age</label><span class="badge">*</span>
|
||||
<input type="text" name="age" placeholder="Age" id="age"
|
||||
value="<?php echo $Age; ?>" class="form-control" readonly>
|
||||
</div>
|
||||
@ -402,8 +408,9 @@ if (!empty($EmpDetails)) {
|
||||
|
||||
<div class="col-md-4 pad" style="margin-top: 18px;">
|
||||
<input type="checkbox" id="checksame" name="sameaddress"
|
||||
onclick="CheckClick"> Current address same as permanent
|
||||
address
|
||||
onclick="CheckClick">
|
||||
<label> Current address same as permanent
|
||||
address</label>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 pad">
|
||||
@ -638,16 +645,18 @@ if (!empty($EmpDetails)) {
|
||||
|
||||
<div class="col-md-3" style="margin-top: 18px;">
|
||||
<div class="form-group">
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">
|
||||
Management
|
||||
Team</label>
|
||||
|
||||
<label class="switch">
|
||||
<input type="checkbox" name="is_management_team"
|
||||
value="<?= $is_management_team; ?>" <?php echo $is_management_team == '1' ? 'checked' : ''; ?>
|
||||
onchange="updateSwitchValue(this)" />
|
||||
<span class="slider"></span>
|
||||
</label>
|
||||
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">
|
||||
Management
|
||||
Team</label>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
@ -839,29 +848,37 @@ if (!empty($EmpDetails)) {
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI
|
||||
Applicable</label>
|
||||
|
||||
<label class="switch">
|
||||
<input type="checkbox" name="esi_applicable"
|
||||
value="<?= $esi_applicable; ?>" <?php echo $esi_applicable == '1' ? 'checked' : ''; ?>
|
||||
onchange="updateSwitchValue(this)" />
|
||||
<span class="slider"></span>
|
||||
</label>
|
||||
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI
|
||||
Applicable</label>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF
|
||||
Applicable</label>
|
||||
|
||||
<label class="switch">
|
||||
<input type="checkbox" name="pf_applicable"
|
||||
value="<?= $pf_applicable; ?>" <?php echo $pf_applicable == '1' ? 'checked' : ''; ?>
|
||||
onchange="updateSwitchValue(this)" />
|
||||
<span class="slider"></span>
|
||||
</label>
|
||||
|
||||
<label
|
||||
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF
|
||||
Applicable</label>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -1032,12 +1049,12 @@ if (!empty($EmpDetails)) {
|
||||
} else { ?>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<span>File Name</span>
|
||||
<label>File Name</label>
|
||||
<input type="text" id="file_name" name="file_name[]"
|
||||
maxlength="255" class="form-control">
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<span>File</span>
|
||||
<label>File</label>
|
||||
<input type="file" name="emp_file[]" class="form-control">
|
||||
</div>
|
||||
<div class="col-md-4" style="margin-top: 23px;">
|
||||
@ -1066,6 +1083,7 @@ if (!empty($EmpDetails)) {
|
||||
<!-- </li> -->
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div> <!-- tab-content -->
|
||||
</div> <!-- end #rootwizard-->
|
||||
@ -1090,6 +1108,7 @@ if (!empty($EmpDetails)) {
|
||||
|
||||
reader.readAsDataURL(input.files[0]);
|
||||
$('#ModifyImage').val(input.files[0]['name']);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -3452,30 +3452,28 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
// PendingQty: pendingqty
|
||||
// }));
|
||||
var rowHtml = `
|
||||
<tr id="${temp}">
|
||||
<td align="left">${temp}</td>
|
||||
<td align="left">${Reqnumber}</td>
|
||||
<td align="left">${materialCode}</td>
|
||||
<td align="left">${materialName}</td>
|
||||
<td align="left">${quantity}</td>
|
||||
<td align="left">${uom}</td>
|
||||
<td align="left">${itemRate}</td>
|
||||
<td align="left">${BasicAmt}</td>
|
||||
<td align="left">${taxexp}</td>
|
||||
<td align="left">${totalexp}</td>
|
||||
<td align="left">${receivedqty}</td>
|
||||
<td align="left">${rejectedqty}</td>
|
||||
<td align="left">${pendingqty}</td>
|
||||
<td>
|
||||
<a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
|
||||
<i class="ri-pencil-fill" data-toggle="tooltip"></i>
|
||||
</a>
|
||||
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
|
||||
<span class="ri-delete-bin-7-fill"></span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
<tr id="${temp}">
|
||||
<td align="left">${temp}</td>
|
||||
<td align="left">${Reqnumber}</td>
|
||||
<td align="left">${materialCode}</td>
|
||||
<td align="left">${materialName}</td>
|
||||
<td align="left">${quantity}</td>
|
||||
<td align="left">${uom}</td>
|
||||
<td align="left">${itemRate}</td>
|
||||
<td align="left">${BasicAmt}</td>
|
||||
<td align="left">${receivedqty}</td>
|
||||
<td align="left">${rejectedqty}</td>
|
||||
<td align="left">${pendingqty}</td>
|
||||
<td>
|
||||
<a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
|
||||
<i class="ri-pencil-fill" data-toggle="tooltip"></i>
|
||||
</a>
|
||||
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
|
||||
<span class="ri-delete-bin-7-fill"></span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
|
||||
// Append the generated row HTML to the target element
|
||||
$('#ImportAppend').append(rowHtml);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user