From c788f5e5e4a9da358e013cc239b10dca8c6c766b Mon Sep 17 00:00:00 2001
From: Nella Zabrina <nellazabrinapramata@yahoo.co.id>
Date: Tue, 30 Apr 2019 00:49:18 +0700
Subject: [PATCH] refactor modal pengumumna
---
.../Controllers/Status/StatusController.php | 49 +++++++++----------
.../components/ModalKlasifikasiComponent.vue | 4 +-
.../components/ModalPengumumanComponent.vue | 4 +-
.../components/StatusPaketTableComponent.vue | 44 +++++++++--------
4 files changed, 52 insertions(+), 49 deletions(-)
diff --git a/app/Http/Controllers/Status/StatusController.php b/app/Http/Controllers/Status/StatusController.php
index 90f2969..2556aa5 100644
--- a/app/Http/Controllers/Status/StatusController.php
+++ b/app/Http/Controllers/Status/StatusController.php
@@ -24,31 +24,30 @@ class StatusController extends Controller
array_push($paketClasses, $paket);
}
- // $pakets = PaketPenyedia::get();
- // foreach ($pakets as $paketDatum){
- // $paket = new PaketClass($paketDatum->id, $paketDatum->kegiatan, $paketDatum->pid,
- // $paketDatum->nama, $paketDatum->sumber_dana, $paketDatum->lokasi, $paketDatum->deskripsi,
- // $paketDatum->penyedia->nama, $paketDatum->pagu, $paketDatum->d_start_work, '4');
- // array_push($paketClasses, $paket);
- // }
-
- // $pakets = PaketSwakelola::get();
- // foreach ($pakets as $paketDatum){
- // $paket = new PaketClass($paketDatum->id, $paketDatum->kegiatan, $paketDatum->pid,
- // $paketDatum->nama, $paketDatum->sumber_dana, $paketDatum->lokasi, $paketDatum->deskripsi,
- // $paketDatum->penyedia->nama, $paketDatum->pagu, $paketDatum->d_start_work, '4');
- // array_push($paketClasses, $paket);
- // }
-
- // $pakets = PaketPenyediaSwakelola::get();
- // foreach ($pakets as $paketDatum){
- // $paket = new PaketClass($paketDatum->id, $paketDatum->kegiatan, $paketDatum->pid,
- // $paketDatum->nama, $paketDatum->sumber_dana, $paketDatum->lokasi, $paketDatum->deskripsi,
- // $paketDatum->penyedia->nama, $paketDatum->pagu, $paketDatum->d_start_work, '4');
- // array_push($paketClasses, $paket);
- // }
-
- // append paket penyedia, swakelola, penyedia swakelola dg status 4
+ // append paket penyedia, swakelola, penyedia swakelola dg status 4 (sudah diumumkan)
+ $pakets = PaketPenyedia::get();
+ foreach ($pakets as $paketDatum){
+ $paket = new PaketClass($paketDatum->id, $paketDatum->kegiatan, $paketDatum->pid,
+ $paketDatum->nama, $paketDatum->sumber_dana, $paketDatum->lokasi, $paketDatum->deskripsi,
+ $paketDatum->penyedia->nama, $paketDatum->pagu, $paketDatum->d_start_work, '4');
+ array_push($paketClasses, $paket);
+ }
+
+ $pakets = PaketSwakelola::get();
+ foreach ($pakets as $paketDatum){
+ $paket = new PaketClass($paketDatum->id, $paketDatum->kegiatan, $paketDatum->pid,
+ $paketDatum->nama, $paketDatum->sumber_dana, $paketDatum->lokasi, $paketDatum->deskripsi,
+ $paketDatum->penyedia->nama, $paketDatum->pagu, $paketDatum->d_start_work, '4');
+ array_push($paketClasses, $paket);
+ }
+
+ $pakets = PaketPenyediaSwakelola::get();
+ foreach ($pakets as $paketDatum){
+ $paket = new PaketClass($paketDatum->id, $paketDatum->kegiatan, $paketDatum->pid,
+ $paketDatum->nama, $paketDatum->sumber_dana, $paketDatum->lokasi, $paketDatum->deskripsi,
+ $paketDatum->penyedia->nama, $paketDatum->pagu, $paketDatum->d_start_work, '4');
+ array_push($paketClasses, $paket);
+ }
return response()->json(['paket' => $paketClasses]);
}
diff --git a/resources/js/components/ModalKlasifikasiComponent.vue b/resources/js/components/ModalKlasifikasiComponent.vue
index 87f95cc..68901fa 100644
--- a/resources/js/components/ModalKlasifikasiComponent.vue
+++ b/resources/js/components/ModalKlasifikasiComponent.vue
@@ -27,8 +27,8 @@
</div>
<div class="modal-footer">
- <button type="button" :id="'simpanKlasifikasi'" v-on:click="klasifikasi(idPaket, jenis)" class="btn button-save">Simpan</button>
- <button type="button" :id="'batalKlasifikasi'" data-dismiss="modal" class="btn btn-primary">Batal</button>
+ <button type="button" id='simpanKlasifikasi' v-on:click="klasifikasi(idPaket, jenis)" class="btn button-save">Simpan</button>
+ <button type="button" id='batalKlasifikasi' data-dismiss="modal" class="btn btn-primary">Batal</button>
</div>
</div>
diff --git a/resources/js/components/ModalPengumumanComponent.vue b/resources/js/components/ModalPengumumanComponent.vue
index 82d666b..682a5d7 100644
--- a/resources/js/components/ModalPengumumanComponent.vue
+++ b/resources/js/components/ModalPengumumanComponent.vue
@@ -24,8 +24,8 @@
</div>
<div class="modal-footer">
- <button type="button" :id="'simpanUmumkan' + idPaket" v-on:click="simpan(idPaket)" class="btn button-save">Ya</button>
- <button type="button" :id="'batalUmumkan' + idPaket" data-dismiss="modal" class="btn btn-primary">Tidak</button>
+ <button type="button" id='simpanUmumkan' v-on:click="simpan(idPaket)" class="btn button-save">Ya</button>
+ <button type="button" id='batalUmumkan' data-dismiss="modal" class="btn btn-primary">Tidak</button>
</div>
</div>
diff --git a/resources/js/components/StatusPaketTableComponent.vue b/resources/js/components/StatusPaketTableComponent.vue
index b0793f4..b82f3c8 100644
--- a/resources/js/components/StatusPaketTableComponent.vue
+++ b/resources/js/components/StatusPaketTableComponent.vue
@@ -42,22 +42,22 @@
<input v-else type="checkbox" name="FD" value="FD" checked disabled>
</td>
<td>
- <input v-if="item.status === '3'" :id="'umumkan' + item.idPaket" v-on:click="pengumuman(item.idPaket)" type="checkbox" name="U" value="U">
+ <input v-if="item.status === '3'" :id="'umumkan' + item.idPaket" v-on:click="pengumuman(item.idPaket, item.namaPaket, item.kegiatan)" type="checkbox" name="U" value="U">
<input v-else-if="item.status === '4'" type="checkbox" name="U" value="U" checked disabled>
<input v-else type="checkbox" name="U" value="U" disabled>
</td>
- <modal-pengumuman-component
- :id="'umumkanModal' + item.idPaket" :idPaket="item.idPaket"
- :kegiatan="item.kegiatan" :namaPaket="item.namaPaket">
- </modal-pengumuman-component>
</tr>
</tbody>
<modal-klasifikasi-component
- :id="idModal" :idPaket="idPaketModal"
+ :id="'klasifikasiModal'+idPaketModal" :idPaket="idPaketModal"
:namaPaket="namaPaketModal" :title="titleModal"
- :status="statusPaket" :jenisPaket="jenisPaket"
- ref="modalKlasifikasi">
+ :status="statusPaket" ref="modalKlasifikasi">
</modal-klasifikasi-component>
+
+ <modal-pengumuman-component
+ :id="'pengumumanModal'+idPaketModal" :idPaket="idPaketModal"
+ :kegiatan="kegiatanModal" :namaPaket="namaPaketModal">
+ </modal-pengumuman-component>
<tfoot>
<tr>
<th class="text-left"></th>
@@ -85,9 +85,9 @@ export default {
idModal: null,
idPaketModal: null,
namaPaketModal: null,
+ kegiatanModal: null,
titleModal: null,
- statusPaket: null,
- jenisPaket: null
+ statusPaket: null
}
},
mounted: function(){
@@ -120,19 +120,23 @@ export default {
})
},
methods: {
- pengumuman: function(id) {
+ pengumuman: function(id, nama, kegiatan) {
+ this.idModal = 'pengumumanModal' + id;
+ this.idPaketModal = id;
+ this.namaPaketModal = nama;
+ this.kegiatanModal = kegiatan;
$('#umumkan' + id).on('change', function(e){
if(e.target.checked){
- $('#umumkanModal' + id).modal('show');
+ $('#pengumumanModal' + id).modal('show');
}
});
- $('#batalUmumkan' + id).on('click', function(e) {
+ $('#batalUmumkan').on('click', function(e) {
$('#umumkan' + id).prop('checked', false);
});
- $('#simpanUmumkan' + id).on('click', function(e) {
- $('#umumkanModal' + id).modal('hide');
+ $('#simpanUmumkan').on('click', function(e) {
+ $('#pengumumanModal' + id).modal('hide');
window.location.reload();
});
},
@@ -173,10 +177,10 @@ export default {
.get(url)
.then(function(instance) {
return function(response) {
- instance.jenisPaket = response.data.jenis_paket;
- if ($('#finalisasi'+id).is(':checked')) {
- instance.$refs.modalKlasifikasi.setJenisPaket(instance.jenisPaket);
- $('#finalisasiModal' + id).modal('show');
+ var jenisPaket = response.data.jenis_paket;
+ if ($('#finalisasi' + id).is(':checked')) {
+ instance.$refs.modalKlasifikasi.setJenisPaket(jenisPaket);
+ $('#klasifikasiModal' + id).modal('show');
}
}
}(this))
@@ -186,7 +190,7 @@ export default {
});
$('#simpanKlasifikasi').on('click', function(e) {
- $('#finalisasiModal' + id).modal('hide');
+ $('#klasifikasiModal' + id).modal('hide');
window.location.reload();
});
}
--
GitLab