Rilis v22.08-premium-rev04

OpenSID · Aug 24, 2022 · 8f86137 · 8f86137
1 parent 8e1d316
commit 8f86137
Show file tree

Hide file tree

Showing 13 changed files with 145 additions and 95 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 # Abaikan folder desa
 desa/*
 
+# Abaikan backup_inkremental
+backup_inkremental/*
+
 # Abaikan file
 *.log
 log-*.php
@@ -14,6 +17,7 @@ mitra
 
 # Abaikan file cache milik phpintel (plugin sublime text)
 .phpintel/*
+.idea/*
 
 # Abaikan file milik library Release dan Curly
 *.pem
@@ -23,20 +27,35 @@ version.json
 Obfuscator.php
 make_obfuscate.php
 
+# Abaikan tema premium
+vendor/themes/denatra/
+vendor/themes/silir/
+vendor/themes/batuah/
+vendor/themes/denava/
+
 # Abaikan isian folder vendor
 vendor/codeigniter/framework/*
 !vendor/codeigniter/framework/system/
 
+# Abaikan dokumentasi
+vendor/*/*/.github
+vendor/*/*/*.md
+vendor/*/*/*.TXT
+vendor/*/*/*.cache
+vendor/*/*/*.yml
+vendor/*/*/*.dist
+vendor/*/*/*.xml
+vendor/*/*/.gitignore
+vendor/*/*/LICENSE
 test/
 tests/
 doc/
 docs/
 example/
 examples/
+
 vendor/libreoffice/*
 vendor/mikey179/*
-.idea/*
-backup_inkremental/*
 
 # Struktur Laravel
 storage/framework/
diff --git a/app/Libraries/TinyMCE.php b/app/Libraries/TinyMCE.php
diff --git a/app/Models/Anak.php b/app/Models/Anak.php
diff --git a/app/Models/IbuHamil.php b/app/Models/IbuHamil.php
diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -1,4 +1,4 @@
-Di rilis ini, versi 22.08-premium-rev03 [untuk diisi]. Rilis ini juga berisi penambahan fitur dan perbaikan lain yang diminta Komunitas SID.
+Di rilis ini, versi 22.08-premium-rev04 [untuk diisi]. Rilis ini juga berisi penambahan fitur dan perbaikan lain yang diminta Komunitas SID.
 Terima kasih pada [untuk diisi] yang terus berkontribusi.
 
 #### Penambahan Fitur
@@ -25,6 +25,9 @@ Terima kasih pada [untuk diisi] yang terus berkontribusi.
 18.[#5476](https://github.com/OpenSID/OpenSID/issues/5476) Memperbaiki luas tanah tidak bisa tersimpan di menu bumindes tanah kas desa.
 19.[#5522](https://github.com/OpenSID/OpenSID/issues/5522) Memperbaiki footer surat mepet dengan isi surat.
 20.[#5482](https://github.com/OpenSID/OpenSID/issues/5482) Merubah nama file foto aparatur desa yang menampilkan NIK.
+21.[#5528](https://github.com/OpenSID/OpenSID/issues/5528) Memperbaiki pengaturan masa berlaku tidak berfungsi pada surat pengantar.
+22.[#5527](https://github.com/OpenSID/OpenSID/issues/5527) Memperbaiki edit sebelum cetak PDF tidak berfungsi.
+23.[#5505](https://github.com/OpenSID/OpenSID/issues/5505) Memperbaiki scorecard konvergensi pada tabel jumlah sasaran dan tabel hasil pengukuran tidak berfungsi dengan benar.
 
 #### Perubahan Teknis
 
@@ -34,3 +37,5 @@ Terima kasih pada [untuk diisi] yang terus berkontribusi.
 4. Menambahkan required pada form edit album.
 5. Mengembalikan fungsi pencarian cetak surat.
 6. Menambahkan penjelasan tambahan di impor analisis.
+7. Memperbarui .gitignore.
+8. Deploy Website Berputar
diff --git a/donjo-app/controllers/Stunting.php b/donjo-app/controllers/Stunting.php
diff --git a/donjo-app/controllers/Surat.php b/donjo-app/controllers/Surat.php
diff --git a/donjo-app/helpers/opensid_helper.php b/donjo-app/helpers/opensid_helper.php
diff --git a/donjo-app/libraries/Rekap.php b/donjo-app/libraries/Rekap.php
@@ -71,6 +71,7 @@ public function get_data_ibu_hamil($kuartal = null, $tahun = null, $id = null)
         $ibuHamil = DB::table('ibu_hamil')
             ->join('kia', 'ibu_hamil.kia_id', '=', 'kia.id')
             ->join('tweb_penduduk', 'kia.ibu_id', '=', 'tweb_penduduk.id')
+            ->where('status_kehamilan', '!=', null)
             ->whereMonth('ibu_hamil.created_at', '>=', $batasBulanBawah)
             ->whereMonth('ibu_hamil.created_at', '<=', $batasBulanAtas)
             ->whereYear('ibu_hamil.created_at', $tahun)

diff --git a/donjo-app/views/surat/form/tgl_berlaku.php b/donjo-app/views/surat/form/tgl_berlaku.php
@@ -1,4 +1,4 @@
-							<?php if ((int) $surat['masa_berlaku'] > 1): ?>
+							<?php if ((int) $surat['masa_berlaku'] > 0): ?>
 								<div class="form-group">
 									<label for="berlaku_dari"  class="col-sm-3 control-label">Berlaku Dari - Sampai</label>
 									<div class="col-sm-3 col-lg-2">

diff --git a/resources/views/admin/stunting/pemantauan_anak_form.blade.php b/resources/views/admin/stunting/pemantauan_anak_form.blade.php
diff --git a/resources/views/admin/stunting/pemantauan_ibu_hamil_form.blade.php b/resources/views/admin/stunting/pemantauan_ibu_hamil_form.blade.php
@@ -50,41 +50,41 @@ class="btn btn-social btn-info btn-sm btn-sm visible-xs-block visible-sm-inline-
                         <div class="col-sm-9">
                             <select class="form-control input-sm required select2" name="id_posyandu" style="width:100%;">
                                 <option value="">-- Cari Posyandu --</option>
-                                @foreach ($posyandu as $data)
-                                    <option value="{{ $data->id }}" @selected($ibuHamil->posyandu_id == $data->id)>{{ $data->nama }}</option>
+                                @foreach ($posyandu as $key => $value)
+                                    <option value="{{ $key }}" @selected($ibuHamil->posyandu_id == $key)>{{ $value }}</option>
                                 @endforeach
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-sm-3 control-label">Status Kehamilan</label>
                         <div class="col-sm-9">
-                            <select class="form-control input-sm required" {{ $ibuHamil->status_kehamilan != null ? '' : 'disabled' }} id="status_kehamilan" name="status_kehamilan">
+                            <select class="form-control input-sm required select2" @disabled($ibuHamil->status_kehamilan === null) id="status_kehamilan" name="status_kehamilan">
                                 <option value="">Pilih Status Kehamilan</option>
-                                @foreach (['Normal', 'Risiko Tinggi (Risti)', 'Kekurangan Energi Kronis (KEK)'] as $key => $value)
-                                <option value="{{ $key+1 }}" {{ selected($ibuHamil->status_kehamilan, $key+1) }}>{{ $value }}</option>
+                                @foreach ($status_kehamilan_ibu as $key => $value)
+                                <option value="{{ $key }}" {{ selected($ibuHamil->status_kehamilan, $key) }}>{{ $value }}</option>
                                 @endforeach
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-sm-3 control-label">Usia Kehamilan (Bulan)</label>
                         <div class="col-sm-9">
-                            <input type="number" {{ $ibuHamil->usia_kehamilan != null ? '' : 'disabled' }} class="form-control input-sm required" min="1" max="12" id="usia_kehamilan" name="usia_kehamilan"
+                            <input type="number" @disabled($ibuHamil->usia_kehamilan === null) class="form-control input-sm required" min="1" max="12" id="usia_kehamilan" name="usia_kehamilan"
                                 placeholder="Masukkan usia kehamilan" value="{{ $ibuHamil->usia_kehamilan }}" />
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-sm-3 control-label">Tanggal Melahirkan</label>
                         <div class="col-sm-9">
-                            <input type="text" {{ $ibuHamil->tanggal_melahirkan != null ? '' : 'disabled' }} class="form-control input-sm datepicker required" id="tanggal_melahirkan" name="tanggal_melahirkan"
+                            <input type="text" @disabled($ibuHamil->tanggal_melahirkan === null) class="form-control input-sm datepicker required" id="tanggal_melahirkan" name="tanggal_melahirkan"
                                 placeholder="Masukkan tanggal melahirkan" value="{{ $ibuHamil->tanggal_melahirkan }}" />
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-sm-3 control-label">Berapa butir pil Fe</label>
                         <div class="col-sm-9">
-                            <input type="number" {{ $ibuHamil->konsumsi_pil_fe ? '' : 'disabled' }} class="form-control input-sm required" min="1" id="butir_pil_fe" name="butir_pil_fe"
+                            <input type="number" @disabled($ibuHamil->konsumsi_pil_fe === null) class="form-control input-sm required" min="1" id="butir_pil_fe" name="butir_pil_fe"
                                 placeholder="Masukkan jumlah butir pil Fe" value="{{ $ibuHamil->butir_pil_fe }}" />
                         </div>
                     </div>

diff --git a/resources/views/admin/surat/konsep.blade.php b/resources/views/admin/surat/konsep.blade.php
@@ -47,29 +47,30 @@ class="btn btn-social btn-warning btn-sm"><i class="fa fa-file-code-o"></i>
 @push('scripts')
     <script type="text/javascript">
         $(function() {
-             $('#cetak-pdf').click(function (e) {
+            $('#cetak-pdf').click(function (e) {
                 e.preventDefault();
+                tinymce.triggerSave();
                 Swal.fire({
-                  title: 'Membuat Surat..',
-                  timerProgressBar: true,
-                  didOpen: () => {
-                    Swal.showLoading()
-                  },
-                  allowOutsideClick: () => false
+                    title: 'Membuat Surat..',
+                    timerProgressBar: true,
+                    didOpen: () => {
+                        Swal.showLoading()
+                    },
+                    allowOutsideClick: () => false
                 })
                 $.ajax({
                     url: `{{ $aksi_cetak }}`,
                     type: 'POST',
                     xhrFields: {
                         responseType: 'blob'
-                      },
+                    },
                     data: $("#validasi").serialize(),
                     success: function(response, status, xhr){
                         // https://stackoverflow.com/questions/34586671/download-pdf-file-using-jquery-ajax
-                        var filename = "";                   
+                        var filename = "";
                         var disposition = xhr.getResponseHeader('Content-Disposition');
 
-                         if (disposition) {
+                        if (disposition) {
                             var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
                             var matches = filenameRegex.exec(disposition);
                             if (matches !== null && matches[1]) filename = matches[1].replace(/['"]/g, '');
@@ -114,11 +115,11 @@ class="btn btn-social btn-warning btn-sm"><i class="fa fa-file-code-o"></i>
                         $('#back').remove();
                         $('#next').show();
                         Swal.fire({
-                          position: 'top-end',
-                          icon: 'success',
-                          title: 'Surat Selesai Dibuat',
-                          showConfirmButton: false,
-                          timer: 1500
+                            position: 'top-end',
+                            icon: 'success',
+                            title: 'Surat Selesai Dibuat',
+                            showConfirmButton: false,
+                            timer: 1500
                         })
                     }
                 });