From 674ed1277f892b59f96cd7057b156523182cccfb Mon Sep 17 00:00:00 2001
From: Ting-Jun Wang <levi900227@gmail.com>
Date: Sat, 3 Jul 2021 04:41:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=AA=E9=99=A4=E8=AA=B2=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/courseTable/courseTable.py |  7 ++++---
 courseTable.py                 | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/api/courseTable/courseTable.py b/api/courseTable/courseTable.py
index aac4e33..7bb0910 100644
--- a/api/courseTable/courseTable.py
+++ b/api/courseTable/courseTable.py
@@ -79,9 +79,10 @@ class CourseTable():
         '''
             移除課程
         '''
-        for key, value in self.table.items():
-            if value['number'] == courseID:
-                self.table[key] = None
+        for i in self.table:
+            if self.table[i]:
+                if self.table[i]['number'] == courseID:
+                    self.table[i] = None
     
     def getDepartmentList(self):
         ans = set()
diff --git a/courseTable.py b/courseTable.py
index f0d217b..77b67d6 100644
--- a/courseTable.py
+++ b/courseTable.py
@@ -47,6 +47,11 @@ class Choose():
                         courseTable.table[str(j+1) + tmp[i]]['name']
                     )
                     table[18 + (13*j+i)].removeBtn.grid()
+                    table[18 + (13*j+i)].id = courseTable.table[str(j+1) + tmp[i]]['number']
+                else:
+                    table[18 + (13*j+i)].classname.config(text="")
+                    table[18 + (13*j+i)].removeBtn.grid_forget()
+                    table[18 + (13*j+i)].id = None
 
     def insert(self,LIST):
         self.listbox.insert(END,*LIST)
@@ -64,8 +69,9 @@ class Space():
     def __init__(self, root, name=None):
         self.frame = Frame(root)
         self.classname = Label(self.frame, font="10", width="10", text=name)
-        self.removeBtn = Button(self.frame, font="10", text="刪")
+        self.removeBtn = Button(self.frame, font="10", text="刪", command=self.removeCourse)
         self.classname.config(relief=RIDGE)
+        self.id = None
 
     def grid(self,Row,Column):
         if Row==5:
@@ -74,6 +80,12 @@ class Space():
         self.classname.grid(row=0,column=0)
         self.removeBtn.grid(row=0,column=1)
         self.removeBtn.grid_forget()
+    
+    def removeCourse(self):
+        # print(self.id)
+        courseTable.remove(self.id)
+        box[0].update()
+        # courseTable.showTableStatus()
         
 root = Tk()
 root.geometry('800x600')
@@ -118,7 +130,6 @@ for j in range(5):
         table.append(Space(root))
         table[k].grid(i+1,j+3)
         k+=1
-print(len(table))