Skip to content

Commit

Permalink
1.5.3 BETA 4
Browse files Browse the repository at this point in the history
  • Loading branch information
AbangAzmi committed May 23, 2024
1 parent 47dfca2 commit 960e841
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# GarudaCBT
## Last version: 1.5.3 (BETA 3)
## Last version: 1.5.3 (BETA 4)

Versi default: 1.5.3 BETA, untuk download v.1.5.2. [ada disini](https://github.com/garudacbt/cbt/tree/1.5.2-build-2024-05-17)

Expand Down
2 changes: 1 addition & 1 deletion application/controllers/Cbtjadwal.php
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion application/controllers/Cbtnilai.php
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion application/controllers/Cbtrekap.php
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion application/controllers/Siswa.php
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions application/views/cbt/nilai/detail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,14 @@ class="w-100 table table-striped table-bordered border-success nowrap">
];

if ($info->opsi == 3) {
array_push($arrAlias, ['valAlias' => $s->opsi_alias_c, 'opsi' => $s->opsi_c, 'value' => 'C']);
$arrAlias[] = ['valAlias' => $s->opsi_alias_c, 'opsi' => $s->opsi_c, 'value' => 'C'];
} elseif ($info->opsi == 4) {
array_push($arrAlias, ['valAlias' => $s->opsi_alias_c, 'opsi' => $s->opsi_c, 'value' => 'C']);
array_push($arrAlias, ['valAlias' => $s->opsi_alias_d, 'opsi' => $s->opsi_d, 'value' => 'D']);
$arrAlias[] = ['valAlias' => $s->opsi_alias_c, 'opsi' => $s->opsi_c, 'value' => 'C'];
$arrAlias[] = ['valAlias' => $s->opsi_alias_d, 'opsi' => $s->opsi_d, 'value' => 'D'];
} else {
array_push($arrAlias, ['valAlias' => $s->opsi_alias_c, 'opsi' => $s->opsi_c, 'value' => 'C']);
array_push($arrAlias, ['valAlias' => $s->opsi_alias_d, 'opsi' => $s->opsi_d, 'value' => 'D']);
array_push($arrAlias, ['valAlias' => $s->opsi_alias_e, 'opsi' => $s->opsi_e, 'value' => 'E']);
$arrAlias[] = ['valAlias' => $s->opsi_alias_c, 'opsi' => $s->opsi_c, 'value' => 'C'];
$arrAlias[] = ['valAlias' => $s->opsi_alias_d, 'opsi' => $s->opsi_d, 'value' => 'D'];
$arrAlias[] = ['valAlias' => $s->opsi_alias_e, 'opsi' => $s->opsi_e, 'value' => 'E'];
}
array_multisort(array_column($arrAlias, 'valAlias'), SORT_ASC, $arrAlias);
?>
Expand Down Expand Up @@ -413,7 +413,7 @@ class="w-100 table table-striped table-bordered border-success nowrap">
<?php
$jwb = isset($s->tabel_jawab[0]) ? $s->tabel_jawab[0] : [];
if ($s->type_soal == '1') :?>
<span><?= $jwb->title ?></span>
<span><?= $jwb->title ?? '' ?></span>
<?php if (isset($jwb->subtitle)) : ?>
<ul>
<?php foreach ($jwb->subtitle as $sub) : ?>
Expand All @@ -424,7 +424,7 @@ class="w-100 table table-striped table-bordered border-success nowrap">
<br>--
<?php endif; ?>
<?php else:?>
<p><?= isset($jwb->title) ? $jwb->title : '' ?>
<p><?= $jwb->title ?? '' ?>
<br><?= isset($jwb->subtitle) ? $jwb->subtitle[0] : '--' ?></p>
<?php endif; ?>
</td>
Expand All @@ -451,7 +451,7 @@ class="fa fa-pencil"></i>
class="fa fa-undo"></i></button>
</td>
</tr>
<?php for ($t = 1; $t < count($s->tabel_soal); $t++):?>
<?php for ($t = 1, $tMax = count($s->tabel_soal); $t < $tMax; $t++):?>
<tr>
<td>
<?php
Expand All @@ -474,9 +474,9 @@ class="fa fa-undo"></i></button>
</td>
<td>
<?php
$jwb = isset($s->tabel_jawab[$t]) ? $s->tabel_jawab[$t] : [];
$jwb = $s->tabel_jawab[$t] ?? [];
if ($s->type_soal == '1') : ?>
<span><?= $jwb->title ?></span>
<span><?= $jwb->title ?? '' ?></span>
<?php if (isset($jwb->subtitle)) : ?>
<ul>
<?php foreach ($jwb->subtitle as $sub) : ?>
Expand All @@ -487,7 +487,7 @@ class="fa fa-undo"></i></button>
<br>--
<?php endif; ?>
<?php else: ?>
<p><?= isset($jwb->title) ? $jwb->title : '' ?>
<p><?= $jwb->title ?? '' ?>
<br><?= isset($jwb->subtitle) ? $jwb->subtitle[0] : '--' ?></p>
<?php endif; ?>
</td>
Expand Down
2 changes: 1 addition & 1 deletion application/views/kelas/status/data.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class="d-none d-sm-inline-block ml-1"> Excel</span></button>
</div>
<div class="modal-body">
<div class="container-fluid border">
<div id="konten-hasil" class="row">
<div id="konten-hasil" class="row" style="word-wrap: break-word">
</div>
<hr>
<div id="konten-nilai" class="row p-2">
Expand Down
2 changes: 0 additions & 2 deletions application/views/members/siswa/cbt/ujian.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,12 @@ class="btn btn-primary btn-oval-sm">

const jns = jsonJawaban['jenis']
for (const key in jsonJawaban) {
console.log(key, jsonJawaban[key]);
if ((jns==='2' || jns==='3') && key === 'jawaban_siswa') {
formData.append('data['+key+']', JSON.stringify(jsonJawaban[key]))
} else {
formData.append('data['+key+']', jsonJawaban[key])
}
}
console.log(Object.fromEntries(formData))

$.ajax({
url: base_url + 'siswa/savejawaban',
Expand Down
19 changes: 16 additions & 3 deletions assets/app/js/linker-list.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ function getRandomInt(max) {
toolbar: [
['font', ['bold', 'italic', 'underline']],
['color', ['color']],
['insert', ['picture']],
['insert', ['picture', 'math']],
['view', ['codeview']],
['delete', ['hapus']]
],
Expand Down Expand Up @@ -915,7 +915,7 @@ function getRandomInt(max) {
return $tables
})
arrEmpty.shift()
//console.log('links', arrEmpty)
//console.log('links1', arrEmpty)
self.hasLinks = arrEmpty.includes(1)
return res;
} else {
Expand All @@ -925,12 +925,24 @@ function getRandomInt(max) {
arrEmpty.push(value.length > 0 ? 1 : 0)
}
});
//console.log('links', arrEmpty)
//console.log('links2', arrEmpty)
self.hasLinks = arrEmpty.includes(1)
return convertListToTable(self.listKiri, self.listKanan, self.linkeds)
}
},

getKeyLinked: function () {
let self = this
let links;
if (self.modelSoal === '2') {
const converted = convertDefaultToList(self.getResult())
links = converted.linked
} else {
links = self.linkeds
}
return links
},

saveEditor: function () {
let self = this
const $summernotes = $('.summernote-editor' + self.listIdPrefix)
Expand Down Expand Up @@ -1003,6 +1015,7 @@ function getRandomInt(max) {
if (self.fnc) {
self.dataResult['type'] = self.tipeSoal
self.dataResult['model'] = self.modelSoal
self.dataResult['links'] = self.getKeyLinked()
self.dataResult['jawaban'] = self.getResult()
self.fnc(
self.idResult,
Expand Down

0 comments on commit 960e841

Please sign in to comment.