From 8fdd234eb9f05633cd7ceff39508c326542fe88f Mon Sep 17 00:00:00 2001
From: Eunice Sarah Siregar <13521013@mahasiswa.itb.ac.id>
Date: Mon, 17 Apr 2023 10:50:17 +0700
Subject: [PATCH] feat: add controller
---
src/controller.py | 22 ++++++++++++++++++++++
src/listlatihan2.py | 5 +----
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/controller.py b/src/controller.py
index d90966b..d890e70 100644
--- a/src/controller.py
+++ b/src/controller.py
@@ -18,7 +18,9 @@ class controller:
self.listLatihan = listLatihan2()
self.listLatihan.switch.connect(self.fromListLatihan)
self.customize = customizeWorkout()
+ self.customize.switch.connect(self.fromCustomize)
self.plan = plan()
+ # self.plan.switch.connect(self.fromPlan)
pass
@@ -53,6 +55,26 @@ class controller:
self.dashboard.show()
elif (page == "customize"):
self.customize.show()
+ elif (page == "plan"):
+ self.plan.show()
+
+ def fromPlan(self, page):
+ self.plan.close()
+ if (page == "dashboard"):
+ self.dashboard.show()
+ elif (page == "customize"):
+ self.customize.show()
+ elif (page == "listLatihan"):
+ self.listLatihan.show()
+
+ def fromCustomize(self, page):
+ self.customize.close()
+ if (page == "dashboard"):
+ self.dashboard.show()
+ elif (page == "listLatihan"):
+ self.listLatihan.show()
+ elif (page == "plan"):
+ self.plan.show()
if __name__ == "__main__":
app = QApplication(sys.argv)
diff --git a/src/listlatihan2.py b/src/listlatihan2.py
index 0b61854..23b6f5c 100644
--- a/src/listlatihan2.py
+++ b/src/listlatihan2.py
@@ -143,7 +143,7 @@ class listLatihan2(QWidget):
listButton.move(1025, 53)
listButton.setCursor(
QCursor(Qt.CursorShape.PointingHandCursor))
- listButton.clicked.connect(self.listWindow)
+ # listButton.clicked.connect(self.listWindow)
# # tombol history
@@ -272,9 +272,6 @@ class listLatihan2(QWidget):
def planWindow(self):
self.switch.emit("plan", {})
-
- def listWindow(self):
- self.switch.emit("listLatihan", {})
def dashboard(self):
self.switch.emit("dashboard", {})
--
GitLab