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

This commit is contained in:
nurafrinaalimi16
2024-04-21 16:57:10 +08:00
32 changed files with 2924 additions and 23927 deletions
@@ -1,8 +1,38 @@
<template>
<<<<<<< HEAD
<div class="row col-md-10 col-md-offset-1">
<div class="col-md-4">
<h4>Maklumat Anggota</h4><hr/>
<ul class="list-group">
<li class="list-group-item"><b>No. Kad Pengenalan : </b>{{ data.user.no_kp }}</li>
<li class="list-group-item"><b>No. Anggota : </b>{{ data.user.no_anggota }}</li>
<li class="list-group-item"><b>Nama : </b>{{ data.user.name }}</li>
<li class="list-group-item"><b>Unit : </b>{{ data.user.unit }}</li>
<li class="list-group-item"><b>Saham : </b>{{ data.user.saham }}</li>
<li class="list-group-item"><b>Yuran : </b>{{ data.user.yuran }}</li>
<li class="list-group-item" v-if="data.election.status==1">
<center>Undian belum bermula</center>
</li>
<li class="list-group-item" v-if="data.election.status==2">
<center>
<router-link v-if="!hasVoted()" :to="{name: 'Vote'}" class="btn btn-info">
Undi Sekarang
</router-link>
<router-link v-else :to="{name: 'Result'}" class="btn btn-info">
Papar Keputusan
</router-link>
</center>
</li>
</ul>
<div v-if="hasVoted()">
<hr/>
<h4>Your votes information</h4><hr/>
=======
<div class="row col-md-10 col-md-offset-1">
<div class="col-md-4">
<h4>Maklumat Anggota</h4>
<hr />
>>>>>>> 5d1d05717ec58a685bba0b6393ad934904cba077
<ul class="list-group">
<li class="list-group-item"><b>Nama : </b>{{ data.user.name }}</li>
<li class="list-group-item"><b>No. Kad Pengenalan : </b>{{ data.user.no_kp }}</li>
@@ -25,6 +55,42 @@
</center>
</li>
</ul>
<<<<<<< HEAD
</div>
</div>
<div class="col-md-8">
<h4>Maklumat Calon</h4><hr/>
<small>Click Picture to see details</small>
<div class="panel panel-primary" v-for="position in data.positions">
<div class="panel-heading">{{ position.name }}</div>
<div class="panel-body table-responsive">
<table class="table table-hover">
<thead>
<tr>
<th></th>
<th>Nama</th>
<th>Unit</th>
<th>Taraf Pendidikan</th>
<th>Pengalaman Kerja </th>
</tr>
</thead>
<tbody>
<tr v-for="(nominee,i) in data.nominees" v-if="nominee.position_id==position.id">
<td><img
@click="view(i)"
:src="createBase64ImageUrl(nominee.photo)"
class="thumbnail"
style="height: 60px;width: 60px;" />
</td>
<td>{{ nominee.name }}</td>
<td>{{ nominee.unit }}</td>
<td>{{ nominee.education}}</td>
<td>{{ nominee.experience}}</td>
</tr>
</tbody>
</table>
=======
<div v-if="hasVoted()">
<hr />
<h4>Maklumat Undian Anda</h4>
@@ -34,6 +100,7 @@
<b>{{ getPosition(result.position_id) }} : </b>{{ getNominee(result.nominee_id) }}
</li>
</ul>
>>>>>>> 5d1d05717ec58a685bba0b6393ad934904cba077
</div>
</div>