sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
497 Commits 4 Branches 6 Tags
26693e8782f47504836d226bc2cab659f1a52219
Commit Graph

120 Commits

Author SHA1 Message Date
cugurlu
e78be7ac9f Add co2 saved property tables and tests 2019-04-01 13:59:54 +02:00
Mika Wauben
644f466696 Merge branch 'fix/checkstyle' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into fix/checkstyle 2019-04-01 11:38:23 +00:00
Sem van der Hoeven
d824a3b819 EDIT::changed activities textfields to labels 2019-03-31 19:28:29 +02:00
cugurlu
f4f79484fa Test all new methods 2019-03-31 15:27:07 +02:00
cugurlu
3b4add03ee Add new activity page properties 2019-03-31 15:26:48 +02:00
cugurlu
32c9713835 Add acitivitySummary to GUI 2019-03-31 15:26:06 +02:00
cugurlu
8e11ecbcf4 Add new methods for getInputMap from database 2019-03-31 15:25:40 +02:00
Sem van der Hoeven
c03538ff34 ADD::added section indicator bars to calculator 
Somehow they were deleted, so I added them again. Also added to the extra section
 2019-03-31 14:41:19 +02:00
Sem van der Hoeven
7805122c06 ADD::added 'extra' section to calculator 
added checkboxes to add extra activities
 2019-03-31 14:26:05 +02:00
Ceren Ugurlu
61ed9fc497 Merge branch 'fixBugs_addLeaderboard' into 'master' 
Fix bugs & add leaderboard

See merge request cse1105/2018-2019/oopp-group-43/template!50
 2019-03-31 11:07:47 +00:00
Sem van der Hoeven
85412af2a6 ADD::added style to friends table 2019-03-31 12:41:45 +02:00
cugurlu
cc236c46b6 Add tests for userService 2019-03-31 00:49:16 +01:00
cugurlu
ed695f941d Add leaderboard and fix friend bugs 2019-03-31 00:47:21 +01:00
cugurlu
a41b697510 Fix calculator bugs 2019-03-31 00:45:50 +01:00
Sem van der Hoeven
ebaeff9fad EDIT::changed colour scheme of 'add friend' button 2019-03-30 19:29:49 +01:00
Ceren Ugurlu
1437bbc1bc Merge branch 'connect_friends_GUI' into 'master' 
Edit GUI for friend property

See merge request cse1105/2018-2019/oopp-group-43/template!49
 2019-03-30 10:58:18 +00:00
Sem van der Hoeven
0b2677fd06 ADD:added section indicators to calculator 
Merge branch 'master' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template

# Conflicts:
#	src/Client/src/main/resources/fxml/calculator.fxml
 2019-03-30 11:18:50 +01:00
Sem van der Hoeven
336e56bb51 ADD:: added section indicator bars to calculator 2019-03-30 11:17:12 +01:00
Ceren Ugurlu
026cd15009 Update DashBoardController.java 2019-03-30 09:36:41 +00:00
cugurlu
a64b31001a Edit dashboard for new properties 2019-03-29 18:11:39 +01:00
cugurlu
704854e8b5 Add new controller friends 2019-03-29 18:11:16 +01:00
cugurlu
25c8951530 Add fxml file for add friend page 2019-03-29 18:10:55 +01:00
cugurlu
e41f434a28 Add new class for tableView 2019-03-29 18:10:01 +01:00
cugurlu
0530fc4ddb Add new icons 2019-03-29 18:09:31 +01:00
cugurlu
d0beb236ea Edit to connect calculator with GUI 2019-03-29 12:47:24 +01:00
Sem van der Hoeven
56bd05324c Merge branch 'finish_calculator_GUI' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into finish_calculator_GUI 
Sourcetree needed to merge this?
 2019-03-28 22:35:54 +01:00
Sem van der Hoeven
fcea76f0e9 FIX::fixed checkstyle import error 2019-03-28 22:34:54 +01:00
Sem van der Hoeven
6fd04b1d0a EDiT:: resolved merge conflicts, most were just empty lines in master 
Merge branch 'master' into 'finish_calculator_GUI'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/CalculatorController.java
#   src/Client/src/main/resources/fxml/calculator.fxml
 2019-03-28 19:44:01 +00:00
Sem van der Hoeven
6ab7141f64 ADD::finished GUI for calculator 
now only need to add animations
 2019-03-28 14:09:36 +01:00
Sem van der Hoeven
980e64657a EDIT::finished home section of calculator 2019-03-27 20:51:14 +01:00
cugurlu
20c37c4899 Add tests for footprint 2019-03-27 13:41:32 +01:00
cugurlu
07f5eb0449 Add methods for calculator and fix checktsyle errors 2019-03-27 13:40:52 +01:00
Sem van der Hoeven
3dec44ada1 EDIT::Finished Travel GUI section of calculator 2019-03-27 13:10:21 +01:00
Sem van der Hoeven
1d10d1d54b ADD::almost completed travel pane of calculator 2019-03-27 09:44:34 +01:00
Merel Steenbergen
2abad808ad FIX: Checkstyle fixes after merge conflicts 2019-03-26 16:01:53 +01:00
Merel Steenbergen
a540b9e8f2 Resolve merge requests 2019-03-26 15:50:11 +01:00
mlwauben
08d46ea8f0 DELETE:: not used imports 2019-03-26 15:48:51 +01:00
mlwauben
e755107fa8 FIX:: checkstyle fixes 2019-03-26 15:48:50 +01:00
mlwauben
37d3e6c4a7 FIX:: checkstyle 'client' 2019-03-26 15:40:43 +01:00
mlwauben
81f58c86f9 FIX:: checkstyle 'client' tests 2019-03-26 15:39:15 +01:00
mlwauben
97a0e38c40 FIX:: application classes server+client 2019-03-26 15:34:50 +01:00
Merel Steenbergen
470a31889a Resolved the conflicts. We should check if the JavaDoc is still in the right place, because it looked a little weird while resolving the conflicts 
Merge branch 'master' into 'fix/checkstyleAndComments'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Server/src/main/java/greenify/server/data/model/User.java
#   src/Server/src/main/java/greenify/server/service/UserService.java
#   src/Server/src/test/java/greenify/server/data/model/UserTest.java
#   src/Server/src/test/java/greenify/server/service/UserServiceTest.java
 2019-03-26 14:33:05 +00:00
Merel Steenbergen
90bf334c19 Merge branch 'AddFriends' into 'master' 
Add methods and tests for friends.

See merge request cse1105/2018-2019/oopp-group-43/template!43
 2019-03-26 14:29:14 +00:00
mlwauben
c6ff4862e6 DELETE:: not used imports 2019-03-26 15:21:23 +01:00
Sem van der Hoeven
bc6e8cd89d Merge branch 'master' into 'Add_Calculator_to_GUI' 
# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Client/src/main/resources/fxml/dashboard.fxml

the conflicts were only empty lines on the master
 2019-03-26 14:04:49 +00:00
Merel Steenbergen
b1f3725f71 Change wrong url (setInput to addFriend) on Client userService 2019-03-26 13:52:13 +00:00
mlwauben
cf96ac30b8 FIX:: checkstyle fixes 2019-03-26 11:55:05 +01:00
Merel Steenbergen
4171b933dc FIX: Spelling error 2019-03-26 11:40:24 +01:00
mlwauben
8677ac94ef FIX:: checkstyle 'client' 2019-03-26 11:34:53 +01:00
mlwauben
bd21e30f26 FIX:: checkstyle 'client' tests 2019-03-26 11:00:24 +01:00