Merge branch 'update/doc' into 'master'

Update/doc

See merge request cse1105/2018-2019/oopp-group-43/template!54

README.md

@@ -1,7 +1,47 @@
-# Merel Steenbergen (masteenbergen) 
+# Greenify
+The easiest way to save CO2 and help the environment! Enter your activities and find out your carbon footprint.
+
+## Getting started 
+You can install greenify with gradle, if you already have gradle on your machine, run: 
+
+```
+gradle install something tralala
+```
+
+Do you not have gradle on your machine, run:
+
+```
+./gradlew install something tralala
+```
+
+With the following you can start the application
+
+```
+gradle greenify bootrun
+```
+
+or without gradle on your device:
+
+```
+./gradlew greenify bootrun
+```
+
+## Running the tests
+The tests cover all non-GUI code:
+
+```
+gradle check
+```
+
+## Licence
+GNU General Public License v3.0
+
+## Contributors
+
+### Merel Steenbergen (masteenbergen) 
 <img src="https://user-images.githubusercontent.com/47633984/55274602-13cc1200-52da-11e9-9bd7-686d84929b83.jpg" width="100"/>
 
-## Personal Development Plan
+#### Personal Development Plan
 
 My strong points:
 1.	I’m a natural leader. I like to know how everyone is doing, if 
@@ -14,34 +54,34 @@ What are two of your weaker points?
 
 <img src="https://user-images.githubusercontent.com/47633984/55274622-2d6d5980-52da-11e9-8be0-ac1ef545f7d9.png" width="700"/>
 
-### G - Goal
+##### G - Goal
 I want to improve on letting other people handle things that I actually want to do myself. I also want to improve my programming and am aiming to not make it a competition, but to really make it a group project. This is important, because you almost never work alone in software developing, which is what I want to do after the studies. 
     
-### R - Reality (Your current situation)
+##### R - Reality (Your current situation)
 I’ve already been working on my teamwork skills since high school. I had a subject that had only projects. I’ve also worked with Scrum before, which really helps you focus on your development without letting your project out of sight. I’m better at working together and listening to tips than I was before. 
 
-### O - Options (Look at possible options)
+##### O - Options (Look at possible options)
 Actively watching myself and letting my teammates know that they need to be clear with me if they don’t like something I say or do are the best ways for me to improve. I would rather improve by myself, but for my goals it is better to let my team guide me. It’s about teamwork after all.
 
-### W - Will (Motivation, plan of action)
+##### W - Will (Motivation, plan of action)
 I’m just going to keep working on myself and hope my teammates will work with me. It also helps to work in different teams to get a much more diverse experience. Every team is different, so I’m just going to wait what this team will bring me and how I will have to adjust myself to make the team efficient. 
 
-# Sem van der Hoeven (4896726, semvanderhoeve)
+### Sem van der Hoeven (4896726, semvanderhoeve)
 <img src="https://user-images.githubusercontent.com/47633984/55274658-d6b44f80-52da-11e9-9404-a4ae9a210b72.jpg" width="100"/>
 
-## Personal development plan
+#### Personal development plan
 <img src="https://user-images.githubusercontent.com/47633984/55274673-0a8f7500-52db-11e9-8d83-e1acbf22aeed.png" width="700"/>
 
-### G - Goal
+##### G - Goal
 My goal with this project is most of all to be able to efficiently work with a group of people. This is important to me because  I have not worked on a (development) project with a (big) group of people before. I believe I have succeeded in this goal when our project is finished and we have got a passing grade.
 
-### R - Reality
+##### R - Reality
 With this project I am already setting the first step towards reaching my goal, as we have already started working as a group. 
 
-### O - Options
+##### O - Options
 The options I have to reach my goal are basically this project, as this is the only big project we will be doing as a team in this year. I want to obviously try to learn as much as I can during this project, especially abour working in a group. The only thing I think would be stopping this is if members of the group had different opinions on how things should be done. but so far everyone is on the same track :D.
 
-### W - Will
+##### W - Will
 I am going to try my hardest to follow the rules we have set up, and to deliver everything I am supposed to. I will try to do this everytime I get the chance to do so. Right now the first step I can take is to work on this personal development plan, so that I already have my part of what we needed to do finished. My teammates can help me achieve this goal by helping if I have questions or don't understand something/am getting stuck with something.
 action plan:
 ⋅⋅* finish my part of the readme that we have to finish 
@@ -49,10 +89,10 @@ action plan:
 ⋅⋅* don't be hesitant on asking people for help
 ⋅⋅* deliver things I need to do on time
 
-# Ceren Ugurlu (4851609, cugurlu)
+### Ceren Ugurlu (4851609, cugurlu)
 <img src="https://user-images.githubusercontent.com/47633984/55274734-10398a80-52dc-11e9-9fce-5059ac2b3f3b.jpeg" width="100"/>
 
-## Personal Development Plan:
+#### Personal Development Plan:
 <img src="https://user-images.githubusercontent.com/47633984/55274694-4296b800-52db-11e9-9cee-b8d1d5c58e6f.png" width="700"/>
 
 My strong points:
@@ -63,7 +103,7 @@ My strong points:
 My weaker points:
 - Sometimes I can be a stressed and anxious person. If we have a difficulty about time management etc. I can get stressed. But if we work efficiently as a team, I do not think this is going to be a problem
 
-### G – Goal
+##### G – Goal
 My goals in this project:
 - Developing my Java skills
 - Learning how to work effectively as a team
@@ -71,13 +111,13 @@ My goals in this project:
 
 I am aiming to successfully finish the parts that belong to me in our project. To achieve this, I should develop my Java skills. I want to contribute to my group and to learn new things from my teammates. When we finish our project, I will be achieved my goal.
 
-### R – Reality
+##### R – Reality
 This is my first team project. I have never experienced this before. I have done some similar programs in different languages but this is the first one in Java. This is both exciting and hard. There are many things I need to do but I like to study and develop myself. 
 
-### O – Options
+##### O – Options
 There are two options to achieve and not to achieve but I do not want to count the second one as an option because we are a team. And teamwork means that many different perspectives and a lot of human power. Therefore, I can say that there is not any reason for an unsuccessful result. If it happens, it is also not a problem. It shows that I need to develop myself. I would try to learn new things from my mistakes.
 
-### W – Will
+##### W – Will
 I will try to do my best to be successful in our project and I am going to start right now for this. The first step I can take is creating a plan with my group mates and to start our project according to this plan.
 
 Action Plan:
@@ -87,10 +127,10 @@ Action Plan:
 - Starting to code (informing each other about the steps we have took)
 - While everyone is working on their part, to inform each other about the progress is very important because some parts can be connected. When two people's parts are connected they should act according to that otherwise it can lead problems or a non-compiling code)
 
-# Mika Wauben (4834739, mlwauben)
+### Mika Wauben (4834739, mlwauben)
 <img src="https://user-images.githubusercontent.com/47633984/55274742-29423b80-52dc-11e9-804d-69feec6d28e0.jpg" width="100"/>
 
-## Personal Development Plan
+#### Personal Development Plan
 <img src="https://user-images.githubusercontent.com/47633984/55274719-c18bf080-52db-11e9-9d3f-018ba68dd1f0.jpg" width="700"/>
 
  My strong points:
@@ -101,14 +141,14 @@ Action Plan:
  1. I like to do things alone. I rather figure something out myself instead of asking for help, even if this takes way too long.
  2. I tend to stay quiet if I'm not absolutely sure my contribution is right or useful. 
 
-### G - Goal
+##### G - Goal
 My goal during this course is getting more experienced in working with things like github, libraries, scrumboard, etc. and asking for help if I need it, since being stuck on something isn’t going to help my groupmates.
     
-### R - Reality
+##### R - Reality
 Every minute that we’re working on the project, I’m also actively working on my goal. 
 
-### O - Options
+##### O - Options
 By working on the project with the chosen programs, I’ll get more experienced in using them. Using those programs for other projects as well will only improve my knowledge. By being active in the groupchat and during the meetings, asking stuff will be easier. 
 
-### W - Will
+##### W - Will
 I will reach my goal by working actively together with my teammates using lots of the useful programs given.    

doc/meetings/week8/20190401_agenda.md

@@ -0,0 +1,47 @@
+# Meeting 7
+
+## Opening
+> Check if everyone is present:
+- ~~Nivard Jansen~~
+- ~~Kristin Peneva~~
+- ~~Daan Sneep~~
+- [x] Merel SteenBergen
+- [x] Ceren Ugurlu
+- [x] Mika Wauben
+- [x] Sem van der Hoeven
+
+- Chair: Mika Wauben
+- Secretary: Ceren Ugurlu
+
+## Points of action
+
+ - First of all, discuss problems we have faced and if somebody is halted because of a problem
+    - if so, try to work out the problem
+    
+### pre/during meeting
+ - Discuss what we did last week (see scrumboard)
+ - Does anyone have blocking issues?
+ - Gitlab    
+ - CI
+ - Coverage reports
+ - Checkstyle reports
+ - Show demo 3 to the TA
+ - Discuss about the presentation
+ - Discuss about final things that need to be done
+
+### post meeting
+ - Focus on the presentation
+ - Focus on the final report
+ - Focus on things we get points for according to the rubric
+
+## Any other business
+> If anybody has something that should be discussed but came up with that after the agenda was finalized, he/she should bring that up now so that it can be discussed after all.
+
+## Question round
+- Questions for the TA
+    - questions that were already present
+		- Ask about custom CI (do we have it already?)
+    - questions that rose during the meeting
+
+## Closing
+> We're almost finished!

doc/reports/sprint-reviews/20190401_sprint_review.md

@@ -0,0 +1,14 @@
+
+# Sprint Review
+
+## Main problems  Encountered
+
+### Problem 1: We had some bugs
+because of some bugs in the server, things did not work as intended. Ceren fixed it.
+
+## Adjustments from previous sprints
+Write all we still need to do down, even if the things are not necessarily assigned to a specific person yet.
+
+## Adjustments for next sprint
+ - Write down all other necessary tasks.
+