diff --git a/htdocs b/htdocs new file mode 120000 index 0000000..d70ebaa --- /dev/null +++ b/htdocs @@ -0,0 +1 @@ +public \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 982d18c..60f1d8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "smk-kelulusan", - "version": "1.2.1", + "version": "1.2.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 451eb6d..03e463a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smk-kelulusan", - "version": "1.2.1", + "version": "1.2.2", "description": "", "main": "webpack.mix.js", "directories": { diff --git a/public/js/app.js b/public/js/app.js index 100e9c0..286aa4a 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -5249,10 +5249,16 @@ var component = { // backgroundColor: '#000', // marginBottom: '1rem', // }}), - Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('.letter__body', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('strong.letter__body-header', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('p', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('span.border-b.border-black', 'SURAT KETERANGAN LULUS')), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('p.font-normal.mt-1', 'Nomor: 061/SMK-BA/V/2020')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('br'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('table', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=6]', 'Kepala SMK Bhakti Anindya selaku Ketua Penyelenggara Ujian Sekolah Tahun Pelajaran 2019/2020 berdasarkan:')), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=5]', '1. Ketuntasan dari seluruh program pembelajaran pada Kurikulum 2013.')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=5]', '2. Kriteria Kelulusan dari satuan pendidikan sesuai dengan peraturan dan perundang-undangan.')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=5]', '3. Rapat Pleno Dewan Pendidik tentang kelulusan pada tanggal 30 April 2020.')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', mithril__WEBPACK_IMPORTED_MODULE_0__["default"].trust(' '))), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=6]', 'Menerangkan bahwa:')), // m('tr', + Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('.letter__body', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('strong.letter__body-header', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('p', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('span.border-b.border-black', 'SURAT KETERANGAN LULUS')), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('p.mt-1', 'Nomor: 102/SMK-BA/V/2021')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('br'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('table', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=6]', 'Kepala SMK Bhakti Anindya selaku Ketua Penyelenggara Ujian Sekolah Tahun Pelajaran 2020/2021 berdasarkan:')), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=5]', '1. Menyelesaikan program pembelajaran di masa COVID -19 yang dibuktikan dengan rapor tiap semester;')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=5]', '2. Memperoleh nilai sikap/prilaku minimal baik;')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=5]', '3. Mengikuti Ujian yang diselenggarakan oleh satuan pendidikan;')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=5]', '4. Rapat Pleno Dewan Pendidik tentang kelulusan pada tanggal 29 Mei 2021.')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', mithril__WEBPACK_IMPORTED_MODULE_0__["default"].trust(' '))), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=6]', 'Menerangkan bahwa:')), // m('tr', // m('td', // m.trust(' '))), - Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Nama Peserta'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', ':'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=3]', _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.nama)]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Tempat / Tanggal Lahir'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', ':'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.tempat_lahir + ' , ' + _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.tanggal_lahir)]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'NIS / NISN'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', ':'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.nis + ' / ' + _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.nisn)]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Nomor Peserta'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', ':'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=3]', _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.nopes)]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Kelas'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', ':'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=3]', _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.kelas)]), // m('tr', [ + Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Nama Peserta'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', ':'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=3]', _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.nama)]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Tempat & Tanggal Lahir'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', ':'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.tempat_lahir + ' , ' + _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.tanggal_lahir)]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'NIS / NISN'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', ':'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.nis + ' / ' + _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.nisn)]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Kelas'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', ':'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=3]', _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current.kelas)]), // m('tr', [ + // m('td'), + // m('td', 'Nomor Peserta'), + // m('td', ':'), + // m('td[colspan=3]', Siswa.current.nopes), + // ]), + // m('tr', [ // m('td'), // m('td', 'Bidang Studi Keahlian'), // m('td', ':'), @@ -5278,11 +5284,11 @@ var component = { if (nama == 'mulok') { return [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-right'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('th.text-left[colspan=2]', 'Mulok'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-center')]), lodash_map__WEBPACK_IMPORTED_MODULE_2___default()(nilai, function (nl, mp) { if (nl != 0) component.rataRata.push(nl); - return nilai == 0 ? null : Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-right.no-num'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=2]', component.namaMapel[mp]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-center', nl.toFixed(2))]); + return nilai == 0 ? null : Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-right.no-num'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=2]', component.namaMapel[mp]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-center.font-bold', nl)]); })]; } else { if (nilai != 0) component.rataRata.push(nilai); - return nilai == 0 ? null : Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-right'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=2]', component.namaMapel[nama]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-center', nilai.toFixed(2))]); + return nilai == 0 ? null : Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-right'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td[colspan=2]', component.namaMapel[nama]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-center.font-bold', nilai)]); } }))]; }), // m('tr', [ @@ -5353,9 +5359,9 @@ var component = { // m('td.text-center', nilai.unbk !== 0 ? nilai.unbk.toFixed(2) : null), // ]); // })), - Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('th[colspan=3]', 'Rata-rata'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-center', (component.rataRata.reduce(function (total, num) { + Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('th[colspan=3]', 'Rata-rata'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td.text-center.font-bold', (component.rataRata.reduce(function (total, num) { return total + num; - }) / component.rataRata.length).toFixed(2))])])))]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('table.signature', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Tangerang, 02 Mei 2020')), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Kepala Sekolah,')), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('.letter__sign', { + }) / component.rataRata.length).toFixed(2))])])))]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('table.signature', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Tangerang, 03 Juni 2021')), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', 'Kepala Sekolah,')), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('tr', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('td', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('.letter__sign', { style: { height: '5rem' } @@ -5548,8 +5554,8 @@ var model = { /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(/*! /home/gregorio/Documents/codes/local/smk-kelulusan/resources/js/app.js */"./resources/js/app.js"); -module.exports = __webpack_require__(/*! /home/gregorio/Documents/codes/local/smk-kelulusan/resources/sass/main.scss */"./resources/sass/main.scss"); +__webpack_require__(/*! /home/gregorio/Documents/Codes/smk-kelulusan/resources/js/app.js */"./resources/js/app.js"); +module.exports = __webpack_require__(/*! /home/gregorio/Documents/Codes/smk-kelulusan/resources/sass/main.scss */"./resources/sass/main.scss"); /***/ }) diff --git a/resources/imports/hasil_belajar_ba_2021.xlsx b/resources/imports/hasil_belajar_ba_2021.xlsx new file mode 100644 index 0000000..e0d2cb1 Binary files /dev/null and b/resources/imports/hasil_belajar_ba_2021.xlsx differ diff --git a/resources/js/components/SKK13HasilBelajar.js b/resources/js/components/SKK13HasilBelajar.js index f35c005..a18a525 100644 --- a/resources/js/components/SKK13HasilBelajar.js +++ b/resources/js/components/SKK13HasilBelajar.js @@ -160,23 +160,27 @@ var component = { m('.letter__body', [ m('strong.letter__body-header', [ m('p', m('span.border-b.border-black', 'SURAT KETERANGAN LULUS')), - m('p.font-normal.mt-1', 'Nomor: 061/SMK-BA/V/2020'), + m('p.mt-1', 'Nomor: 102/SMK-BA/V/2021'), ]), m('br'), m('table', [ m('tr', - m('td[colspan=6]', 'Kepala SMK Bhakti Anindya selaku Ketua Penyelenggara Ujian Sekolah Tahun Pelajaran 2019/2020 berdasarkan:')), + m('td[colspan=6]', 'Kepala SMK Bhakti Anindya selaku Ketua Penyelenggara Ujian Sekolah Tahun Pelajaran 2020/2021 berdasarkan:')), m('tr', [ m('td'), - m('td[colspan=5]', '1. Ketuntasan dari seluruh program pembelajaran pada Kurikulum 2013.'), + m('td[colspan=5]', '1. Menyelesaikan program pembelajaran di masa COVID -19 yang dibuktikan dengan rapor tiap semester;'), ]), m('tr', [ m('td'), - m('td[colspan=5]', '2. Kriteria Kelulusan dari satuan pendidikan sesuai dengan peraturan dan perundang-undangan.'), + m('td[colspan=5]', '2. Memperoleh nilai sikap/prilaku minimal baik;'), ]), m('tr', [ m('td'), - m('td[colspan=5]', '3. Rapat Pleno Dewan Pendidik tentang kelulusan pada tanggal 30 April 2020.'), + m('td[colspan=5]', '3. Mengikuti Ujian yang diselenggarakan oleh satuan pendidikan;'), + ]), + m('tr', [ + m('td'), + m('td[colspan=5]', '4. Rapat Pleno Dewan Pendidik tentang kelulusan pada tanggal 29 Mei 2021.'), ]), m('tr', m('td', @@ -194,7 +198,7 @@ var component = { ]), m('tr', [ m('td'), - m('td', 'Tempat / Tanggal Lahir'), + m('td', 'Tempat & Tanggal Lahir'), m('td', ':'), m('td', Siswa.current.tempat_lahir + ' , ' + Siswa.current.tanggal_lahir), ]), @@ -204,12 +208,6 @@ var component = { m('td', ':'), m('td', Siswa.current.nis + ' / ' + Siswa.current.nisn), ]), - m('tr', [ - m('td'), - m('td', 'Nomor Peserta'), - m('td', ':'), - m('td[colspan=3]', Siswa.current.nopes), - ]), m('tr', [ m('td'), m('td', 'Kelas'), @@ -218,6 +216,12 @@ var component = { ]), // m('tr', [ // m('td'), + // m('td', 'Nomor Peserta'), + // m('td', ':'), + // m('td[colspan=3]', Siswa.current.nopes), + // ]), + // m('tr', [ + // m('td'), // m('td', 'Bidang Studi Keahlian'), // m('td', ':'), // m('td[colspan=3]', Siswa.current.bsk), @@ -279,7 +283,7 @@ var component = { return nilai == 0 ? null : m('tr', [ m('td.text-right.no-num'), m('td[colspan=2]', component.namaMapel[mp]), - m('td.text-center', nl.toFixed(2)) + m('td.text-center.font-bold', nl) ]); }) ]; @@ -289,7 +293,7 @@ var component = { return nilai == 0 ? null : m('tr', [ m('td.text-right'), m('td[colspan=2]', component.namaMapel[nama]), - m('td.text-center', nilai.toFixed(2)) + m('td.text-center.font-bold', nilai) ]); } })) @@ -365,7 +369,7 @@ var component = { // })), m('tr', [ m('th[colspan=3]', 'Rata-rata'), - m('td.text-center', (component.rataRata.reduce((total, num) => total + num) / component.rataRata.length).toFixed(2)), + m('td.text-center.font-bold', (component.rataRata.reduce((total, num) => total + num) / component.rataRata.length).toFixed(2)), // m('td.text-center', (component.rataRata.usbn.reduce((total, num) => total + num) / component.rataRata.usbn.length).toFixed(2)), // m('td.text-center', (component.rataRata.unbk.reduce((total, num) => total + num) / component.rataRata.unbk.length).toFixed(2)), ]), @@ -378,7 +382,7 @@ var component = { ]), m('table.signature', [ m('tr', - m('td', 'Tangerang, 02 Mei 2020')), + m('td', 'Tangerang, 03 Juni 2021')), m('tr', m('td', 'Kepala Sekolah,')), m('tr',