mahdahar/pbmc-cmod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into zakaria

Browse Source
This commit is contained in:
mikael-zakaria 2024-12-07 08:59:56 +08:00
commit 4254ab3924
5 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/API_DictMappings.php
View File

@ -104,7 +104,7 @@ class API_DictMappings extends ResourceController {
return $this->fail($response , 409);
}
// getting mapid after
if($update == 0) { $update =$db->insertID(); }
if($update == 0) { $update = $db->insertID(); }
// dict_mapping_profiles
$datasource = '';
@ -117,7 +117,7 @@ class API_DictMappings extends ResourceController {
WHEN NOT MATCHED BY TARGET THEN
INSERT (MAPID, LISCODE)
VALUES (s.MAPID, s.LISCODE)
WHEN NOT MATCHED BY SOURCE THEN
WHEN NOT MATCHED BY SOURCE and t.MAPID='$update' THEN
DELETE;";
if( $db->query($sql) ) {

7
app/Controllers/AdminController.php
View File

@ -60,6 +60,11 @@ class AdminController extends BaseController {
}
public function dictMappings_index() {
return view('admin/dictMappings_index');
$db = \Config\Database::connect();
$sql = "select TESTCODE from DICT_TESTS where ENDVALIDDATE is null";
$query = $db->query($sql);
$results = $query->getResultArray();
$data['tests'] = $results;
return view('admin/dictMappings_index', $data);
}
}

34
app/Views/admin/dictMappings_index.php
View File

@ -1,6 +1,15 @@
<?= $this->extend('admin/layout/main.php') ?>
<?= $this->section('content') ?>
<datalist id='liscode'>
<?php
echo "";
foreach($tests as $data) {
$testcode = $data['TESTCODE'];
echo "<option value='$testcode' />";
}
?>
</datalist>
<div class="card border-0 m-1">
<div class="card-body">
<div class='card-title'>Dictionary Mapping Order</div>
@ -37,8 +46,8 @@
<table class="table table-sm table-borderless">
<input type='hidden' id='updateSingle' value='' />
<tr class="align-middle"> <th>HIS Code</th> <th>:</th> <td><input class='form-control' type='text' id='hiscodeSingle'/></td> </tr>
<tr class="align-middle"> <th>LIS Code</th> <th>:</th> <td><input class='form-control' type='text' id='liscodeSingle' oninput='this.value = this.value.toUpperCase();' /></td> </tr>
<tr class="align-middle"> <th>Desc.</th> <th>:</th> <td><input class='form-control' type='text' id='descsSingle'/></td> </tr>
<tr class="align-middle"> <th>LIS Code</th> <th>:</th> <td><input list='liscode' class='form-control' type='text' id='liscodeSingle' oninput='this.value = this.value.toUpperCase();' /></td> </tr>
<tr class="align-middle"> <th>Desc.</th> <th>:</th> <td><textarea class='form-control' id='descsSingle'></textarea></td> </tr>
</table>
<button class='btn btn-sm btn-primary' onclick='saveSingle()'>Save</button>
<button class='btn btn-sm btn-secondary' data-bs-dismiss="modal">Cancel</button>
@ -63,7 +72,7 @@
<table class="table table-sm table-borderless">
<input type='hidden' id='updateProfile' value='' />
<tr class="align-middle"> <th>HIS Code</th> <th>:</th> <td><input class='form-control' type='text' id='hiscodeProfile'/></td> </tr>
<tr class="align-middle"> <th>Desc.</th> <th>:</th> <td><input class='form-control' type='text' id='descsProfile'/></td> </tr>
<tr class="align-middle"> <th>Desc.</th> <th>:</th> <td><textarea class='form-control' id='descsProfile'></textarea></td> </tr>
</table>
</div>
<div class="col-6">
@ -71,8 +80,8 @@
<tr class="align-top">
<th>LIS Code</th> <th>:</th>
<?php $j=1; ?>
<td> <?php for($i=1;$i<=11;$i++) { echo "<input class='mliscode$j' type='text' maxlength='5' size='7' oninput='this.value = this.value.toUpperCase();' /> <br />\n";$j++; } ?> </td>
<td> <?php for($i=1;$i<=11;$i++) { echo "<input class='mliscode$j' type='text' maxlength='5' size='7' oninput='this.value = this.value.toUpperCase();' /> <br />\n";$j++; } ?> </td>
<td> <?php for($i=1;$i<=11;$i++) { echo "<input class='mliscode$j' list='liscode' type='text' maxlength='5' size='7' oninput='this.value = this.value.toUpperCase();' /> <br />\n";$j++; } ?> </td>
<td> <?php for($i=1;$i<=11;$i++) { echo "<input class='mliscode$j' list='liscode' type='text' maxlength='5' size='7' oninput='this.value = this.value.toUpperCase();' /> <br />\n";$j++; } ?> </td>
</tr>
</table>
</div>
@ -106,12 +115,6 @@ function index() {
descs = data[i].DESCS;
editBtn = '';
if(data[i].LISCODE == null) { liscode = '-'; }
/*
if(data[i].HISCODE != null) { text2 = data[i].TEXT2; }
if(data[i].MAPPINGTYPE != null) { unit = data[i].UNIT; }
if(data[i].MAPPINGID != null) { refftext = data[i].REFFTEXT; }
if(data[i].DESCS != null) { refftext = data[i].DESCS; }
*/
if(maptype == 'S') {
editBtn = '<button class="btn btn-sm btn-success" ' + ' onclick="editSingle(' + mapid+ ')">Edit' + '</button> ';
} else {
@ -180,6 +183,13 @@ function editProfile(mapid) {
$("#updateProfile").val(mapid);
$("#hiscodeProfile").val(data.HISCODE);
$("#descsProfile").val(data.DESCS);
// empty mliscode
for (let i = 1; i <= 22; i++) {
let id = `.mliscode${i}`;
let element = $(id);
element.val('');
}
// populate mliscode
for (let i = 0; i < data.mliscodes.length; i++) {
const fieldId = `mliscode${i + 1}`;
$(`.${fieldId}`).val(data.mliscodes[i].LISCODE);
@ -204,7 +214,7 @@ function saveSingle() {
method: "POST",
data: data,
success: function(response) {
$("#liscodeSingle").val('');
$(".liscodeSingle").val('');
$("#hiscodeSingle").val('');
$("#descsSingle").val('');
$("#updateSingle").val('');

2
app/Views/admin/layout/main.php
View File

@ -49,7 +49,7 @@
</footer>
</div>
</div>
<script src="<?=base_url();?>assets/jquery-3.6.0.min.js"></script>
<script src="<?=base_url();?>assets/jquery-3.7.1.min.js"></script>
<script src="<?=base_url();?>assets/js/bootstrap.bundle.min.js"></script>
<script src="<?=base_url();?>assets/datatables/datatables.min.js"></script>
<script src="<?=base_url();?>assets/js/scripts.js"></script>

2
public/assets/jquery-3.7.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long