Commit graph

153 commits

Author SHA1 Message Date
c2caecba4a Added more test cases 2018-11-01 21:17:32 -04:00
a9f26d7261 Fixed the order of tests 2018-11-01 21:09:22 -04:00
94e4bb4286 Added JUnit for SignUp 2018-11-01 21:04:55 -04:00
IvanaE
ac45779b27 can no longer edit service name 2018-11-01 20:30:03 -04:00
IvanaE
3fe77feeb5 made it look pretty 2018-11-01 19:51:35 -04:00
IvanaE
e14c3bd0b3 fixed ui elements 2018-11-01 14:42:04 -04:00
IvanaE
e029609918 fixed ui elements 2018-11-01 14:40:25 -04:00
IvanaE
ed6927b7db trying some wild stuff 2018-11-01 12:49:40 -04:00
e18b97a1a9 Updated test files 2018-10-31 13:31:46 -04:00
518f765d8e Added basic JUnit files 2018-10-31 13:24:01 -04:00
Mary Tran
0e7b23ac57 Changing gridview text colour to white 2018-10-31 12:55:15 -04:00
Mary Tran
461c696a59 Increased DB version. Changed User to HomeOwner in existing DBs 2018-10-30 12:24:46 -04:00
IvanaE
f5bc54316a made it pretty 2018-10-30 11:16:56 -04:00
IvanaE
f0b25cb4da accidentally changed to many things 2018-10-30 11:16:06 -04:00
IvanaE
fece5c7758 refactored user to homeowner 2018-10-30 11:08:08 -04:00
IvanaE
fd2cf0fe0d added popups and services 2018-10-28 19:31:34 -04:00
Mary Tran
c4981f60f9 Replacing a relic from the past 2018-10-25 21:24:33 -04:00
Mary Tran
48ac26f804 Added Integration Tests for services table 2018-10-25 16:43:08 -04:00
Mary Tran
4c6b7686af Added new table for services. Not tested yet 2018-10-25 16:14:38 -04:00
IvanaE
2002092458 fixed security of users 2018-10-23 17:16:18 -04:00
Mary Tran
27bc56bc7f Changed ListView to GridView for admin welcome page 2018-10-22 23:09:55 -04:00
IvanaE
5ebf406850 added admin welcome page 2018-10-22 14:48:11 -04:00
Mary Tran
f1dd30d7bb Fixing getAllUsers again 2018-10-22 14:23:01 -04:00
Mary Tran
8e4c7c7a8e Added admin first, and fixed getAllUsers 2018-10-21 21:27:35 -04:00
Mary Tran
6cbf771b82 Add Admin first, always, and fixed getAllUsers 2018-10-21 21:13:11 -04:00
IvanaE
846df76cdb added field validation 2018-10-21 16:34:47 -04:00
IvanaE
b5558cd3a7 fixed welcome page? 2018-10-19 19:04:28 -04:00
IvanaE
6e01dd42a3 Merge branch 'lBranch'
# Conflicts:
#	OlympusServices/.idea/caches/build_file_checksums.ser
#	OlympusServices/.idea/vcs.xml
#	OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
#	OlympusServices/app/src/main/res/layout/activity_main.xml
#	OlympusServices/app/src/main/res/layout/activity_sign_up.xml
#	OlympusServices/build.gradle
2018-10-19 19:02:28 -04:00
Anshu Sharma
6d32b64e90 Logic 2018-10-19 16:45:18 -04:00
IvanaE
fb432776dd added logo 2018-10-18 12:32:21 -04:00
IvanaE
6e41f83316 changed cursor from pink to white - gotta stay on brand 2018-10-18 11:55:18 -04:00
IvanaE
f92a38c954 made password field not visible, pop up text white instead of pink 2018-10-18 11:48:01 -04:00
IvanaE
7b90d4b807 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
# Conflicts:
#	OlympusServices/app/src/main/res/layout/activity_log_in.xml
2018-10-18 11:36:47 -04:00
IvanaE
bd0d8df3fb made layout look good on actual phones 2018-10-18 11:33:05 -04:00
903a599c88 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-10-17 17:53:59 -04:00
d89ef6c758 Changed UML 2018-10-17 17:53:33 -04:00
IvanaE
633bfc8fe4 gave credit to style repos, removed admin option from sign up drop down 2018-10-15 10:36:54 -04:00
12c3091a54 Fixed UML Diagram 2018-10-14 00:05:55 -04:00
3baeb2b679 Fixed UML Diagram 2018-10-14 00:02:58 -04:00
IvanaE
13de8619d9 fixed merge conflict, when you pull check the right dependency is in your build.gradle file 2018-10-10 13:44:55 -04:00
Mary Tran
96ca7c8490 Changed some unit test usernames to randomized string 2018-10-08 18:16:08 -04:00
Mary Tran
a45341d30d Added docs and ability to get a list of all users from database 2018-10-08 18:00:21 -04:00
Mary Tran
5587abae8b Running unit tests with Robolectric instead of starting up emulator every time 2018-10-08 16:25:15 -04:00
Mary Tran
0762919f74 Added DBHelper for database access and DBTest. Added constructors, setters, and getters to UserType classes 2018-10-08 11:48:58 -04:00
IvanaE
c873aee013 another text fix 2018-10-05 12:45:50 -04:00
IvanaE
32f3656803 fixed text 2018-10-05 12:45:07 -04:00
IvanaE
d68e3a6384 added borders 2018-10-05 12:38:13 -04:00
IvanaE
cd4c3e1e3f added appointment class and finished ui 2018-10-05 12:35:05 -04:00
IvanaE
6edf86c40a created class files for UserType, User, ServiceProvider, Admin, Service 2018-10-05 11:57:32 -04:00
IvanaE
6bc415d57d fixed text colour 2018-10-04 14:14:59 -04:00
IvanaE
036c03f07e added all pages, using premade components 2018-10-04 13:23:53 -04:00
IvanaE
5a97ad2ec8 added sign up page, still working on drop down menu 2018-09-28 18:09:05 -04:00
IvanaE
5663255788 Added android project 2018-09-28 15:39:43 -04:00