KoPKB/E-Vote
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Hayatie' of https://gitlab.com/erahn/voting into backup

Browse Source
This commit is contained in:
nurafrinaalimi16
2024-04-21 16:57:10 +08:00
parent 87d954cddb be2aeef315
commit dd8f56cd48
32 changed files with 2924 additions and 23927 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/components/demo/admin/admin/admin.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<div class="container col-md-8 col-md-offset-2">
<h4>Manage Account</h4>
<h4>Pengurusan Akaun Pengguna </h4>
<router-view></router-view>
</div>
</template>
resources/assets/js/components/demo/admin/admin/edit.vue
+1 -1
View File
@@ -56,7 +56,7 @@ export default{
.catch(error=>{
$.notifyClose();
vm.loading = false;
vm.util.showResult(error, 'error')
vm.util.showResult(error.response, 'error');
})
}
}
resources/assets/js/components/demo/admin/admin/index.vue
+5 -5
View File
@@ -4,7 +4,7 @@
<div class="form-group">
<router-link :to="{name: 'Add Account'}" class="btn btn-success">
<i class="fa fa-plus"></i> Add Account</router-link>
<i class="fa fa-plus"></i> Tambah Akaun Pengguna</router-link>
<button class="btn btn-default" @click="refreshAdmin()">
<i class="fa fa-refresh"></i> Refresh</button>
</div>
@@ -24,8 +24,8 @@
<td>{{ admin.name }}</td>
<td>{{ admin.email }}</td>
<td>
<button class="btn btn-danger" @click="id=admin.id;util.showModal('#delete-admin-modal')">
<i class="fa fa-trash"></i> Padam
<button class="btn btn-danger" @click="deleteAdmin(admin.id)">
<i class="fa fa-trash"></i> Padam
</button>
</td>
</tr>
@@ -38,8 +38,8 @@
<h3>Are you sure to delete this admin?</h3>
</modal-body>
<modal-footer>
<button @click="deleteAdmin()" class="btn btn-danger">Delete</button>
<button @click="util.hideModal('#delete-admin-modal')" class="btn btn-default">Cancel</button>
<button @click="deleteAdmin()" class="btn btn-danger">Padam</button>
<button @click="util.hideModal('#delete-admin-modal')" class="btn btn-default">Batal</button>
</modal-footer>
</modal>
</div>
resources/assets/js/components/demo/admin/admin/password.vue
+1 -1
View File
@@ -40,7 +40,7 @@ export default{
if (this.loading || !this.checkPassword()) return;
var vm = this;
vm.loading = true;
vm.util.notify('Updating Password', 'loading');
vm.util.notify('Kemaskini Katalaluan', 'loading');
axios.put(config.API+'admin/password/'+this.data.user.id, $('#edit_form').serialize())
.then(response=>{
$.notifyClose();
resources/assets/js/components/demo/admin/home/home.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<script>
export default{
created: function () {
this.util.setTitle('Voting System - Maklumat Undian');
this.util.setTitle('MyKoPKB - Maklumat Undian');
}
}
</script>
resources/assets/js/components/demo/admin/home/index.vue
+4
View File
@@ -26,6 +26,10 @@
<th>Undian Mula</th>
<th>Undian Tamat</th>
<th>Papar</th>
<th>Nama Undian</th>
<th>Undian Mula</th>
<th>Undian Tamat</th>
<th>Papar</th>
</tr>
</thead>
<tbody>
resources/assets/js/components/demo/admin/index.vue
+7 -6
View File
@@ -1,5 +1,6 @@
<template>
<div>
<div v-if="!loading">
<nav class="navbar navbar-default navbar-fixed-top" id="nav">
<div class="container-fluid">
@@ -15,9 +16,9 @@
<ul class="nav navbar-nav">
<!-- {{ users }} -->
<router-link :to="{name: 'Admin Home'}" tag="li" exact><a href="#">Laman Utama</a></router-link>
<router-link :to="{name: 'Admin Home'}" tag="li" exact><a href="#">LAMAN UTAMA </a></router-link>
<router-link :to="{name: 'Kemaskini Jawatan'}" v-if="data.user.role==1" tag="li">
<a href="#">Jawatan</a>
<a href="#"><b>JAWATAN</b></a>
</router-link>
<!-- <router-link :to="{name: 'Manage Partylist'}" v-if="data.user.role==1" tag="li">
@@ -25,15 +26,15 @@
</router-link> -->
<router-link :to="{name: 'Manage Voter'}" v-if="data.user.role==1" tag="li">
<a href="#">Anggota Koperasi</a>
<a href="#"><b>ANGGOTA KOPERASI</b></a>
</router-link>
<router-link :to="{name: 'Maklumat Calon'}" v-if="data.user.role==1" tag="li">
<a href="#">Calon</a>
<a href="#"><b>SENARAI ALK</b></a>
</router-link>
<router-link :to="{name: 'Kehadiran Calon'}" v-if="data.user.role==1" tag="li">
<a href="#">Kehadiran</a>
<a href="#"><b>KEHADIRAN</b></a>
</router-link>
</ul>
@@ -84,7 +85,7 @@ export default{
// }),
created: function () {
this.util.setTitle('Voting System - Administrator');
this.util.setTitle('MyKoPKB - Administrator');
var vm = this;
if (this.util.isLogin()) {
this.util.setAuthorization();
resources/assets/js/components/demo/admin/login.vue
+1 -1
View File
@@ -69,7 +69,7 @@ export default{
created: function () {
if (this.util.isLogin())
return this.$router.push({name:'Admin Home'})
this.util.setTitle('Admin Login');
this.util.setTitle('Log Masuk Admin ');
},
methods: {
resources/assets/js/components/demo/admin/nominee/add.vue
+1 -1
View File
@@ -34,7 +34,7 @@
<label for="position_id">Jawatan</label>
<select class="form-control" v-model="position_id" name="position_id" required>
<option value="0" disabled>--- Pilih Jawatan ---</option>
<option v-for="position in data.positions" :value="position.id">{{ position.name }}</option>
<option v-for="position in data.positions" :key="position.id" :value="position.id">{{ position.name }}</option>
</select>
</div>
resources/assets/js/components/demo/admin/nominee/edit.vue
+4 -4
View File
@@ -49,7 +49,7 @@
<label for="partylist_id">Partylist</label>
<select class="form-control" name="partylist_id" :value="nominee.partylist_id">
<option value="">--- Select Partylist (Optional) ---</option>
<option v-for="partylist in data.partylists" :value="partylist.id">{{ partylist.name}}</option>
<option v-for="partylist in data.partylists" :key="partylist.id" :value="partylist.id">{{ partylist.name }}</option>
</select>
</div>
@@ -62,7 +62,7 @@
</div>
<div class="form-group pull-right">
<input type="submit" value="Submit" class="btn btn-info">
<input type="submit" value="Simpan" class="btn btn-info">
<router-link
:to="{name:'Maklumat Calon'}"
class="btn btn-default">
@@ -125,7 +125,7 @@ export default{
if (this.loading) return;
var vm = this;
this.loading = true;
this.util.notify('Updating nominee', 'progress', 0);
this.util.notify('Kemaskini undian', 'progress', 0);
$('#edit_form').ajaxSubmit({
success: function (response) {
$.notifyClose();
@@ -139,7 +139,7 @@ export default{
vm.util.showResult(error, 'error', 'ajax');
},
uploadProgress: function (a, b, c, progress) {
this.util.notify('Updating nominee', 'progress', progress);
this.util.notify('Kemaskini undian', 'progress', progress);
}
})
}
resources/assets/js/components/demo/admin/nominee/index.vue
+14 -5
View File
@@ -34,11 +34,12 @@
</tr>
</thead>
<tbody>
<tr v-for="nominee in nominees">
<tr v-for="nominee in nominees" :key="nominee.id">
<td>
<img :alt="nominee.name" :src="createBase64ImageUrl(nominee.photo)" class="thumbnail"
style="height: 60px;width: 60px;">
</td>
<!-- <td>{{ nominee.id }}</td> -->
<td>{{ nominee.name }}</td>
<td>{{ nominee.no_anggota }}</td>
<td>{{ nominee.unit }}</td>
@@ -50,12 +51,12 @@
<router-link :to="{ name: 'Edit Nominee', params: { id: nominee.id } }"
class="btn btn-primary">
<i class="fa fa-edit"></i> Edit
<i class="fa fa-edit"></i> Set semula
</router-link>
<button class="btn btn-danger" @click="util.showModal(nominee.id)" id=nominee.id>
<i class="fa fa-trash"></i> Padam
</button>
</td>
</tr>
<tr v-if="nominees.length < 1">
<td colspan="7">No Calon</td>
@@ -71,7 +72,7 @@
<h3>Are you sure to delete this nominee?</h3>
</modal-body>
<modal-footer>
<button class="btn btn-danger" @click="deleteNominee()">Delete</button>
<button class="btn btn-danger" @click="deleteNominee()">Padam</button>
<button class="btn btn-default" @click="util.hideModal('#delete-nominee-modal')">
Kembali
</button>
@@ -104,8 +105,16 @@ export default {
axios.delete(config.API + 'nominee/' + nomineeId) // Make DELETE request
.then(response => {
$.notifyClose(); // Close notification
if (this.util.showResult(response, 'success')) { // Show success notification
// if (this.util.showResult(response, 'success')) {
if (response.data && response.data.status === 'success') {
this.util.notify('Nominee deleted successfully', 'success');
// Show success notification
this.refreshNominee(); // Refresh the list of nominees
} else {
this.util.notify('Failed to delete nominee', 'error'); // Show error notification
}
})
.catch(error => {
resources/assets/js/components/demo/admin/partylist/partylist.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<script>
export default{
created: function () {
this.util.setTitle('Voting System - Manage Partylist');
this.util.setTitle('MyKoPKB - Manage Partylist');
}
}
</script>
resources/assets/js/components/demo/admin/position/index.vue
+1 -1
View File
@@ -9,7 +9,7 @@
<i class="fa fa-plus"></i> Tambah Jawatan
</router-link>
<button class="btn btn-default" @click="refreshPosition()">
<i class="fa fa-refresh"></i> Refresh Position
<i class="fa fa-refresh"></i> Kemaskini Jawatan
</button>
</div>
resources/assets/js/components/demo/admin/voter/index.vue
+3 -3
View File
@@ -23,7 +23,7 @@
<th>Unit</th>
<th>Saham</th>
<th>Yuran</th>
<th>Action</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@@ -37,12 +37,12 @@
<td>{{ voter.yuran }}</td>
<td>
<button class="btn btn-info" @click="edit(i)">
<i class="fa fa-edit"></i> Edit
<i class="fa fa-edit"></i> Set semula
</button>
<button
class="btn btn-danger"
@click="util.showModal('#delete-voter-modal');id=voter.id">
<i class="fa fa-trash"></i> Delete
<i class="fa fa-trash"></i> Padam
</button>
</td>
</tr>