Skip to content

Commit

Permalink
Minor textuaDatatable issue fixed in QC Testing
Browse files Browse the repository at this point in the history
  • Loading branch information
amitdugar committed Aug 26, 2019
1 parent 9de2007 commit 405aa3d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ public function fetchQualityCheckDetails($parameters)
$row[] = ucwords($aRow['tester_name']);

// $row[] = '<a href="/quality-check/edit/' . base64_encode($aRow['qc_test_id']) . '" class="btn btn-default" style="margin-right: 2px;" title="Edit"><i class="far fa-edit"></i>Edit</a>';

$actionBtn .='<div class="btn-group btn-group-sm" role="group" aria-label="Small Horizontal Primary">';
$actionBtn ='<div class="btn-group btn-group-sm" role="group" aria-label="Small Horizontal Primary">';
if ($roleCode != 'manager') {
$actionBtn.='<a class="btn btn-danger" href="/quality-check/edit/' . base64_encode($aRow['qc_test_id']) . '"><i class="si si-pencil"></i> Edit</a>';
}
Expand Down
6 changes: 3 additions & 3 deletions module/Application/view/application/quality-check/add.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ $lineOutComeColor2 = "#000000";
<div class="content">
<div class="block block-rounded block-bordered">
<div class="block-header block-header-default">
<h3 class="block-title">Add Quality Check Testing Details</h3>
<h3 class="block-title">Add a new Quality Check Test</h3>
</div>
<div class="block-content">
<div class="col-md-12 table-responsive" id="hide">
<form name="qcAddInformation" id="qcAddInformation" class="mb-5" action="<?php echo $this->url('quality-check', array('action' => 'add')); ?>" method="post">
<div class="form-group row">
<label class="col-sm-2 col-form-label" for="">Qc Sample ID <span class="mandatory">*</span></label>
<label class="col-sm-2 col-form-label" for="">QC Sample ID <span class="mandatory">*</span></label>
<div class="col-sm-4">
<input type="text" class="form-control isRequired" id="qcSampleId" name="qcSampleId" placeholder="Enter the QC Sample id" title="Please enter the QC Sample id">
<input type="text" class="form-control isRequired" id="qcSampleId" name="qcSampleId" placeholder="Enter the QC Sample ID" title="Please enter the QC Sample ID">
</div>

<label class="col-sm-2 col-form-label" for="">Qc Test Date <span class="mandatory">*</span></label>
Expand Down
4 changes: 2 additions & 2 deletions module/Application/view/application/quality-check/edit.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ $lineOutComeColor2 = "#000000";
<form name="qcEditInformation" id="qcEditInformation" class="mb-5" action="<?php echo $this->url('quality-check', array('action' => 'edit')); ?>" method="post">

<div class="form-group row">
<label class="col-sm-2 col-form-label" for="">Qc Sample ID <span class="mandatory">*</span></label>
<label class="col-sm-2 col-form-label" for="">QC Sample ID <span class="mandatory">*</span></label>
<div class="col-sm-4">
<input type="text" value="<?php echo $result['qc_sample_id']; ?>" class="form-control isRequired" id="qcSampleId" name="qcSampleId" placeholder="Enter the QC sample id" title="Please enter the QC sample id">
<input type="text" value="<?php echo $result['qc_sample_id']; ?>" class="form-control isRequired" id="qcSampleId" name="qcSampleId" placeholder="Enter the QC Sample ID" title="Please enter the QC Sample ID">
</div>
<label class="col-sm-2 col-form-label" for="">Qc Test Date<span class="mandatory">*</span></label>
<div class="col-sm-4">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ $roleCode = $sessionLogin->roleCode;

<?php $i = 0; ?>
<div class="col-sm-3">
<input type="checkbox" onclick="javascript:fnShowHide(this.value);" value="<?php echo $i;?>" id="iCol<?php echo $i;?>" data-showhide="qc_sample_id" class="showhideCheckBox" /> <label for="iCol<?php echo $i;?>">Qc Sample Id</label>
<input type="checkbox" onclick="javascript:fnShowHide(this.value);" value="<?php echo $i;?>" id="iCol<?php echo $i;?>" data-showhide="qc_sample_id" class="showhideCheckBox" /> <label for="iCol<?php echo $i;?>">QC Sample ID</label>
</div>
<div class="col-sm-3">
<input type="checkbox" onclick="javascript:fnShowHide(this.value);" value="<?php echo $i = $i+1;?>" id="iCol<?php echo $i;?>" data-showhide="qc_test_date" class="showhideCheckBox" /> <label for="iCol<?php echo $i;?>">QC Date</label> <br>
Expand Down

0 comments on commit 405aa3d

Please sign in to comment.