From 0ec2a6b8a76b272549f5ed32e9e516a2d55ee757 Mon Sep 17 00:00:00 2001
From: Pc <Pdcrowd@gmail.com>
Date: Sun, 26 Jan 2020 10:30:22 +0700
Subject: [PATCH] =?UTF-8?q?=20-close=20#102=20=E0=B9=81=E0=B8=81=E0=B9=89?=
 =?UTF-8?q?=20code=20ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SE-Sprint1/client/src/components/Club.vue           |  8 ++++----
 SE-Sprint1/client/src/components/Clubmemberview.vue | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/SE-Sprint1/client/src/components/Club.vue b/SE-Sprint1/client/src/components/Club.vue
index 3829277..821b464 100755
--- a/SE-Sprint1/client/src/components/Club.vue
+++ b/SE-Sprint1/client/src/components/Club.vue
@@ -155,8 +155,8 @@ export default {
         
       },
       Branchs: [],
+      Yesrs: [],
       Officers: [],
-      Years: [],
       ClubTypes: [],
       valid: false
       
@@ -224,10 +224,10 @@ export default {
           "/Clubs/" +
             this.Club.Branch_id +
             "/" +
-            this.Club.Officer_id +
-            "/" +
             this.Club.Year_id +
             "/" +
+            this.Club.Officer_id +
+            "/" +
             this.Club.ClubType_id +
             "/" +
             this.Club.ClubName +
@@ -243,8 +243,8 @@ export default {
         .then(response => {
           console.log(response.data);
           this.Club.Branch_id = ""
-          this.Club.Officer_id = ""
           this.Club.Year_id = ""
+          this.Club.Officer_id = ""
           this.Club.ClubType_id = ""
           this.Club.ClubName = ""
           this.Club.ClubPresident = ""
diff --git a/SE-Sprint1/client/src/components/Clubmemberview.vue b/SE-Sprint1/client/src/components/Clubmemberview.vue
index a814be6..161ba83 100755
--- a/SE-Sprint1/client/src/components/Clubmemberview.vue
+++ b/SE-Sprint1/client/src/components/Clubmemberview.vue
@@ -19,7 +19,7 @@
     </v-row>
     <v-row justify="center">
       <v-col cols="10">
-        <v-data-table :headers="headers" :items="items" :items-per-page="5" class="elevation-1"></v-data-table>
+        <v-data-table :headers="headers" :items="tempItem" :items-per-page="5" class="elevation-1"></v-data-table>
       </v-col>
     </v-row>
 
@@ -63,8 +63,11 @@ export default {
       } else {
         this.tempItem = []
         this.items.forEach(club => {
-          if(club.clubs.clubName.includes(this.clubname)) {
-            this.tempItem.push(club)
+          if(club.clubs) {
+            if(club.clubs.clubName.includes(this.clubname)) {
+              this.tempItem.push(club)
+            }
+
           }
         });
       }
@@ -75,7 +78,7 @@ getClubmember() {
         .then(response => {
           this.items = response.data
           this.tempItem = this.items
-          console.log(JSON.stringify(this.items))
+          console.log(this.items)
         })
         .catch(e => {
           console.log(e)