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

resources/assets/js/components/demo/admin/home/final.vue

@@ -1,48 +1,47 @@
 <template>
-<div class="container">
-	<div class="row">
-		<div class="col-md-12">
-			<div v-for="position in positions">
-				<h5>{{ position.name }}</h5>
-				<div class="table-responsive">
-					<table class="table table-striped table-condensed">
-						<thead>
-							<tr>
-								<th width="10%">No. Anggota</th>
-								<th width="30%">Nama</th>
-								<th width="20%">Partylist</th>
-								<th width="20%">Unit</th>
-								<th width="20%">Undian</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="result in results" v-if="result.position_id==position.id">
-								<td>{{ getNominee(result.nominee_id)['student_id'] }}</td>
-								<td>{{ getNominee(result.nominee_id)['name'] }}</td>
-								<td>{{ getPartylist(getNominee(result.nominee_id)['partylist_id']) }}</td>
-								<td>{{ getNominee(result.nominee_id)['Unit'] }}</td>
-								<td>{{ result.votes}}</td>
-							</tr>
-							<tr v-for="no_vote in no_votes" v-if="no_vote.position_id==position.id">
-								<td>{{ no_vote.student_id }}</td>
-								<td>{{ no_vote.name }}</td>
-								<td>{{ getPartylist(no_vote.partylist_id) }}</td>
-								<td>{{ no_vote.unit }}</td>
-								<td>0</td>
-							</tr>
-						</tbody>
-					</table>
+	<div class="container">
+		<div class="row">
+			<div class="col-md-12">
+				<div v-for="position in positions">
+					<h5>{{ position.name }}</h5>
+					<div class="table-responsive">
+						<table class="table table-striped table-condensed">
+							<thead>
+								<tr>
+									<th width="20%">No. Anggota</th>
+									<th width="30%">Nama</th>
+									<th width="20%">Unit</th>
+									<th width="10%">Undian</th>
+									<th width="20%">Peratus (%)</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr v-for="result in results" v-if="result.position_id == position.id">
+									<td>{{ getNominee(result.nominee_id)['no_anggota'] }}</td>
+									<td>{{ getNominee(result.nominee_id)['name'] }}</td>
+									<td>{{ getNominee(result.nominee_id)['unit'] }}</td>
+									<td>{{ result.votes }}</td>
+									<td>{{ calculatePercentage(result.votes, position.id) }}</td>
+								</tr>
+								<tr v-for="no_vote in no_votes" v-if="no_vote.position_id == position.id">
+									<td>{{ no_vote.no_anggota }}</td>
+									<td>{{ no_vote.name }}</td>
+									<td>{{ no_vote.unit }}</td>
+									<td>0</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+					<hr />
 				</div>
-				<hr/>
 			</div>
 		</div>
 	</div>
-</div>
 </template>
 
 <script>
-export default{
-	data: function() {
+export default {
+	data: function () {
 		return {
 			nominees: [],
 			results: [],
@@ -66,21 +65,29 @@ export default{
 				if (id == partylists[i]['id'])
 					return partylists[i]['name'];
 			return 'No Partylist';
+		},
+
+		calculatePercentage(votes, positionId) {
+			const totalVotes = this.results
+				.filter(result => result.position_id === positionId)
+				.reduce((total, result) => total + result.votes, 0);
+
+			return ((votes / totalVotes) * 100).toFixed(2);
 		}
 	},
 
 	created: function () {
 		this.util.notify('Loading please wait...', 'loading');
 		var vm = this;
-		axios.get(config.API+'election/result/'+this.election_id)
-			.then(response=>{
+		axios.get(config.API + 'election/result/' + this.election_id)
+			.then(response => {
 				$.notifyClose();
 				vm.nominees = response.data.nominee;
 				vm.results = response.data.result;
 				vm.partylists = response.data.partylist;
 				vm.positions = response.data.position;
 			})
-			.catch(error=>{
+			.catch(error => {
 				$.notifyClose();
 				vm.util.showResult(error, 'error');
 			})

resources/assets/js/components/demo/admin/home/index.vue

@@ -1,19 +1,19 @@
 <template>
 	<div class="panel panel-default">
 		<div class="panel-body">
-			<h4> Undian Terkini</h4>
+			<h4>Undian Terkini</h4>
 			<div class="form-group">
 				<button class="btn btn-success" v-if="data.election.status == 1 &&  data.user.role==1"
-					@click="util.showModal('#start-election-modal')">Undian bermula</button>
+					@click="util.showModal('#start-election-modal')">Mula Undian</button>
 
 				<router-link :to="{ name: 'Current Result' }" class="btn btn-info" v-if="data.election.status == 2">
-					View Results
+					Papar Keputusan
 				</router-link>
 
 				<button class="btn btn-danger" v-if="data.election.status == 2"
-					@click="util.showModal('#stop-election-modal')">End Election</button>
+					@click="util.showModal('#stop-election-modal')">Tamat Undian</button>
 
-				<label v-if="data.election.status == 2">Undian bermula  {{ start_date }}</label>
+				<label v-if="data.election.status == 2">Undian bermula {{ start_date }}</label>
 
 			</div>
 
@@ -22,10 +22,10 @@
 					<thead>
 						<tr>
 							<th>ID</th>
-							<th>Election Name</th>
-							<th>Election Start</th>
-							<th>Election End</th>
-							<th>View</th>
+							<th>Nama Undian</th>
+							<th>Undian Mula</th>
+							<th>Undian Tamat</th>
+							<th>Papar</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -36,7 +36,7 @@
 							<td>{{ election.end }}</td>
 							<td>
 								<router-link :to="{ name: 'Election Result', params: { election_id: election.id } }"
-									class="btn btn-info">View Result</router-link>
+									class="btn btn-info">Keputusan Undian</router-link>
 							</td>
 						</tr>
 						<tr v-if="data.elections.length < 1">

resources/assets/js/components/demo/admin/index.vue

@@ -16,7 +16,7 @@
 
 					<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>
 						</router-link>

resources/assets/js/components/demo/admin/voter/index.vue

@@ -9,13 +9,14 @@
 				<i class="fa fa-plus"></i> Tambah Pengundi
 			</router-link>
 			<button class="btn btn-default" @click="refreshVoter()">
-				<i class="fa fa-refresh"></i> Kemaskini
+				<i class="fa fa-refresh"></i> Kemaskini Pengundi
 			</button>
 		</div>
 		<div class="table-responsive">
 			<table class="table table-hover" id="position_table">
 				<thead>
 					<tr>
+						<th>Bil.</th>
 						<th>Nama Anggota</th>
 						<th>No. Kad Pengenalan</th>
 						<th>No. Anggota</th>
@@ -27,6 +28,7 @@
 				</thead>
 				<tbody>
 					<tr v-for="(voter,i) in data.voters.data">
+						<td>{{ i + 1 }}</td>
 						<td>{{ voter.name }}</td>
 						<td>{{ voter.no_kp }}</td>
 						<td>{{ voter.no_anggota }}</td>

resources/assets/js/components/demo/admin/voter/kehadiran.vue

@@ -0,0 +1,187 @@
+<template>
+	<div class="panel panel-default">
+		<div class="panel-body">
+			<button class="btn btn-success" @click="refreshVoter()">
+				<i class="fa fa-refresh"></i> Kemaskini Pengundi
+			</button>
+
+			<button class="btn btn-primary" @click="downloadPDF()">
+                <i class="fa fa-download"></i> Muat Turun PDF
+            </button>
+
+
+			<div class="table-responsive">
+				<table class="table table-hover">
+					<thead>
+						<tr>
+							<th>Bil.</th>
+							<th>Nama Anggota</th>
+							<th>No. Kad Pengenalan</th>
+							<th>No. Anggota</th>
+							<th>Unit</th>
+							<th>Kehadiran</th>
+							<th>Tarikh/Masa</th>
+						</tr>
+					</thead>
+					<tbody>
+						<!-- Display Fizikal attendees -->
+						<template v-for="(voter, i) in data.voters.data">
+							<tr v-if="voter.kehadiran === 1">
+								<td>{{ i + 1 }}</td> <!-- Display the serial number -->
+								<td>{{ voter.name }}</td>
+								<td>{{ voter.no_kp }}</td>
+								<td>{{ voter.no_anggota }}</td>
+								<td>{{ voter.unit }}</td>
+								<td>{{ getKehadiranString(voter.kehadiran) }}</td>
+								<td>{{ voter.updated_at }}</td>
+							</tr>
+						</template>
+
+						<!-- Display Maya attendees -->
+						<template v-for="(voter, i) in data.voters.data">
+							<tr v-if="voter.kehadiran === 2">
+								<td>{{ i + 1 }}</td> <!-- Display the serial number -->
+								<td>{{ voter.name }}</td>
+								<td>{{ voter.no_kp }}</td>
+								<td>{{ voter.no_anggota }}</td>
+								<td>{{ voter.unit }}</td>
+								<td>{{ getKehadiranString(voter.kehadiran) }}</td>
+								<td>{{ voter.updated_at }}</td>
+							</tr>
+						</template>
+
+						<template v-for="(voter, i) in data.voters.data">
+							<tr v-if="voter.kehadiran === 0">
+								<td>{{ i + 1 }}</td> <!-- Display the serial number -->
+								<td>{{ voter.name }}</td>
+								<td>{{ voter.no_kp }}</td>
+								<td>{{ voter.no_anggota }}</td>
+								<td>{{ voter.unit }}</td>
+								<td>{{ getKehadiranString(voter.kehadiran) }}</td>
+								<td>{{ voter.updated_at }}</td>
+							</tr>
+						</template>
+					</tbody>
+				</table>
+			</div>
+
+			<!-- Display attendance percentage -->
+			<div class="text-right">
+				<h5><b>{{ attendancePercentage }}% Kehadiran Pengundi</b></h5>
+			</div>
+
+			<ul class="pagination" v-if="pages.length > 1">
+				<router-link tag="li" v-for="page in pages" :key="page['pages']" :to="{ query: { page: page['page'] } }"
+					:class="{ 'active': current_page == page['page'] }" exact>
+					<a href="#">{{ page['page'] }}</a>
+				</router-link>
+			</ul>
+		</div>
+	</div>
+</template>
+
+<script>
+
+import html2canvas from 'html2canvas';
+import jsPDF from 'jspdf';
+
+export default {
+	data: function () {
+		return {
+			id: 0
+		}
+	},
+
+	created: function () {
+		this.refreshVoter();
+	},
+
+	methods: {
+		search: function () {
+
+		},
+
+		refreshVoter: function () {
+			var vm = this;
+			this.util.notify('Refreshing Voter', 'loading');
+			axios.get(config.API + 'voter?page=' + this.current_page)
+				.then(response => {
+					console.log(response)
+					$.notifyClose();
+					vm.data.voters = response.data;
+				})
+				.catch(error => {
+					$.notifyClose();
+					vm.util.showResult(error);
+				})
+		},
+
+		getKehadiranString(kehadiran) {
+			// Map integer values to corresponding string representations
+			switch (kehadiran) {
+				case 1:
+					return 'Fizikal';
+				case 2:
+					return 'Maya';
+				default:
+					return '-';
+			}
+		},
+
+		downloadPDF() {
+            const table = document.getElementById('voterTable');
+
+            html2canvas(table).then(canvas => {
+                const imgData = canvas.toDataURL('image/png');
+                const pdf = new jsPDF();
+                pdf.addImage(imgData, 'PNG', 0, 0);
+                pdf.save('kehadiran-pengundi.pdf');
+            });
+        },
+
+	},
+
+	watch: {
+		'$route.query.page': function () {
+			$.notifyClose();
+			this.refreshVoter();
+		}
+	},
+
+	computed: {
+		pages: function () {
+			var pages = [];
+			if (this.data.voters.last_page)
+				for (var i = 1; i <= this.data.voters.last_page; i++) {
+					let x = {};
+					x['page'] = i;
+					pages.push(x);
+				}
+			return pages;
+		},
+
+		current_page: function () {
+			return this.$route.query.page ? this.$route.query.page : 1;
+		},
+
+		// Calculate total attendance percentage
+		attendancePercentage() {
+			// Count total members who attended physically (Fizikal)
+			const fizikalCount = this.data.voters.data.reduce((total, voter) => {
+				return voter.kehadiran === 1 ? total + 1 : total;
+			}, 0);
+
+			// Count total members who attended virtually (Maya)
+			const mayaCount = this.data.voters.data.reduce((total, voter) => {
+				return voter.kehadiran === 2 ? total + 1 : total;
+			}, 0);
+
+			// Calculate total attendance percentage
+			const totalAttendance = fizikalCount + mayaCount;
+			const totalMembers = this.data.voters.data.length;
+			return totalMembers === 0 ? 0 : ((totalAttendance / totalMembers) * 100).toFixed(2);
+		}
+	}
+
+}
+</script>

resources/assets/js/components/demo/admin/voter/viewkehadiran.vue

@@ -0,0 +1,113 @@
+<template>
+    <div class="container">
+        <div class="row">
+            <div class="col-md-12">
+                <div v-for="position in positions">
+                    <h5>{{ position.name }}</h5>
+                    <div class="table-responsive">
+                        <table class="table table-striped table-condensed">
+                            <thead>
+                                <tr>
+                                    <th width="10%">No. Anggota</th>
+                                    <th width="30%">Name</th>
+                                    <th width="20%">No. Kad Pengenalan</th>
+                                    <th width="20%">Unit</th>
+                                    <th width="20%">No. Telefon</th>
+                                    <th width="20%">Kehadiran</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr v-for="result in results" v-if="result.position_id==position.id">
+                                    <td>{{ getVoter(result.nominee_id)['no_anggota'] }}</td>
+                                    <td>{{ getNominee(result.nominee_id)['name'] }}</td>
+                                    <td>{{ getPartylist(getNominee(result.nominee_id)['partylist_id']) }}</td>
+                                    <td>{{ getNominee(result.nominee_id)['unit'] }}</td>
+                                    <td>{{ result.votes}}</td>
+                                </tr>
+                                <tr v-for="no_vote in no_votes" v-if="no_vote.position_id==position.id">
+                                    <td>{{ no_vote.student_id }}</td>
+                                    <td>{{ no_vote.name }}</td>
+                                    <td>{{ getPartylist(no_vote.partylist_id) }}</td>
+                                    <td>{{ no_vote.unit }}</td>
+                                    <td>0</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                    <hr/>
+                </div>
+            </div>
+        </div>
+    </div>
+    </template>
+    
+    <script>
+    export default{
+        data: function() {
+            return {
+                nominees: [],
+                results: [],
+                partylists: [],
+                positions: []
+            }
+        },
+    
+        methods: {
+            getNominee: function (id) {
+                let nominees = this.nominees;
+                for (var i in nominees)
+                    if (id == nominees[i]['id'])
+                        return nominees[i];
+                return {};
+            },
+    
+            getPartylist: function (id) {
+                let partylists = this.partylists;
+                for (var i in partylists)
+                    if (id == partylists[i]['id'])
+                        return partylists[i]['name'];
+                return 'No Partylist';
+            }
+        },
+    
+        created: function () {
+            this.util.notify('Loading please wait...', 'loading');
+            var vm = this;
+            axios.get(config.API+'election/result/'+this.election_id)
+                .then(response=>{
+                    $.notifyClose();
+                    vm.nominees = response.data.nominee;
+                    vm.results = response.data.result;
+                    vm.partylists = response.data.partylist;
+                    vm.positions = response.data.position;
+                })
+                .catch(error=>{
+                    $.notifyClose();
+                    vm.util.showResult(error, 'error');
+                })
+        },
+    
+        computed: {
+            election_id: function () {
+                return this.$route.params.election_id;
+            },
+    
+            no_votes: function () {
+                let nominees = this.nominees;
+                let results = this.results;
+                let no_votes = [];
+                for (var i in nominees) {
+                    var hasvote = false;
+                    for (var y in results) {
+                        if (results[y]['nominee_id'] == nominees[i]['id'])
+                            hasvote = true;
+                    }
+                    if (!hasvote)
+                        no_votes.push(nominees[i]);
+                }
+                return no_votes;
+            }
+    
+        }
+    }
+    </script>