Commit graph

193 commits

Author SHA1 Message Date
IvanaE
b1910247c3 what about now 2018-11-16 15:53:03 -05:00
IvanaE
924bb3319e fixed bad constructor 2018-11-16 15:50:56 -05:00
Mary Tran
92c4d8cfd8 Fixed a typo 2018-11-16 15:37:31 -05:00
Mary Tran
d7cf9ba311 Added description field to database and fixed some tests with old ServiceProvider constructor 2018-11-16 15:33:54 -05:00
Batuhan Berk Başoğlu
66d33d4cc4 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
Batuhan Berk Başoğlu
76c693e91e 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
Batuhan Berk Başoğlu
90a1161f16 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
2742160b60 added general description to front end 2018-11-16 14:37:35 -05:00
Batuhan Berk Başoğlu
5e781ee225 Added comments 2018-11-16 12:31:19 -05:00
Batuhan Berk Başoğlu
a2ff9fc82c Added comments 2018-11-16 12:30:21 -05:00
Anshu Sharma
1a1a9cc6a0 Comments for Availability class. 2018-11-16 12:24:13 -05:00
Anshu Sharma
2d9e2d565b commit changes 2018-11-16 12:10:19 -05:00
Anshu Sharma
3d1c4b24af changes 2018-11-16 12:08:25 -05:00
IvanaE
3eb2b0dafe fixed availibilities ui 2018-11-16 12:02:27 -05:00
FunwithaPorpoise
c44539c59d Merge pull request #17 from ebivibe/DBBranch
Fixed 0 start time bug
2018-11-15 15:19:48 -05:00
Mary Tran
56c57404bd 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
9f5883bdee Fixed 0 start time bug 2018-11-15 12:32:37 -05:00
Anshu Sharma
6e1c5915ca Added toasts 2018-11-15 11:53:32 -05:00
Anshu Sharma
2ebda7ab71 working set time. 2018-11-15 10:56:06 -05:00
Anshu Sharma
c463906934 comment explaining setTime 2018-11-15 07:33:08 -05:00
Anshu Sharma
d2b074d518 Service Provider Availabilities 2018-11-15 07:26:46 -05:00
Anshu Sharma
5eed3f6ee3 check 2018-11-14 21:21:27 -05:00
IvanaE
1634fcfb16 fixed spinner i think? 2018-11-14 20:38:39 -05:00
IvanaE
60f9008151 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
6b72b3162c fixed small errors 2018-11-14 14:14:22 -05:00
Batuhan Berk Başoğlu
24b16fd8b1 Finished the test files 2018-11-14 13:59:26 -05:00
Batuhan Berk Başoğlu
2eb8555ae5 Added 2 Test Cases 2018-11-14 12:45:59 -05:00
Batuhan Berk Başoğlu
e45e742d71 merging with master 2018-11-14 12:34:44 -05:00
Batuhan Berk Başoğlu
3be59387a4 Updated the branch 2018-11-14 12:26:28 -05:00
IvanaE
3155b66a7e layout fixes 2018-11-13 22:29:17 -05:00
IvanaE
94b333ded9 fixed availability time formating 2018-11-13 22:20:01 -05:00
IvanaE
4a7c058c5f actually fixed license this time 2018-11-13 22:14:51 -05:00
IvanaE
a88a575e7c fixed sort of 2018-11-13 22:11:19 -05:00
IvanaE
696c4e4e4b fixed services page 2018-11-13 21:54:44 -05:00
Batuhan Berk Başoğlu
d4fd4900ed Fixed UML 2018-11-13 16:07:24 -05:00
IvanaE
caafe441b9 fixes still needed 2018-11-13 15:17:41 -05:00
IvanaE
a517c63e7a finished edit profile? 2018-11-13 14:21:45 -05:00
IvanaE
bf2b4ae004 think i got them all 2018-11-13 14:00:01 -05:00
IvanaE
c3f35ad540 pls work 2018-11-13 13:57:03 -05:00
IvanaE
e374be7175 one more go 2018-11-13 13:53:55 -05:00
IvanaE
4202da62cb how about now? 2018-11-13 13:49:26 -05:00
IvanaE
1da25d2aff broken code will be fixed soon :( 2018-11-13 13:40:14 -05:00
Batuhan Berk Başoğlu
19b42bf9a5 Updated UML Diagram 2018-11-12 17:26:29 -05:00
FunwithaPorpoise
ad48945e19 Merge pull request #16 from ebivibe/DBBranch
Updated DBHelper for Deliverable 3
2018-11-11 23:27:18 -05:00
Mary Tran
39b59d5660 Fixed HomeOwner to ServiceProvider 2018-11-11 23:25:07 -05:00
Mary Tran
9a93d20dce Updated DBHelper for Deliverable 3 2018-11-11 22:55:47 -05:00
IvanaE
6b0686fbdf added latest updates 2018-11-11 18:35:17 -05:00
IvanaE
32f1031782 deliverable 3 ui, methods to be filled in 2018-11-11 15:52:55 -05:00
Anshu Sharma
16e39ff120 changes 2018-11-11 12:15:02 -05:00
Anshu Sharma
9c6c3ea257 Comment ' 2018-11-11 11:59:46 -05:00
Batuhan Berk Başoğlu
4fd07d81b1 Updated UML Diagram 2018-11-11 11:47:23 -05:00
Anshu Sharma
b730557cec Fixed constructor 2018-11-11 11:40:03 -05:00
Anshu Sharma
65fc33daa1 Availabilities 2018-11-11 11:37:05 -05:00
IvanaE
89985db38f final ui changes 2018-11-09 23:32:40 -05:00
IvanaE
8e3c6db4ef Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-11-09 17:36:11 -05:00
IvanaE
5687572fda made ui look pretty 2018-11-09 17:35:48 -05:00
Anshu Sharma
24c15fafa0 fix conflict 2018-11-09 11:53:12 -05:00
Anshu Sharma
163b1173cf comments for project. 2018-11-09 11:48:05 -05:00
IvanaE
df6c25b065 fixed password length 2018-11-08 11:43:43 -05:00
IvanaE
8ae08f829b added service exists verification 2018-11-07 14:16:54 -05:00
IvanaE
cc8e5946c5 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-11-07 13:50:58 -05:00
IvanaE
95e281fc87 added field checking, fixed some errors 2018-11-07 13:50:10 -05:00
Batuhan Berk Başoğlu
d1f7e5a81c Added comments to test files 2018-11-07 13:47:06 -05:00
Batuhan Berk Başoğlu
c5d85d3f5c Testing 2018-11-07 13:28:41 -05:00
IvanaE
f615b2f6e1 file wasn't stages 2018-11-07 11:39:37 -05:00
IvanaE
4520816740 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
ef6446f05b chaoe ensuing 2018-11-07 11:28:54 -05:00
Anshu Sharma
d4f1433f91 whatever 2018-11-07 11:26:51 -05:00
Batuhan Basoglu
aa56f4d772 testing 123 2018-11-03 22:54:32 -04:00
IvanaE
c11c42c305 removed USELESS file 2018-11-02 19:07:36 -04:00
IvanaE
e02b30c0ba no message 2018-11-02 18:57:00 -04:00
IvanaE
ab9fa36a68 fixed indenting 2018-11-02 18:50:00 -04:00
IvanaE
59317ddf37 already so done with circle ci 2018-11-02 18:49:26 -04:00
IvanaE
676c92763e trying changing path 2018-11-02 18:41:07 -04:00
IvanaE
62fd194ad9 one more time 2018-11-02 18:39:32 -04:00
IvanaE
dff3eda2f5 added circle ci config 2018-11-02 18:32:44 -04:00
IvanaE
e38d34b9eb fixed table alignment 2018-11-02 18:14:32 -04:00
Batuhan Berk Başoğlu
0ad149265f Merged JUnit with Master 2018-11-02 11:40:15 -04:00
Batuhan Berk Başoğlu
4862bc8a7b made some fix 2018-11-02 00:19:46 -04:00
Batuhan Berk Başoğlu
295242e572 added all test files 2018-11-02 00:18:07 -04:00
Batuhan Berk Başoğlu
4fcbb34f38 made 3 test cases for each class 2018-11-01 23:17:34 -04:00
Batuhan Berk Başoğlu
672a241e88 Fixed test files 2018-11-01 21:29:48 -04:00
Batuhan Berk Başoğlu
3a4c792cb5 Added more test cases 2018-11-01 21:17:32 -04:00
Batuhan Berk Başoğlu
2ea28277c3 Fixed the order of tests 2018-11-01 21:09:22 -04:00
Batuhan Berk Başoğlu
45ede0cbd5 Added JUnit for SignUp 2018-11-01 21:04:55 -04:00
IvanaE
33611b8983 can no longer edit service name 2018-11-01 20:30:03 -04:00
IvanaE
ea0e8bd7d1 made it look pretty 2018-11-01 19:51:35 -04:00
IvanaE
8ac71c9cac fixed ui elements 2018-11-01 14:42:04 -04:00
IvanaE
6f49545aba fixed ui elements 2018-11-01 14:40:25 -04:00
IvanaE
695ab61b15 trying some wild stuff 2018-11-01 12:49:40 -04:00
Batuhan Berk Başoğlu
aa0fa2a4ba Updated test files 2018-10-31 13:31:46 -04:00
Batuhan Berk Başoğlu
ec69678da4 Added basic JUnit files 2018-10-31 13:24:01 -04:00
Mary Tran
39ba11d11b Changing gridview text colour to white 2018-10-31 12:55:15 -04:00
Mary Tran
23293089cb Increased DB version. Changed User to HomeOwner in existing DBs 2018-10-30 12:24:46 -04:00
IvanaE
8b2532d27e made it pretty 2018-10-30 11:16:56 -04:00
IvanaE
073885ebeb accidentally changed to many things 2018-10-30 11:16:06 -04:00
IvanaE
3491212fbc refactored user to homeowner 2018-10-30 11:08:08 -04:00
IvanaE
7790edac33 added popups and services 2018-10-28 19:31:34 -04:00
FunwithaPorpoise
60c0da3558 Merge pull request #14 from ebivibe/DBBranch
Db branch
2018-10-26 22:25:34 -04:00
Batuhan Berk Başoğlu
6c270be5ce Updated UML Diagram for Deliverable 2 2018-10-26 14:43:41 -04:00