naming changes

This commit is contained in:
faiqahzaman
2024-02-29 09:57:59 +08:00
parent 25d85dac75
commit c8f23d2e58
21 changed files with 57 additions and 57 deletions
@@ -17,8 +17,8 @@
<router-link :to="{name: 'Admin Home'}" tag="li" exact> <router-link :to="{name: 'Admin Home'}" tag="li" exact>
<a href="#"><span class="fa fa-home"></span></a> <a href="#"><span class="fa fa-home"></span></a>
</router-link> </router-link>
<router-link :to="{name: 'Manage Position'}" tag="li"> <router-link :to="{name: 'Kemaskini Jawatan'}" tag="li">
<a href="#">Manage Position</a> <a href="#">Kemaskini Jawatan</a>
</router-link> </router-link>
</ul> </ul>
</div> </div>
@@ -2,7 +2,7 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<h3><b>Add Position</b></h3> <h3><b>Tambah Jawatan</b></h3>
<form> <form>
<div class="form-group"> <div class="form-group">
<label for="name">Position</label> <label for="name">Position</label>
@@ -4,7 +4,7 @@
<form id="add_form" @submit.prevent="add()"> <form id="add_form" @submit.prevent="add()">
<div class="form-group"> <div class="form-group">
<label for="name">Name</label> <label for="name">Nama</label>
<input type="text" name="name" class="form-control" required/> <input type="text" name="name" class="form-control" required/>
</div> </div>
@@ -8,7 +8,7 @@
<table class="table table-striped table-condensed"> <table class="table table-striped table-condensed">
<thead> <thead>
<tr> <tr>
<th width="10%">Student ID</th> <th width="10%">No. Anggota</th>
<th width="30%">Name</th> <th width="30%">Name</th>
<th width="20%">Partylist</th> <th width="20%">Partylist</th>
<th width="20%">Course</th> <th width="20%">Course</th>
@@ -1,6 +1,6 @@
<template> <template>
<div class="container col-md-8 col-md-offset-2"> <div class="container col-md-8 col-md-offset-2">
<h4>Manage Election</h4> <h4>Maklumat Undian</h4>
<router-view></router-view> <router-view></router-view>
</div> </div>
</template> </template>
@@ -8,7 +8,7 @@
<script> <script>
export default{ export default{
created: function () { created: function () {
this.util.setTitle('Voting System - Manage Election'); this.util.setTitle('Voting System - Maklumat Undian');
} }
} }
</script> </script>
@@ -17,7 +17,7 @@
<router-link :to="{name: 'Admin Home'}" tag="li" exact><a href="#">Home</a></router-link> <router-link :to="{name: 'Admin Home'}" tag="li" exact><a href="#">Home</a></router-link>
<router-link :to="{name: 'Manage Position'}" tag="li"> <router-link :to="{name: 'Kemaskini Jawatan'}" tag="li">
<a href="#">Jawatan</a> <a href="#">Jawatan</a>
</router-link> </router-link>
@@ -26,10 +26,10 @@
</router-link> </router-link>
<router-link :to="{name: 'Manage Voter'}" tag="li"> <router-link :to="{name: 'Manage Voter'}" tag="li">
<a href="#">Ahli Koperasi</a> <a href="#">Anggota Koperasi</a>
</router-link> </router-link>
<router-link :to="{name: 'Manage Nominee'}" tag="li"> <router-link :to="{name: 'Maklumat Calon'}" tag="li">
<a href="#">Calon</a> <a href="#">Calon</a>
</router-link> </router-link>
@@ -15,12 +15,12 @@
<div class="col-md-8"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label for="name">Name</label> <label for="name">Nama</label>
<input type="text" name="name" class="form-control" required/> <input type="text" name="name" class="form-control" required/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="student_id">Student ID</label> <label for="student_id">No. Anggota</label>
<input type="text" name="student_id" class="form-control" required/> <input type="text" name="student_id" class="form-control" required/>
</div> </div>
@@ -58,7 +58,7 @@
<div class="form-group pull-right"> <div class="form-group pull-right">
<input type="submit" value="Submit" class="btn btn-info"> <input type="submit" value="Submit" class="btn btn-info">
<router-link <router-link
:to="{name:'Manage Nominee', query:{position_id:position_id}}" :to="{name:'Maklumat Calon', query:{position_id:position_id}}"
class="btn btn-default"> class="btn btn-default">
Submit Submit
</router-link> </router-link>
@@ -88,7 +88,7 @@ export default{
$.notifyClose(); $.notifyClose();
vm.loading = false; vm.loading = false;
if (vm.util.showResult(response, 'success', 'ajax')) if (vm.util.showResult(response, 'success', 'ajax'))
vm.$router.push({name: 'Manage Nominee'}); vm.$router.push({name: 'Maklumat Calon'});
}, },
error: function (error) { error: function (error) {
$.notifyClose(); $.notifyClose();
@@ -17,12 +17,12 @@
<div class="col-md-8"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label for="name">Name</label> <label for="name">Nama</label>
<input type="text" name="name" class="form-control" :value="nominee.name" required/> <input type="text" name="name" class="form-control" :value="nominee.name" required/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="student_id">Student ID</label> <label for="student_id">No. Anggota</label>
<input type="text" name="student_id" class="form-control" :value="nominee.student_id" required/> <input type="text" name="student_id" class="form-control" :value="nominee.student_id" required/>
</div> </div>
@@ -60,7 +60,7 @@
<div class="form-group pull-right"> <div class="form-group pull-right">
<input type="submit" value="Submit" class="btn btn-info"> <input type="submit" value="Submit" class="btn btn-info">
<router-link <router-link
:to="{name:'Manage Nominee'}" :to="{name:'Maklumat Calon'}"
class="btn btn-default"> class="btn btn-default">
Back Back
</router-link> </router-link>
@@ -81,7 +81,7 @@ export default{
created: function () { created: function () {
if (!this.nominee.id) if (!this.nominee.id)
this.$router.push({name:'Manage Nominee'}); this.$router.push({name:'Maklumat Calon'});
}, },
methods: { methods: {
@@ -95,7 +95,7 @@ export default{
$.notifyClose(); $.notifyClose();
vm.loading = false; vm.loading = false;
if (vm.util.showResult(response, 'success', 'ajax')) if (vm.util.showResult(response, 'success', 'ajax'))
vm.$router.push({name: 'Manage Nominee'}); vm.$router.push({name: 'Maklumat Calon'});
}, },
error: function (error) { error: function (error) {
$.notifyClose(); $.notifyClose();
@@ -5,7 +5,7 @@
<router-link <router-link
tag="li" tag="li"
class="list-group-item" class="list-group-item"
:to="{name: 'Manage Nominee'}" :to="{name: 'Maklumat Calon'}"
exact exact
replace replace
:class="{'active':position_id==0}"> :class="{'active':position_id==0}">
@@ -26,7 +26,7 @@
<div class="col-md-9 panel panel-default"> <div class="col-md-9 panel panel-default">
<div class="panel-body table-responsive"> <div class="panel-body table-responsive">
<div class="form-group"> <div class="form-group">
<router-link :to="{name: 'Add Nominee', query:{position_id:position_id}}" class="btn btn-success"><i class="fa fa-plus"></i> Add Nominee</router-link> <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> </div>
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
@@ -1,6 +1,6 @@
<template> <template>
<div class="container col-md-10 col-md-offset-1"> <div class="container col-md-10 col-md-offset-1">
<h4>Manage Nominee</h4> <h4>Maklumat Calon</h4>
<router-view></router-view> <router-view></router-view>
</div> </div>
</template> </template>
@@ -8,7 +8,7 @@
<script> <script>
export default{ export default{
created: function () { created: function () {
this.util.setTitle('Voting System - Manage Nominee'); this.util.setTitle('Voting System - Maklumat Calon');
} }
} }
</script> </script>
@@ -1,7 +1,7 @@
<template> <template>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<h4>Add Position</h4> <h4>Tambah Jawatan</h4>
<form @submit.prevent="add()" id="add-form"> <form @submit.prevent="add()" id="add-form">
<div class="form-group"> <div class="form-group">
<label for="name">Name</label> <label for="name">Name</label>
@@ -9,7 +9,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<button type="submit" class="btn btn-success">Submit</button> <button type="submit" class="btn btn-success">Submit</button>
<router-link :to="{name: 'Manage Position'}" class="btn btn-default">Back</router-link> <router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Back</router-link>
</div> </div>
</form> </form>
</div> </div>
@@ -34,7 +34,7 @@ export default{
$.notifyClose(); $.notifyClose();
vm.loading = false; vm.loading = false;
if (vm.util.showResult(response, 'success')) { if (vm.util.showResult(response, 'success')) {
vm.$router.push({name:'Manage Position', query:{refresh:true}}); vm.$router.push({name:'Kemaskini Jawatan', query:{refresh:true}});
} }
}) })
.catch(error=>{ .catch(error=>{
@@ -9,7 +9,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="submit" value="Submit" class="btn btn-success"/> <input type="submit" value="Submit" class="btn btn-success"/>
<router-link :to="{name: 'Manage Position'}" class="btn btn-default">Back</router-link> <router-link :to="{name: 'Kemaskini Jawatan'}" class="btn btn-default">Back</router-link>
</div> </div>
</form> </form>
</div> </div>
@@ -26,7 +26,7 @@ export default{
created: function () { created: function () {
if (!this.data.position.id) { if (!this.data.position.id) {
this.$router.push({name:'Manage Position'}); this.$router.push({name:'Kemaskini Jawatan'});
} }
}, },
@@ -41,7 +41,7 @@ export default{
vm.loading = false; vm.loading = false;
$.notifyClose(); $.notifyClose();
if (vm.util.showResult(response, 'success')) { if (vm.util.showResult(response, 'success')) {
vm.$router.push({name:'Manage Position', query:{refresh:true}}); vm.$router.push({name:'Kemaskini Jawatan', query:{refresh:true}});
} }
}) })
.catch(error=>{ .catch(error=>{
@@ -5,8 +5,8 @@
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
<router-link class="btn btn-success" :to="{name:'Add Position'}"> <router-link class="btn btn-success" :to="{name:'Tambah Jawatan'}">
<i class="fa fa-plus"></i> Add Position <i class="fa fa-plus"></i> Tambah Jawatan
</router-link> </router-link>
<button class="btn btn-default" @click="refreshPosition()"> <button class="btn btn-default" @click="refreshPosition()">
<i class="fa fa-refresh"></i> Refresh Position <i class="fa fa-refresh"></i> Refresh Position
@@ -71,7 +71,7 @@ export default{
created: function () { created: function () {
if (this.$route.query.refresh) { if (this.$route.query.refresh) {
this.refreshPosition(); this.refreshPosition();
this.$router.replace({name: 'Manage Position'}) this.$router.replace({name: 'Kemaskini Jawatan'})
} }
}, },
@@ -1,6 +1,6 @@
<template> <template>
<div class="container col-md-8 col-md-offset-2"> <div class="container col-md-8 col-md-offset-2">
<h4>Manage Position</h4> <h4>Kemaskini Jawatan</h4>
<router-view></router-view> <router-view></router-view>
</div> </div>
</template> </template>
@@ -8,7 +8,7 @@
<script> <script>
export default{ export default{
created: function () { created: function () {
this.util.setTitle('Voting System - Manage Position'); this.util.setTitle('Voting System - Kemaskini Jawatan');
} }
} }
</script> </script>
@@ -1,15 +1,15 @@
<template> <template>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<h4>Add Voter</h4> <h4>Tambah Pengundi</h4>
<form @submit.prevent="add()" id="add-form"> <form @submit.prevent="add()" id="add-form">
<div class="form-group"> <div class="form-group">
<label for="name">Name</label> <label for="name">Nama</label>
<input type="text" name="name" class="form-control" required> <input type="text" name="name" class="form-control" required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="student_id">Student ID</label> <label for="student_id">No. Anggota</label>
<input type="text" name="student_id" class="form-control" required> <input type="text" name="student_id" class="form-control" required>
</div> </div>
@@ -4,12 +4,12 @@
<h4>Edit Voter</h4> <h4>Edit Voter</h4>
<form @submit.prevent="edit()" id="edit-form"> <form @submit.prevent="edit()" id="edit-form">
<div class="form-group"> <div class="form-group">
<label for="name">Name</label> <label for="name">Nama</label>
<input type="text" name="name" class="form-control" :value="data.voter.name" required/> <input type="text" name="name" class="form-control" :value="data.voter.name" required/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="student_id">Student ID</label> <label for="student_id">No. Anggota</label>
<input type="text" name="student_id" class="form-control" :value="data.voter.student_id" required/> <input type="text" name="student_id" class="form-control" :value="data.voter.student_id" required/>
</div> </div>
@@ -5,8 +5,8 @@
<div class="panel-body"> <div class="panel-body">
<div class="form-group"> <div class="form-group">
<router-link class="btn btn-success" :to="{name:'Add Voter'}"> <router-link class="btn btn-success" :to="{name:'Tambah Pengundi'}">
<i class="fa fa-plus"></i> Add Voter <i class="fa fa-plus"></i> Tambah Pengundi
</router-link> </router-link>
<button class="btn btn-default" @click="refreshVoter()"> <button class="btn btn-default" @click="refreshVoter()">
<i class="fa fa-refresh"></i> Refresh Voter <i class="fa fa-refresh"></i> Refresh Voter
@@ -16,8 +16,8 @@
<table class="table table-hover" id="position_table"> <table class="table table-hover" id="position_table">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Nama</th>
<th>Student ID</th> <th>No. Anggota</th>
<th>Course</th> <th>Course</th>
<th>Action</th> <th>Action</th>
</tr> </tr>
@@ -1,6 +1,6 @@
<template> <template>
<div class="container col-md-8 col-md-offset-2"> <div class="container col-md-8 col-md-offset-2">
<h4>Manage Voters</h4> <h4>Maklumat Pengundi</h4>
<router-view></router-view> <router-view></router-view>
</div> </div>
</template> </template>
@@ -8,7 +8,7 @@
<script> <script>
export default{ export default{
created: function () { created: function () {
this.util.setTitle('Voting System - Manage Voters'); this.util.setTitle('Voting System - Maklumat Pengundi');
} }
} }
</script> </script>
@@ -3,8 +3,8 @@
<div class="col-md-4"> <div class="col-md-4">
<h4>Voter's Information</h4><hr/> <h4>Voter's Information</h4><hr/>
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><b>Student ID : </b>{{ data.user.student_id }}</li> <li class="list-group-item"><b>No. Anggota : </b>{{ data.user.student_id }}</li>
<li class="list-group-item"><b>Name : </b>{{ data.user.name }}</li> <li class="list-group-item"><b>Nama : </b>{{ data.user.name }}</li>
<li class="list-group-item"><b>Course : </b>{{ data.user.course }}</li> <li class="list-group-item"><b>Course : </b>{{ data.user.course }}</li>
<li class="list-group-item" v-if="data.election.status==1"> <li class="list-group-item" v-if="data.election.status==1">
<center>Election hasn't started yet</center> <center>Election hasn't started yet</center>
+5 -5
View File
@@ -79,13 +79,13 @@ const routes = [
{ {
path:'', path:'',
component: ManagePositionIndex, component: ManagePositionIndex,
name: 'Manage Position' name: 'Kemaskini Jawatan'
}, },
{ {
path:'add', path:'add',
component: ManagePositionAdd, component: ManagePositionAdd,
name: 'Add Position' name: 'Tambah Jawatan'
}, },
{ {
@@ -136,7 +136,7 @@ const routes = [
{ {
path: 'add', path: 'add',
component: ManageVoterAdd, component: ManageVoterAdd,
name: 'Add Voter' name: 'Tambah Pengundi'
}, },
{ {
@@ -156,13 +156,13 @@ const routes = [
{ {
path: '', path: '',
component: ManageNomineeIndex, component: ManageNomineeIndex,
name: 'Manage Nominee' name: 'Maklumat Calon'
}, },
{ {
path: 'add', path: 'add',
component: ManageNomineeAdd, component: ManageNomineeAdd,
name: 'Add Nominee' name: 'Tambah Calon'
}, },
{ {
+5 -5
View File
@@ -122,13 +122,13 @@ export default [
{ {
path:'', path:'',
component: ManagePositionIndex, component: ManagePositionIndex,
name: 'Manage Position' name: 'Kemaskini Jawatan'
}, },
{ {
path:'add', path:'add',
component: ManagePositionAdd, component: ManagePositionAdd,
name: 'Add Position' name: 'Tambah Jawatan'
}, },
{ {
@@ -179,7 +179,7 @@ export default [
{ {
path: 'add', path: 'add',
component: ManageVoterAdd, component: ManageVoterAdd,
name: 'Add Voter' name: 'Tambah Pengundi'
}, },
{ {
@@ -199,13 +199,13 @@ export default [
{ {
path: '', path: '',
component: ManageNomineeIndex, component: ManageNomineeIndex,
name: 'Manage Nominee' name: 'Maklumat Calon'
}, },
{ {
path: 'add', path: 'add',
component: ManageNomineeAdd, component: ManageNomineeAdd,
name: 'Add Nominee' name: 'Tambah Calon'
}, },
{ {