diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..54249f896b003bf26d547667e6d1e658cd940e24
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,23 @@
+image: python:3.10
+
+before_script:
+ - python --version # For debugging
+ - pip install isort pylint pytest pyqt6 db-sqlite3 requests
+
+stages:
+ - linting
+ - test
+
+pylint:
+ stage: linting
+ script:
+ - python -m pylint src
+
+pytest:
+ stage: test
+ tags:
+ - rpl
+ script:
+ - pytest
+ only:
+ - merge_request
diff --git a/README.md b/README.md
index c8b24e9412e80d086297e050458d6f2d2f2454c5..93491ea5fd697c213a16a80f32cc6e5d2e0f554b 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,70 @@
# FitU
+FitU merupakan sebuah aplikasi desktop yang dapat membantu pengguna untuk menyusun program olahraga secara pribadi. Aplikasi FitU menawarkan berbagai jenis latihan yang dapat dipersonalisasi sesuai dengan kebutuhan penggunanya. Aplikasi FitU menawarkan berbagai fitur untuk menunjang latihan penggunanya, seperti contoh gerakan dan instruksi latihan untuk memastikan bahwa pengguna melakukan latihan dengan benar dan aman.
+## Fitur
-## Getting started
+Aplikasi FitU memiliki beberapa fitur, yaitu:
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
+- Register
+- Dashboard
+- List Of Exercise
+- Customize Exercise
+- Recomendation Of Exercise Program
+- Exercise
+- History Of Exercise
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+## _Requirement_
-## Add your files
+- Python3
+- _library_:
+ - PyQt6
+ - sqlite3
+ - pytest
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+## Cara Menjalankan Aplikasi
-```
-cd existing_repo
-git remote add origin https://gitlab.informatika.org/eunicesarah/fitu.git
-git branch -M main
-git push -uf origin main
-```
+### Untuk Windows
-## Integrate with your tools
+Klik file ```run.bat```
-- [ ] [Set up project integrations](https://gitlab.informatika.org/eunicesarah/fitu/-/settings/integrations)
-## Collaborate with your team
+## Daftar Modul yang Diimplementasikan
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
+| Nama Modul | NIM Penanggung Jawab | Nama Penanggung Jawab |
+| -------------------- | ------------------------------ | ----------------------------------------------------- |
+| Registrasi | 13521013 | Eunice Sarah Siregar |
+| Dashboard | 13521027 | Agsha Athalla Nurkareem |
+| Daftar Latihan | 13521011 | Afnan Edsa Ramadhan |
+| Kustomisasi Latihan | 13521014 | Muhhamad Syauqi Jannatan |
+| Rencana Latihan | 13521010 Page Plan | Muhamad Salman Hakim Alfarisi |
+| | 13521013 Excercise, End of Exc | Eunice Sarah Siregar |
+### Registrasi
-## Test and Deploy
+
-Use the built-in continuous integration in GitLab.
+### Dashboard
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
+
-***
+### Daftar Latihan
-# Editing this README
+
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
+### Kustomisasi Latihan
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
+
-## Name
-Choose a self-explaining name for your project.
+### Rencana Latihan
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
+
+
+
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
+## Daftar Tabel Basis data yang Diimplementasikan
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+- user = (**name**, height, weight, goal, gender, age)
+- daftar_latihan = (**exercise_id**, title, description, goals, duration, repetition, gif)
+- latihan_program = (program_id, exercise_id)
+- program = (**program_id**, title_program)
+- riwayat_latihan = (**history_id**, program_id, name, title_program, calories, date, tot_duration)
diff --git a/src/controller.py b/src/controller.py
index bec3560578d6ecebc6f35857a56ccdf7e8af5d99..e2786966e30681bafbf9fc8a43228f2f8a50a4f1 100644
--- a/src/controller.py
+++ b/src/controller.py
@@ -192,7 +192,8 @@ class controller:
(1, 'Full Body Workout'),
(2, 'Upper Body Workout'),
(3, 'Lower Body Workout'),
- (4, 'Core Workout')
+ (4, 'Core Workout'),
+ (5, 'Cardio Workout')
""")
cur.execute("""
@@ -209,7 +210,16 @@ class controller:
(2, 201),
(3, 202),
(3, 205),
- (3, 106)
+ (3, 106),
+ (3, 105),
+ (4, 203),
+ (4, 204),
+ (4, 207),
+ (4, 208),
+ (5, 101),
+ (5, 103),
+ (5, 208),
+ (5, 203)
""")
cur.execute("""
diff --git a/test/test_dashboard.py b/test/test_dashboard.py
index 19e42a4c23e4dc471d2fea0aead65615fc26df14..29f6ef76daf5648ca0f28a96de99322eb0a2c040 100644
--- a/test/test_dashboard.py
+++ b/test/test_dashboard.py
@@ -35,7 +35,7 @@ def test_element(app, qtbot):
assert len(app.findChildren(QLabel)) == 8
else:
assert len(app.findChildren(QPushButton)) == 7
- assert len(app.findChildren(QLabel)) == 21
+ assert len(app.findChildren(QLabel)) >= 21
assert app.findChildren(QPushButton)[0].text() == 'Home'
assert app.findChildren(QPushButton)[1].text() == 'Customize'
assert app.findChildren(QPushButton)[2].text() == 'Plan'
diff --git a/test/test_plan.py b/test/test_plan.py
index 497b813840d2f4930129f70075e945c5485010db..b0ad7e8ac64fd6dd7ec49c43a8eb3b3e42b61a9f 100644
--- a/test/test_plan.py
+++ b/test/test_plan.py
@@ -20,4 +20,10 @@ def test_window(app,qtbot):
assert app.windowTitle() == "FitU - Plan"
assert app.height() == 720
assert app.width() == 1280
- assert len(app.findChildren(QPushButton)) == 10
\ No newline at end of file
+ assert len(app.findChildren(QPushButton)) == len(app.programExercises) + 6
+
+def test_element(app,qtbot):
+ assert app.findChildren(QPushButton)[0].text() == "Home"
+ assert app.findChildren(QPushButton)[1].text() == "Customize"
+ assert app.findChildren(QPushButton)[2].text() == "Plan"
+ assert app.findChildren(QPushButton)[3].text() == "List"
\ No newline at end of file