Merge branch 'hotfix/1.2.2'

htdocs

@@ -0,0 +1 @@
+public

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "smk-kelulusan",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smk-kelulusan",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "",
   "main": "webpack.mix.js",
   "directories": {

public/js/app.js

@@ -5141,13 +5141,13 @@ __webpack_require__.r(__webpack_exports__);
 
 var component = {
   oninit: function oninit() {
-    document.title = 'Surat Keterangan Hasil Belajar K13 Siswa - SMK Bhakti Anindya';
+    document.title = 'Surat Keterangan Lulus - SMK Bhakti Anindya';
     _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].current = {};
     _models_AccessLog__WEBPACK_IMPORTED_MODULE_4__["default"].fetch('sk-k13-hasil-belajar');
   },
   namaMapel: {
     'agama': 'Pendidikan Agama dan Budi Pekerti',
-    'pkn': 'Pendidikan Pancasila Kewarganegaraan',
+    'pkn': 'Pendidikan Pancasila dan Kewarganegaraan',
     'indo': 'Bahasa Indonesia',
     'penjas': 'Pendidikan Jasmani, Olahraga dan Kesehatan',
     'senbud': 'Seni Budaya',
@@ -5176,7 +5176,7 @@ var component = {
   confirmPrint: 0,
   view: function view() {
     component.rataRata = [];
-    return [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('.header', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('span.italic.text-xs', ['Saat ini sudah ', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('strong', [_models_AccessLog__WEBPACK_IMPORTED_MODULE_4__["default"].current.accessed, ' / ', _models_AccessLog__WEBPACK_IMPORTED_MODULE_4__["default"].current.total]), ' siswa yang telah mencetak surat keterangan hasil belajar.']), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('h1.title', 'Surat Keterangan Hasil Belajar Siswa SMK Bhakti Anindya'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('span', 'Silahkan masukkan NISN dan Tanggal Lahir kamu di bawah ini.')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('form.form', {
+    return [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('.header', [Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('span.italic.text-xs', ['Saat ini sudah ', Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('strong', [_models_AccessLog__WEBPACK_IMPORTED_MODULE_4__["default"].current.accessed, ' / ', _models_AccessLog__WEBPACK_IMPORTED_MODULE_4__["default"].current.total]), ' siswa yang telah mencetak surat keterangan hasil belajar.']), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('h1.title', 'Surat Keterangan Lulus Siswa SMK Bhakti Anindya'), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('span', 'Silahkan masukkan NISN dan Tanggal Lahir kamu di bawah ini.')]), Object(mithril__WEBPACK_IMPORTED_MODULE_0__["default"])('form.form', {
       onsubmit: function onsubmit(e) {
         e.preventDefault();
         _models_Siswa__WEBPACK_IMPORTED_MODULE_3__["default"].cariData({
@@ -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/2019')]), 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 keluulsan 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");
+__webpack_require__(/*! /home/gregorio/Documents/Codes/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");
+module.exports = __webpack_require__(/*! /home/gregorio/Documents/Codes/smk-kelulusan/resources/sass/main.scss */"./resources/sass/main.scss");
 
 
 /***/ })

resources/js/components/SKK13HasilBelajar.js

@@ -6,13 +6,13 @@ import AccessLog from "../models/AccessLog"
 
 var component = {
     oninit: () => {
-        document.title = 'Surat Keterangan Hasil Belajar K13 Siswa - SMK Bhakti Anindya';
+        document.title = 'Surat Keterangan Lulus - SMK Bhakti Anindya';
         Siswa.current = {};
         AccessLog.fetch('sk-k13-hasil-belajar');
     },
     namaMapel: {
         'agama': 'Pendidikan Agama dan Budi Pekerti',
-        'pkn': 'Pendidikan Pancasila Kewarganegaraan',
+        'pkn': 'Pendidikan Pancasila dan Kewarganegaraan',
         'indo': 'Bahasa Indonesia',
         'penjas': 'Pendidikan Jasmani, Olahraga dan Kesehatan',
         'senbud': 'Seni Budaya',
@@ -52,7 +52,7 @@ var component = {
                     ]),
                     ' siswa yang telah mencetak surat keterangan hasil belajar.'
                 ]),
-                m('h1.title', 'Surat Keterangan Hasil Belajar Siswa SMK Bhakti Anindya'),
+                m('h1.title', 'Surat Keterangan Lulus Siswa SMK Bhakti Anindya'),
                 m('span', 'Silahkan masukkan NISN dan Tanggal Lahir kamu di bawah ini.'),
             ]),
             m('form.form', {
@@ -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/2019'),
+                        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 keluulsan 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',