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

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

Browse Source
This commit is contained in:
nurafrinaalimi16
2024-04-23 08:17:11 +08:00
parent 9881f6a09e 53cbd4355f
commit 75f9596e59
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/components/demo/admin/nominee/index.vue
+1 -1
View File
@@ -21,7 +21,7 @@
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th>Id</th> <th></th>
<th>Nama</th> <th>Nama</th>
<th>No. Anggota</th> <th>No. Anggota</th>
<th>Unit</th> <th>Unit</th>
resources/assets/js/components/demo/voter/home/attendance.vue
+1 -1
View File
@@ -39,7 +39,7 @@
</div> </div>
<center><input type="submit" value="SAYA TERIMA" class="btn btn-primary" <center><input type="submit" value="SAYA TERIMA" class="btn btn-primary"
v-if="data.election.status == 1 && data.user.kehadiran == 0" /></center> v-if="data.election.status == 2 && data.user.kehadiran == 0" /></center>
</form> </form>
</div> </div>
</div> </div>
resources/assets/js/components/demo/voter/home/index.vue
+10 -8
View File
@@ -39,7 +39,7 @@
<div class="col-md-8"> <div class="col-md-8">
<h4>Maklumat Calon</h4> <h4>Maklumat Calon</h4>
<hr /> <hr />
<!-- <small>Click Picture to see details</small> --> <small>Tekan gambar untuk maklumat calon</small>
<div class="panel panel-primary" v-for="position in data.positions"> <div class="panel panel-primary" v-for="position in data.positions">
<div class="panel-heading">{{ position.name }}</div> <div class="panel-heading">{{ position.name }}</div>
<div class="panel-body table-responsive"> <div class="panel-body table-responsive">
@@ -47,11 +47,12 @@
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
<th>Bil.</th>
<th>Nama</th> <th>Nama</th>
<th>No. Anggota</th> <th>No. Anggota</th>
<th>Unit</th> <th>Unit</th>
<th>Taraf Pendidikan</th> <!-- <th>Taraf Pendidikan</th>
<th>Pengalaman Kerja </th> <th>Pengalaman Kerja </th> -->
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -60,11 +61,12 @@
<td><img @click="view(nominee, i)" :src="createBase64ImageUrl(nominee.photo)" <td><img @click="view(nominee, i)" :src="createBase64ImageUrl(nominee.photo)"
class="thumbnail" style="height: 60px;width: 60px;" /> class="thumbnail" style="height: 60px;width: 60px;" />
</td> </td>
<td>{{ nominee.no_calon }}</td>
<td>{{ nominee.name }}</td> <td>{{ nominee.name }}</td>
<td>{{ nominee.no_anggota }}</td> <td>{{ nominee.no_anggota }}</td>
<td>{{ nominee.unit }}</td> <td>{{ nominee.unit }}</td>
<td>{{ nominee.education }}</td> <!-- <td>{{ nominee.education }}</td>
<td>{{ nominee.experience }}</td> <td>{{ nominee.experience }}</td> -->
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -86,10 +88,10 @@
<img :src="nomineeViewed.photo" class="thumbnail nominee-viewed-photo" /> <img :src="nomineeViewed.photo" class="thumbnail nominee-viewed-photo" />
</div> </div>
<div class="detail-section"> <div class="detail-section">
<span><b> Name : </b>{{ nomineeViewed.name }}</span> <span><b> Nama : </b>{{ nomineeViewed.name }}</span>
<span><b> Unit : </b>{{ nomineeViewed.unit }}</span> <span><b> Unit : </b>{{ nomineeViewed.unit }}</span>
<span><b> Education : </b>{{ nomineeViewed.education }}</span> <span><b> Taraf Pendidikan : </b>{{ nomineeViewed.education }}</span>
<span><b> Experience : </b>{{ nomineeViewed.experience }}</span> <span><b> Pengalaman Kerja : </b>{{ nomineeViewed.experience }}</span>
</div> </div>
</div> </div>
</div> </div>