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

This commit is contained in:
nurafrinaalimi16
2024-04-07 11:14:33 +08:00
34 changed files with 451 additions and 228 deletions
@@ -8,7 +8,7 @@
<script>
export default{
created: function () {
this.util.setTitle('Voting System - Manage Account');
this.util.setTitle('MyKoPKB - Pengurusan Akaun');
}
}
</script>
@@ -1,10 +1,10 @@
<template>
<div class="panel panel-default">
<div class="panel-body">
<h4>Update Account</h4>
<h4>Kemaskini Akaun</h4>
<form @submit.prevent="edit()" id="edit_form">
<div class="form-group">
<label for="name">Name</label>
<label for="name">Nama</label>
<input type="text" name="name" class="form-control" :value="data.user.name" required/>
</div>
@@ -15,7 +15,7 @@
<div class="form-group">
<input type="submit" value="Submit" class="btn btn-info"/>
<router-link :to="{name: 'Update Password'}" class="btn btn-default">Change Password</router-link>
<router-link :to="{name: 'Update Password'}" class="btn btn-default">Tukar Kata Laluan</router-link>
</div>
</form>
</div>
@@ -13,9 +13,9 @@
<thead>
<tr>
<th>ID</th>
<th>Name</th>
<th>Nama</th>
<th>Email</th>
<th>Delete</th>
<th>Padam</th>
</tr>
</thead>
<tbody>
@@ -25,7 +25,7 @@
<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> Delete
<i class="fa fa-trash"></i> Padam
</button>
</td>
</tr>
@@ -1,26 +1,26 @@
<template>
<div class="panel panel-default">
<div class="panel-body">
<h4>Update Password</h4>
<h4>Kemaskini Kata Laluan </h4>
<form @submit.prevent="edit()" id="edit_form">
<div class="form-group">
<label for="old_password">Old Password</label>
<label for="old_password">Kata Laluan lama</label>
<input type="password" name="old_password" class="form-control" required/>
</div>
<div class="form-group">
<label for="password">New Password</label>
<label for="password">Kata Laluan Baru </label>
<input type="password" name="password" class="form-control" required/>
</div>
<div class="form-group">
<label for="confirm_password">Confirm Password</label>
<label for="confirm_password">Sahkan Kata Laluan</label>
<input type="password" name="confirm_password" class="form-control" required/>
</div>
<div class="form-group">
<input type="submit" value="Submit" class="btn btn-info"/>
<router-link :to="{name: 'Update Account'}" class="btn btn-default">Back</router-link>
<router-link :to="{name: 'Update Account'}" class="btn btn-default">Kembali</router-link>
</div>
</form>
</div>
@@ -9,10 +9,10 @@
<thead>
<tr>
<th width="10%">No. Anggota</th>
<th width="30%">Name</th>
<th width="30%">Nama</th>
<th width="20%">Partylist</th>
<th width="20%">Unit</th>
<th width="20%">Votes</th>
<th width="20%">Undian</th>
</tr>
</thead>
<tbody>
@@ -1,7 +1,7 @@
<template>
<div class="row">
<div class="col-md-4">
<h4>Positions</h4><hr/>
<h4>Jawatan</h4><hr/>
<ul class="list-group">
<router-link :key="position.id" v-for="position in data.positions" class="list-group-item" :class="{'active':position.id==position_id}" tag="li" :to="{query:{position_id:position.id}}" exact replace>
{{ position.name }}
@@ -9,14 +9,14 @@
<li class="list-group-item">
<center>
<button class="btn btn-info" @click="refreshNominees()">
Refresh results <i class="fa fa-refresh"></i>
Kemaskini Keputusan<i class="fa fa-refresh"></i>
</button>
</center>
</li>
</ul>
</div>
<div class="col-md-8">
<h4>Results</h4><hr/>
<h4>Keputusan</h4><hr/>
<div class="panel panel-default">
<div class="panel-heading">{{ getPosition(position_id) }} - Results as of : {{ last_update }}</div>
<div class="panel-body">
@@ -9,7 +9,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" :href="data.baseURL" >AGM</a>
<a class="navbar-brand" :href="data.baseURL" ><img src='https://i.postimg.cc/ZBDD0ZfQ/Whats-App-Image-2024-03-21-at-1-24-46-PM-2.jpg' border='0' alt="MyKoPKB Logo"></a>
</div>
<div class="collapse navbar-collapse" id="myNavbar">
@@ -46,14 +46,14 @@
<ul class="dropdown-menu">
<router-link :to="{name:'Update Account'}" tag="li" exact>
<a href="#">Update Account</a>
<a href="#">Kemaskini Akaun</a>
</router-link>
<router-link :to="{name: 'Manage Account'}" tag="li" v-if="data.user.id==1">
<a href="#">Manage Account</a>
<a href="#">Pengurusan Akaun</a>
</router-link>
<li @click="logout()"><a>Logout</a></li>
<li @click="logout()"><a>Log Keluar</a></li>
</ul>
</li>
</ul>
File diff suppressed because one or more lines are too long
@@ -21,36 +21,36 @@
</div>
<div class="form-group">
<label for="motto">Motto</label>
<input type="text" name="motto" class="form-control" placeholder="(Optional)" />
<label for="education">Taraf Pendidikan</label>
<input type="text" name="education" class="form-control" placeholder="(Optional)" />
</div>
<div class="form-group">
<label for="description">Description</label>
<textarea name="description" class="form-control" placeholder="(Optional)"></textarea>
<label for="pengalaman">Pengalaman Kerja</label>
<textarea name="pengalaman" class="form-control" placeholder="(Optional)"></textarea>
</div>
<div class="form-group">
<label for="position_id">Position</label>
<label for="position_id">Jawatan</label>
<select class="form-control" v-model="position_id" name="position_id" required>
<option value="0" disabled>--- Select Position ---</option>
<option value="0" disabled>--- Pilih Jawatan ---</option>
<option v-for="position in data.positions" :value="position.id">{{ position.name }}</option>
</select>
</div>
<div class="form-group">
<!-- <div class="form-group">
<label for="partylist_id">Partylist</label>
<select class="form-control" name="partylist_id">
<option value="">--- Select Partylist (Optional) ---</option>
<option v-for="partylist in data.partylists" :value="partylist.id">{{ partylist.name }}</option>
</select>
</div>
</div> -->
<div id="imagePreview">
<img :src="imageUrl" v-if="imageUrl" alt="Preview">
</div>
<div>
<label for="image">Masukkan Gambar</label>
<label for="image">Muatnaik Gambar</label>
<input name="photo" type="file" accept="image/*" id="file-input" @change="handleImageChange">
</div>
@@ -28,19 +28,19 @@
</div>
<div class="form-group">
<label for="motto">Motto</label>
<input type="text" name="motto" class="form-control" :value="nominee.motto" placeholder="(Optional)" />
<label for="education">Taraf Pendidikan</label>
<input type="text" name="education" class="form-control" :value="nominee.education" placeholder="(Optional)" />
</div>
<div class="form-group">
<label for="description">Description</label>
<textarea name="description" class="form-control" placeholder="(Optional)">{{ nominee.description}}</textarea>
<label for="experience">Pengalaman Kerja </label>
<textarea name="experience" class="form-control" placeholder="(Optional)">{{ nominee.experience}}</textarea>
</div>
<div class="form-group">
<label for="position_id">Position</label>
<label for="position_id">Jawatan</label>
<select class="form-control" name="position_id" :value="nominee.position_id" required>
<option value="0" disabled>--- Select Position ---</option>
<option value="0" disabled>--- Pilih Jawatan ---</option>
<option v-for="position in data.positions" :value="position.id">{{ position.name }}</option>
</select>
</div>
@@ -57,7 +57,7 @@
<img :src="imageUrl" v-if="imageUrl" alt="Preview">
</div>
<div>
<label for="image">Masukkan Gambar</label>
<label for="image">Muat Naik Gambar</label>
<input name="photo" type="file" accept="image/*" id="file-input" @change="handleImageChange">
</div>
@@ -66,7 +66,7 @@
<router-link
:to="{name:'Maklumat Calon'}"
class="btn btn-default">
Back
Kembali
</router-link>
</div>
</div>
@@ -131,7 +131,7 @@ export default{
$.notifyClose();
vm.loading = false;
if (vm.util.showResult(response, 'success', 'ajax'))
vm.$router.push({name: 'Maklumat Calon'});
vm.$router.push({name: 'Maklumat Calon',query:{refresh:true}});
},
error: function (error) {
$.notifyClose();
@@ -139,7 +139,7 @@ export default{
vm.util.showResult(error, 'error', 'ajax');
},
uploadProgress: function (a, b, c, progress) {
vm.util.notify('Updating Nominee', 'progress', progress);
this.util.notify('Updating nominee', 'progress', progress);
}
})
}
@@ -1,91 +1,90 @@
<template>
<div class="row">
<div class="col-md-3" style="max-width: 250px;">
<ul class="list-group">
<router-link
tag="li"
class="list-group-item"
:to="{name: 'Maklumat Calon'}"
exact
replace
:class="{'active':position_id==0}">
All Position
</router-link>
<router-link
v-for="position in data.positions"
:key="position.id"
tag="li"
class="list-group-item"
:to="{query: {position_id:position.id}}"
exact
replace>
{{ position.name }}
</router-link>
</ul>
</div>
<div class="col-md-9 panel panel-default">
<div class="panel-body table-responsive">
<div class="form-group">
<router-link :to="{name: 'Tambah Calon', query:{position_id:position_id}}" class="btn btn-success"><i class="fa fa-plus"></i> Tambah Calon</router-link>
</div>
<table class="table table-hover">
<thead>
<tr>
<th></th>
<th>Name</th>
<th>No. Anggota</th>
<th>Unit</th>
<th>Position</th>
<!-- <th>Partylist</th> -->
<th>Action</th>
</tr>
</thead>
<tbody>
<tr v-for="nominee in nominees">
<td>
<img :alt="nominee.name" :src="createBase64ImageUrl(nominee.photo)" class="thumbnail" style="height: 60px;width: 60px;">
</td>
<td>{{ nominee.name}}</td>
<td>{{ nominee.no_anggota}}</td>
<td>{{ nominee.unit}}</td>
<td>{{ nominee.position}}</td>
<!-- <td>{{ nominee.partylist}}</td> -->
<td>
<router-link :to="{name: 'Edit Nominee', params:{id:nominee.id}}" class="btn btn-info">
<div class="row">
<div class="col-md-3" style="max-width: 250px;">
<ul class="list-group">
<router-link tag="li" class="list-group-item" :to="{ name: 'Maklumat Calon' }" exact replace
:class="{ 'active': position_id == 0 }">
Senarai Jawatan
</router-link>
<router-link v-for="position in data.positions" :key="position.id" tag="li" class="list-group-item"
:to="{ query: { position_id: position.id } }" exact replace>
{{ position.name }}
</router-link>
</ul>
</div>
<div class="col-md-9 panel panel-default">
<div class="panel-body table-responsive">
<div class="form-group">
<router-link :to="{ name: 'Tambah Calon', query: { position_id: position_id } }"
class="btn btn-success"><i class="fa fa-plus"></i> Tambah Calon</router-link>
</div>
<table class="table table-hover">
<thead>
<tr>
<th>Id</th>
<th>Nama</th>
<th>No. Anggota</th>
<th>Unit</th>
<th>Jawatan</th>
<!-- <th>Partylist</th> -->
<th>Taraf Pendidikan </th>
<th>Pengalaman Kerja</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
<tr v-for="nominee in nominees">
<td>
<img :alt="nominee.name" :src="createBase64ImageUrl(nominee.photo)" class="thumbnail"
style="height: 60px;width: 60px;">
</td>
<td>{{ nominee.name }}</td>
<td>{{ nominee.no_anggota }}</td>
<td>{{ nominee.unit }}</td>
<td>{{ nominee.position }}</td>
<td>{{ nominee.education }}</td>
<td>{{ nominee.experience }}</td>
<router-link :to="{ name: 'Edit Nominee', params: { id: nominee.id } }"
class="btn btn-primary">
<i class="fa fa-edit"></i> Edit
</router-link>
<button
class="btn btn-danger"
@click="util.showModal('#delete-nominee-modal');id=nominee.id">
<i class="fa fa-trash"></i> Delete
<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 nominees</td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr v-if="nominees.length < 1">
<td colspan="7">No Calon</td>
</tr>
</tbody>
</table>
</div>
</div>
<modal id="delete-nominee-modal">
<modal-header>Padam Calon</modal-header>
<modal-body>
<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-default" @click="util.hideModal('#delete-nominee-modal')">
Kembali
</button>
</modal-footer>
</modal>
</div>
<modal id="delete-nominee-modal">
<modal-header>Delete Nominee</modal-header>
<modal-body>
<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-default" @click="util.hideModal('#delete-nominee-modal')">
Back
</button>
</modal-footer>
</modal>
</div>
</template>
<script>
export default{
export default {
data: function () {
return {
id: 0
@@ -98,32 +97,33 @@ export default{
methods: {
deleteNominee: function () {
this.util.hideModal('#delete-nominee-modal');
var vm = this;
this.util.notify('Deleting nominee', 'loading');
axios.delete(config.API+'nominee/'+this.id)
.then(response=>{
$.notifyClose();
if(vm.util.showResult(response, 'success'))
vm.refreshNominee();
})
.catch(error=>{
$.notifyClose();
vm.util.showResult(error, 'error');
})
deleteNominee(nomineeId) {
this.util.hideModal('#delete-nominee-modal'); // Hide modal
this.util.notify('Deleting nominee', 'loading'); // Show loading notification
axios.delete(config.API + 'nominee/' + nomineeId) // Make DELETE request
.then(response => {
$.notifyClose(); // Close notification
if (this.util.showResult(response, 'success')) { // Show success notification
this.refreshNominee(); // Refresh the list of nominees
}
})
.catch(error => {
$.notifyClose(); // Close notification
this.util.showResult(error, 'error'); // Show error notification
})
},
refreshNominee: function () {
var vm = this;
this.util.notify('Refreshing Nominees', 'loading');
axios.get(config.API+'nominee')
.then(response=>{
axios.get(config.API + 'nominee')
.then(response => {
$.notifyClose();
console.log(response);
vm.data.nominees = response.data;
})
.catch(error=>{
.catch(error => {
$.notifyClose();
vm.showResult(error);
})
@@ -131,7 +131,7 @@ export default{
getPosition: function (id) {
var positions = this.data.positions;
for (var i in positions)
for (var i in positions)
if (positions[i].id == id)
return positions[i]['name'];
},
@@ -144,9 +144,9 @@ export default{
return 'No partylists';
},
createBase64ImageUrl: function(base64ImageData) {
return "data:image/png;base64," + base64ImageData;
}
createBase64ImageUrl: function (base64ImageData) {
return "data:image/png;base64," + base64ImageData;
}
},
computed: {
@@ -170,3 +170,6 @@ export default{
}
}
</script>
<style></style>
@@ -8,7 +8,7 @@
<script>
export default{
created: function () {
this.util.setTitle('Voting System - Maklumat Calon');
this.util.setTitle('MyKoPKB - Maklumat Calon');
}
}
</script>
@@ -4,12 +4,12 @@
<h4>Tambah Jawatan</h4>
<form @submit.prevent="add()" id="add-form">
<div class="form-group">
<label for="name">Name</label>
<label for="name">Nama</label>
<input type="text" name="name" class="form-control" required>
</div>
<div class="form-group">
<button type="submit" class="btn btn-success">Submit</button>
<router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Back</router-link>
<button type="submit" class="btn btn-success">Hantar</button>
<router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Kembali</router-link>
</div>
</form>
</div>
@@ -1,15 +1,15 @@
<template>
<div class="panel panel-default">
<div class="panel-body">
<h4>Edit Position</h4>
<h4>Edit Jawatan</h4>
<form @submit.prevent="edit()" id="edit-form">
<div class="form-group">
<label for="name">Name</label>
<label for="name">Nama</label>
<input type="text" name="name" class="form-control" :value="data.position.name" required/>
</div>
<div class="form-group">
<input type="submit" value="Submit" class="btn btn-success"/>
<router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Back</router-link>
<router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Kembali</router-link>
</div>
</form>
</div>
@@ -18,8 +18,8 @@
<thead>
<tr>
<th>ID</th>
<th>Name</th>
<th>Action</th>
<th>Nama</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@@ -33,12 +33,12 @@
<button
class="btn btn-danger"
@click="util.showModal('#delete-position-modal');id=position.id">
<i class="fa fa-trash"></i> Delete
<i class="fa fa-trash"></i> Padam
</button>
</td>
</tr>
<tr v-if="data.positions.length < 1">
<td colspan="3">No Positions</td>
<td colspan="3">No Jawatan</td>
</tr>
</tbody>
</table>
@@ -47,12 +47,12 @@
</div>
<modal id="delete-position-modal">
<modal-header>Delete Position</modal-header>
<modal-header>Padam Jawatan</modal-header>
<modal-body>
<h2>Are you sure to delete Position?</h2>
</modal-body>
<modal-footer>
<button class="btn btn-danger" @click="deletePosition()">Delete</button>
<button class="btn btn-danger" @click="deletePosition()">Padam</button>
<button class="btn btn-default" @click="util.hideModal('#delete-position-modal')">Cancel</button>
</modal-footer>
</modal>
@@ -8,7 +8,7 @@
<script>
export default{
created: function () {
this.util.setTitle('Voting System - Kemaskini Jawatan');
this.util.setTitle('MyKoPKB-Kemaskini Jawatan');
}
}
</script>
@@ -8,7 +8,7 @@
<script>
export default{
created: function () {
this.util.setTitle('Voting System - Maklumat Pengundi');
this.util.setTitle('MyKoPKB - Maklumat Pengundi');
}
}
</script>