Commit Graph

178 Commits

Author SHA1 Message Date
Sem van der Hoeven
29229e457c Revert "Revert "MERGE::Merge branch 'fix_gradle_build_file'""
This reverts commit 7af5470a8e.
2019-03-11 16:03:00 +01:00
Sem van der Hoeven
7af5470a8e Revert "MERGE::Merge branch 'fix_gradle_build_file'"
This reverts commit 309337f26d, reversing
changes made to d902c7401d.
2019-03-11 15:59:38 +01:00
Sem van der Hoeven
309337f26d MERGE::Merge branch 'fix_gradle_build_file'
# Conflicts:
#	src/GoGreen/Client/src/test/java/UserServiceTest.java
resolved using 'Theirs'
2019-03-11 15:48:58 +01:00
Merel Steenbergen
d902c7401d Add score for vegetarian meal.md 2019-03-11 14:40:55 +00:00
Sem van der Hoeven
cd7f5b390b ADD::added titles to the pages from the GUI
the different pages now have titles indicating on what page you are, and switching between pages works now
2019-03-11 15:40:16 +01:00
Merel Steenbergen
bbc7794e6b Add chair and secretary.md 2019-03-11 14:06:56 +00:00
Merel Steenbergen
d8b51922ac Update 20190311_agenda.md 2019-03-11 14:05:00 +00:00
Merel Steenbergen
6d0bcaeb5c Update 20190311_agenda.md 2019-03-11 14:04:26 +00:00
Merel Steenbergen
c35d5d76bc Delete 03112019_Agenda 2019-03-11 14:03:26 +00:00
Merel Steenbergen
cfa7717bea Update agenda_03112019 2019-03-11 14:02:52 +00:00
Merel Steenbergen
909f9a6dd1 Add new file 2019-03-11 14:02:17 +00:00
Sem van der Hoeven
6df15465e7 Merge branch 'changeDoc' into 'master'
Add some CO2 emmission scores and good sources to find information to score schema

See merge request cse1105/2018-2019/oopp-group-43/template!11
2019-03-11 13:52:35 +00:00
Daan Sneep
c5c34e17dc Checkstyle screenshot uploaded 2019-03-11 13:46:39 +00:00
Sem van der Hoeven
a231b7374d ADD::tried to add application plugin to build.gradle 2019-03-11 14:42:06 +01:00
Merel Steenbergen
b4c3f3644a Add some CO2 emmission scores and good sources to find information 2019-03-11 13:40:11 +00:00
Mika Wauben
c0fdb466d5 Merge branch 'changeDoc' into 'master'
Change doc

See merge request cse1105/2018-2019/oopp-group-43/template!10
2019-03-11 13:37:18 +00:00
Merel Steenbergen
dff3cffb00 Merge branch 'addBacklogSprint2' into 'master'
Add backlog sprint2

See merge request cse1105/2018-2019/oopp-group-43/template!9
2019-03-11 13:36:39 +00:00
Mika Wauben
60907b30f7 Add backlog sprint3 2019-03-11 13:21:43 +00:00
Mika Wauben
dc5534ae34 Add retrospective sprint2 2019-03-11 13:12:50 +00:00
Mika Wauben
2a0210326e Add new directory 2019-03-11 13:06:13 +00:00
Sem van der Hoeven
aabe922f8f ADD:: Added dashboard
added controller class and functionality to switch between sections
2019-03-11 14:05:26 +01:00
cugurlu
c15ba030bf Fix client test 2019-03-11 11:50:27 +01:00
cugurlu
3681daa6f4 Add coverage report 2019-03-11 11:41:11 +01:00
Merel Steenbergen
e6e3544bb7 Merge branch 'changeDoc' into 'master'
Change doc

See merge request cse1105/2018-2019/oopp-group-43/template!8
2019-03-10 20:46:54 +00:00
Mika Wauben
688d2ef847 Add scrum board sprint2 2019-03-10 07:12:46 +00:00
Mika Wauben
a6e1a70448 Replace backlog_sprint2.pdf 2019-03-10 07:07:52 +00:00
Mika Wauben
987997bfb3 Add scrum board sprint1 2019-03-10 07:06:58 +00:00
Mika Wauben
bcc3295ac8 Merge branch 'ConvertToPDF' into 'master'
MERGE: PDF files instead of excel.

See merge request cse1105/2018-2019/oopp-group-43/template!7
v0.1.0 v1.0
2019-03-10 07:02:08 +00:00
Sem van der Hoeven
2e1becbe32 REMOVE::removed settings.gradle file in src folder
this messed with the paths for the main settings.gradle file
2019-03-09 14:12:44 +01:00
Sem van der Hoeven
803b0c2064 EDIT:: edited gitignore file to include the .gradle and .idea directories, and to include the classpath and project files.
maybe this fixes the pipline build failure
2019-03-09 13:40:19 +01:00
Sem van der Hoeven
fa73f6fb4d EDIT:: Reimported project
reimported project to fix the errors in client application

FIX:: fixed the "location is not set" error in client application when loading fxml file

reimporting the project made it work, as it now has a submodule folder structure

EDIT:: edited settings.gradle file to include the modules in the new structure

EDIT: edited client build.gradle and server build.gradle files to pick the right common folder
(changed complie(:Common) to compile(:src:Common))
2019-03-09 13:33:15 +01:00
Merel Steenbergen
722205a24c EDIT: Convert sprint backlog en review to pdf 2019-03-08 19:26:54 +01:00
Sem van der Hoeven
cab6d9aeeb FIX:: fixed Client application class
The class was not seeing some imports from the same package, and some getters and setters for User.java were not written, so I wrote those and fixed the imports

FIX:: fixed packages

Everything now isn't in several subpackages in the Client, Common and Server package anymore, but straight in their respectable packages. Also fixed the package names

BUG FIX: fixed Client Application class not being able to see GetBean method

Don't really know how it got fixed, but resolving the import issues also fixed this bug.

EDIT::changed main class in build.gradle file to Client.Application

---------------
I now only get a bug where the fxmlloader can't see the fxml files, and thus I can't start the application. I get the error message "location not set" although I used fxmlloader.setLocation.
2019-03-07 20:46:51 +01:00
Sem van der Hoeven
aa79365784 apparently the changes that were supposed to be made weren't committed in my previous commit, so here is the right one
REMOVE:: removed the .gradle and build folders from the Client, Server and Common folders, also moved the contents that was in the src folders of these folders, to the folders themselves and deleted the src folders

EDIT:: edited the build.gradle file, build should now work

combined the build.gradle files in the Client, Server and Common folders into the build.gradle file in the root
2019-03-06 21:22:29 +01:00
Sem van der Hoeven
7a60ecb60f REMOVE:: removed the .gradle and build folders from the Client, Server and Common folders, also moved the contents that was in the src folders of these folders, to the folders themselves and deleted the src folders
EDIT:: edited the build.gradle file, build should now work

combined the build.gradle files in the Client, Server and Common folders into the build.gradle file in the root

Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into fix_gradle_build_file
2019-03-06 21:20:09 +01:00
Sem van der Hoeven
7b1dc88653 REMOVE:: removed the .idea and .gradle files from the GoGreen subfolders
REMOVE:: removed the Client and Server folders from the src folder

they were no longer necessary since everything now is in the GoGreen folder

EDIT:: edited .gitignore file

.gitignore file should now exclude the .idea and .gradle directories

FIX:: fixed the gradle build file.

had to set the main class, for testing purposes I set the GUI.logincontroller class as main class, but this will change
2019-03-06 16:07:26 +01:00
Sem van der Hoeven
7bdd47ba90 ADD::added .gitlab-ci.yml
added because it was deleted with merge of branch 'cleanUpRepository', but we need it for the ci
2019-03-06 14:06:08 +00:00
Sem van der Hoeven
8b94c80ca0 Merge branch 'cleanUpRepository'
# Conflicts:
#	src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock
#	src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties

Conflicts resolved using 'Theirs'
2019-03-06 15:01:11 +01:00
Sem van der Hoeven
5b802068ab MOVE::moved GoGreen folder into src folder
because all our code is in the src folder, the gogreen folder should be here too
2019-03-06 14:53:22 +01:00
Mika Wauben
5b802ea980 Replace backlog_sprint2.pdf 2019-03-06 11:22:08 +00:00
Mika Wauben
fc3b750348 Replace backlog_sprint2 2019-03-06 11:17:50 +00:00
Mika Wauben
584a373284 Delete backlog_sprint2.xlsx 2019-03-06 11:17:28 +00:00
Mika Wauben
0b244ebc00 Replace backlog_sprint2.xlsx 2019-03-06 11:16:08 +00:00
Merel Steenbergen
3b180893c7 Update doc_meetings_20190311_agenda.md 2019-03-06 11:08:21 +00:00
Merel Steenbergen
9e3128d4a0 Update doc_meetings_20190311_agenda.md 2019-03-06 10:55:03 +00:00
Merel Steenbergen
85ddd2b787 Update doc_meetings_20190311_agenda.md 2019-03-06 10:54:43 +00:00
Merel Steenbergen
5c63e701e8 Upload agenda 11-03-2019 2019-03-06 10:53:29 +00:00
Merel Steenbergen
36a7faf052 Delete docx file, md file is sufficient 2019-03-06 11:37:28 +01:00
Merel Steenbergen
c741e07a79 Merge branch 'Delete_OOPPbeginnging_directory' into 'master'
Delete directory and add notes

See merge request cse1105/2018-2019/oopp-group-43/template!6
2019-03-06 10:24:10 +00:00
Merel Steenbergen
91cc14f1b0 Merge branch 'Delete_OOPPbeginnging_directory' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into Delete_OOPPbeginnging_directory 2019-03-06 11:19:42 +01:00