nus-cs2103-AY1920S2 · AaronCQL · Apr 12, 2020 · Apr 12, 2020 · Apr 12, 2020 · Apr 12, 2020
diff --git a/.gitignore b/.gitignore
@@ -13,9 +13,17 @@ src/main/resources/docs/
 /config.json
 /preferences.json
 /*.log.*
+/exports
 
 # Test sandbox files
 src/test/data/sandbox/
 
 # MacOS custom attributes files created by Finder
 .DS_Store
+
+# VSC files
+.classpath
+.project
+.settings
+.vscode
+/bin
diff --git a/LICENSE b/LICENSE
@@ -2,11 +2,11 @@ MIT License
 
 Copyright (c) 2016 Software Engineering Education - FOSS Resources
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+Permission is hereby granted, free of charge, to any client obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
+copies of the Software, and to permit clients to whom the Software is
 furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all

diff --git a/README.adoc b/README.adoc
@@ -1,11 +1,8 @@
-= Address Book (Level 3)
+= FitBiz
 ifdef::env-github,env-browser[:relfileprefix: docs/]
 
-https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
-https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
-https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
-https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
-
+https://travis-ci.com/AY1920S2-CS2103T-F11-2/main[image:https://travis-ci.com/AY1920S2-CS2103T-F11-2/main.svg?branch=master[Build Status]]
+https://coveralls.io/github/AY1920S2-CS2103T-F11-2/main[image:https://coveralls.io/repos/github/AY1920S2-CS2103T-F11-2/main/badge.svg?branch=master[Coverage Status]]
 
 ifdef::env-github[]
 image::docs/images/Ui.png[width="600"]
@@ -15,20 +12,23 @@ ifndef::env-github[]
 image::images/Ui.png[width="600"]
 endif::[]
 
-* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
-* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
-* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
+* The Fitness Business Management App you never knew you needed
+* Tailored made for fitness coaches to manage their clients without the hassle of traditional pen and paper
+* Here are some things you can do:
+** Track your client's exercises and training schedules
+** Display detailed graphs and charts of your client's training data
+** Export a client's training data in `csv` format, allowing clients to easily store or view their own data on Excel
 
 == Site Map
 
 * <<UserGuide#, User Guide>>
 * <<DeveloperGuide#, Developer Guide>>
-* <<LearningOutcomes#, Learning Outcomes>>
 * <<AboutUs#, About Us>>
 * <<ContactUs#, Contact Us>>
 
 == Acknowledgements
 
+* Adapted from the https://se-education.org/[AddressBook-Level3 project] created by SE-EDU initiative
 * Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
 _Marco Jakob_.
 * Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]

diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,10 @@ mainClassName = 'seedu.address.Main'
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 
+application {
+    applicationDefaultJvmArgs = ['-Dglass.gtk.uiScale=1.5']
+}
+
 repositories {
     mavenCentral()
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
@@ -39,6 +43,8 @@ jacocoTestReport {
 
 test {
     useJUnitPlatform()
+    // uncomment this to enable printing to stdout in tests
+    // testLogging.showStandardStreams = true
 }
 
 dependencies {
@@ -67,7 +73,7 @@ dependencies {
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
+    archiveName = 'FitBiz.jar'
 
     destinationDir = file("${buildDir}/jar/")
 }
@@ -77,8 +83,8 @@ task coverage(type: JacocoReport) {
     classDirectories.from files(sourceSets.main.output)
     executionData.from files(jacocoTestReport.executionData)
     afterEvaluate {
-        classDirectories.from files(classDirectories.files.collect {
-            fileTree(dir: it, exclude: ['**/*.jar'])
+        classDirectories = files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: ['seedu/address/ui', 'seedu/address/model/util'])
         })
     }
     reports {
@@ -133,8 +139,8 @@ asciidoctor {
         idprefix: '',  // for compatibility with GitHub preview
         idseparator: '-',
         'site-root': "${sourceDir}",  // must be the same as sourceDir, do not modify
-        'site-name': 'AddressBook-Level3',
-        'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
+        'site-name': 'FitBiz',
+        'site-githuburl': 'https://github.com/AY1920S2-CS2103T-F11-2/main',
         'site-seedu': true,  // delete this line if your project is not a fork (not a SE-EDU project)
     ]
 

diff --git a/docs/AboutUs.adoc b/docs/AboutUs.adoc
@@ -4,53 +4,48 @@
 :imagesDir: images
 :stylesDir: stylesheets
 
-AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
-_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
-{empty} +
+FitBiz is developed by 5 passionate software engineering students who aim to help fitness coaches manage their clients in a dynamic and innovative way.
+
 We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
 
 == Project Team
 
-=== John Doe
-image::damithc.jpg[width="150", align="left"]
-{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
+=== Choo Qi Le Aaron
+image::aaroncql.png[width="200", align="left"]
+{empty}[https://github.com/AaronCQL[GitHub]] [<<aaroncql#, Project Portfolio>>]
 
-Role: Project Advisor
+Role: Team Leader + Developer
 
 '''
 
-=== John Roe
-image::lejolly.jpg[width="150", align="left"]
-{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
+=== Fong Yong Jie
+image::yonggiee.png[width="200", align="left"]
+{empty}[https://github.com/Yonggiee[GitHub]] [<<yonggiee#, Project Portfolio>>]
 
-Role: Team Lead +
-Responsibilities: UI
+Role: Developer
 
 '''
 
-=== Johnny Doe
-image::yijinl.jpg[width="150", align="left"]
-{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
+=== Li Zi Ying
+image::ziyingli.png[width="200", align="left"]
+{empty}[https://github.com/ziyingli[GitHub]] [<<ziyingli#, Project Portfolio>>]
 
-Role: Developer +
-Responsibilities: Data
+Role: Developer
 
 '''
 
-=== Johnny Roe
-image::m133225.jpg[width="150", align="left"]
-{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
+=== Ng Ming Liang
+image::dban1.png[width="200", align="left"]
+{empty}[https://github.com/Dban1[GitHub]] [<<dban1#, Project Portfolio>>]
 
-Role: Developer +
-Responsibilities: Dev Ops + Threading
+Role: Developer
 
 '''
 
-=== Benson Meier
-image::yl_coder.jpg[width="150", align="left"]
-{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
+=== Toh Ker Wei
+image::tohkerwei.png[width="200", align="left"]
+{empty}[https://github.com/tohkerwei[GitHub]] [<<tohkerwei#, Project Portfolio>>]
 
-Role: Developer +
-Responsibilities: UI
+Role: Developer
 
 '''
diff --git a/docs/ContactUs.adoc b/docs/ContactUs.adoc
@@ -2,6 +2,6 @@
 :site-section: ContactUs
 :stylesDir: stylesheets
 
-* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
+* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S2-CS2103T-F11-2/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
 * *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
-* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
+* *Email us* : You can also reach us at `e0310119[at]u.nus.edu.sg`
diff --git a/docs/DevOps.adoc b/docs/DevOps.adoc
@@ -1,4 +1,4 @@
-= AddressBook Level 3 - Dev Ops
+= FitBiz Level 3 - Dev Ops
 :site-section: DeveloperGuide
 :toc:
 :toc-title: