Commit graph

219 commits

Author SHA1 Message Date
IvanaE
a5a25902d1 added comment to ui 2018-11-28 13:11:37 -05:00
IvanaE
5faed3fd4a new ui for del 4 2018-11-26 21:09:54 -05:00
IvanaE
9fabb41d83 Merge branch 'DBBranch' 2018-11-25 15:20:41 -05:00
8ec11d9fd5 Added the test files for final deliverable 2018-11-24 20:24:42 -05:00
Mary Tran
fc0e17658a Added a small clarification thing 2018-11-24 15:17:40 -05:00
Mary Tran
874df37f72 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch 2018-11-24 14:57:22 -05:00
Mary Tran
c49c2ca8d8 Changed fetch service providers to include first and last name 2018-11-24 14:23:17 -05:00
IvanaE
bb23d12201 combined booking classes 2018-11-23 14:51:40 -05:00
IvanaE
46f08ecb09 Update README.md 2018-11-23 12:14:41 -05:00
IvanaE
d6ddfe9c2e Update README.md 2018-11-23 12:13:16 -05:00
IvanaE
337470184b Update README.md 2018-11-23 12:12:49 -05:00
IvanaE
6191486f71 Update README.md 2018-11-23 12:12:24 -05:00
IvanaE
8ae85f3727 Update README.md 2018-11-23 12:11:30 -05:00
IvanaE
4791f71ae5 Update README.md 2018-11-23 12:09:59 -05:00
IvanaE
15cc55e63a Update README.md 2018-11-23 12:08:28 -05:00
269ce3fa7f Build has been created 2018-11-23 12:03:36 -05:00
Mary Tran
8f42ac5183 wow I closed a cursor before finishing using it 2018-11-21 22:58:35 -05:00
Mary Tran
5a3b59b1d9 Trying again to fix DB things 2018-11-20 23:54:03 -05:00
Mary Tran
e6c383f1f9 Completed booking and lookup by time available 2018-11-20 23:43:16 -05:00
IvanaE
5f5f2042da updated readme 2018-11-20 18:23:02 -05:00
IvanaE
e0ee4f23b9 Update README.md 2018-11-20 18:20:28 -05:00
Mary Tran
168d8be0c7 Added some DB functionalities - not done yet 2018-11-20 13:03:26 -05:00
IvanaE
ab64c2bb0d month starts at 1 2018-11-20 12:28:51 -05:00
9b07e5e20c UML Fix 2 2018-11-20 11:38:30 -05:00
96f791db10 UML Fix 2018-11-20 11:32:08 -05:00
IvanaE
ed1c35d487 actually fixed errors? 2018-11-19 21:52:14 -05:00
IvanaE
b3332768fc fixed errors? 2018-11-19 21:50:06 -05:00
FunwithaPorpoise
8de6cfa9be Merge pull request #20 from ebivibe/DBBranch
Updated booking
2018-11-19 21:39:52 -05:00
Mary Tran
944c1226b7 Updated booking 2018-11-19 21:37:27 -05:00
9138283cdd UML should be perfect this time 2018-11-19 21:36:12 -05:00
Mary Tran
f69b8a2a1d Added a few things to Booking 2018-11-19 21:33:39 -05:00
e772562b77 Updated UML Diagram again 2018-11-19 21:24:13 -05:00
567e9c0739 Updated UML Diagram 2018-11-19 21:14:30 -05:00
IvanaE
534bb270f4 added some new ui 2018-11-19 20:37:32 -05:00
FunwithaPorpoise
9787466a06 Merge pull request #19 from ebivibe/DBBranch
Pre-create Service Provider
2018-11-18 17:23:29 -05:00
Mary Tran
c61a703041 Pre-create Service Provider 2018-11-18 17:15:44 -05:00
213845f5f3 pulling 2018-11-18 16:35:06 -05:00
IvanaE
ef7d9db62b added more of the finding and edit profile 2018-11-18 15:35:32 -05:00
56e0b9e13e pulling 2018-11-18 15:05:52 -05:00
d6117810be pulling 2018-11-18 15:05:25 -05:00
IvanaE
0a9033ca48 del3 submission 2018-11-18 15:03:10 -05:00
IvanaE
489141194d updates needed 2018-11-18 14:48:15 -05:00
IvanaE
3be7d85c8d waiting for dbhelper to finish recycler view 2018-11-18 13:40:28 -05:00
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