Commit graph

202 commits

Author SHA1 Message Date
IvanaE
8cd1ea33d8 fixed it 2018-11-18 13:39:25 -05:00
IvanaE
86b189aeb9 added rating 2018-11-18 13:38:43 -05:00
IvanaE
d15af93180 added new activities, started find service provider 2018-11-18 13:26:50 -05:00
IvanaE
af48d1b905 updated booking class 2018-11-18 11:57:00 -05:00
IvanaE
2f7d8feec3 added booking class 2018-11-18 11:48:03 -05:00
IvanaE
1ba91f5cde added comments to edit profile and services list 2018-11-17 14:34:36 -05:00
IvanaE
18216adfae finished adding description 2018-11-17 14:29:46 -05:00
IvanaE
5d33269b15 secondary constructor 2018-11-16 16:06:32 -05:00
IvanaE
60c1329bcd what about now 2018-11-16 15:56:09 -05:00
IvanaE
04c895262e what about now 2018-11-16 15:53:03 -05:00
IvanaE
cb06782c04 fixed bad constructor 2018-11-16 15:50:56 -05:00
Mary Tran
d83ae6bb69 Fixed a typo 2018-11-16 15:37:31 -05:00
Mary Tran
2ddcb21f9c Added description field to database and fixed some tests with old ServiceProvider constructor 2018-11-16 15:33:54 -05:00
05affa6903 Added UML and Test file fixes, added string description to the DBHelper and SignUp. Further fixes needed 2018-11-16 14:48:27 -05:00
17b07d2d2c Added UML and Test file fixes, added string description to the DBHelper and SignUp. Further fixes needed 2018-11-16 14:48:02 -05:00
e08f9464d1 Added UML and Test file fixes, added string description to the DBHelper and SignUp. Further fixes needed 2018-11-16 14:47:26 -05:00
IvanaE
daf7e4133a added general description to front end 2018-11-16 14:37:35 -05:00
617b75b997 Added comments 2018-11-16 12:31:19 -05:00
22d678be9e Added comments 2018-11-16 12:30:21 -05:00
Anshu Sharma
d7a2efd5ef Comments for Availability class. 2018-11-16 12:24:13 -05:00
Anshu Sharma
d81799f038 commit changes 2018-11-16 12:10:19 -05:00
Anshu Sharma
19d9956392 changes 2018-11-16 12:08:25 -05:00
IvanaE
6b1ef72f49 fixed availibilities ui 2018-11-16 12:02:27 -05:00
FunwithaPorpoise
4c2c67be68 Merge pull request #17 from ebivibe/DBBranch
Fixed 0 start time bug
2018-11-15 15:19:48 -05:00
Mary Tran
858907d2de Added a few tests and made deleting a Provider delete all relevant rows in all tables 2018-11-15 15:17:07 -05:00
Mary Tran
6a2944adce Fixed 0 start time bug 2018-11-15 12:32:37 -05:00
Anshu Sharma
f640904da7 Added toasts 2018-11-15 11:53:32 -05:00
Anshu Sharma
08a88bd2ac working set time. 2018-11-15 10:56:06 -05:00
Anshu Sharma
d0719293f9 comment explaining setTime 2018-11-15 07:33:08 -05:00
Anshu Sharma
6276160f94 Service Provider Availabilities 2018-11-15 07:26:46 -05:00
Anshu Sharma
57fdeae53a check 2018-11-14 21:21:27 -05:00
IvanaE
b7cc459862 fixed spinner i think? 2018-11-14 20:38:39 -05:00
IvanaE
6f88a7bc71 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
# Conflicts:
#	OlympusServices/.idea/caches/build_file_checksums.ser
2018-11-14 14:15:06 -05:00
IvanaE
ac5b0fc972 fixed small errors 2018-11-14 14:14:22 -05:00
cc2e0566df Finished the test files 2018-11-14 13:59:26 -05:00
fd9888fcdc Added 2 Test Cases 2018-11-14 12:45:59 -05:00
6495b19d9e merging with master 2018-11-14 12:34:44 -05:00
3470b334ca Updated the branch 2018-11-14 12:26:28 -05:00
IvanaE
1cc89a1cb7 layout fixes 2018-11-13 22:29:17 -05:00
IvanaE
b250363f49 fixed availability time formating 2018-11-13 22:20:01 -05:00
IvanaE
8408aed8f6 actually fixed license this time 2018-11-13 22:14:51 -05:00
IvanaE
65c906b1f9 fixed sort of 2018-11-13 22:11:19 -05:00
IvanaE
06310f1b90 fixed services page 2018-11-13 21:54:44 -05:00
725bf4dbd4 Fixed UML 2018-11-13 16:07:24 -05:00
IvanaE
8750d55198 fixes still needed 2018-11-13 15:17:41 -05:00
IvanaE
995142d117 finished edit profile? 2018-11-13 14:21:45 -05:00
IvanaE
d3550b9ea8 think i got them all 2018-11-13 14:00:01 -05:00
IvanaE
7594bc45fc pls work 2018-11-13 13:57:03 -05:00
IvanaE
8ce3d9e512 one more go 2018-11-13 13:53:55 -05:00
IvanaE
a422c6fc3d how about now? 2018-11-13 13:49:26 -05:00
IvanaE
3e555f0b41 broken code will be fixed soon :( 2018-11-13 13:40:14 -05:00
18715dc5fb Updated UML Diagram 2018-11-12 17:26:29 -05:00
FunwithaPorpoise
c6f089c951 Merge pull request #16 from ebivibe/DBBranch
Updated DBHelper for Deliverable 3
2018-11-11 23:27:18 -05:00
Mary Tran
7db152a0a8 Fixed HomeOwner to ServiceProvider 2018-11-11 23:25:07 -05:00
Mary Tran
91476b3ddc Updated DBHelper for Deliverable 3 2018-11-11 22:55:47 -05:00
IvanaE
9ae4458e98 added latest updates 2018-11-11 18:35:17 -05:00
IvanaE
fbc434c60b deliverable 3 ui, methods to be filled in 2018-11-11 15:52:55 -05:00
Anshu Sharma
c2d372d3e5 changes 2018-11-11 12:15:02 -05:00
Anshu Sharma
8dfa481448 Comment ' 2018-11-11 11:59:46 -05:00
20e5eb8d17 Updated UML Diagram 2018-11-11 11:47:23 -05:00
Anshu Sharma
cac2532c5a Fixed constructor 2018-11-11 11:40:03 -05:00
Anshu Sharma
8bdca52a6d Availabilities 2018-11-11 11:37:05 -05:00
IvanaE
5e3a37d0e8 final ui changes 2018-11-09 23:32:40 -05:00
IvanaE
0a49bb14d4 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-11-09 17:36:11 -05:00
IvanaE
56c816b10a made ui look pretty 2018-11-09 17:35:48 -05:00
Anshu Sharma
926ffa89b2 fix conflict 2018-11-09 11:53:12 -05:00
Anshu Sharma
970c3422f4 comments for project. 2018-11-09 11:48:05 -05:00
IvanaE
21359e5aaf fixed password length 2018-11-08 11:43:43 -05:00
IvanaE
e37019dd41 added service exists verification 2018-11-07 14:16:54 -05:00
IvanaE
d984df34ae Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-11-07 13:50:58 -05:00
IvanaE
46ffe2b2e5 added field checking, fixed some errors 2018-11-07 13:50:10 -05:00
57429abb8e Added comments to test files 2018-11-07 13:47:06 -05:00
ce0ead94e0 Testing 2018-11-07 13:28:41 -05:00
IvanaE
c5f5157ef1 file wasn't stages 2018-11-07 11:39:37 -05:00
IvanaE
b8ea57317e Merge branch 'lBranch'
# Conflicts:
#	OlympusServices/.idea/caches/build_file_checksums.ser
#	OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java
#	OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java
2018-11-07 11:39:08 -05:00
IvanaE
0445964fbb chaoe ensuing 2018-11-07 11:28:54 -05:00
Anshu Sharma
b31edbb3df whatever 2018-11-07 11:26:51 -05:00
Batuhan Basoglu
135c8346ce testing 123 2018-11-03 22:54:32 -04:00
IvanaE
f1fdbe843b removed USELESS file 2018-11-02 19:07:36 -04:00
IvanaE
c4099b64ba no message 2018-11-02 18:57:00 -04:00
IvanaE
da6a01b935 fixed indenting 2018-11-02 18:50:00 -04:00
IvanaE
64924b16c9 already so done with circle ci 2018-11-02 18:49:26 -04:00
IvanaE
9d63942fd5 trying changing path 2018-11-02 18:41:07 -04:00
IvanaE
8d570d4470 one more time 2018-11-02 18:39:32 -04:00
IvanaE
1822ad1818 added circle ci config 2018-11-02 18:32:44 -04:00
IvanaE
e787613704 fixed table alignment 2018-11-02 18:14:32 -04:00
03558823e9 Merged JUnit with Master 2018-11-02 11:40:15 -04:00
36b09aa724 made some fix 2018-11-02 00:19:46 -04:00
3f8d9e9853 added all test files 2018-11-02 00:18:07 -04:00
e9ee14542c made 3 test cases for each class 2018-11-01 23:17:34 -04:00
ac00abfa53 Fixed test files 2018-11-01 21:29:48 -04:00
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