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

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

@@ -9,7 +9,7 @@
 							<span class="icon-bar"></span>
 							<span class="icon-bar"></span>
 						</button>	
-						<a class="navbar-brand" :href="data.baseURL" ><img src='/images/MyKoPKB-logo.png' border='0' alt="MyKoPKB Logo"></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' width="150" height="auto" alt="MyKoPKB Logo"></a>
 					</div>
 					<div class="collapse navbar-collapse" id="myNavbar">
 	

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

@@ -44,17 +44,26 @@
 							<td>{{ nominee.no_anggota }}</td>
 							<td>{{ nominee.unit }}</td>
 							<td>{{ nominee.position }}</td>
-							<td>{{ nominee.education }}</td>
+							<td>
-							<td>{{ nominee.experience }}</td>
+								<ol>
+									<li v-for="(item, index) in nominee.education" :key="index">{{ item }}</li>
+								</ol>
+							</td>
+							<td>
+								<ol>
+									<li v-for="(item, index) in nominee.experience" :key="index">{{ item }}</li>
+								</ol>
+							</td>
+
 
 
 
 							<router-link :to="{ name: 'Edit Nominee', params: { id: nominee.id } }"
 								class="btn btn-primary">
-								<i class="fa fa-edit"></i> Set semula
+								<i class="fa fa-edit"></i>Kemaskini
 							</router-link>
 							<button class="btn btn-danger" @click="util.showModal(nominee.id)" id=nominee.id>
-								<i class="fa fa-trash"></i> Padam
+								<i class="fa fa-trash"></i>Padam
 							</button>
 
 						</tr>
@@ -106,14 +115,14 @@ export default {
 				.then(response => {
 					$.notifyClose(); // Close notification
 					// if (this.util.showResult(response, 'success')) {
-						if (response.data && response.data.status === 'success') {
+					if (response.data && response.data.status === 'success') {
 						this.util.notify('Nominee deleted successfully', 'success');
 
 
 						// Show success notification
 						this.refreshNominee(); // Refresh the list of nominees
 					} else {
-                this.util.notify('Failed to delete nominee', 'error'); // Show error notification
+						this.util.notify('Failed to delete nominee', 'error'); // Show error notification
 
 					}
 				})

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

@@ -1,7 +1,7 @@
 <template>
 <div class="panel panel-default">
 	<div class="panel-body">
-		<h4>Edit Voter</h4>
+		<h4><b>Kemaskini Maklumat</b></h4>
 		<form @submit.prevent="edit()" id="edit-form">
 			<div class="form-group">
 				<label for="name">Nama</label>
@@ -13,14 +13,29 @@
 				<input type="text" name="no_kp" class="form-control" :value="data.voter.no_kp" required/>
 			</div>
 
+			<div class="form-group">
+				<label for="telefon">No. Telefon</label>
+				<input type="text" name="telefon" class="form-control" :value="data.voter.telefon" required/>
+			</div>
+
 			<div class="form-group">
 				<label for="Unit">Unit</label>
 				<input type="text" name="unit" class="form-control" :value="data.voter.unit" required/>
 			</div>
 
 			<div class="form-group">
-				<input type="submit" value="Submit" class="btn btn-success"/>
+				<label for="saham">Saham</label>
-				<router-link :to="{name: 'Manage Voter'}" class="btn btn-default">Back</router-link>
+				<input type="text" name="saham" class="form-control" :value="data.voter.saham" required/>
+			</div>
+
+			<div class="form-group">
+				<label for="yuran">Yuran</label>
+				<input type="text" name="yuran" class="form-control" :value="data.voter.yuran" required/>
+			</div>
+
+			<div class="form-group">
+				<input type="submit" value="Hantar" class="btn btn-success"/>
+				<router-link :to="{name: 'Manage Voter'}" class="btn btn-default">Kembali</router-link>
 			</div>
 		</form>
 	</div>