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

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

@@ -18,7 +18,7 @@
 						Vote Now
 					</router-link>
 					<router-link v-else :to="{name: 'Result'}" class="btn btn-info">
-						View Result
+						Papar Keputusan
 					</router-link>
 				</center>
 			</li>
@@ -45,8 +45,9 @@
 						<tr>
 							<th></th>
 							<th>Name</th>
-							<th>Partylist</th>
 							<th>Unit</th>
+							<th>Taraf Pendidikan</th>
+							<th>Pengalaman Kerja </th>
 						</tr>
 					</thead>
 					<tbody>
@@ -58,8 +59,9 @@
 									style="height: 60px;width: 60px;" />
 							</td>
 							<td>{{ nominee.name }}</td>
-							<td>{{ getPartylist(nominee.partylist_id) }}</td>
-							<td>{{ nominee.unit }}</td>
+							<td>{{ nominee.unit  }}</td>
+							<td>{{ nominee.education}}</td>
+							<td>{{ nominee.experience}}</td>
 						</tr>
 					</tbody>
 				</table>
@@ -77,8 +79,8 @@
 						<h3><strong><em>"{{ x.motto }}"</em></strong></h3>
 						<b> Name : </b>{{ x.name }}<br/>
 						<b> Unit : </b>{{ x.unit }}<br/>
-						<b> Partylist : </b>{{ getPartylist(x.partylist_id) }}<br/><hr/>
-						{{ x.description }}
+						<b> education : </b>{{ getPartylist(x.education) }}<br/><hr/>
+						{{ x.experience }}
 					</div>
 				</div>
 			</modal-body>