diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 25569fc..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: 2 -jobs: - build: - working_directory: ~/SEG2105-Olympus/OlympusServices - docker: - - image: circleci/android:api-28-alpha - environment: - JVM_OPTS: -Xmx3200m - steps: - - checkout: - path: ~/SEG2105-Olympus - - restore_cache: - key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - - run: - name: Chmod permissions - command: sudo chmod +x ./gradlew - - run: - name: Download Dependencies - command: ./gradlew androidDependencies - - save_cache: - paths: - - ~/.gradle - key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} - - run: - name: Run UnitTest - command: ./gradlew test - - store_artifacts: - path: app/build/outputs/apk/debug/ - destination: apks/ - - store_test_results: - path: app/build/test-results - diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 0890c19..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,5 +0,0 @@ -# These are supported funding model platforms - -github: [batuhan-basoglu] -ko_fi: batuhanbasoglu -liberapay: batuhan-basoglu diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml deleted file mode 100644 index c659871..0000000 --- a/.github/workflows/mirror.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: 🪞 Push to Mirrors - -on: [ push, delete, create ] - -# Ensures that only one mirror task will run at a time. -concurrency: - group: git-mirror - -jobs: - gitlab: - runs-on: ubuntu-latest - steps: - - name: Mirror to GitLab - uses: wearerequired/git-mirror-action@v1 - env: - SSH_PRIVATE_KEY: ${{ secrets.ACTIONS_SSH_KEY }} - with: - source-repo: "git@github.com:batuhan-basoglu/SEG2105-Olympus-Android-Application.git" - destination-repo: "git@gitlab.com:batuhan-basoglu/SEG2105-Olympus-Android-Application.git" - - codeberg: - runs-on: ubuntu-latest - steps: - - name: Mirror to Codeberg - uses: wearerequired/git-mirror-action@v1 - env: - SSH_PRIVATE_KEY: ${{ secrets.ACTIONS_SSH_KEY }} - with: - source-repo: "git@github.com:batuhan-basoglu/SEG2105-Olympus-Android-Application.git" - destination-repo: "git@codeberg.org:batuhan-basoglu/SEG2105-Olympus-Android-Application.git" - - forgejo: - runs-on: ubuntu-latest - steps: - - name: Mirror to Forgejo - uses: wearerequired/git-mirror-action@v1 - env: - SSH_PRIVATE_KEY: ${{ secrets.ACTIONS_SSH_KEY }} - with: - source-repo: "git@github.com:batuhan-basoglu/SEG2105-Olympus-Android-Application.git" - destination-repo: "git@git.batuhan.basoglu.ca:batuhan-basoglu/SEG2105-Olympus-Android-Application.git" diff --git a/Deliverable2.zip b/Deliverable2.zip deleted file mode 100644 index a5338f4..0000000 Binary files a/Deliverable2.zip and /dev/null differ diff --git a/Deliverable3.zip b/Deliverable3.zip deleted file mode 100644 index 8124e2f..0000000 Binary files a/Deliverable3.zip and /dev/null differ diff --git a/Deliverable4.zip b/Deliverable4.zip deleted file mode 100644 index 76df801..0000000 Binary files a/Deliverable4.zip and /dev/null differ diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index f288702..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/OlympusServices/.idea/assetWizardSettings.xml b/OlympusServices/.idea/assetWizardSettings.xml new file mode 100644 index 0000000..6b96cf0 --- /dev/null +++ b/OlympusServices/.idea/assetWizardSettings.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser index 12f74ff..279981b 100644 Binary files a/OlympusServices/.idea/caches/build_file_checksums.ser and b/OlympusServices/.idea/caches/build_file_checksums.ser differ diff --git a/OlympusServices/.idea/compiler.xml b/OlympusServices/.idea/compiler.xml deleted file mode 100644 index 61a9130..0000000 --- a/OlympusServices/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OlympusServices/.idea/gradle.xml b/OlympusServices/.idea/gradle.xml index 8a91881..7ac24c7 100644 --- a/OlympusServices/.idea/gradle.xml +++ b/OlympusServices/.idea/gradle.xml @@ -1,18 +1,17 @@ - diff --git a/OlympusServices/.idea/jarRepositories.xml b/OlympusServices/.idea/jarRepositories.xml deleted file mode 100644 index 10637db..0000000 --- a/OlympusServices/.idea/jarRepositories.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OlympusServices/.idea/misc.xml b/OlympusServices/.idea/misc.xml index 7cbaeeb..dc34569 100644 --- a/OlympusServices/.idea/misc.xml +++ b/OlympusServices/.idea/misc.xml @@ -1,3 +1,4 @@ + - + diff --git a/OlympusServices/.idea/runConfigurations.xml b/OlympusServices/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/OlympusServices/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/OlympusServices/.idea/vcs.xml b/OlympusServices/.idea/vcs.xml index 6c0b863..62bd7a0 100644 --- a/OlympusServices/.idea/vcs.xml +++ b/OlympusServices/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/OlympusServices/app/build.gradle b/OlympusServices/app/build.gradle index 313fb68..7bdef2b 100644 --- a/OlympusServices/app/build.gradle +++ b/OlympusServices/app/build.gradle @@ -24,18 +24,14 @@ android { } dependencies { - + implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:design:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' testImplementation 'junit:junit:4.12' - testImplementation 'androidx.test:core:1.0.0' - testImplementation 'org.mockito:mockito-core:1.10.19' testImplementation 'org.robolectric:robolectric:4.0-alpha-3-SNAPSHOT' androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test:rules:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - androidTestImplementation 'org.hamcrest:hamcrest-library:1.3' implementation 'com.jaredrummler:material-spinner:1.2.5' implementation 'com.android.support:design:28.0.0-alpha3' implementation 'com.rengwuxian.materialedittext:library:2.1.4' diff --git a/OlympusServices/app/src/main/AndroidManifest.xml b/OlympusServices/app/src/main/AndroidManifest.xml index 425603f..f8bc8ab 100644 --- a/OlympusServices/app/src/main/AndroidManifest.xml +++ b/OlympusServices/app/src/main/AndroidManifest.xml @@ -30,50 +30,18 @@ - - - - - - - - - - - + + \ No newline at end of file diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Admin.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Admin.java index 7f8bdfa..4d2938b 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Admin.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Admin.java @@ -1,32 +1,10 @@ package com.uottawa.olympus.olympusservices; -/** - * The class Admin is a child of the class userType. The class gives - * admin permission over the app such that the user can add and delete services - * and can add and delete other users from the database of the app. - * - */ - public class Admin extends UserType { - /** - * The constructor for the admin object with predefined fields. - * There should only be one admin object for the entire app. - */ Admin(){ super("admin", "admin", "Admin", "Admin"); } - Admin(String hash, String salt){ - super("admin", hash, salt, "Admin", "Admin"); - } - - /** - * The getRole() method returns a string "Admin" - * the app gets role of user type objects for access - * app permission purposes. - * - * @return String object "Admin" - */ public String getRole(){ return "Admin"; } } diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/AdminWelcome.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/AdminWelcome.java index f8e2861..0068236 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/AdminWelcome.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/AdminWelcome.java @@ -5,72 +5,29 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; -/** - * The Admin Welcome class is the welcome - * screen for admin users when they have logged into the - * app. The admin welcome screen has features such as the - * user list and service list which it can only access. - * - */ - public class AdminWelcome extends AppCompatActivity { - /** - * Creates the xml pages for the class object - * on creation of the object. - * - * @param savedInstanceState Bundle for transfer of data. - */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_admin_welcome); } - - /** - * Override so that nothing occurs when pressing the - * back button on this activity of the app. - * - */ @Override public void onBackPressed(){ } - /** - * Logs out the user and returns them back to - * main activity. End all current user activity - * for security purposes. - * - * @param view View object of current activity. - */ public void LogOut(View view){ Intent intent = new Intent(getApplicationContext(), Main.class); startActivity(intent); finish(); } - - /** - * On click of list of user button that goes to - * UserList screen for the admin to edit the user list - * of the app. - * - * @param view View object of current activity - */ public void goToUsers(View view){ Intent intent = new Intent(getApplicationContext(), UsersList.class); startActivity(intent); } - - /** - * On click of list of services button goes to - * ServiceList screen for the admin to edit the - * service list of the app. - * - * @param view - */ public void goToServices(View view){ - Intent intent = new Intent(getApplicationContext(), AdminServicesList.class); + Intent intent = new Intent(getApplicationContext(), ServicesList.class); startActivity(intent); } } diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Appointment.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Appointment.java index 536383e..93cd7a0 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Appointment.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Appointment.java @@ -1,11 +1,5 @@ package com.uottawa.olympus.olympusservices; -/** - * This class is the class for Appointments - * which has not been implemented yet. This - * feature shall be expanded upon next deliverable. - * - */ public class Appointment { Service service; ServiceProvider provider; diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java deleted file mode 100644 index 76144a5..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Booking.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -public class Booking { - private int starth; - private int startmin; - private int endh; - private int endmin; - private int day; - private int month; - private int year; - private ServiceProvider serviceprovider; //username - private HomeOwner homeowner; //username - private Service service; - public enum Status { - PENDING{ - @Override - public String toString() { - return "Pending"; - } - }, - CONFIRMED{ - @Override - public String toString() { - return "Confirmed"; - } - }, - CANCELLED{ - @Override - public String toString() { - return "Cancelled"; - } - } - } - private Status status; - - private int rating; //out of 5 - private String comment; - - public Booking(int starth, int startmin, int endh, int endmin, int day, int month, int year, - ServiceProvider serviceprovider, HomeOwner homeowner, Service service){ - this.starth = starth; - this.startmin = startmin; - this.endh = endh; - this.endmin = endmin; - this.day = day; - this.month = month; - this.year = year; - this.serviceprovider = serviceprovider; - this.homeowner = homeowner; - this.service = service; - this.status = Status.PENDING; - } - - - public int getStarth() { - return starth; - } - - public void setStarth(int starth) { - this.starth = starth; - } - - public int getStartmin() { - return startmin; - } - - public void setStartmin(int startmin) { - this.startmin = startmin; - } - - public int getEndh() { - return endh; - } - - public void setEndh(int endh) { - this.endh = endh; - } - - public int getEndmin() { - return endmin; - } - - public void setEndmin(int endmin) { - this.endmin = endmin; - } - - public int getDay() { - return day; - } - - public void setDay(int day) { - this.day = day; - } - - public int getMonth() { - return month; - } - - public void setMonth(int month) { - this.month = month; - } - - public int getYear() { - return year; - } - - public void setYear(int year) { - this.year = year; - } - - public ServiceProvider getServiceprovider() { - return serviceprovider; - } - - public void setServiceprovider(ServiceProvider serviceprovider) { - this.serviceprovider = serviceprovider; - } - - public HomeOwner getHomeowner() { - return homeowner; - } - - public void setHomeowner(HomeOwner homeowner) { - this.homeowner = homeowner; - } - - public Service getService(){ return service; } - - public void setService(Service service) { this.service = service;} - - public void setStatus(Status status){ - this.status = status; - } - - public Status getStatus(){ - return this.status; - } - - public int getRating() { - return rating; - } - - public void setRating(int rating) { - this.rating = rating; - } - - public String getComment() { - return comment; - } - - public void setComment(String comment) { - this.comment = comment; - } -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Bookings.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Bookings.java deleted file mode 100644 index 992ebb4..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Bookings.java +++ /dev/null @@ -1,404 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SwitchCompat; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.CompoundButton; -import android.widget.EditText; -import android.widget.RadioButton; -import android.widget.RadioGroup; -import android.widget.TextView; -import android.widget.Toast; - -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -public class Bookings extends AppCompatActivity { - - //field for RecyclerView - private RecyclerView mRecyclerView; - //field for adapter of Recycler view - private RecyclerView.Adapter mAdapter; - //field for layout manager of Recyler view. - private RecyclerView.LayoutManager mLayoutManager; - - String username; - DBHelper dbhelper; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_bookings); - Bundle bundle = getIntent().getExtras(); - username = bundle.getString("username"); - dbhelper = new DBHelper(this); - - //get the list of bookings - List booking = (List)dbhelper.findBookings(username); - Collections.reverse(booking); - Booking[] bookings = new Booking[booking.size()]; - bookings = booking.toArray(bookings); - Booking[] mostRecentBookings = new Booking[bookings.length]; - - /* //mock data - Booking[] bookings = {new Booking(5, 5, 6, 6, 2, 3, 2019, (ServiceProvider)dbhelper.findUserByUsername("testing"), - (HomeOwner)dbhelper.findUserByUsername("tester"), dbhelper.findService("service1"))}; - */ - - //Make the recycler view show the bookings - mRecyclerView = (RecyclerView) findViewById(R.id.Bookings); - mLayoutManager = new LinearLayoutManager(this); - mRecyclerView.setLayoutManager(mLayoutManager); - mAdapter = new MyAdapter(bookings, this); - mRecyclerView.setAdapter(mAdapter); - - //remove or add cancelled booking depending on the switch position - SwitchCompat toggle = findViewById(R.id.Switch); - toggle.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (isChecked) { - List booking = (List)dbhelper.findBookings(username); - Collections.reverse(booking); - Booking[] bookings = new Booking[booking.size()]; - bookings = booking.toArray(bookings); - mAdapter = new MyAdapter(bookings, Bookings.this); - mRecyclerView.setAdapter(mAdapter); - mAdapter.notifyDataSetChanged(); - } else { - List booking = (List)dbhelper.findNonCancelledBookings(username); - Collections.reverse(booking); - Booking[] bookings = new Booking[booking.size()]; - bookings = booking.toArray(bookings); - mAdapter = new MyAdapter(bookings, Bookings.this); - mRecyclerView.setAdapter(mAdapter); - mAdapter.notifyDataSetChanged(); - } - } - }); - - } - - /** - * Override so that previous screen refreshes when pressing the - * back button on this activity of the app. - * - */ - @Override - public void onBackPressed(){ - //goes back to the appropriate screen depending on the type of user - Intent intent; - if(dbhelper.findUserByUsername(username).getRole().equals("ServiceProvider")){ - intent = new Intent(getApplicationContext(),ServiceProviderWelcome.class); - } - else{ - intent = new Intent(getApplicationContext(),Welcome.class); - } - - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - - - public class MyAdapter extends RecyclerView.Adapter { - - private Booking[] bookings; - private Context context; - - // Provide a reference to the views for each data item - // Complex data items may need more than one view per item, and - // you provide access to all the views for a data item in a view holder - - // Provide a suitable constructor (depends on the kind of dataset) - public MyAdapter(Booking[] bookings, Context context) { - this.bookings = bookings; - } - - // Create new views (invoked by the layout manager) - @NonNull - @Override - public BookingHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View v = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.booking_list_item, parent, false); - BookingHolder vh = new BookingHolder(v); - return vh; - } - - // Replace the contents of a view (invoked by the layout manager) - @Override - public void onBindViewHolder(BookingHolder holder, int position) { - Booking booking = bookings[position]; - holder.serviceprovider.setText(booking.getServiceprovider().getFirstname()+" "+booking.getServiceprovider().getLastname()+", "+booking.getServiceprovider().getCompanyname()); - holder.homeowner.setText(booking.getHomeowner().getFirstname()+" "+booking.getHomeowner().getLastname()); - holder.service.setText(booking.getService().getName()); - String day; - String month; - String year = booking.getYear()+""; - if(booking.getDay()<10){ - day = "0"+booking.getDay(); - } - else{ - day = booking.getDay()+""; - } - if(booking.getMonth()<10){ - month = "0"+booking.getMonth(); - } - else{ - month = booking.getMonth()+""; - } - - holder.date.setText(month+"/"+day+"/"+year); - holder.start.setText(formatTime(booking.getStarth(), booking.getStartmin())); - holder.end.setText(formatTime(booking.getEndh(), booking.getEndmin())); - holder.status.setText(booking.getStatus().toString()); - holder.ho = booking.getHomeowner().getUsername(); - holder.sp = booking.getServiceprovider().getUsername(); - - - } - - // Return the size of your dataset (invoked by the layout manager) - @Override - public int getItemCount() { - return bookings.length; - } - - class BookingHolder extends RecyclerView.ViewHolder implements View.OnClickListener{ - - TextView homeowner; - TextView serviceprovider; - TextView service; - TextView date; - TextView start; - TextView end; - TextView status; - String ho; - String sp; - int starth; - int startmin; - int endh; - int endmin; - int month; - int day; - int year; - - public BookingHolder(View row){ - super(row); - homeowner = row.findViewById(R.id.HomeOwnerName); - serviceprovider = row.findViewById(R.id.ServiceProviderName); - service = row.findViewById(R.id.ServiceName); - date = row.findViewById(R.id.DateName); - start = row.findViewById(R.id.StartTime); - end = row.findViewById(R.id.EndTime); - status = row.findViewById(R.id.StatusName); - - - row.setOnClickListener(this); - } - @Override - public void onClick(View view) { - //show different dialogs depending on the type of user - //Service Provider can confirm or cancel while Home Owner can rate and comment, or cancel - if(dbhelper.findUserByUsername(username).getRole()=="ServiceProvider"){ - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(Bookings.this); - alertDialogBuilder.setMessage("Cancel or Confirm your booking"); - alertDialogBuilder.setPositiveButton("Confirm Booking", - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface arg0, int arg1) { - int[] times = parseTime(start.getText().toString(), end.getText().toString()); - starth = times[0]; - startmin = times[1]; - endh = times[2]; - endmin = times[3]; - String[] dates = date.getText().toString().split("/"); - month = Integer.parseInt(dates[0].replaceAll("\\s+","")); - day = Integer.parseInt(dates[1].replaceAll("\\s+","")); - year = Integer.parseInt(dates[2].replaceAll("\\s+","")); - if(dbhelper.confirmBooking(new Booking(starth, startmin, endh, endmin, day, month, year, (ServiceProvider)dbhelper.findUserByUsername(sp), - (HomeOwner)dbhelper.findUserByUsername(ho), - new Service(service.getText().toString(), 5)))){ - - Toast.makeText(Bookings.this,"Booking is confirmed",Toast.LENGTH_LONG).show(); - Bookings.this.recreate(); - } - else{ - Toast.makeText(Bookings.this,"Booking could not be confirmed",Toast.LENGTH_LONG).show(); - } - - } - }); - - alertDialogBuilder.setNegativeButton("Cancel Booking", - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - int[] times = parseTime(start.getText().toString(), end.getText().toString()); - starth = times[0]; - startmin = times[1]; - endh = times[2]; - endmin = times[3]; - String[] dates = date.getText().toString().split("/"); - month = Integer.parseInt(dates[0].replaceAll("\\s+","")); - day = Integer.parseInt(dates[1].replaceAll("\\s+","")); - year = Integer.parseInt(dates[2].replaceAll("\\s+","")); - if(dbhelper.cancelBooking(new Booking(starth, startmin, endh, endmin, day, month, year, (ServiceProvider)dbhelper.findUserByUsername(sp), - (HomeOwner)dbhelper.findUserByUsername(ho), - new Service(service.getText().toString(), 5)))){ - Toast.makeText(Bookings.this,"Booking is cancelled",Toast.LENGTH_LONG).show(); - Bookings.this.recreate(); - } - else{ - Toast.makeText(Bookings.this,"Booking could not be cancelled",Toast.LENGTH_LONG).show(); - } - } - }); - - AlertDialog alertDialog = alertDialogBuilder.create(); - alertDialog.show(); - } - else{ //if user is a Home Owner - final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(Bookings.this); - alertDialogBuilder.setView(R.layout.rating_item); - alertDialogBuilder.setPositiveButton("Rate Booking", - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface arg0, int arg1) { - int[] times = parseTime(start.getText().toString(), end.getText().toString()); - starth = times[0]; - startmin = times[1]; - endh = times[2]; - endmin = times[3]; - String[] dates = date.getText().toString().split("/"); - month = Integer.parseInt(dates[0].replaceAll("\\s+","")); - day = Integer.parseInt(dates[1].replaceAll("\\s+","")); - year = Integer.parseInt(dates[2].replaceAll("\\s+","")); - - //rating bar - RadioGroup ratingselect = ((AlertDialog) arg0).findViewById(R.id.RatingSelect); - int selectedId = ratingselect.getCheckedRadioButtonId(); - RadioButton ratingpicked; - //comment field - EditText comment = ((AlertDialog) arg0).findViewById(R.id.Comment); - if(selectedId!=-1 && !comment.getText().toString().equals("")){ - ratingpicked = (RadioButton)((AlertDialog) arg0).findViewById(selectedId); - double rating = Double.parseDouble(ratingpicked.getText().toString()); - - Booking booking = new Booking(starth, startmin, endh, endmin, day, month, year, (ServiceProvider)dbhelper.findUserByUsername(sp), - (HomeOwner)dbhelper.findUserByUsername(ho), - new Service(service.getText().toString(), 5)); - if(!dbhelper.addRating(booking, rating, comment.getText().toString())){ - Toast.makeText(Bookings.this, "Rating cannot be added before the appointment", Toast.LENGTH_SHORT).show(); - } - else{ - Toast.makeText(Bookings.this, "Rating and comment added", Toast.LENGTH_SHORT).show(); - Bookings.this.recreate(); - - } - - } - else{ - Toast.makeText(Bookings.this, "Rating and comment must be filled in", Toast.LENGTH_SHORT).show(); - } - - } - }); - - alertDialogBuilder.setNegativeButton("Cancel Booking", - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - - int[] times = parseTime(start.getText().toString(), end.getText().toString()); - starth = times[0]; - startmin = times[1]; - endh = times[2]; - endmin = times[3]; - String[] dates = date.getText().toString().split("/"); - month = Integer.parseInt(dates[0].replaceAll("\\s+","")); - day = Integer.parseInt(dates[1].replaceAll("\\s+","")); - year = Integer.parseInt(dates[2].replaceAll("\\s+","")); - if(dbhelper.cancelBooking(new Booking(starth, startmin, endh, endmin, day, month, year, (ServiceProvider)dbhelper.findUserByUsername(sp), - (HomeOwner)dbhelper.findUserByUsername(ho), - new Service(service.getText().toString(), 5)))){ - Toast.makeText(Bookings.this,"Booking is cancelled",Toast.LENGTH_LONG).show(); - Bookings.this.recreate(); - } - else{ - Toast.makeText(Bookings.this,"Booking could not be cancelled",Toast.LENGTH_LONG).show(); - } - } - }); - - AlertDialog alertDialog = alertDialogBuilder.create(); - alertDialog.show(); - - } - - - } - - - } - - - } - - /** - * formats the time into a string - * @param hours - * @param minutes - * @return - */ - private String formatTime(int hours, int minutes){ - String time = ""; - if(hours<10){ - time = time+"0"+hours+":"; - }else{ - time = time+hours+":"; - } - if (minutes<10){ - time = time+"0"+minutes; - } - else { - time = time+minutes; - } - return time; - } - - /** - * Parses a string into an array of ints representing times - * @param startTime - * @param endTime - * @return - */ - private int[] parseTime(String startTime, String endTime){ - int[] times = new int[4]; - if(startTime.equals("START")){ - times[0]=0; - times[1]=0; - }else{ - times[0] = Integer.parseInt(startTime.substring(0,2)); - times[1] = Integer.parseInt(startTime.substring(3)); - } - if(endTime.equals("END")){ - times[2]=0; - times[3]=0; - }else{ - times[2] = Integer.parseInt(endTime.substring(0,2)); - times[3] = Integer.parseInt(endTime.substring(3)); - } - return times; - } -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DBHelper.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DBHelper.java index 7976cb8..452473d 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DBHelper.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DBHelper.java @@ -6,13 +6,8 @@ import android.database.sqlite.SQLiteOpenHelper; import android.database.Cursor; import android.content.ContentValues; -import java.util.ArrayList; -import java.util.Calendar; import java.util.LinkedList; import java.util.List; -import java.util.GregorianCalendar; - -import com.uottawa.olympus.olympusservices.Booking.Status; /** * The class DBHelper allows the Android application to access and perform @@ -27,13 +22,10 @@ import com.uottawa.olympus.olympusservices.Booking.Status; public class DBHelper extends SQLiteOpenHelper { //version of db used for update method - private static final int DB_VERSION = 7; + private static final int DB_VERSION = 2; //name of db in app data private static final String DB_NAME = "UsersDB.db"; - //has the data been added? - private static boolean setUp = false; - //SQLiteDatabase for reading private static SQLiteDatabase readDB; @@ -44,66 +36,19 @@ public class DBHelper extends SQLiteOpenHelper { private static final String TABLE_LOGIN = "userInfo"; //columns of TABLE_LOGIN private static final String COLUMN_USERNAME = "username"; - private static final String COLUMN_PASSWORD = "password"; //actually stores password hash + private static final String COLUMN_PASSWORD = "password"; private static final String COLUMN_FIRSTNAME = "firstName"; private static final String COLUMN_LASTNAME = "lastName"; private static final String COLUMN_USERTYPE = "userType"; - private static final String COLUMN_ADDRESS = "address"; - private static final String COLUMN_PHONE = "phone"; - private static final String COLUMN_COMPANY = "company"; - private static final String COLUMN_LICENSED = "licensed"; - private static final String COLUMN_DESCRIPTION = "description"; - private static final String COLUMN_SALT = "salt"; + +// private static final String TABLE_SERVICEPROVIDERS = "serviceProviders"; //name of table containing services and rates private static final String TABLE_SERVICES = "services"; - //columns of TABLE_SERVICES + //columns of TABLE_LOGIN private static final String COLUMN_SERVICE = "service"; private static final String COLUMN_RATE = "rate"; - //name of table containing service provider information - private static final String TABLE_SERVICEPROVIDERS = "serviceProviders"; - //columns of TABLE_SERVICEPROVIDERS - private static final String COLUMN_SERVICEPROVIDERNAME = "username"; - private static final String COLUMN_SERVICEPROVIDERSERVICE = "service"; - private static final String COLUMN_AVERAGERATING = "averageRating"; - private static final String COLUMN_RATERS = "raters"; - private static final String COLUMN_ACTIVE = "active"; - - //name of table containing service provider availability - //availability is stored as number of minutes from 00:00 - private static final String TABLE_AVAILABILITY = "availability"; - //columns of TABLE_AVAILABILITY - private static final String COLUMN_AVAILABILITYNAME = "username"; - private static final String COLUMN_MONSTART = "mondaystart"; - private static final String COLUMN_MONEND = "mondayend"; - private static final String COLUMN_TUESTART = "tuesdaystart"; - private static final String COLUMN_TUEEND = "tuesdayend"; - private static final String COLUMN_WEDSTART = "wednesdaystart"; - private static final String COLUMN_WEDEND = "wednesdayend"; - private static final String COLUMN_THUSTART = "thursdaystart"; - private static final String COLUMN_THUEND = "thursdayend"; - private static final String COLUMN_FRISTART = "fridaystart"; - private static final String COLUMN_FRIEND = "fridayend"; - private static final String COLUMN_SATSTART = "saturdaystart"; - private static final String COLUMN_SATEND = "saturdayend"; - private static final String COLUMN_SUNSTART = "sundaystart"; - private static final String COLUMN_SUNEND = "sundayend"; - - //name of table containing booking - private static final String TABLE_BOOKINGS = "bookings"; - //columns of TABLE_BOOKING - private static final String COLUMN_BOOKINGSERVICEPROVIDER = "serviceProvider"; - private static final String COLUMN_BOOKINGHOMEOWNER = "homeOwner"; - private static final String COLUMN_BOOKINGSERVICE = "service"; - private static final String COLUMN_BOOKINGYEAR = "year"; - private static final String COLUMN_BOOKINGMONTH = "month"; - private static final String COLUMN_BOOKINGDATE = "day"; - private static final String COLUMN_BOOKINGSTART = "starttime"; - private static final String COLUMN_BOOKINGEND = "endtime"; - private static final String COLUMN_BOOKINGSTATUS = "status"; - private static final String COLUMN_RATING = "rating"; - private static final String COLUMN_COMMENT = "comment"; /** * Creates an instance of DBHelper to allow activities to access and @@ -116,13 +61,8 @@ public class DBHelper extends SQLiteOpenHelper { //since these methods take a while we will call them once and store the returned dbs readDB = this.getReadableDatabase(); writeDB = this.getWritableDatabase(); - + //pre-add the admin user addUser(new Admin()); - - if (!setUp){ - setUp(); - setUp = true; - } } @Override @@ -131,17 +71,10 @@ public class DBHelper extends SQLiteOpenHelper { //making the table containing user login information String CREATE_LOGIN_TABLE = "CREATE TABLE "+ TABLE_LOGIN + "(" + COLUMN_USERNAME + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK," - + COLUMN_PASSWORD + " TEXT," + + COLUMN_PASSWORD + " TEXT NOT NULL," + COLUMN_FIRSTNAME + " TEXT DEFAULT 'FirstName'," + COLUMN_LASTNAME + " TEXT DEFAULT 'LastName'," - + COLUMN_USERTYPE + " TEXT NOT NULL, " - + COLUMN_ADDRESS + " TEXT, " - + COLUMN_PHONE + " TEXT, " - + COLUMN_COMPANY + " TEXT, " - + COLUMN_LICENSED + " TEXT, " - + COLUMN_DESCRIPTION + " TEXT, " - + COLUMN_SALT + " TEXT " - + ")"; + + COLUMN_USERTYPE + " TEXT NOT NULL" + ")"; db.execSQL(CREATE_LOGIN_TABLE); //making the table containing services and their rates @@ -149,57 +82,6 @@ public class DBHelper extends SQLiteOpenHelper { + COLUMN_SERVICE + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK," + COLUMN_RATE + " REAL DEFAULT 0.0" + ")"; db.execSQL(CREATE_SERVICES_TABLE); - - //making the table containing service providers and offered services - String CREATE_SERVICEPROVIDERS_TABLE = "CREATE TABLE "+ TABLE_SERVICEPROVIDERS + "(" - + COLUMN_SERVICEPROVIDERNAME + " TEXT, " - + COLUMN_SERVICEPROVIDERSERVICE + " TEXT, " - + COLUMN_AVERAGERATING + " REAL DEFAULT 0, " - + COLUMN_RATERS + " REAL DEFAULT 0, " - + COLUMN_ACTIVE + " TEXT DEFAULT 'active', " - //service provider name is foreign key - + " FOREIGN KEY(" + COLUMN_SERVICEPROVIDERNAME - + ") REFERENCES " + TABLE_LOGIN + "(" + COLUMN_USERNAME +"), " - //service is also foreign key - + " FOREIGN KEY(" + COLUMN_SERVICEPROVIDERSERVICE - + ") REFERENCES " + TABLE_SERVICES + "(" + COLUMN_SERVICE +") " - + ")"; - db.execSQL(CREATE_SERVICEPROVIDERS_TABLE); - - //making the table containing services and their rates - String CREATE_AVAILABILITY_TABLE = "CREATE TABLE "+ TABLE_AVAILABILITY + "(" - + COLUMN_AVAILABILITYNAME + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK, " - + COLUMN_MONSTART + " REAL, " - + COLUMN_MONEND + " REAL, " - + COLUMN_TUESTART + " REAL, " - + COLUMN_TUEEND + " REAL, " - + COLUMN_WEDSTART + " REAL, " - + COLUMN_WEDEND + " REAL, " - + COLUMN_THUSTART + " REAL, " - + COLUMN_THUEND + " REAL, " - + COLUMN_FRISTART + " REAL, " - + COLUMN_FRIEND + " REAL, " - + COLUMN_SATSTART + " REAL, " - + COLUMN_SATEND + " REAL, " - + COLUMN_SUNSTART + " REAL, " - + COLUMN_SUNEND + " REAL)"; - db.execSQL(CREATE_AVAILABILITY_TABLE); - - //making the table containing bookings - String CREATE_BOOKING_TABLE = "CREATE TABLE "+ TABLE_BOOKINGS + "(" - + COLUMN_BOOKINGSERVICEPROVIDER + " TEXT," - + COLUMN_BOOKINGHOMEOWNER + " TEXT," - + COLUMN_BOOKINGSERVICE + " TEXT, " - + COLUMN_BOOKINGYEAR + " REAL," - + COLUMN_BOOKINGMONTH + " REAL, " - + COLUMN_BOOKINGDATE + " REAL, " - + COLUMN_BOOKINGSTART + " REAL, " - + COLUMN_BOOKINGEND + " REAL, " - + COLUMN_BOOKINGSTATUS + " TEXT, " - + COLUMN_RATING + " REAL DEFAULT 0, " - + COLUMN_COMMENT + " TEXT DEFAULT ''" - + ")"; - db.execSQL(CREATE_BOOKING_TABLE); } @Override @@ -215,77 +97,6 @@ public class DBHelper extends SQLiteOpenHelper { db.execSQL("CREATE TABLE IF NOT EXISTS "+ TABLE_SERVICES + "(" + COLUMN_SERVICE + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK," + COLUMN_RATE + " REAL DEFAULT 0.0" + ")"); - - case 2: //going from db versions 1-2 to 3 - db.execSQL("CREATE TABLE IF NOT EXISTS "+ TABLE_SERVICEPROVIDERS + "(" - + COLUMN_SERVICEPROVIDERNAME + " TEXT NOT NULL, " - + COLUMN_SERVICEPROVIDERSERVICE + " TEXT NOT NULL, " - //service provider name is foreign key - + " FOREIGN KEY(" + COLUMN_SERVICEPROVIDERNAME - + ") REFERENCES " + TABLE_LOGIN + "(" + COLUMN_USERNAME +"), " - //service is also foreign key - + " FOREIGN KEY(" + COLUMN_SERVICEPROVIDERSERVICE - + ") REFERENCES " + TABLE_SERVICES + "(" + COLUMN_SERVICE +") " - + ")"); - db.execSQL("CREATE TABLE IF NOT EXISTS "+ TABLE_AVAILABILITY + "(" - + COLUMN_AVAILABILITYNAME + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK, " - + COLUMN_MONSTART + " REAL, " - + COLUMN_MONEND + " REAL, " - + COLUMN_TUESTART + " REAL, " - + COLUMN_TUEEND + " REAL, " - + COLUMN_WEDSTART + " REAL, " - + COLUMN_WEDEND + " REAL, " - + COLUMN_THUSTART + " REAL, " - + COLUMN_THUEND + " REAL, " - + COLUMN_FRISTART + " REAL, " - + COLUMN_FRIEND + " REAL, " - + COLUMN_SATSTART + " REAL, " - + COLUMN_SATEND + " REAL, " - + COLUMN_SUNSTART + " REAL, " - + COLUMN_SUNEND + " REAL)"); - - db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_ADDRESS + " TEXT"); - db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_PHONE + " TEXT"); - db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_COMPANY + " TEXT"); - db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_LICENSED + " TEXT"); - case 3: - db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_DESCRIPTION + " TEXT"); - db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_SALT + " TEXT"); - case 4: - db.execSQL("ALTER TABLE " + TABLE_SERVICEPROVIDERS + " ADD COLUMN " + COLUMN_AVERAGERATING + " REAL DEFAULT 0"); - db.execSQL("ALTER TABLE " + TABLE_SERVICEPROVIDERS + " ADD COLUMN " + COLUMN_RATERS + " REAL DEFAULT 0"); - db.execSQL("ALTER TABLE " + TABLE_SERVICEPROVIDERS + " ADD COLUMN " + COLUMN_ACTIVE + " TEXT DEFAULT 'active'"); - db.execSQL("CREATE TABLE IF NOT EXISTS "+ TABLE_BOOKINGS + "(" - + COLUMN_BOOKINGSERVICEPROVIDER + " TEXT," - + COLUMN_BOOKINGHOMEOWNER + " TEXT," - + COLUMN_BOOKINGSERVICE + " TEXT, " - + COLUMN_BOOKINGYEAR + " REAL," - + COLUMN_BOOKINGMONTH + " REAL, " - + COLUMN_BOOKINGDATE + " REAL, " - + COLUMN_BOOKINGSTART + " REAL, " - + COLUMN_BOOKINGEND + " REAL, " - + COLUMN_BOOKINGSTATUS + " TEXT, " - + COLUMN_RATING + " REAL DEFAULT 0 " - + ")"); - case 5: - db.execSQL("ALTER TABLE " + TABLE_BOOKINGS + " ADD COLUMN " + COLUMN_COMMENT + " TEXT DEFAULT ''"); - case 6: - Cursor cursor = db.query(TABLE_LOGIN, new String[]{COLUMN_USERNAME, COLUMN_PASSWORD}, null, null, - null, null, null); - if (cursor.moveToFirst()){ - for (int i = 0; i 0; + } /** @@ -491,32 +207,8 @@ public class DBHelper extends SQLiteOpenHelper { * @return whether a user was deleted */ public boolean deleteUser(String username) { - if (username == null) return false; - - Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_LOGIN - + " WHERE " + COLUMN_USERNAME + " = ?", - new String[]{username}); - - if (!cursor.moveToFirst()) return false; - - boolean deleted; - if (cursor.getString(4).equals("ServiceProvider")) { - deleted = writeDB.delete(TABLE_LOGIN, COLUMN_USERNAME+" = ?", - new String[]{username}) > 0; - - if (deleted) { - writeDB.delete(TABLE_SERVICEPROVIDERS, COLUMN_SERVICEPROVIDERNAME + " = ?", - new String[]{username}); - writeDB.delete(TABLE_AVAILABILITY, COLUMN_AVAILABILITYNAME + " = ?", - new String[]{username}); - } - cursor.close(); - return deleted; - } else { - cursor.close(); - return writeDB.delete(TABLE_LOGIN, COLUMN_USERNAME+" = ?", - new String[]{username}) > 0; - } + return writeDB.delete(TABLE_LOGIN, COLUMN_USERNAME+" = ?", + new String[]{username}) > 0; } /** @@ -541,15 +233,14 @@ public class DBHelper extends SQLiteOpenHelper { * Returns true if successful in adding service to database. * * @param service service to be added - * @return true if adding service was successful + * @return whether adding service was successful */ public boolean addService(Service service){ - if (service == null) return false; - //Check for duplicate username by querying services table + //Check for duplicate username by querying login table Cursor cursor = writeDB.query(TABLE_SERVICES, new String[] {COLUMN_SERVICE}, COLUMN_SERVICE + " = ?", - new String[]{service.getName().toLowerCase().trim()}, + new String[]{service.getName()}, null, null, null, "1"); //If cursor has 1+ elements in it, username already exists in table @@ -560,7 +251,7 @@ public class DBHelper extends SQLiteOpenHelper { cursor.close(); ContentValues values = new ContentValues(); - values.put(COLUMN_SERVICE, service.getName().toLowerCase().trim()); + values.put(COLUMN_SERVICE, service.getName()); values.put(COLUMN_RATE, service.getRate()); writeDB.insert(TABLE_SERVICES, null, values); return true; @@ -575,10 +266,7 @@ public class DBHelper extends SQLiteOpenHelper { * @return object representing service found */ public Service findService(String serviceName){ - if (serviceName == null) return null; - Service service; - serviceName = serviceName.toLowerCase().trim(); Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_SERVICES + " WHERE " + COLUMN_SERVICE + " = ?", new String[]{serviceName}); @@ -602,15 +290,14 @@ public class DBHelper extends SQLiteOpenHelper { * * @param service service object containing updated values * - * @return true if updating service information was successful + * @return whether updating service information was successful */ public boolean updateService(Service service){ - if (service == null) return false; ContentValues values = new ContentValues(); values.put(COLUMN_RATE, service.getRate()); return writeDB.update(TABLE_SERVICES, values, COLUMN_SERVICE+" = ?", - new String[]{service.getName().toLowerCase().trim()}) > 0; + new String[]{service.getName()}) > 0; } /** @@ -622,12 +309,9 @@ public class DBHelper extends SQLiteOpenHelper { * @param name name of service * @param rate rate of service * - * @return true if updating service information was successful + * @return whether updating service information was successful */ public boolean updateService(String name, double rate){ - if (name == null) return false; - - name = name.toLowerCase().trim(); ContentValues values = new ContentValues(); if (rate > 0) values.put(COLUMN_RATE, rate); @@ -638,29 +322,16 @@ public class DBHelper extends SQLiteOpenHelper { /** * Looks in database for a service, and deletes the corresponding - * entry. Returns true if a service was deleted, false otherwise. + * entry. Returns true if a user was deleted, false otherwise. * * @param service service of entry to delete - * @return true if the service was deleted + * @return whether the service was deleted */ public boolean deleteService(String service) { - if (service == null) return false; - - boolean deleted; - String nullify = null; - service = service.toLowerCase().trim(); - - deleted = writeDB.delete(TABLE_SERVICES, COLUMN_SERVICE+" = ?", + return writeDB.delete(TABLE_SERVICES, COLUMN_SERVICE+" = ?", new String[]{service}) > 0; - - if (deleted) { - writeDB.delete(TABLE_SERVICEPROVIDERS, COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[]{service}); - } - return deleted; } - /** * Returns a list of String arrays containing the service categories, * names and hourly rates. @@ -668,872 +339,12 @@ public class DBHelper extends SQLiteOpenHelper { * @return list of arrays of [service, rate] */ public List getAllServices(){ - return getAll("SELECT * FROM " + TABLE_SERVICES + " ORDER BY " + COLUMN_SERVICE); + return getAll("SELECT * FROM " + TABLE_SERVICES); } /** - * Adds a service to a service provider. The service provider now offers the service. - * - * @param serviceProvider service provider who offers service - * @param service service offered - * - * @return true if adding service to provider was successful - */ - public boolean addServiceProvidedByUser(ServiceProvider serviceProvider, Service service){ - if (serviceProvider == null || service == null) return false; - return addServiceProvidedByUser(serviceProvider.getUsername(), service.getName()); - } - - /** - * Adds a service to a service provider. The service provider now offers the service. - * - * @param serviceProvider service provider who offers service - * @param serviceName service offered - * - * @return true if adding service to provider was successful - */ - public boolean addServiceProvidedByUser(ServiceProvider serviceProvider, String serviceName){ - if (serviceProvider == null || serviceName == null) return false; - return addServiceProvidedByUser(serviceProvider.getUsername(), serviceName); - } - - /** - * Adds a service to a service provider. The service provider now offers the service. - * - * @param serviceProviderUsername service provider who offers service - * @param serviceName service offered - * - * @return true if adding service to provider was successful - */ - public boolean addServiceProvidedByUser(String serviceProviderUsername, String serviceName){ - if (serviceProviderUsername == null || serviceName == null) return false; - - //TODO: Check if serviceProviderUsername and serviceName are in db before adding - - serviceName = serviceName.toLowerCase().trim(); - - //Check for duplicate username/service combination by querying login table - Cursor cursor = writeDB.query(TABLE_SERVICEPROVIDERS, - new String[] {COLUMN_ACTIVE}, - COLUMN_SERVICEPROVIDERNAME + " = ? AND " - + COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[]{serviceProviderUsername, serviceName}, - null, null, null, - "1"); - //If cursor has 1+ elements in it, username/service combination already exists in table - if (cursor.moveToFirst()){ - if (cursor.getString(0).equals("active")){ - cursor.close(); - return false; - } else { - ContentValues values = new ContentValues(); - values.put(COLUMN_ACTIVE, "active"); - return writeDB.update(TABLE_SERVICEPROVIDERS, values, - COLUMN_SERVICEPROVIDERNAME + " = ? AND " - + COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[]{serviceProviderUsername, serviceName})>0; - } - - } - cursor.close(); - - ContentValues values = new ContentValues(); - values.put(COLUMN_SERVICEPROVIDERNAME, serviceProviderUsername); - values.put(COLUMN_SERVICEPROVIDERSERVICE, serviceName); - writeDB.insert(TABLE_SERVICEPROVIDERS, null, values); - return true; - } - - /** - * Removes service from service provider. Provider no longer offers this service. - * - * @param serviceProvider service provider who once offered service - * @param service service to be removed - * - * @return true if service provider's status for this service is now inactive - */ - public boolean deleteServiceProvidedByUser(ServiceProvider serviceProvider, Service service){ - if (serviceProvider == null || service == null) return false; - return deleteServiceProvidedByUser(serviceProvider.getUsername(), service.getName()); - } - - /** - * Removes service from service provider. Provider no longer offers this service. - * - * @param serviceProvider service provider who once offered service - * @param serviceName service to be removed - * - * @return true if service provider's status for this service is now inactive - */ - public boolean deleteServiceProvidedByUser(ServiceProvider serviceProvider, String serviceName){ - if (serviceProvider == null || serviceName == null) return false; - return deleteServiceProvidedByUser(serviceProvider.getUsername(), serviceName); - } - - /** - * Removes service from service provider. Provider no longer offers this service. - * - * @param serviceProviderUsername service provider who once offered service - * @param serviceName service to be removed - * - * @return true if service provider's status for this service is now inactive - */ - public boolean deleteServiceProvidedByUser(String serviceProviderUsername, String serviceName){ - if (serviceProviderUsername == null || serviceName == null) return false; - serviceName = serviceName.toLowerCase().trim(); - - ContentValues values = new ContentValues(); - values.put(COLUMN_ACTIVE, "inactive"); - - return writeDB.update(TABLE_SERVICEPROVIDERS, values, - COLUMN_SERVICEPROVIDERNAME + " = ? AND " - + COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[]{serviceProviderUsername, serviceName}) > 0; - } - - /** - * Fetches all services provided by a service provider - * - * @param serviceProvider - * @return a list of [service, rate] - */ - public List getAllServicesProvidedByUser(ServiceProvider serviceProvider){ - if (serviceProvider == null) return new ArrayList<>(); - - return getAllServicesProvidedByUser(serviceProvider.getUsername()); - } - - /** - * Fetches all services provided by a service provider - * - * @param serviceProviderName - * @return a list of [service, rate] - */ - public List getAllServicesProvidedByUser(String serviceProviderName){ - if (serviceProviderName == null) return new ArrayList<>(); - - return getAll("SELECT " + TABLE_SERVICES + "." + COLUMN_SERVICE + ", " - + TABLE_SERVICES + "." + COLUMN_RATE - + " FROM " + TABLE_SERVICES + " JOIN " + TABLE_SERVICEPROVIDERS - + " ON " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERSERVICE + " = " - + TABLE_SERVICES + "." + COLUMN_SERVICE - + " AND " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERNAME - + "= '" + serviceProviderName + "'" - + " AND " + TABLE_SERVICEPROVIDERS + "." + COLUMN_ACTIVE + " = 'active'"); - } - - /** - * Fetches all service providers who provide a specified service - * - * @param service name of service - * @return a list of [username, first name, last name, average rating] sorted by rating - */ - public List getAllProvidersByService(Service service){ - if (service == null) return new ArrayList<>(); - - return getAllProvidersByService(service.getName()); - } - - /** - * Fetches all service providers who provide a specified service - * - * @param serviceName name of service - * @return a list of [username, first name, last name, average rating] sorted by rating - */ - public List getAllProvidersByService(String serviceName){ - if (serviceName == null) return new ArrayList<>(); - - serviceName = serviceName.toLowerCase().trim(); - return getAll( - "SELECT " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERNAME + ", " - + TABLE_LOGIN + "." + COLUMN_FIRSTNAME + ", " - + TABLE_LOGIN + "." + COLUMN_LASTNAME + ", " - + TABLE_SERVICEPROVIDERS + "." + COLUMN_AVERAGERATING - + " FROM " + TABLE_SERVICEPROVIDERS + " JOIN " + TABLE_LOGIN - + " ON " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERNAME + " = " - + TABLE_LOGIN + "." + COLUMN_USERNAME - + " AND " + COLUMN_SERVICEPROVIDERSERVICE + " = '" + serviceName + "'" - + " AND " + TABLE_SERVICEPROVIDERS + "." + COLUMN_ACTIVE + " = 'active'" - + " ORDER BY " + TABLE_SERVICEPROVIDERS + "." + COLUMN_AVERAGERATING + " DESC"); - } - - /** - * Updates a service provider's availabilities based on ServiceProvider object provided - * - * @param serviceProvider - * @return true if availability was updated successfully - */ - public boolean updateAvailability(ServiceProvider serviceProvider){ - //availability is stored as number of minutes from 00:00 - if (serviceProvider == null) return false; - int[][] availabilities = serviceProvider.getAvailabilities(); - if (availabilities == null) return false; - - Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_AVAILABILITY - + " WHERE " + COLUMN_AVAILABILITYNAME + " = ?", - new String[]{serviceProvider.getUsername()}); - - ContentValues contentValues = new ContentValues(); - addAvailabilityToContentValues(contentValues, COLUMN_MONSTART, COLUMN_MONEND, availabilities[0]); - addAvailabilityToContentValues(contentValues, COLUMN_TUESTART, COLUMN_TUEEND, availabilities[1]); - addAvailabilityToContentValues(contentValues, COLUMN_WEDSTART, COLUMN_WEDEND, availabilities[2]); - addAvailabilityToContentValues(contentValues, COLUMN_THUSTART, COLUMN_THUEND, availabilities[3]); - addAvailabilityToContentValues(contentValues, COLUMN_FRISTART, COLUMN_FRIEND, availabilities[4]); - addAvailabilityToContentValues(contentValues, COLUMN_SATSTART, COLUMN_SATEND, availabilities[5]); - addAvailabilityToContentValues(contentValues, COLUMN_SUNSTART, COLUMN_SUNEND, availabilities[6]); - - if (!cursor.moveToFirst()){ - contentValues.put(COLUMN_AVAILABILITYNAME, serviceProvider.getUsername()); - writeDB.insert(TABLE_AVAILABILITY, null, contentValues); - } else { - writeDB.update(TABLE_AVAILABILITY, contentValues, - COLUMN_AVAILABILITYNAME + " = ?", new String[]{serviceProvider.getUsername()}); - } - return true; - } - - - //note that this method overwrites serviceProvider's availability if it exists - public int[][] getAvailabilities(ServiceProvider serviceProvider){ - if (serviceProvider==null) return new int[7][4]; - Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_AVAILABILITY - + " WHERE " + COLUMN_AVAILABILITYNAME + " = ?", - new String[]{serviceProvider.getUsername()}); - if (cursor.moveToFirst()){ - for (int i = 0; i < 7; i++) { - int start = cursor.getInt(i*2+1); - int end = cursor.getInt(i*2+2); - serviceProvider.setAvailabilities(i, start/60, start%60, - end/60, end%60); - } - } else { - return new int[7][4]; - } - return serviceProvider.getAvailabilities(); - } - - public int[][] getAvailabilities(String serviceProviderName){ - int[][] availabilities = new int[7][4]; - if (serviceProviderName==null) return availabilities; - - Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_AVAILABILITY - + " WHERE " + COLUMN_AVAILABILITYNAME + " = ?", - new String[]{serviceProviderName}); - if (cursor.moveToFirst()){ - for (int i = 0; i < 7; i++) { - int start = cursor.getInt(i*2+1); - int end = cursor.getInt(i*2+2); - availabilities[i] = new int[]{start/60, start%60, end/60, end%60}; - } - } - return availabilities; - } - - - /** - * Returns a list of unbooked time slots that are at least 30 minutes - * @param serviceProvider - * @param year - * @param month - * @param day - * @return list of [start hour, start minute, end hour, end minute] of available timeslots - */ - public List getAvailabilityByDate(ServiceProvider serviceProvider, int year, int month, int day){ - return getAvailabilityByDate(serviceProvider.getUsername(), year, month, day); - } - - /** - * Returns a list of unbooked time slots that are at least 30 minutes - * @param serviceProvider - * @param year - * @param month - * @param day - * @return list of [start hour, start minute, end hour, end minute] of available timeslots - */ - public List getAvailabilityByDate(String serviceProvider, int year, int month, int day){ - - List availabilities = new ArrayList<>(); - - Cursor bookings = writeDB.query(TABLE_BOOKINGS, new String[] {COLUMN_BOOKINGSTART, COLUMN_BOOKINGEND}, - COLUMN_BOOKINGSERVICEPROVIDER+ " = ?" - + " AND " + COLUMN_BOOKINGYEAR + " = ?" - + " AND " + COLUMN_BOOKINGMONTH + " = ?" - + " AND " + COLUMN_BOOKINGDATE + " = ?", - new String[]{serviceProvider, String.valueOf(year), - String.valueOf(month),String.valueOf(day)}, - null, null, COLUMN_BOOKINGSTART, null); - - Cursor availability = getAvailabilityByDayOfWeek(serviceProvider, year, month, day); - if (availability.moveToFirst()) { - int previousEnd = availability.getInt(0); - int currentStart; - int currentEnd; - if (bookings.moveToFirst()) { - for (int i = 0; i < bookings.getCount(); i++) { - currentStart = bookings.getInt(0); - if (currentStart - previousEnd >= 30){ - availabilities.add(new int[]{previousEnd/60, previousEnd%60, - currentStart/60, currentStart%60}); - } - previousEnd = bookings.getInt(1); - bookings.moveToNext(); - } - currentStart = availability.getInt(1); - if (currentStart - previousEnd >= 30){ - availabilities.add(new int[]{previousEnd/60, previousEnd%60, - currentStart/60, currentStart%60}); - } - } else { - currentStart = availability.getInt(0); - currentEnd = availability.getInt(1); - availabilities.add(new int[]{currentStart/60, currentStart%60, - currentEnd/60, currentEnd%60}); - } - } - return availabilities; - } - - public boolean addBooking(Booking booking){ - if (booking == null) return false; - - return addBooking(booking.getServiceprovider().getUsername(), - booking.getHomeowner().getUsername(), booking.getService().getName(), - booking.getYear(), booking.getMonth(), booking.getDay(), - booking.getStarth(), booking.getStartmin(), - booking.getEndh(), booking.getEndmin()); - } - - public boolean addBooking(String serviceProvider, String homeOwner, String service, - String monthDayYear, int starth, int startmin, int endh, int endmin){ - String[] date = monthDayYear.split("/"); - - return addBooking(serviceProvider, homeOwner, service, - Integer.parseInt(date[2]), Integer.parseInt(date[0]), Integer.parseInt(date[1]), - starth, startmin, endh, endmin); - } - - /** - * - * @param serviceProvider - * @param homeOwner - * @param service - * @param year - * @param month - * @param day - * @param starth - * @param startmin - * @param endh - * @param endmin - * @return true if booking was successfully added - */ - public boolean addBooking(String serviceProvider, String homeOwner, String service, - int year, int month, int day, - int starth, int startmin, int endh, int endmin){ - - GregorianCalendar current = new GregorianCalendar(); - current.setTimeInMillis(System.currentTimeMillis()); - GregorianCalendar bookDate = new GregorianCalendar(year, month-1, day, starth, startmin); - - //check if time of booking is after this time - if (current.compareTo(bookDate) > 0) return false; - - service = service.trim().toLowerCase(); - - Cursor cursor = writeDB.query(TABLE_SERVICEPROVIDERS, new String[]{COLUMN_SERVICEPROVIDERNAME}, - COLUMN_SERVICEPROVIDERNAME + " = ? AND " - + COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[] {serviceProvider, service}, - null, null, null, "1"); - if (!cursor.moveToFirst()) { - cursor.close(); - return false; - } - cursor.close(); - - if (isProviderAvailable(serviceProvider, year, month, day, starth, startmin, - endh, endmin)){ - - ContentValues contentValues = new ContentValues(); - contentValues.put(COLUMN_BOOKINGSTART, starth * 60 + startmin); - contentValues.put(COLUMN_BOOKINGEND, endh * 60 + endmin); - contentValues.put(COLUMN_BOOKINGDATE, day); - contentValues.put(COLUMN_BOOKINGMONTH, month); - contentValues.put(COLUMN_BOOKINGYEAR, year); - contentValues.put(COLUMN_BOOKINGSERVICEPROVIDER, serviceProvider); - contentValues.put(COLUMN_BOOKINGHOMEOWNER, homeOwner); - contentValues.put(COLUMN_BOOKINGSERVICE, service); - contentValues.put(COLUMN_BOOKINGSTATUS, Status.PENDING.toString()); - contentValues.put(COLUMN_RATING, 0); - - writeDB.insert(TABLE_BOOKINGS, null, contentValues); - - return true; - } - return false; - } - - /** - * - * @param username - * @return list of booking objects related to specified user. - * Returns an empty list if no bookings found - */ - public List findBookings(String username){ - ServiceProvider serviceProvider = null; - HomeOwner homeOwner = null; - Cursor cursor = writeDB.rawQuery("SELECT " + COLUMN_USERTYPE + " FROM " + TABLE_LOGIN + " WHERE " - + COLUMN_USERNAME + " = ?", - new String[] {username}); - if (!cursor.moveToFirst() || cursor.getString(0).equals("Admin")) return new ArrayList<>(); - - if (cursor.getString(0).equals("ServiceProvider")) { - serviceProvider = (ServiceProvider)findUserByUsername(username); - cursor = writeDB.rawQuery("SELECT * FROM " + TABLE_BOOKINGS + " WHERE " - + COLUMN_BOOKINGSERVICEPROVIDER + " = ?", - new String[]{username}); - } else { - homeOwner = (HomeOwner)findUserByUsername(username); - cursor = writeDB.rawQuery("SELECT * FROM " + TABLE_BOOKINGS + " WHERE " - + COLUMN_BOOKINGHOMEOWNER + " = ?", - new String[]{username}); - } - - return getBookings(cursor, serviceProvider, homeOwner); - } - - /** - * - * @param username - * @return list of booking objects related to specified user. - * Returns an empty list if no bookings found - */ - public List findNonCancelledBookings(String username) { - List bookingList = new ArrayList<>(); - ServiceProvider serviceProvider = null; - HomeOwner homeOwner = null; - Cursor cursor = writeDB.rawQuery("SELECT " + COLUMN_USERTYPE + " FROM " + TABLE_LOGIN + " WHERE " - + COLUMN_USERNAME + " = ?", - new String[]{username}); - if (!cursor.moveToFirst() || cursor.getString(0).equals("Admin")) return bookingList; - - if (cursor.getString(0).equals("ServiceProvider")) { - serviceProvider = (ServiceProvider) findUserByUsername(username); - cursor = writeDB.rawQuery("SELECT * FROM " + TABLE_BOOKINGS + " WHERE " - + COLUMN_BOOKINGSERVICEPROVIDER + " = ? AND " - + COLUMN_BOOKINGSTATUS + " != ?", - new String[]{username, Status.CANCELLED.toString()}); - } else { - homeOwner = (HomeOwner) findUserByUsername(username); - cursor = writeDB.rawQuery("SELECT * FROM " + TABLE_BOOKINGS + " WHERE " - + COLUMN_BOOKINGHOMEOWNER + " = ? AND " - + COLUMN_BOOKINGSTATUS + " != ?", - new String[]{username, Status.CANCELLED.toString()}); - } - - return getBookings(cursor, serviceProvider, homeOwner); - } - - /** - * Sets status of specified booking to cancelled. Returns false if booking - * does not exist in database, or date of booking has already passed. - * - * @param booking - * @return true if booking was successfully cancelled - */ - public boolean confirmBooking(Booking booking){ - return modifyBookingStatus(booking, Status.CONFIRMED); - } - - /** - * Sets status of specified booking to cancelled. Returns false if booking was already cancelled, - * booking does not exist in database, or date of booking has already passed. - * - * @param booking - * @return true if booking was successfully cancelled - */ - public boolean cancelBooking(Booking booking){ - return modifyBookingStatus(booking, Status.CANCELLED); - } - - /** - * Add a rating for a specific booking, and updates the average rating for the service provider - * and service combination. The booking must have passed before a rating can be added. - * Note that the rating is final. - * - * @param booking Booking with rating and comment already included - * @return true if adding the rating was successful - */ - public boolean addRating(Booking booking){ - return addRating(booking, booking.getRating(), booking.getComment()); - } - - /** - * Add a rating for a specific booking, and updates the average rating for the service provider - * and service combination. The booking must have passed before a rating can be added. - * Note that the rating is final. - * - * @param booking - * @param rating - * - * @return true if adding the rating was successful - */ - public boolean addRating(Booking booking, double rating){ - return addRating(booking, rating, ""); - } - - /** - * Add a rating for a specific booking, and updates the average rating for the service provider - * and service combination. The booking must have passed before a rating can be added. - * Note that the rating is final. - * - * @param booking - * @param rating - * @param comment - * @return true if adding the rating was successful - */ - public boolean addRating(Booking booking, double rating, String comment){ - if (booking == null) return false; - - GregorianCalendar current = new GregorianCalendar(); - current.setTimeInMillis(System.currentTimeMillis()); - GregorianCalendar bookDate = new GregorianCalendar(booking.getYear(), booking.getMonth()-1, - booking.getDay(), booking.getEndh(), booking.getEndmin()); - - //check if time of booking is before this time - if (current.compareTo(bookDate) < 0) return false; - - ContentValues contentValues = new ContentValues(); - contentValues.put(COLUMN_RATING, rating); - contentValues.put(COLUMN_COMMENT, comment); - - Cursor cursor = writeDB.query(TABLE_BOOKINGS, new String[]{COLUMN_RATING}, - COLUMN_BOOKINGSERVICEPROVIDER + " = ? AND " - + COLUMN_BOOKINGHOMEOWNER + " = ? AND " - + COLUMN_BOOKINGYEAR + " = ? AND " - + COLUMN_BOOKINGMONTH + " = ? AND " - + COLUMN_BOOKINGDATE + " = ? AND " - + COLUMN_BOOKINGSTART + " = ?", - new String[] {booking.getServiceprovider().getUsername(), - booking.getHomeowner().getUsername(), - String.valueOf(booking.getYear()), - String.valueOf(booking.getMonth()), - String.valueOf(booking.getDay()), - String.valueOf(booking.getStarth()*60 + booking.getStartmin())}, - null, null, null, null); - int previousrating = 0; - - if (cursor.moveToFirst()){ - previousrating = cursor.getInt(0); - } - - boolean updated = writeDB.update(TABLE_BOOKINGS, contentValues, - COLUMN_BOOKINGSERVICEPROVIDER + " = ? AND " - + COLUMN_BOOKINGHOMEOWNER + " = ? AND " - + COLUMN_BOOKINGYEAR + " = ? AND " - + COLUMN_BOOKINGMONTH + " = ? AND " - + COLUMN_BOOKINGDATE + " = ? AND " - + COLUMN_BOOKINGSTART + " = ? AND " - + COLUMN_BOOKINGSTART + " != ?", - new String[] {booking.getServiceprovider().getUsername(), - booking.getHomeowner().getUsername(), - String.valueOf(booking.getYear()), - String.valueOf(booking.getMonth()), - String.valueOf(booking.getDay()), - String.valueOf(booking.getStarth()*60 + booking.getStartmin()), - Status.CANCELLED.toString()}) > 0; - - if (updated) { - cursor = writeDB.query(TABLE_SERVICEPROVIDERS, new String[]{COLUMN_AVERAGERATING, COLUMN_RATERS}, - COLUMN_SERVICEPROVIDERNAME + " = ? AND " - + COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[] {booking.getServiceprovider().getUsername(), booking.getService().getName().toLowerCase().trim()}, - null, null, null, null); - - cursor.moveToFirst(); - - int currentRaters = cursor.getInt(1); - double currentAverageRatings = cursor.getDouble(0)*currentRaters - + rating - previousrating; - currentRaters += previousrating == 0? 1 : 0; - cursor.close(); - - contentValues = new ContentValues(); - contentValues.put(COLUMN_AVERAGERATING, currentAverageRatings/(double)currentRaters); - contentValues.put(COLUMN_RATERS, currentRaters); - - writeDB.update(TABLE_SERVICEPROVIDERS, contentValues, - COLUMN_SERVICEPROVIDERNAME + " = ? AND " - + COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[] {booking.getServiceprovider().getUsername(), - booking.getService().getName().toLowerCase().trim()}); - } - return updated; - - } - - /** - * Returns the average rating for a service provider's service - * - * @param serviceProvider - * @param service - * @return average rating of specified service provider and service combination - */ - public double getAverageRating(ServiceProvider serviceProvider, Service service){ - return getAverageRating(serviceProvider.getUsername(), service.getName()); - } - - /** - * Returns the average rating for a service provider's service - * - * @param serviceProviderName name of service provider - * @param serviceName name of service - * @return average rating of specified service provider and service combination - */ - public double getAverageRating(String serviceProviderName, String serviceName){ - serviceName = serviceName.trim().toLowerCase(); - Cursor cursor = writeDB.query(TABLE_SERVICEPROVIDERS, new String[]{COLUMN_AVERAGERATING}, - COLUMN_SERVICEPROVIDERNAME + " = ? AND " - + COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[] {serviceProviderName, serviceName}, - null, null, null, null); - cursor.moveToFirst(); - double rating = cursor.getDouble(0); - cursor.close(); - - return rating; - } - - /** - * Gets a list of Strings in form [Homeowner username, rating, comment] for a specific - * service provider and service combination. Only includes bookings that have been rated. - * - * @param serviceProvider - * @param service - * @return - */ - public List getAllRatingsAndComments(ServiceProvider serviceProvider, Service service){ - return getAllRatingsAndComments(serviceProvider.getUsername(), service.getName()); - } - - /** - * Gets a list of Strings in form [Homeowner username, rating, comment] for a specific - * service provider and service combination. Only includes bookings that have been rated. - * - * @param serviceProviderName - * @param serviceName - * @return - */ - public List getAllRatingsAndComments(String serviceProviderName, String serviceName){ - serviceName = serviceName.toLowerCase().trim(); - return getAll("SELECT " + COLUMN_BOOKINGHOMEOWNER +", " - + COLUMN_RATING + ", " + COLUMN_COMMENT + " FROM " + TABLE_BOOKINGS - + " WHERE " + COLUMN_BOOKINGSERVICEPROVIDER + " = '" + serviceProviderName - + "' AND " + COLUMN_BOOKINGSERVICE + " = '" + serviceName - + "' AND " + COLUMN_RATING + " > 0"); - } - - public String[] getSpecificRatingAndComment(String serviceProviderName, String serviceName, - int year, int month, int day, int starth, int startmin){ - Cursor cursor = writeDB.query(TABLE_BOOKINGS, - new String[]{COLUMN_BOOKINGHOMEOWNER, COLUMN_RATING, COLUMN_COMMENT}, - COLUMN_BOOKINGSERVICEPROVIDER + " = ? AND " - + COLUMN_BOOKINGSERVICE + " = ? AND " - + COLUMN_BOOKINGYEAR + " = ? AND " - + COLUMN_BOOKINGMONTH + " = ? AND " - + COLUMN_BOOKINGDATE + " = ? AND " - + COLUMN_BOOKINGSTART + " = ? AND " - + COLUMN_RATING + " > 0", - new String[]{serviceProviderName, serviceName, String.valueOf(year), - String.valueOf(month), String.valueOf(day), String.valueOf(starth*60+startmin)}, - null, null, null, null); - if (cursor.moveToFirst()){ - return new String[]{cursor.getString(0), - cursor.getString(1),cursor.getString(2)}; - } else { - return null; - } - } - - /** - * Returns the number of people who rated a service provider's service - * - * @param serviceProvider name of service provider - * @param service name of service - * @return number of raters for specified service provider and service combination - */ - public int getRaters(ServiceProvider serviceProvider, Service service){ - return getRaters(serviceProvider.getUsername(), service.getName()); - - } - - /** - * Returns the number of people who rated a service provider's service - * - * @param serviceProviderName name of service provider - * @param serviceName name of service - * @return number of raters for specified service provider and service combination - */ - public int getRaters(String serviceProviderName, String serviceName){ - serviceName = serviceName.trim().toLowerCase(); - Cursor cursor = writeDB.query(TABLE_SERVICEPROVIDERS, new String[]{COLUMN_RATERS}, - COLUMN_SERVICEPROVIDERNAME + " = ? AND " - + COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[] {serviceProviderName, serviceName}, - null, null, null, null); - cursor.moveToFirst(); - cursor.close(); - - return cursor.getInt(0); - } - - /** - * Returns list of [username, first name, last name, rating] of service providers that - * have a rating equal to or above the specified rating - * - * @param service - * @param rating minimum rating - * @return a List of [username, first name, last name, rating] of service providers - */ - public List getProvidersAboveRating(Service service, double rating){ - return getProvidersAboveRating(service.getName(), rating); - } - - /** - * Returns list of [username, first name, last name, rating] of service providers that - * have a rating equal to or above the specified rating - * - * @param serviceName name of service - * @param rating minimum rating - * @return a List of [username, first name, last name, rating] of service providers - */ - public List getProvidersAboveRating(String serviceName, double rating){ - serviceName = serviceName.trim().toLowerCase(); - return getAll("SELECT " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERNAME + ", " - + TABLE_LOGIN + "." + COLUMN_FIRSTNAME + ", " - + TABLE_LOGIN + "." + COLUMN_LASTNAME + ", " - + TABLE_SERVICEPROVIDERS + "." + COLUMN_AVERAGERATING - + " FROM " + TABLE_SERVICEPROVIDERS + " JOIN " + TABLE_LOGIN - + " ON " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERNAME + " = " - + TABLE_LOGIN + "." + COLUMN_USERNAME - + " AND " + COLUMN_SERVICEPROVIDERSERVICE + " = '" + serviceName + "'" - + " AND " + TABLE_SERVICEPROVIDERS + "." + COLUMN_ACTIVE + " = 'active'" - + " AND " + TABLE_SERVICEPROVIDERS + "." + COLUMN_AVERAGERATING + " >= " + rating - + " ORDER BY " + TABLE_SERVICEPROVIDERS + "." + COLUMN_AVERAGERATING + " DESC"); - } - - /** - * Returns list of [username, first name, last name, rating] of service providers - * available at the specified time - * - * @param service - * @param year - * @param month - * @param day - * @param starth starting hour - * @param startmin starting minute - * @param endh ending hour - * @param endmin ending minute - * @return a List of [username, first name, last name, rating] of service providers - */ - public List getProvidersByTime(Service service, int year, int month, int day, - int starth, int startmin, int endh, int endmin){ - return getProvidersByTime(service.getName(), year, month, day, starth, startmin, endh, endmin); - } - - /** - * Returns list of [username, first name, last name, rating] of service providers - * available at the specified time - * - * @param serviceName name of service - * @param year - * @param month - * @param day - * @param starth starting hour - * @param startmin starting minute - * @param endh ending hour - * @param endmin ending minute - * @return a List of [username, first name, last name, rating] of service providers - */ - public List getProvidersByTime(String serviceName, int year, int month, int day, - int starth, int startmin, int endh, int endmin){ - serviceName = serviceName.trim().toLowerCase(); - List providers = getAll("SELECT " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERNAME + ", " - + TABLE_LOGIN + "." + COLUMN_FIRSTNAME + ", " - + TABLE_LOGIN + "." + COLUMN_LASTNAME + ", " - + TABLE_SERVICEPROVIDERS + "." + COLUMN_AVERAGERATING - + " FROM " + TABLE_SERVICEPROVIDERS + " JOIN " + TABLE_LOGIN - + " ON " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERNAME + " = " - + TABLE_LOGIN + "." + COLUMN_USERNAME - + " AND " + COLUMN_SERVICEPROVIDERSERVICE + " = '" + serviceName + "'" - + " AND " + TABLE_SERVICEPROVIDERS + "." + COLUMN_ACTIVE + " = 'active'" - + " ORDER BY " + TABLE_SERVICEPROVIDERS + "." + COLUMN_AVERAGERATING + " DESC"); - - for (int i = providers.size()-1; i >= 0; i--){ - if (!isProviderAvailable(providers.get(i)[0], year, month, day, - starth, startmin, endh, endmin)){ - providers.remove(i); - } - } - return providers; - } - - /** - * Returns list of [username, first name, last name, rating] of service providers - * available at the specified time and have a rating equal to or above the specified rating - * - * @param service - * @param rating minimum rating of filter - * @param year - * @param month - * @param day - * @param starth starting hour - * @param startmin starting minute - * @param endh ending hour - * @param endmin ending minute - * @return List of [username, first name, last name, rating] of service providers - */ - public List getProvidersByTimeAndRating(Service service, double rating, int year, int month, int day, - int starth, int startmin, int endh, int endmin){ - return getProvidersByTimeAndRating(service.getName(), rating, year, month, day, - starth, startmin, endh, endmin); - } - - /** - * Returns list of [username, first name, last name, rating] of service providers - * available at the specified time and have a rating equal to or above the specified rating. - * - * @param serviceName name of service - * @param rating minimum rating of filter - * @param year - * @param month - * @param day - * @param starth starting hour - * @param startmin starting minute - * @param endh ending hour - * @param endmin ending minute - * @return List of Strings of [username, first name, last name, rating] of service providers - */ - public List getProvidersByTimeAndRating(String serviceName, double rating, int year, int month, int day, - int starth, int startmin, int endh, int endmin){ - serviceName = serviceName.trim().toLowerCase(); - List providers = getProvidersByTime(serviceName, year, month, day, starth, startmin, endh, endmin); - - int i = providers.size()-1; - boolean allLowRatingsRemoved = false; - while (i>-1 && !allLowRatingsRemoved){ - if (getAverageRating(providers.get(i)[0], serviceName)>=rating){ - allLowRatingsRemoved = true; - } else { - providers.remove(i--); - } - } - return providers; - } - - - /** - * Prints all entries of table. One cell is printed per line with column name. - * Rows are separated by a blank line. + * Prints all entries of table. One row is printed per line. Columns are + * separated by spaces. * * @param tableName name of table to print */ @@ -1551,233 +362,7 @@ public class DBHelper extends SQLiteOpenHelper { cursor.close(); } - /** - * Deletes all data from database. It's used for testing when - * DB needs to be cleared. Please don't call this anywhere else. - */ - void deleteAll(){ - writeDB.execSQL("DELETE FROM " + TABLE_LOGIN); - writeDB.execSQL("DELETE FROM " + TABLE_SERVICES); - writeDB.execSQL("DELETE FROM " + TABLE_SERVICEPROVIDERS); - writeDB.execSQL("DELETE FROM " + TABLE_AVAILABILITY); - writeDB.execSQL("DELETE FROM " + TABLE_BOOKINGS); - } - /** - * I got really tired of trying to figure out how to rate and book at the same time. - * So Imma force it V2 - */ - void forceAddBookingDONTTOUCH(Booking booking) { - if (isProviderAvailable(booking.getServiceprovider().getUsername(), - booking.getYear(), booking.getMonth(), booking.getDay(), - booking.getStarth(), booking.getStartmin(), - booking.getEndh(), booking.getEndmin())) { - forceAddBookingDONTTOUCH(booking.getServiceprovider().getUsername(), - booking.getHomeowner().getUsername(), - booking.getService().getName(), - booking.getYear(), booking.getMonth(), booking.getDay(), - booking.getStarth(), booking.getStartmin(), - booking.getEndh(), booking.getEndmin(), - booking.getStatus()); - } - } - /** - * So I got really tired of trying to figure out how to rate and book at the same time. - * So Imma force it. - * - * @param serviceProvider - * @param homeOwner - * @param service - * @param year - * @param month - * @param day - * @param starth - * @param startmin - * @param endh - * @param endmin - */ - void forceAddBookingDONTTOUCH(String serviceProvider, String homeOwner, String service, - int year, int month, int day, - int starth, int startmin, int endh, int endmin, - Status status){ - service = service.trim().toLowerCase(); - - Cursor cursor = writeDB.query(TABLE_SERVICEPROVIDERS, new String[]{COLUMN_SERVICEPROVIDERNAME}, - COLUMN_SERVICEPROVIDERNAME + " = ? AND " - + COLUMN_SERVICEPROVIDERSERVICE + " = ?", - new String[] {serviceProvider, service}, - null, null, null, "1"); - if (!cursor.moveToFirst()) { - cursor.close(); - return; - } - cursor.close(); - - - ContentValues contentValues = new ContentValues(); - contentValues.put(COLUMN_BOOKINGSTART, starth * 60 + startmin); - contentValues.put(COLUMN_BOOKINGEND, endh * 60 + endmin); - contentValues.put(COLUMN_BOOKINGDATE, day); - contentValues.put(COLUMN_BOOKINGMONTH, month); - contentValues.put(COLUMN_BOOKINGYEAR, year); - contentValues.put(COLUMN_BOOKINGSERVICEPROVIDER, serviceProvider); - contentValues.put(COLUMN_BOOKINGHOMEOWNER, homeOwner); - contentValues.put(COLUMN_BOOKINGSERVICE, service); - contentValues.put(COLUMN_BOOKINGSTATUS, status.toString()); - contentValues.put(COLUMN_RATING, 0); - - writeDB.insert(TABLE_BOOKINGS, null, contentValues); - - } - - - /** - * Method called to add default values to app. - * Adds three - */ - private void setUp(){ - - //pre-add ten services - Service service = new Service("Dragon Tamer", 168.60); - Service service1 = new Service("Juggler", 14.35); - Service service2 = new Service("Bug Catcher", 6); - Service service3 = new Service("Firebreather", 72.3); - Service service4 = new Service("Spy", 900); - Service service5 = new Service("Thug", 123.45); - Service service6 = new Service("Baker", 25.60); - Service service7 = new Service("Maid", 13.20); - Service service8 = new Service("Butler", 496); - Service service9 = new Service("Gardener", 0); - - - addService(service); - addService(service1); - addService(service2); - addService(service3); - addService(service4); - addService(service5); - addService(service6); - addService(service7); - addService(service8); - addService(service9); - - - //pre-add an admin, three service providers, and three homeowners - ServiceProvider testing = new ServiceProvider( - "testing", "testing", - "TestFirst", "TestLast", - "1234 Test", "6136136163", - "Test Co", false, - "Tested 10 years"); - ServiceProvider testing1 = new ServiceProvider( - "testing1", "testing", - "owo", "OwO", - "10 Weee", "8594738261", - "Independent", true, - "Hire me"); - ServiceProvider testing2 = new ServiceProvider( - "testing2", "testing", - "Beep", "BOOP", - "33 Beep", "1833980091", - "Beepbeep", true, - "Beep beep lettuce"); - HomeOwner tester = new HomeOwner("tester", "tester", - "Itest", "Testtest"); - HomeOwner tester1 = new HomeOwner("tester1", "tester", - "Testest", "Testest"); - HomeOwner tester2 = new HomeOwner("tester2", "tester", - "Robolectric", "Junit"); - - //add first service provider - addUser(testing); - addServiceProvidedByUser("testing", "dragon tamer"); - addServiceProvidedByUser("testing", "juggler"); - addServiceProvidedByUser("testing", "bug catcher"); - addServiceProvidedByUser("testing", "firebreather"); - addServiceProvidedByUser("testing", "spy"); - addServiceProvidedByUser("testing", "Baker"); - addServiceProvidedByUser("testing", "Gardener"); - for (int i = 0; i<6; i++){ - testing.setAvailabilities(i, 0, 0, 23, 59); - } - updateAvailability(testing); - - addUser(testing1); - addServiceProvidedByUser("testing1", "dragon tamer"); - addServiceProvidedByUser("testing1", "juggler"); - addServiceProvidedByUser("testing1", "firebreather"); - addServiceProvidedByUser("testing1", "spy"); - addServiceProvidedByUser("testing1", "thug"); - for (int i = 0; i<4; i++){ - testing1.setAvailabilities(i, 0, 0, 23, 59); - } - updateAvailability(testing1); - - addUser(testing2); - addServiceProvidedByUser("testing2", "dragon tamer"); - for (int i = 3; i<7; i++){ - testing2.setAvailabilities(i, 0, 0, 23, 59); - } - updateAvailability(testing2); - - //add three homeowners - addUser(tester); - addUser(tester1); - addUser(tester2); - - //add like ten bookings - Booking booking = new Booking(10, 0, 12, 15, - 1, 10, 2018, testing, tester, service); - booking.setStatus(Status.CONFIRMED); - Booking booking1 = new Booking(13, 30, 14, 58, - 1, 10, 2018, testing, tester1, service); - booking1.setStatus(Status.CANCELLED); - Booking booking2 = new Booking(10, 0, 12, 15, - 2, 11, 2018, testing, tester, service); - booking2.setStatus(Status.CONFIRMED); - Booking booking3 = new Booking(10, 0, 12, 15, - 3, 10, 2018, testing, tester, service); - booking3.setStatus(Status.PENDING); - Booking booking4 = new Booking(10, 0, 12, 15, - 10, 11, 2018, testing, tester, service); - booking4.setStatus(Status.CONFIRMED); - Booking booking5 = new Booking(10, 0, 12, 15, - 12, 10, 2018, testing2, tester, service); - booking5.setStatus(Status.CONFIRMED); - Booking booking6 = new Booking(10, 0, 12, 15, - 1, 11, 2018, testing2, tester1, service); - booking6.setStatus(Status.CONFIRMED); - Booking booking7 = new Booking(10, 0, 12, 15, - 2, 10, 2018, testing1, tester1, service); - booking7.setStatus(Status.CONFIRMED); - Booking booking8 = new Booking(10, 0, 12, 15, - 4, 12, 2018, testing1, tester1, service); - Booking booking9 = new Booking(10, 0, 12, 15, - 3, 12, 2018, testing1, tester1, service); - - forceAddBookingDONTTOUCH(booking); - forceAddBookingDONTTOUCH(booking1); - forceAddBookingDONTTOUCH(booking2); - forceAddBookingDONTTOUCH(booking3); - forceAddBookingDONTTOUCH(booking4); - forceAddBookingDONTTOUCH(booking5); - forceAddBookingDONTTOUCH(booking6); - forceAddBookingDONTTOUCH(booking7); - forceAddBookingDONTTOUCH(booking8); - forceAddBookingDONTTOUCH(booking9); - - addRating(booking, 5, "Amazing"); - addRating(booking3, 1, "Never showed up"); - addRating(booking5, 3, "Decent"); - addRating(booking7, 4, "OK I guess"); - - } - - /** - * Gets all items in a table - * @param rawQuery SELECT * query - * @return list of array representing all items in raw query - */ private List getAll(String rawQuery){ List list = new LinkedList<>(); String[] infoArray; @@ -1797,222 +382,4 @@ public class DBHelper extends SQLiteOpenHelper { return list; } - /** - * Adds a service provider's availabilities for a specific day to content values - * @param contentValues - * @param startColumn - * @param endColumn - * @param startAndEndTimes - */ - private void addAvailabilityToContentValues(ContentValues contentValues, - String startColumn, String endColumn, - int[] startAndEndTimes){ - if (startAndEndTimes == null){ - contentValues.put(startColumn, 0); - contentValues.put(endColumn, 0); - } else { - int startTime = startAndEndTimes[0]*60+startAndEndTimes[1]; - int endTime = startAndEndTimes[2]*60+startAndEndTimes[3]; - if (endTime - startTime <=0 || startTime > 1439 || startTime < 0 - || endTime > 1439 || endTime <= 0) { - contentValues.put(startColumn, 0); - contentValues.put(endColumn, 0); - } else { - contentValues.put(startColumn, startTime); - contentValues.put(endColumn, endTime); - } - } - - } - - /** - * Helper method to get a service provider's availability by day of week - * - * @param serviceProvider username of service provider - * @param year - * @param month - * @param day - * @return Cursor containing the start and end of the service provider's availabilities - * on selected day of the week - */ - private Cursor getAvailabilityByDayOfWeek(String serviceProvider, int year, int month, int day){ - GregorianCalendar start = new GregorianCalendar(year, month-1, day); - //Calendar.DAY_OF_WEEK starts with 1 for Sunday, and onwards - int dayOfWeek = start.get(Calendar.DAY_OF_WEEK); - Cursor cursor = null; - - //Check availabilities on day of week - switch (dayOfWeek){ - case 1: //Sunday - cursor = writeDB.query(TABLE_AVAILABILITY, new String[] {COLUMN_SUNSTART, COLUMN_SUNEND}, - COLUMN_AVAILABILITYNAME + " = ?", new String[] {serviceProvider}, null, - null, null, null); - break; - case 2: //Monday - cursor = writeDB.query(TABLE_AVAILABILITY, new String[] {COLUMN_MONSTART, COLUMN_MONEND}, - COLUMN_AVAILABILITYNAME + " = ?", new String[] {serviceProvider}, null, - null, null, null); - break; - case 3: //Tuesday - cursor = writeDB.query(TABLE_AVAILABILITY, new String[] {COLUMN_TUESTART, COLUMN_TUEEND}, - COLUMN_AVAILABILITYNAME + " = ?", new String[] {serviceProvider}, null, - null, null, null); - break; - case 4: //Wednesday - cursor = writeDB.query(TABLE_AVAILABILITY, new String[] {COLUMN_WEDSTART, COLUMN_WEDEND}, - COLUMN_AVAILABILITYNAME + " = ?", new String[] {serviceProvider}, null, - null, null, null); - break; - case 5: //Thursday - cursor = writeDB.query(TABLE_AVAILABILITY, new String[] {COLUMN_THUSTART, COLUMN_THUEND}, - COLUMN_AVAILABILITYNAME + " = ?", new String[] {serviceProvider}, null, - null, null, null); - break; - case 6: //Friday - cursor = writeDB.query(TABLE_AVAILABILITY, new String[] {COLUMN_FRISTART, COLUMN_FRIEND}, - COLUMN_AVAILABILITYNAME + " = ?", new String[] {serviceProvider}, null, - null, null, null); - break; - case 7: //Saturday - cursor = writeDB.query(TABLE_AVAILABILITY, new String[] {COLUMN_SATSTART, COLUMN_SATEND}, - COLUMN_AVAILABILITYNAME + " = ?", new String[] {serviceProvider}, null, - null, null, null); - break; - } - - return cursor; - } - - /** - * Helper method to change booking status - * @param booking - * @param status status to update - * @return true if modification was successful - */ - private boolean modifyBookingStatus(Booking booking, Status status){ - if (booking == null) return false; - - GregorianCalendar current = new GregorianCalendar(); - current.setTimeInMillis(System.currentTimeMillis()); - GregorianCalendar bookDate = new GregorianCalendar(booking.getYear(), booking.getMonth()-1, - booking.getDay(), booking.getStarth(), booking.getStartmin()); - - //check if time of booking has passed - if (current.compareTo(bookDate) > 0) return false; - - ContentValues contentValues = new ContentValues(); - contentValues.put(COLUMN_BOOKINGSTATUS, status.toString()); - - return writeDB.update(TABLE_BOOKINGS, contentValues, - COLUMN_BOOKINGSERVICEPROVIDER + " = ? AND " - + COLUMN_BOOKINGHOMEOWNER + " = ? AND " - + COLUMN_BOOKINGYEAR + " = ? AND " - + COLUMN_BOOKINGMONTH + " = ? AND " - + COLUMN_BOOKINGDATE + " = ? AND " - + COLUMN_BOOKINGSTART + " = ? AND " - + COLUMN_BOOKINGSTATUS + " != ?", - new String[] {booking.getServiceprovider().getUsername(), - booking.getHomeowner().getUsername(), - String.valueOf(booking.getYear()), - String.valueOf(booking.getMonth()), - String.valueOf(booking.getDay()), - String.valueOf(booking.getStarth()*60 + booking.getStartmin()), - Status.CANCELLED.toString()}) > 0; - } - - /** - * Helper method to determine whether service provider is available at specified date and time. - * Returns false if end time before start time, or service provider not available - * - * @param serviceProvider - * @param year - * @param month - * @param day - * @param starth - * @param startmin - * @param endh - * @param endmin - * @return true if service provider is available for specified time slot - */ - private boolean isProviderAvailable(String serviceProvider, int year, int month, int day, - int starth, int startmin, int endh, int endmin){ - - int bookingStart = starth*60 + startmin; - int bookingEnd = endh*60 + endmin; - int availabilityStart, availabilityEnd; - - if (bookingEnd < bookingStart) return false; - - Cursor cursor = getAvailabilityByDayOfWeek(serviceProvider, year, month, day); - - cursor.moveToFirst(); - availabilityStart = cursor.getInt(0); - availabilityEnd = cursor.getInt(1); - - //service provider not available if availability end is 0, if availability starts after booking start, - // or if availability ends before booking end - if (availabilityEnd == 0 || availabilityStart > bookingStart || availabilityEnd < bookingEnd) { - return false; - } - - //now we know for sure that the service provider is available on said day of the week - //we check to see if any of the bookings overlap on this time slot - cursor = writeDB.query(TABLE_BOOKINGS, new String[] {COLUMN_BOOKINGSTART, COLUMN_BOOKINGEND}, - COLUMN_BOOKINGSERVICEPROVIDER + " = ? AND " - + COLUMN_BOOKINGYEAR + " = ? AND " - + COLUMN_BOOKINGMONTH + " = ? AND " - + COLUMN_BOOKINGDATE + " = ? AND " - + COLUMN_BOOKINGSTATUS + " != ?", - new String[] {serviceProvider, String.valueOf(year), - String.valueOf(month), String.valueOf(day), Status.CANCELLED.toString()}, - null, null, COLUMN_BOOKINGSTART, null); - if (cursor.moveToFirst()){ - for (int i = 0; i= bookingStart)|| - (availabilityStart <= bookingEnd && availabilityEnd >= bookingEnd) || - (availabilityStart >= bookingStart && availabilityEnd <= bookingEnd)) return false; - - cursor.moveToNext(); - } - } - return true; - } - - private List getBookings(Cursor cursor, ServiceProvider serviceProvider, HomeOwner homeOwner){ - List bookingList = new ArrayList<>(); - - if (cursor.moveToFirst()) { - for (int i = 0; i < cursor.getCount(); i++) { - int startTime = cursor.getInt(6); - int endTime = cursor.getInt(7); - int starth = startTime / 60; - int startmin = startTime % 60; - int endh = endTime / 60; - int endmin = endTime % 60; - int day = cursor.getInt(5); - int month = cursor.getInt(4); - int year = cursor.getInt(3); - String stat = cursor.getString(8); - Status status = (stat.equals("Pending") ? Status.PENDING : - stat.equals("Confirmed") ? Status.CONFIRMED : Status.CANCELLED); - ServiceProvider serviceprovider = (serviceProvider == null ? - (ServiceProvider) findUserByUsername(cursor.getString(0)) : serviceProvider); - HomeOwner homeowner = (homeOwner == null ? - (HomeOwner) findUserByUsername(cursor.getString(1)) : homeOwner); - Service service = (Service)findService(cursor.getString(2)); - Booking booking = new Booking(starth, startmin, endh, endmin, day, month, year, - serviceprovider, homeowner, service); - booking.setStatus(status); - bookingList.add(booking); - - cursor.moveToNext(); - } - } - return bookingList; - } - } - diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DeleteServiceDialogFragment.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DeleteServiceDialogFragment.java deleted file mode 100644 index 031cfae..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DeleteServiceDialogFragment.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.view.LayoutInflater; -import android.widget.EditText; -import android.widget.Toast; - -public class DeleteServiceDialogFragment extends DialogFragment{ - public interface NoticeDialogListener { - public void onDialogDelete(DialogFragment dialog); - public void onDialogNevermind(DialogFragment dialog); - } - DeleteServiceDialogFragment.NoticeDialogListener mListener; - - @Override - public void onAttach(Context context) { - super.onAttach(context); - // Verify that the host activity implements the callback interface - try { - // Instantiate the NoticeDialogListener so we can send events to the host - mListener = (DeleteServiceDialogFragment.NoticeDialogListener) context; - } catch (ClassCastException e) { - // The activity doesn't implement the interface, throw exception - throw new ClassCastException(this.toString() - + " must implement NoticeDialogListener"); - } - } - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - // Get the layout inflater - LayoutInflater inflater = getActivity().getLayoutInflater(); - - // Inflate and set the layout for the dialog - // Pass null as the parent view because its going in the dialog layout - builder.setView(inflater.inflate(R.layout.dialog_service_delete, null)) - // Add action buttons - .setPositiveButton(R.string.remove, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int id) { - Bundle args = new Bundle(); - args.putString("name", (String)getArguments().get("name")); - DeleteServiceDialogFragment.this.setArguments(args); - mListener.onDialogDelete(DeleteServiceDialogFragment.this); - - - } - }) - .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - Bundle args = new Bundle(); - args.putString("name", (String)getArguments().get("name")); - mListener.onDialogNevermind(DeleteServiceDialogFragment.this); - } - }) - .setTitle((String)getArguments().get("name")); - return builder.create(); - } -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java index 722a410..3998964 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java @@ -7,19 +7,12 @@ import android.content.DialogInterface; import android.os.Bundle; import android.support.v4.app.DialogFragment; import android.view.LayoutInflater; -import android.widget.EditText; -import android.widget.Toast; public class EditServiceDialogFragment extends DialogFragment{ - /** - * Creates a NoticeDialogListener interface for other classes to - * implement to have this class be functional in the other classes. - * - */ - public interface NoticeDialogListener { - public void onDialogEdit(DialogFragment dialog); - public void onDialogDelete(DialogFragment dialog); +public interface NoticeDialogListener { + public void onDialogEdit(DialogFragment dialog); + public void onDialogDelete(DialogFragment dialog); } EditServiceDialogFragment.NoticeDialogListener mListener; @@ -37,14 +30,6 @@ public class EditServiceDialogFragment extends DialogFragment{ + " must implement NoticeDialogListener"); } } - - /** - * Edit the Dialog to change rate of a service that the - * admin wants to change. - * - * @param savedInstanceState Bundle to transfer information. - * @return Dialog that is sent to admin for information. - */ @Override public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); @@ -59,27 +44,20 @@ public class EditServiceDialogFragment extends DialogFragment{ @Override public void onClick(DialogInterface dialog, int id) { Bundle args = new Bundle(); + //@anshu: get the name and rate to come from the dialog_service_new dialog args.putString("name", (String)getArguments().get("name")); - EditText rateInput = (EditText) ((AlertDialog) dialog).findViewById(R.id.RateInput); - if(rateInput.getText().toString().length()>0 && !rateInput.getText().toString().equals(".")){ - Double rate = Double.parseDouble(rateInput.getText().toString()); - args.putDouble("rate", rate); - - EditServiceDialogFragment.this.setArguments(args); - mListener.onDialogEdit(EditServiceDialogFragment.this); - } - else{ - Toast.makeText(getContext(), "Rate cannot be empty", Toast.LENGTH_LONG).show(); - - } - + args.putDouble("rate", 2.5); + // + EditServiceDialogFragment.this.setArguments(args); + mListener.onDialogEdit(EditServiceDialogFragment.this); } }) .setNegativeButton(R.string.delete, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { Bundle args = new Bundle(); + //@anshu: get the name and rate to come from the dialog_service_new dialog args.putString("name", (String)getArguments().get("name")); - + // EditServiceDialogFragment.this.setArguments(args); mListener.onDialogDelete(EditServiceDialogFragment.this); } diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/FindServiceProvider.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/FindServiceProvider.java deleted file mode 100644 index e18f7c1..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/FindServiceProvider.java +++ /dev/null @@ -1,495 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.app.DatePickerDialog; -import android.app.TimePickerDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.DatePicker; -import android.widget.ListView; -import android.widget.RadioButton; -import android.widget.RadioGroup; -import android.widget.RatingBar; -import android.widget.TextView; -import android.widget.TimePicker; -import android.widget.Toast; - -import com.jaredrummler.materialspinner.MaterialSpinner; - -import java.util.Calendar; -import java.util.Iterator; -import java.util.List; - -public class FindServiceProvider extends AppCompatActivity { - String username; - DBHelper dbHelper; - - //field for RecyclerView - private RecyclerView mRecyclerView; - //field for adapter of Recycler view - private RecyclerView.Adapter mAdapter; - //field for layout manager of Recyler view. - private RecyclerView.LayoutManager mLayoutManager; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_find_service_provider); - Bundle bundle = getIntent().getExtras(); - username = bundle.getString("username"); - - - dbHelper = new DBHelper(this); - MaterialSpinner spinner2 = findViewById(R.id.ServicesInput); - - //populate the list of services - List serviceslist = dbHelper.getAllServices(); - String[] services = new String[(serviceslist.size())]; - Iterator iter = serviceslist.iterator(); - for (int i=0; i providers; - //time and date picked - if(!button.getText().toString().equals("Start") && !button2.getText().toString().equals("End") - && !button3.getText().toString().equals("Date")){ - start = button.getText().toString(); - end = button2.getText().toString(); - date = button3.getText().toString(); - - String[] dates = date.split("/"); - int month = Integer.parseInt(dates[0].replaceAll("\\s+","")); - int day = Integer.parseInt(dates[1].replaceAll("\\s+","")); - int year = Integer.parseInt(dates[2].replaceAll("\\s+","")); - - String[] starttimes = start.split(":"); - int starth = Integer.parseInt(starttimes[0].replaceAll("\\s+","")); - int startmin = Integer.parseInt(starttimes[1].replaceAll("\\s+","")); - - String[] endtimes = end.split(":"); - int endh = Integer.parseInt(endtimes[0].replaceAll("\\s+","")); - int endmin = Integer.parseInt(endtimes[1].replaceAll("\\s+","")); - - int[] times = {starth, startmin, endh, endmin}; - //rating picked and time valid - if(selectedId!=-1 && validateTime(times)){ - ratingpicked = (RadioButton) findViewById(selectedId); - rating = Double.parseDouble(ratingpicked.getText().toString()); - providers = dbHelper.getProvidersByTimeAndRating(service, rating, year, month, day, - starth, startmin, endh, endmin); - } - //rating not picked and time valid - else if(validateTime(times)){ - providers = dbHelper.getProvidersByTime(service, year, month, day, - starth, startmin, endh, endmin); - } - //rating picked - else if(selectedId!=-1){ - Toast.makeText(this, "Times are invalid, only searching by service and rating"+starth+";"+startmin+","+endh+";"+endmin, Toast.LENGTH_SHORT).show(); - ratingpicked = (RadioButton) findViewById(selectedId); - rating = Double.parseDouble(ratingpicked.getText().toString()); - providers = dbHelper.getProvidersAboveRating(service, rating); - - } - //no rating & time not valid - else{ - Toast.makeText(this, "Times are invalid, only searching by service", Toast.LENGTH_SHORT).show(); - providers = dbHelper.getAllProvidersByService(service); - - } - } - //time and date not picked - else{ - if(selectedId!=-1){ - ratingpicked = (RadioButton) findViewById(selectedId); - rating = Double.parseDouble(ratingpicked.getText().toString()); - providers = dbHelper.getProvidersAboveRating(service, rating); - } - else{ - providers = dbHelper.getAllProvidersByService(service); - } - } - - //update recycler view - String[][] providerslist = new String[providers.size()][]; - for(int i=0; itime[0]){ - return true; - }else{ - if(time[2]==time[0]&&time[3]>time[1]){ - return true; - }else{ - return false; - } - } - } - - //adapter for the recycler view - public class MyAdapter extends RecyclerView.Adapter { - - private String[][] serviceProviders; - private Context context; - - // Provide a reference to the views for each data item - // Complex data items may need more than one view per item, and - // you provide access to all the views for a data item in a view holder - - // Provide a suitable constructor (depends on the kind of dataset) - public MyAdapter(String[][] serviceProviders, Context context) { - this.serviceProviders = serviceProviders; - } - - // Create new views (invoked by the layout manager) - @NonNull - @Override - public ProviderHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View v = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.service_list_item, parent, false); - ProviderHolder vh = new ProviderHolder(v); - return vh; - } - - // Replace the contents of a view (invoked by the layout manager) - @Override - public void onBindViewHolder(ProviderHolder holder, int position) { - String[] serviceprovider = serviceProviders[position]; - holder.name.setText(serviceprovider[1]+" "+serviceprovider[2]); - holder.rate.setText(""+serviceprovider[3]); - holder.username.setText(serviceprovider[0]); - - } - - // Return the size of your dataset (invoked by the layout manager) - @Override - public int getItemCount() { - return serviceProviders.length; - } - - class ProviderHolder extends RecyclerView.ViewHolder implements View.OnClickListener{ - - TextView name; - TextView rate; - TextView username; - - public ProviderHolder(View row){ - super(row); - name = row.findViewById(R.id.Name); - rate = row.findViewById(R.id.Rate); - username = row.findViewById(R.id.Username); - row.setOnClickListener(this); - } - @Override - public void onClick(View view) { - TextView nameview = (TextView)view.findViewById(R.id.Username); - final String name = nameview.getText().toString(); - - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(FindServiceProvider.this); - //show service provider info - alertDialogBuilder.setView(R.layout.sp_info_item); - alertDialogBuilder.setPositiveButton("Make Booking", - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface arg0, int arg1) { - makeBooking(name); - } - }); - - alertDialogBuilder.setNegativeButton("Nevermind", - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }); - - AlertDialog alertDialog = alertDialogBuilder.create(); - alertDialog.show(); - - //set the service provider info - ServiceProvider sp = (ServiceProvider)dbHelper.findUserByUsername(name); - TextView spname = alertDialog.findViewById(R.id.NameName); - spname.setText(sp.getFirstname()+" "+sp.getLastname()); - - TextView company = alertDialog.findViewById(R.id.CompanyName); - company.setText(sp.getCompanyname()); - - TextView address = alertDialog.findViewById(R.id.AddressName); - address.setText(sp.getAddress()); - - TextView phone = alertDialog.findViewById(R.id.PhoneNumberName); - phone.setText(sp.getPhonenumber()); - - TextView licensed = alertDialog.findViewById(R.id.LicensedName); - if(sp.isLicensed()){ - licensed.setText("Yes"); - } - else{ - licensed.setText("No"); - } - TextView description = alertDialog.findViewById(R.id.DescriptionName); - description.setText(sp.getDescription()); - - TextView rating = alertDialog.findViewById(R.id.AverageRatingName); - MaterialSpinner spinner = findViewById(R.id.ServicesInput); - rating.setText(""+dbHelper.getAverageRating(name, spinner.getText().toString())); - - TextView ratingtext = alertDialog.findViewById(R.id.AverageRating); - ratingtext.setText("Rating for " +spinner.getText().toString()); - - //actual data - List randc = dbHelper.getAllRatingsAndComments(name,spinner.getText().toString()); - String[] ratings = new String[randc.size()]; - for(int i=0; i(FindServiceProvider.this, R.layout.simple_list_item_1_customized, ratings); - //list of comments and ratings - ListView listView = (ListView) alertDialog.findViewById(R.id.RatingList); - listView.setAdapter(adapter); - - - - - } - - - } - - - } -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/HomeOwner.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/HomeOwner.java index 3b77303..4807fa2 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/HomeOwner.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/HomeOwner.java @@ -1,50 +1,12 @@ package com.uottawa.olympus.olympusservices; -/** - * The class HomeOwner is a child of the class userType. The class permission - * to the user of a standard homeowner hence users with homeowner permissions - * are able to book service providers. Has not been implemented yet. - * - */ - public class HomeOwner extends UserType { - /** - * Constructor of the HomeOwner object that takes the username, password, - * lastname, and firstname as parameters to use for the creation of a - * HomeOwner object. - * - * @param username String for username. - * @param password String for password. - * @param firstname String for firstname. - * @param lastname String for lastname. - */ HomeOwner(String username, String password, String firstname, String lastname){ super(username, password, firstname, lastname); } - /** - * Constructor of the HomeOwner object that takes the username, password, - * lastname, and firstname as parameters to use for the creation of a - * HomeOwner object. - * - * @param username String for username. - * @param hash String for hash. - * @param salt String for salt. - * @param firstname String for firstname. - * @param lastname String for lastname. - */ - HomeOwner(String username, String hash, String salt, String firstname, String lastname){ - super(username, hash, salt, firstname, lastname); - } - - /** - * Returns the type of role the user is for this class. - * will return the string "HomeOwner". - * - * @return "HomeOwner" String object. - */ public String getRole(){ return "HomeOwner"; } } diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/HomeOwnerEditProfile.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/HomeOwnerEditProfile.java deleted file mode 100644 index 09741d6..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/HomeOwnerEditProfile.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; -import android.widget.CheckBox; -import android.widget.TextView; -import android.widget.Toast; - -public class HomeOwnerEditProfile extends AppCompatActivity { - String username; - DBHelper dbHelper; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_home_owner_edit_profile); - - Bundle bundle = getIntent().getExtras(); - username = bundle.getString("username"); - dbHelper = new DBHelper(this); - UserType user; - user = dbHelper.findUserByUsername(username); - TextView firstname = findViewById(R.id.FirstNameInput); - TextView lastname = findViewById(R.id.LastNameInput); - TextView password = findViewById(R.id.PasswordInput); - - - firstname.setText(user.getFirstname()); - lastname.setText(user.getLastname()); - password.setText(""); - - } - /** - * Override so that previous screen refreshes when pressing the - * back button on this activity of the app. - * - */ - @Override - public void onBackPressed(){ - Intent intent = new Intent(getApplicationContext(),Welcome.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - - - /** - * Saves updated user information to the database - * @param view - */ - public void Save(View view){ - TextView firstname = findViewById(R.id.FirstNameInput); - TextView lastname = findViewById(R.id.LastNameInput); - TextView password = findViewById(R.id.PasswordInput); - - //Checks for the fields - if((password.getText().toString().length()>=5 || password.getText().toString().equals("")) - && firstname.getText().toString().length()>0 - && lastname.getText().toString().length()>0 - && password.getText().toString().matches("[a-zA-Z0-9]*") - && firstname.getText().toString().matches("[a-zA-Z]*") - && lastname.getText().toString().matches("[a-zA-Z]*") - ) { - - if(dbHelper.updateUserInfo(username, password.getText().toString(), firstname.getText().toString(), lastname.getText().toString() - )){ - //add comment method here - Toast.makeText(this, "Profile has been updated", Toast.LENGTH_LONG).show(); - } - else{ - Toast.makeText(this, "Could not update profile ", Toast.LENGTH_LONG).show(); - - } - - } - else{ - Toast.makeText(this, "Fields cannot be empty and must be formatted correctly", Toast.LENGTH_LONG).show(); - } - } - -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/LogIn.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/LogIn.java index 76688e1..6afde1a 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/LogIn.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/LogIn.java @@ -7,34 +7,14 @@ import android.widget.EditText; import android.view.View; import android.widget.Toast; -/** - * The login activity for the app that checks - * credentials of users to allow them to log in and use - * the functionality of the app. - * - */ - public class LogIn extends AppCompatActivity { - /** - * On creation of this activity the login xml file - * is loaded up. - * - * @param savedInstanceState Bundle object for transfer of information. - */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_log_in); } - /** - * On click of the login button the app checks if all specification - * for login credentials are met and then either sends an error toast - * or logs the user in. - * - * @param view View object that contains all the buttons and editTexts. - */ public void onClickLogIn(View view){ String username = ((EditText) findViewById(R.id.UsernameInput)).getText().toString(); String password = ((EditText) findViewById(R.id.PasswordInput)).getText().toString(); @@ -44,19 +24,12 @@ public class LogIn extends AppCompatActivity { if (dbHelper.findUserByUsername(username) != null) { UserType user = dbHelper.findUserByUsername(username); if (user.getUsername().equals(username) && - PasswordEncryption.slowEquals(user.getHash(), - PasswordEncryption.encrypt(password, user.getSalt()))) { + user.getPassword().equals(password)) { if(user.getRole()=="Admin"){ Intent intent = new Intent(getApplicationContext(),AdminWelcome.class); startActivity(intent); finish(); } - else if(user.getRole()=="ServiceProvider"){ - Intent intent = new Intent(getApplicationContext(),ServiceProviderWelcome.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } else { Intent intent = new Intent(getApplicationContext(),Welcome.class); intent.putExtra("username", username); @@ -81,12 +54,6 @@ public class LogIn extends AppCompatActivity { } - - /** - * app closes the the activity when back is pressed and - * no user information written down is saved in the EditText for - * security purposes. - */ @Override public void onBackPressed(){ Intent intent = new Intent(getApplicationContext(), Main.class); diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Main.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Main.java index eb86354..6245cb1 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Main.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Main.java @@ -5,21 +5,8 @@ import android.os.Bundle; import android.content.Intent; import android.view.View; -/** - * The starting page of the app which contains two buttons - * of either registering for the app or logging into an existing - * account. - * - */ - public class Main extends AppCompatActivity { - /** - * On creation of the object the app loads up the xml page - * for the class and creates dbHelper object and Admin object - * and then add the admin into the database. - * @param savedInstanceState - */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -31,11 +18,6 @@ public class Main extends AppCompatActivity { } - /** - * On click of the sign up button loads up the sign up activity - * - * @param view View object containing the buttons. - */ public void onClickSignUp(View view){ Intent intent = new Intent(getApplicationContext(),SignUp.class); startActivity(intent); @@ -43,11 +25,6 @@ public class Main extends AppCompatActivity { } - /** - * On click of the Login button loads up the login activity. - * - * @param view View object containing the buttons. - */ public void onClickLogIn(View view){ Intent intent = new Intent(getApplicationContext(),LogIn.class); startActivity(intent); diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MakeBooking.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MakeBooking.java deleted file mode 100644 index ec010ed..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MakeBooking.java +++ /dev/null @@ -1,247 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.app.DatePickerDialog; -import android.app.TimePickerDialog; -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.DatePicker; -import android.widget.TextView; -import android.widget.TimePicker; -import android.widget.Toast; - -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -public class MakeBooking extends AppCompatActivity { - String homeowner; - String serviceprovider; - String service; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_make_booking); - Bundle bundle = getIntent().getExtras(); - homeowner = bundle.getString("homeowner"); - serviceprovider = bundle.getString("serviceprovider"); - service = bundle.getString("service"); - - TextView homeo = findViewById(R.id.HomeOwner); - TextView servicep = findViewById(R.id.ServiceProvider); - TextView serv = findViewById(R.id.Service); - - homeo.setText("Home Owner: \n"+homeowner); - servicep.setText("ServiceProvider: \n"+serviceprovider); - serv.setText("Service: \n"+service); - - } - /** - * Override so that previous screen refreshes when pressing the - * back button on this activity of the app. - * - */ - @Override - public void onBackPressed(){ - Intent intent = new Intent(getApplicationContext(),Welcome.class); - intent.putExtra("username", homeowner); - startActivity(intent); - finish(); - } - public void Cancel(View view){ - onBackPressed(); - } - - public void Book(View view){ - Button button = findViewById(R.id.Start); - Button button2 = findViewById(R.id.End); - Button button3 = findViewById(R.id.Date); - - //check that fields are filled in - if(!button.getText().toString().equals("Start") && !button2.getText().toString().equals("End") - && !button3.getText().toString().equals("Date")){ - String[] dates = button3.getText().toString().split("/"); - int month = Integer.parseInt(dates[0].replaceAll("\\s+","")); - int day = Integer.parseInt(dates[1].replaceAll("\\s+","")); - int year = Integer.parseInt(dates[2].replaceAll("\\s+","")); - - //parse times - String[] starttimes = button.getText().toString().split(":"); - int starth = Integer.parseInt(starttimes[0].replaceAll("\\s+","")); - int startmin = Integer.parseInt(starttimes[1].replaceAll("\\s+","")); - - String[] endtimes = button2.getText().toString().split(":"); - int endh = Integer.parseInt(endtimes[0].replaceAll("\\s+","")); - int endmin = Integer.parseInt(endtimes[1].replaceAll("\\s+","")); - - //check date is valid - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - try { - Date selecteddate = sdf.parse(dates[2].replaceAll("\\s+","") + "-" + dates[0].replaceAll("\\s+","") + "-" + dates[1].replaceAll("\\s+","")); - if(selecteddate.compareTo(date)<0){ - Toast.makeText(this, "Date must be a future date", Toast.LENGTH_SHORT).show(); - } - else{ - //check time is valid - if (starthtime[0]){ - return true; - }else{ - if(time[2]==time[0]&&time[3]>time[1]){ - return true; - }else{ - return false; - } - } - } - - -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MyAdapter.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MyAdapter.java new file mode 100644 index 0000000..2855872 --- /dev/null +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/MyAdapter.java @@ -0,0 +1,10 @@ +package com.uottawa.olympus.olympusservices; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java index 09cc543..7f0496e 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java @@ -8,29 +8,8 @@ import android.os.Bundle; import android.support.v4.app.DialogFragment; import android.view.LayoutInflater; -import android.content.res.Resources; -import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.view.ViewGroup; -import android.widget.EditText; -import android.view.View; -import android.widget.Toast; - -import com.rengwuxian.materialedittext.MaterialEditText; - -/** - * Creates a dialog whenever admin adds a new service into the - * service list which the admin fills in to provide the fields of - * the service. - */ public class NewServiceDialogFragment extends DialogFragment { - /** - * Creates a NoticeDialogListener interface for other classes to - * implement to have this class be functional in the other classes. - * - */ public interface NoticeDialogListener { public void onDialogNew(DialogFragment dialog); public void onDialogNevermind(DialogFragment dialog); @@ -51,48 +30,26 @@ public class NewServiceDialogFragment extends DialogFragment { + " must implement NoticeDialogListener"); } } - - /** - * Creates the Dialog to add the name and rate of a new service that - * the admin has added to the list of services. - * - * @param savedInstanceState Bundle to transfer information. - * @return Dialog that is sent to admin for information. - */ @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); // Get the layout inflater LayoutInflater inflater = getActivity().getLayoutInflater(); - View view = inflater.inflate(R.layout.dialog_service_new, null); - // Inflate and set the layout for the dialog // Pass null as the parent view because its going in the dialog layout - builder.setView(view) + builder.setView(inflater.inflate(R.layout.dialog_service_new, null)) // Add action buttons .setPositiveButton(R.string.add, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { - EditText nameInput = (EditText) ((AlertDialog) dialog).findViewById(R.id.NameInput); - EditText rateInput = (EditText) ((AlertDialog) dialog).findViewById(R.id.RateInput); - String name = nameInput.getText().toString(); - DBHelper dbHelper = new DBHelper(getContext()); - if (rateInput.getText().toString().length()>0 && !rateInput.getText().toString().equals(".") && name.length()>0 && name.matches("^[a-zA-Z0-9_ ]*$") && dbHelper.findService(name)==null){ - Double rate = Double.parseDouble(rateInput.getText().toString()); - Bundle args = new Bundle(); - args.putString("name", name); - args.putDouble("rate", rate); - NewServiceDialogFragment.this.setArguments(args); - mListener.onDialogNew(NewServiceDialogFragment.this); - } - else if(!(rateInput.getText().toString().length()>0) || !(name.length()>0)|| !name.matches("[a-zA-Z]*") || !rateInput.getText().toString().equals(".")){ - Toast.makeText(getContext(), "Service must have an alphanumeric name and a rate", Toast.LENGTH_LONG).show(); - } - else{ - Toast.makeText(getContext(), "Service already exists", Toast.LENGTH_LONG).show(); - } + Bundle args = new Bundle(); + //@anshu: get the name and rate to come from the dialog_service_new dialog + args.putString("name", "test2"); + args.putDouble("rate", 2.5); + /// + NewServiceDialogFragment.this.setArguments(args); + mListener.onDialogNew(NewServiceDialogFragment.this); } }) .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/PasswordEncryption.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/PasswordEncryption.java deleted file mode 100644 index e0f91d5..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/PasswordEncryption.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.os.Message; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.lang.Math; - -public class PasswordEncryption { - private static final MessageDigest MESSAGE_DIGEST; - private static final char[] POSSIBLE_CHARS; - private static final SecureRandom random; - - static{ - MessageDigest messageDigest; - try{ - messageDigest = MessageDigest.getInstance("SHA-256"); - } catch (NoSuchAlgorithmException e){ - messageDigest = null; - } - MESSAGE_DIGEST = messageDigest; - - POSSIBLE_CHARS = new char[94]; - for (int i = 33; i<127; i++){ - POSSIBLE_CHARS[i-33] = (char)i; - } - - random = new SecureRandom(); - } - - public static String encrypt(String password, String salt){ - password = salt + password; - - byte[] passwordBytes = password.getBytes(); - byte[] hashedPassword; - - MESSAGE_DIGEST.reset(); - MESSAGE_DIGEST.update(passwordBytes); - hashedPassword = MESSAGE_DIGEST.digest(); - - - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < hashedPassword.length; i++) { - if ((hashedPassword[i] & 0xff) < 0x10) { - sb.append("0"); - } - - sb.append(Long.toString(hashedPassword[i] & 0xff, 16)); - } - return sb.toString(); - } - - public static String generateSalt(){ - long stringID = Math.abs(random.nextLong()); - String salt = ""; - - while(stringID > 0){ - //the least significant digit is added to nonce string first - int index = (int)(stringID%94); - salt += POSSIBLE_CHARS[index]; - stringID /= 94; - } - return salt; - } - - public static boolean slowEquals(String one, String two){ - byte[] first = one.getBytes(); - byte[] second = two.getBytes(); - - int length = first.length > second.length ? second.length : first.length; - boolean same = true; - for (int i = 0; i serviceProviders; - /** - * Constructor for a new service which uses the parameters - * to fill in the fields of the service and creates an arrayList - * for all the providers that provide that service. - * - * @param name String of the name of service. - * @param rate double of the price of service. - */ Service(String name, double rate) { this.name = name; this.rate = rate; serviceProviders = new ArrayList(); } - /** - * Gets the Name field of the service. - * - * @return String of the name. - */ public String getName() { return name; } - /** - * Gets the Rate field of the service. - * - * @return double of the rate. - */ public double getRate() { return rate; } - /** - * Changes the name field of the object to parameter given. - * - * @param name String object of new name - */ public void setName(String name) { this.name = name; } - /** - * Changes the rate field of the object to parameter given. - * - * @param rate double of new rate. - */ public void setRate(double rate) { this.rate = rate; } - /** - * Adds a new service provider that offers this service into the list - * of service providers that offer this service. - * - * @param user Service Provider object which is added to the service's list. - * @return boolean of if the Service provider has been added. - */ public boolean addServiceProvider(ServiceProvider user){ for (ServiceProvider listUser : serviceProviders){ if (user.getUsername().equals(listUser.getUsername())){ diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java index 774f7e1..15bfde4 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java @@ -1,120 +1,19 @@ package com.uottawa.olympus.olympusservices; import java.util.ArrayList; -import java.util.Date; import java.util.List; -/** - * The service provider is the child userType class. The service provider - * class provides services which the homeowner can buy in the app. - * - */ - public class ServiceProvider extends UserType { - //Field for list of services that service provider offers. private List services; - //Field for array of availabilities - /* - DO NOT CHANGE THIS ARRAY. The 2D array size is hard coded such that the first array has a size - of 7 and the array inside has an array size of 4. The array is setup such that the index represent a day of the - week. Monday is 0, Tuesday is 1, Wednesday is 2, Thursday is 3, Friday is 4, Saturday is 5, - Sunday is 6. so, [Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday]. Inside each of - the arrays there is a another array containing int values such that index 0,1,2,3 is startHour, - startMin, endHour, endMin respectively. - */ - private int[][] availabilities; - private String address; - private String phonenumber; - private String companyname; - private boolean licensed; - private String description; - private int rating; - - - - - /** - * Constructor for the service object which takes the parameters to - * fill out the service providers field. - * - * @param username String of the username. - * @param password String of the password. - * @param firstname String of the firstname. - * @param lastname String of the lastname. - */ - ServiceProvider(String username, String password, String firstname, String lastname, String address, - String phonenumber, String companyname, boolean licensed){ - this(username, password, firstname, lastname, address, phonenumber, companyname, licensed, ""); - } - - /** - * - * @param username - * @param password - * @param firstname - * @param lastname - * @param address - * @param phonenumber - * @param companyname - * @param licensed - * @param description - */ - ServiceProvider(String username, String password, String firstname, String lastname, String address, - String phonenumber, String companyname, boolean licensed, String description){ + ServiceProvider(String username, String password, String firstname, String lastname){ super(username, password, firstname, lastname); services = new ArrayList<>(); - availabilities = new int[7][4]; - this.address = address; - this.phonenumber = phonenumber; - this.companyname = companyname; - this.licensed = licensed; - this.description = description; - this.rating = 0; } - /** - * - * @param username - * @param hash - * @param salt - * @param firstname - * @param lastname - * @param address - * @param phonenumber - * @param companyname - * @param licensed - * @param description - */ - ServiceProvider(String username, String hash, String salt, String firstname, String lastname, String address, - String phonenumber, String companyname, boolean licensed, String description){ - super(username, hash, salt, firstname, lastname); - services = new ArrayList<>(); - availabilities = new int[7][4]; - this.address = address; - this.phonenumber = phonenumber; - this.companyname = companyname; - this.licensed = licensed; - this.description = description; - this.rating = 0; - } - - - /** - * gets the role of the UserType. - * - * @return String "Service Provider" - */ public String getRole(){ return "ServiceProvider"; } - /** - * adds service to the to service list if the service is in the - * database list of services. - * - * @param service Service object which is added to the services field. - * @return boolean whether service is added. - */ public boolean addService(Service service){ for (Service listService : services){ if (service.getName().equals(listService.getName())){ @@ -125,83 +24,8 @@ public class ServiceProvider extends UserType { return true; } - /** - * Gets the services list field of service provider. - * - * @return arrayList of Services - */ - - - - public void setAvailabilities(int day, int startHour, int startMin, int endHour, int endMin){ - availabilities[day][0] = startHour; - availabilities[day][1] = startMin; - availabilities[day][2] = endHour; - availabilities[day][3] = endMin; - } - - public int[][] getAvailabilities(){ - return availabilities; - } - - public void setAvailabilities(int[][] availabilities) { - this.availabilities = availabilities; - } - - public void setServices(List services) { - this.services = services; - } - public List getServices(){ return services; } - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getPhonenumber() { - return phonenumber; - } - - public void setPhonenumber(String phonenumber) { - this.phonenumber = phonenumber; - } - - public String getCompanyname() { - return companyname; - } - - public void setCompanyname(String companyname) { - this.companyname = companyname; - } - - public boolean isLicensed() { - return licensed; - } - - public void setLicensed(boolean licensed) { - this.licensed = licensed; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getRating() { - return rating; - } - - public void setRating(int rating) { - this.rating = rating; - } - -} \ No newline at end of file +} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderAvailabilities.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderAvailabilities.java deleted file mode 100644 index 2898772..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderAvailabilities.java +++ /dev/null @@ -1,241 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.app.TimePickerDialog; -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; -import android.widget.TimePicker; -import android.widget.Toast; - -import java.util.Calendar; - -/** - * - * This class is the java class for the Service Provider's Availabilities menu. This class generates the menu from - * the saved Availabilities that the user has set previously or on default set no Availabilities. - * The menu gives the option to change availabilities for each day of the week or remove his availability on that - * day. User will receive a toast if they set impossible availabilities or they will receive a toast saying - * that their availabilities have been saved. - * - */ - -public class ServiceProviderAvailabilities extends AppCompatActivity { - private String username; - - /** - * This class generates the availabilities from the serviceProvider class fields - * on creation of this menu so the user can edit and change it on the menu. - * - * @param savedInstanceState - */ - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_service_provider_availabilities); - Bundle bundle = getIntent().getExtras(); - username = bundle.getString("username"); - DBHelper dbHelper = new DBHelper(this); - ServiceProvider user = (ServiceProvider) dbHelper.findUserByUsername(username); - int[][] days = user.getAvailabilities(); - String startTime; - String endTime; - int i = 0; - for(int[] times: days){ - startTime = formatTime(times[0],times[1]); - endTime = formatTime(times[2],times[3]); - if(times[0]==0&×[1]==0&×[2]==0&×[3]==0){ - startTime = "START"; - endTime = "END"; - } - if(i==0){ - ((Button)findViewById(R.id.MondayStart)).setText(startTime); - ((Button)findViewById(R.id.MondayEnd)).setText(endTime); - }else if(i==1){ - ((Button)findViewById(R.id.TuesdayStart)).setText(startTime); - ((Button)findViewById(R.id.TuesdayEnd)).setText(endTime); - }else if(i==2){ - ((Button)findViewById(R.id.WednesdayStart)).setText(startTime); - ((Button)findViewById(R.id.WednesdayEnd)).setText(endTime); - }else if(i==3){ - ((Button)findViewById(R.id.ThursdayStart)).setText(startTime); - ((Button)findViewById(R.id.ThursdayEnd)).setText(endTime); - }else if(i==4){ - ((Button)findViewById(R.id.FridayStart)).setText(startTime); - ((Button)findViewById(R.id.FridayEnd)).setText(endTime); - }else if(i==5){ - ((Button)findViewById(R.id.SaturdayStart)).setText(startTime); - ((Button)findViewById(R.id.SaturdayEnd)).setText(endTime); - }else if(i==6){ - ((Button)findViewById(R.id.SundayStart)).setText(startTime); - ((Button)findViewById(R.id.SundayEnd)).setText(endTime); - } - i++; - } - } - - - public void onClick(View v) { - // Get Current Time - final Calendar c = Calendar.getInstance(); - int hour = c.get(Calendar.HOUR_OF_DAY); - int minute = c.get(Calendar.MINUTE); - final Button button = (Button)v; - - // Launch Time Picker Dialog - TimePickerDialog timePickerDialog = new TimePickerDialog(this, - new TimePickerDialog.OnTimeSetListener() { - - @Override - public void onTimeSet(TimePicker view, int hourOfDay, - int minute) { - String time = ""; - - button.setText(formatTime(hourOfDay,minute)); - //set availibility for service provider and check start time is less than finish - } - - }, hour, minute, false); - timePickerDialog.show(); - } - - public void onRemove(View view){ - //set time to Start/End, set availibility for start and end to null - Button start; - Button end; - if(view.getId()==R.id.DeleteMon){ - start = findViewById(R.id.MondayStart); - end = findViewById(R.id.MondayEnd); - start.setText("START"); - end.setText("END"); - }else if(view.getId()==R.id.DeleteTuesday){ - start = findViewById(R.id.TuesdayStart); - end = findViewById(R.id.TuesdayEnd); - start.setText("START"); - end.setText("END"); - }else if(view.getId()==R.id.DeleteWednesday){ - start = findViewById(R.id.WednesdayStart); - end = findViewById(R.id.WednesdayEnd); - start.setText("START"); - end.setText("END"); - }else if(view.getId()==R.id.DeleteThursday){ - start = findViewById(R.id.ThursdayStart); - end = findViewById(R.id.ThursdayEnd); - start.setText("START"); - end.setText("END"); - }else if(view.getId()==R.id.DeleteFriday){ - start = findViewById(R.id.FridayStart); - end = findViewById(R.id.FridayEnd); - start.setText("START"); - end.setText("END"); - }else if(view.getId()==R.id.DeleteSaturday){ - start = findViewById(R.id.SaturdayStart); - end = findViewById(R.id.SaturdayEnd); - start.setText("START"); - end.setText("END"); - }else{ - start = findViewById(R.id.SundayStart); - end = findViewById(R.id.SundayEnd); - start.setText("START"); - end.setText("END"); - } - } - - /** - * Parses the views of the UI to generate 2D int array and updates the database and user with - * the new 2D on click of the setTime button. - * - * @param view - */ - public void onSetTimes(View view){ - int[] mondayTime = parseTime( ((Button)findViewById(R.id.MondayStart)).getText().toString(),((Button)findViewById(R.id.MondayEnd)).getText().toString() ); - int[] tuesdayTime = parseTime( ((Button)findViewById(R.id.TuesdayStart)).getText().toString(),((Button)findViewById(R.id.TuesdayEnd)).getText().toString() ); - int[] wednesdayTime = parseTime( ((Button)findViewById(R.id.WednesdayStart)).getText().toString(),((Button)findViewById(R.id.WednesdayEnd)).getText().toString() ); - int[] thursdayTime = parseTime( ((Button)findViewById(R.id.ThursdayStart)).getText().toString(),((Button)findViewById(R.id.ThursdayEnd)).getText().toString() ); - int[] fridayTime = parseTime( ((Button)findViewById(R.id.FridayStart)).getText().toString(), ((Button)findViewById(R.id.FridayEnd)).getText().toString() ); - int[] saturdayTime = parseTime( ((Button)findViewById(R.id.SaturdayStart)).getText().toString(),((Button)findViewById(R.id.SaturdayEnd)).getText().toString() ); - int[] sundayTime = parseTime( ((Button)findViewById(R.id.SundayStart)).getText().toString(),((Button)findViewById(R.id.SundayEnd)).getText().toString() ); - int[][] availabilities = {mondayTime,tuesdayTime,wednesdayTime,thursdayTime,fridayTime,saturdayTime,sundayTime}; - boolean validation = true; - for(int[] times: availabilities){ - if(!validateTime(times)){ - validation = false; - } - } - if(validation){ - DBHelper dbHelper = new DBHelper(this); - ServiceProvider user = (ServiceProvider) dbHelper.findUserByUsername(username); - user.setAvailabilities(availabilities); - dbHelper.updateAvailability(user); - Toast.makeText(this, "New Availabilities have been set.", Toast.LENGTH_LONG).show(); - } else{ - Toast.makeText(this, "All end times must be later then start times.", Toast.LENGTH_LONG).show(); - } - - - } - - /** - * Override so that previous screen refreshes when pressing the - * back button on this activity of the app. - * - */ - @Override - public void onBackPressed(){ - Intent intent = new Intent(getApplicationContext(),ServiceProviderWelcome.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - - private String formatTime(int hours, int minutes){ - String time = ""; - if(hours<10){ - time = time+"0"+hours+":"; - }else{ - time = time+hours+":"; - } - if (minutes<10){ - time = time+"0"+minutes; - } - else { - time = time+minutes; - } - return time; - } - - private int[] parseTime(String startTime, String endTime){ - int[] times = new int[4]; - if(startTime.equals("START")){ - times[0]=0; - times[1]=0; - }else{ - times[0] = Integer.parseInt(startTime.substring(0,2)); - times[1] = Integer.parseInt(startTime.substring(3)); - } - if(endTime.equals("END")){ - times[2]=0; - times[3]=0; - }else{ - times[2] = Integer.parseInt(endTime.substring(0,2)); - times[3] = Integer.parseInt(endTime.substring(3)); - } - return times; - } - - private boolean validateTime(int[] time){ - if(time[0]==0&&time[1]==0&&time[2]==0&&time[3]==0){ - return true; - } - if(time[2]>time[0]){ - return true; - }else{ - if(time[2]==time[0]&&time[3]>time[1]){ - return true; - }else{ - return false; - } - } - } -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderEditProfile.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderEditProfile.java deleted file mode 100644 index 11eae79..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderEditProfile.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; -import android.widget.CheckBox; -import android.widget.TextView; -import android.widget.Toast; - -public class ServiceProviderEditProfile extends AppCompatActivity { - String username; - DBHelper dbHelper; - - /** - * Prepoplates the fields with user information when the activity is created - * @param savedInstanceState - */ - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_service_provider_edit_profile); - Bundle bundle = getIntent().getExtras(); - username = bundle.getString("username"); - dbHelper = new DBHelper(this); - ServiceProvider user; - user = (ServiceProvider)dbHelper.findUserByUsername(username); - TextView firstname = findViewById(R.id.FirstNameInput); - TextView lastname = findViewById(R.id.LastNameInput); - TextView password = findViewById(R.id.PasswordInput); - TextView companyname = findViewById(R.id.CompanyNameInput); - TextView address = findViewById(R.id.AddressInput); - TextView phonenumber = findViewById(R.id.PhoneNumberInput); - TextView description = findViewById(R.id.DescriptionInput); - CheckBox licensed = findViewById(R.id.LicensedInput); - - - firstname.setText(user.getFirstname()); - lastname.setText(user.getLastname()); - password.setText(""); - companyname.setText(user.getCompanyname()); - address.setText(user.getAddress()); - phonenumber.setText(user.getPhonenumber()); - description.setText(user.getDescription()); - licensed.setChecked(user.isLicensed()); - - } - - /** - * Override so that previous screen refreshes when pressing the - * back button on this activity of the app. - * - */ - @Override - public void onBackPressed(){ - Intent intent = new Intent(getApplicationContext(),ServiceProviderWelcome.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - - /** - * Saves updated user information to the database - * @param view - */ - public void Save(View view){ - TextView firstname = findViewById(R.id.FirstNameInput); - TextView lastname = findViewById(R.id.LastNameInput); - TextView password = findViewById(R.id.PasswordInput); - TextView companyname = findViewById(R.id.CompanyNameInput); - TextView address = findViewById(R.id.AddressInput); - TextView phonenumber = findViewById(R.id.PhoneNumberInput); - TextView description = findViewById(R.id.DescriptionInput); - CheckBox licensed = findViewById(R.id.LicensedInput); - - //Checks for the fields - if((password.getText().toString().length()>=5 || password.getText().toString().equals("")) - && firstname.getText().toString().length()>0 - && lastname.getText().toString().length()>0 && companyname.getText().toString().length()>0 - && address.getText().toString().length()>0 && phonenumber.getText().toString().length()>0 - && password.getText().toString().matches("[a-zA-Z0-9]*") - && firstname.getText().toString().matches("[a-zA-Z]*") - && lastname.getText().toString().matches("[a-zA-Z]*") - && companyname.getText().toString().matches("^[a-zA-Z0-9_ ]*$") - && address.getText().toString().matches("^[a-zA-Z0-9_ ]*$") - && description.getText().toString().matches("^[a-zA-Z0-9_ ]*$") - && phonenumber.getText().toString().matches("^(\\+\\d{1,2}\\s)?\\(?\\d{3}\\)?[\\s.-]?\\d{3}[\\s.-]?\\d{4}$") - && address.getText().toString().replaceAll("\\s+","").length()>0) { - - - if(dbHelper.updateUserInfo(username, password.getText().toString(), firstname.getText().toString(), lastname.getText().toString(), - address.getText().toString(), phonenumber.getText().toString(), companyname.getText().toString(), licensed.isChecked(), description.getText().toString())){ - //add comment method here - Toast.makeText(this, "Profile has been updated", Toast.LENGTH_LONG).show(); - } - else{ - Toast.makeText(this, "Could not update profile ", Toast.LENGTH_LONG).show(); - - } - - } - else{ - Toast.makeText(this, "Fields cannot be empty (other than description) and must be formatted correctly", Toast.LENGTH_LONG).show(); - } - } - - -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java deleted file mode 100644 index 36105c0..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java +++ /dev/null @@ -1,232 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.content.Context; -import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.TextView; -import android.widget.Toast; - -import com.jaredrummler.materialspinner.MaterialSpinner; - -import java.util.Iterator; -import java.util.List; - -/** - * Creates the view and dialog listener for List of services - * which the admin can view and manipulate. - * - */ -public class ServiceProviderServicesList extends AppCompatActivity implements DeleteServiceDialogFragment.NoticeDialogListener{ - - //field for RecyclerView - private RecyclerView mRecyclerView; - //field for adapter of Recycler view - private RecyclerView.Adapter mAdapter; - //field for layout manager of Recyler view. - private RecyclerView.LayoutManager mLayoutManager; - - private String username; - - /** - * On creation loads up the xml, and generates the services list, - * and fills out the recylerView fields. - * - * @param savedInstanceState Bundle to transfer information. - */ - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_service_provider_services_list); - - Bundle bundle = getIntent().getExtras(); - username = bundle.getString("username"); - DBHelper dbHelper = new DBHelper(this); - - //grid - List serviceslist2 = dbHelper.getAllServicesProvidedByUser(username); - Service[] services2 = new Service[(serviceslist2.size())]; - Iterator iter2 = serviceslist2.iterator(); - for (int i=0; i serviceslist = dbHelper.getAllServices(); - String[] services = new String[(serviceslist.size())]; - Iterator iter = serviceslist.iterator(); - for (int i=0; i { - - private Service[] services; - private Context context; - - // Provide a reference to the views for each data item - // Complex data items may need more than one view per item, and - // you provide access to all the views for a data item in a view holder - - // Provide a suitable constructor (depends on the kind of dataset) - public MyAdapter(Service[] services, Context context) { - this.services = services; - } - - // Create new views (invoked by the layout manager) - @NonNull - @Override - public ServicesHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View v = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.service_list_item, parent, false); - ServicesHolder vh = new ServicesHolder(v); - return vh; - } - - // Replace the contents of a view (invoked by the layout manager) - @Override - public void onBindViewHolder(ServicesHolder holder, int position) { - Service service = services[position]; - holder.name.setText(service.getName()); - holder.rate.setText(String.format("$%,.2f", service.getRate())); - - - - } - - // Return the size of your dataset (invoked by the layout manager) - @Override - public int getItemCount() { - return services.length; - } - - //nested class for the items in the recycler view - class ServicesHolder extends RecyclerView.ViewHolder implements View.OnClickListener{ - - TextView name; - TextView rate; - - public ServicesHolder(View row){ - super(row); - name = row.findViewById(R.id.Name); - rate = row.findViewById(R.id.Rate); - row.setOnClickListener(this); - } - - /** - * Onclick function for the items in the recycler view - * @param view - */ - @Override - public void onClick(View view) { - TextView nameview = (TextView)view.findViewById(R.id.Name); - String name = nameview.getText().toString(); - deleteService(view, name); - - } - - - } - - - } - -} \ No newline at end of file diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderWelcome.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderWelcome.java deleted file mode 100644 index 2b34266..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderWelcome.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; -import android.widget.TextView; -import android.content.Intent; - -/** - * Welcome class creates the welcome screen for the HomeOwners and ServiceProviders - * as a temporary screen until full functionality of those two a classes are - * implemented. - * - */ -public class ServiceProviderWelcome extends AppCompatActivity { - String username; - - /** - * On creation of this object the app will display the xml file for - * the welcome page which gets the role and username of the UserType - * object and welcomes the user with a message. - * - * @param savedInstanceState Bundle to transfer data - */ - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_service_provider_welcome); - Bundle bundle = getIntent().getExtras(); - username = bundle.getString("username"); - DBHelper dbHelper = new DBHelper(this); - UserType user; - user = dbHelper.findUserByUsername(username); - TextView welcome = findViewById(R.id.Welcome); - welcome.setText("Welcome "+user.getFirstname()+ " you are logged in as a Service Provider"); - - - } - - /** - * Override so that nothing occurs when pressing the - * back button on this activity of the app. - * - */ - @Override - public void onBackPressed(){ - } - - /** - * Logs out the user and returns them back to - * main activity. End all current user activity - * for security purposes. - * - * @param view View object of current activity. - */ - public void LogOut(View view){ - Intent intent = new Intent(getApplicationContext(), Main.class); - startActivity(intent); - finish(); - } - - public void EditProfile(View view){ - Intent intent = new Intent(getApplicationContext(),ServiceProviderEditProfile.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - - public void EditServices(View view){ - Intent intent = new Intent(getApplicationContext(),ServiceProviderServicesList.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - public void EditAvailabilities(View view){ - Intent intent = new Intent(getApplicationContext(),ServiceProviderAvailabilities.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - public void SeeBookings(View view){ - Intent intent = new Intent(getApplicationContext(),Bookings.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - - -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/AdminServicesList.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServicesList.java similarity index 73% rename from OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/AdminServicesList.java rename to OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServicesList.java index ad967ff..db0cd9e 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/AdminServicesList.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServicesList.java @@ -10,36 +10,24 @@ import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.GridView; import android.widget.TextView; -import android.widget.Toast; import java.util.Iterator; import java.util.List; -/** - * Creates the view and dialog listener for List of services - * which the admin can view and manipulate. - * - */ -public class AdminServicesList extends AppCompatActivity implements NewServiceDialogFragment.NoticeDialogListener, EditServiceDialogFragment.NoticeDialogListener{ +public class ServicesList extends AppCompatActivity implements NewServiceDialogFragment.NoticeDialogListener, EditServiceDialogFragment.NoticeDialogListener{ - //field for RecyclerView private RecyclerView mRecyclerView; - //field for adapter of Recycler view private RecyclerView.Adapter mAdapter; - //field for layout manager of Recyler view. private RecyclerView.LayoutManager mLayoutManager; - /** - * On creation loads up the xml, and generates the services list, - * and fillsout the recylerView fields. - * - * @param savedInstanceState Bundle to transfer information. - */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_admin_services_list); + setContentView(R.layout.activity_services_list); DBHelper dbHelper = new DBHelper(this); List serviceslist = dbHelper.getAllServices(); Service[] services = new Service[(serviceslist.size())]; @@ -61,22 +49,10 @@ public class AdminServicesList extends AppCompatActivity implements NewServiceDi } - - /** - * Adds new services to the generated list. - * - * @param view View object contains the generated list and buttons - */ public void addService(View view) { DialogFragment newFragment = new NewServiceDialogFragment(); newFragment.show(getSupportFragmentManager(), "addService"); } - - /** - * Edits services to the generated list. - * - * @param view View object contains the generated list and buttons - */ public void editService(View view, String name) { DialogFragment newFragment = new EditServiceDialogFragment(); newFragment.show(getSupportFragmentManager(), "editService"); @@ -85,12 +61,6 @@ public class AdminServicesList extends AppCompatActivity implements NewServiceDi newFragment.setArguments(args); } //add new service - - /** - * Uses dialog to obtain the fields for addSerivce. - * - * @param dialog DialogFragment used to obtain the fields for the added service - */ @Override public void onDialogNew(DialogFragment dialog) { DBHelper dbHelper = new DBHelper(this); @@ -101,23 +71,11 @@ public class AdminServicesList extends AppCompatActivity implements NewServiceDi this.recreate(); } //user clicked cancel - - /** - * Uses dialog to cancel adding a service. - * - * @param dialog DialogFragment that contains the cancel button. - */ @Override public void onDialogNevermind(DialogFragment dialog) { } //edits service with info from dialog - - /** - * Uses Dialog to edit service. - * - * @param dialog DialogFragment that contains the fields and buttons to edit rate. - */ @Override public void onDialogEdit(DialogFragment dialog) { DBHelper dbHelper = new DBHelper(this); @@ -128,18 +86,11 @@ public class AdminServicesList extends AppCompatActivity implements NewServiceDi this.recreate(); } //deletes service with info from dialog - - /** - * Uses Dialog to delete a service from the serviceList. - * - * @param dialog DialogFragment that contains the delete service button. - */ @Override public void onDialogDelete(DialogFragment dialog) { DBHelper dbHelper = new DBHelper(this); String name = (String)dialog.getArguments().get("name"); dbHelper.deleteService(name); - Toast.makeText(this, "Service \""+(String)dialog.getArguments().get("name")+"\" has been deleted", Toast.LENGTH_LONG).show(); dialog.dismiss(); this.recreate(); } @@ -163,7 +114,7 @@ public class AdminServicesList extends AppCompatActivity implements NewServiceDi @Override public ServicesHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View v = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.service_list_item, parent, false); + .inflate(R.layout.list_item, parent, false); ServicesHolder vh = new ServicesHolder(v); return vh; } @@ -173,7 +124,7 @@ public class AdminServicesList extends AppCompatActivity implements NewServiceDi public void onBindViewHolder(ServicesHolder holder, int position) { Service service = services[position]; holder.name.setText(service.getName()); - holder.rate.setText(String.format("$%,.2f", service.getRate())); + holder.rate.setText(""+service.getRate()); diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java index 299c5ee..d4d8e38 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java @@ -9,21 +9,7 @@ import android.widget.EditText; import android.view.View; import android.widget.Toast; -/** - * This class is used to create new userType where the user - * fills in his information and his data is sent to to the database - * to create a new userType object. - * - */ - public class SignUp extends AppCompatActivity { - - /** - * On creation of this class the xml page is loaded up onto the app and - * the EditTexts are set up to accept the information of the user. - * - * @param savedInstanceState Bundle for transferring information - */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -39,13 +25,6 @@ public class SignUp extends AppCompatActivity { } - /** - * On click creates a new user if the the user information - * fits the criteria specified by the documentation and is - * not a duplicate of another user. - * - * @param view View object that contains all the editText and buttons used. - */ public void onClickSignUp(View view){ UserType newUser; String username = ((EditText) findViewById(R.id.UsernameInput)).getText().toString(); @@ -53,67 +32,41 @@ public class SignUp extends AppCompatActivity { String firstname = ((EditText) findViewById(R.id.FirstNameInput)).getText().toString(); String lastname = ((EditText) findViewById(R.id.LastNameInput)).getText().toString(); MaterialSpinner spinner = findViewById(R.id.RoleInput); - - if(username.length()>=5 && password.length()>=5 && firstname.length()>0 && lastname.length()>0 - && username.matches("[a-zA-Z0-9]*") && password.matches("[a-zA-Z0-9]*") + //TODO add message conditional to check if every EditText is filled up to standards + if(username.length()>=5 && password.length()>5 && firstname.length()>0 && lastname.length()>0 && username.matches("[a-zA-Z0-9]*") && password.matches("[a-zA-Z0-9]*") && firstname.matches("[a-zA-Z]*") && lastname.matches("[a-zA-Z]*")){ - DBHelper dbHelper = new DBHelper(this); - Intent intent = new Intent(getApplicationContext(),LogIn.class); switch(spinner.getText().toString()){ case "Home Owner": newUser = new HomeOwner(username,password,firstname,lastname); - if(dbHelper.addUser(newUser)){ - startActivity(intent); - finish(); - }else{ - Toast.makeText(this,"Username is taken",Toast.LENGTH_LONG).show(); - } break; case "Service Provider": - if(dbHelper.findUserByUsername(username)==null) { - Intent intent2 = new Intent(getApplicationContext(), SignUpPart2.class); - intent2.putExtra("firstname", firstname); - intent2.putExtra("lastname", lastname); - intent2.putExtra("username", username); - intent2.putExtra("password", password); - startActivity(intent2); - finish(); - }else{ - Toast.makeText(this,"Username is taken",Toast.LENGTH_LONG).show(); - } + newUser = new ServiceProvider(username,password,firstname,lastname); break; - default: newUser = new HomeOwner(username,password,firstname,lastname); //if nothing is enter then defaults to user role. - - if(dbHelper.addUser(newUser)){ - startActivity(intent); - finish(); - }else{ - Toast.makeText(this,"Username is taken",Toast.LENGTH_LONG).show(); - } break; } + DBHelper dbHelper = new DBHelper(this); + Intent intent = new Intent(getApplicationContext(),LogIn.class); //TODO check if signup should take to the login page or automatically login + if(dbHelper.addUser(newUser)){ + startActivity(intent); + finish(); + }else{ + Toast.makeText(this,"Username is taken",Toast.LENGTH_LONG).show(); + } } else if(firstname.length()==0 || lastname.length()==0 || username.length()==0 || password.length()==0){ Toast.makeText(this, "Fields cannot be empty", Toast.LENGTH_LONG).show(); } - else if (username.length()<5 || password.length()<5 ){ + else if (username.length()<=5 || password.length()<=5 ){ Toast.makeText(this, "Password and username must be longer than 4 characters", Toast.LENGTH_LONG).show(); } else{ Toast.makeText(this, "Fields may only contain alphanumeric values", Toast.LENGTH_LONG).show(); } } - - /** - * app closes the the activity when back is pressed and - * no user information written down is saved in the EditText for - * security purposes. - */ - @Override public void onBackPressed(){ Intent intent = new Intent(getApplicationContext(), Main.class); diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUpPart2.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUpPart2.java deleted file mode 100644 index 7eb5913..0000000 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUpPart2.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.uottawa.olympus.olympusservices; - -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; -import android.widget.CheckBox; -import android.widget.EditText; -import android.widget.Toast; - -public class SignUpPart2 extends AppCompatActivity { - private String username; - private String password; - private String firstname; - private String lastname; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_sign_up_part2); - Bundle bundle = getIntent().getExtras(); - username = bundle.getString("username"); - password = bundle.getString("password"); - firstname = bundle.getString("firstname"); - lastname = bundle.getString("lastname"); - } - - public void SignUp(View view){ - DBHelper dbHelper = new DBHelper(this); - Intent intent = new Intent(getApplicationContext(),LogIn.class); - String companyname = ((EditText) findViewById(R.id.CompanyNameInput)).getText().toString(); - String phonenumber = ((EditText) findViewById(R.id.PhoneNumberInput)).getText().toString(); - String address = ((EditText) findViewById(R.id.AddressInput)).getText().toString(); - boolean licensed = ((CheckBox) findViewById(R.id.LicensedInput)).isChecked(); - String description = ((EditText) findViewById(R.id.DescriptionInput)).getText().toString(); - - if(companyname.length()>0 && address.length()>0 && phonenumber.length()>0 - && companyname.matches("^[a-zA-Z0-9_ ]*$") && address.matches("^[a-zA-Z0-9_ ]*$") - && phonenumber.matches("^(\\+\\d{1,2}\\s)?\\(?\\d{3}\\)?[\\s.-]?\\d{3}[\\s.-]?\\d{4}$") - && description.matches("^[a-zA-Z0-9_ ]*$") - && companyname.replaceAll("\\s+","").length()>0 - && address.replaceAll("\\s+","").length()>0) { - - ServiceProvider serviceProvider = new ServiceProvider(username, password, firstname, lastname, - address, phonenumber, companyname, licensed, description); - if(dbHelper.addUser(serviceProvider)){ - startActivity(intent); - finish(); - }else{ - Toast.makeText(this,"Could not create account",Toast.LENGTH_LONG).show(); - } - } - else{ - Toast.makeText(this, "Fields cannot be empty and must be formatted correctly", Toast.LENGTH_LONG).show(); - } - - } -} diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/UserType.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/UserType.java index cb6e502..8c8cbeb 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/UserType.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/UserType.java @@ -3,120 +3,42 @@ package com.uottawa.olympus.olympusservices; import java.io.Serializable; -/** - * UserType is the abstract object that is the parent class - * of all users in this program with all common methods and - * fields set in this one class. - */ - public abstract class UserType { - //field for the username attached to the userType. String username; - //field for the password hash attached to the userType. - String hash; - //field for the firstname attached to the userType. + String password; String firstname; - //field for the lastname attached to the userType. String lastname; - //field for the salt attached to the userType. - String salt; - /** - * Constructor filling out all the field values with given parameters - * entered by a new user for the app. - * - * @param username String object containing the username. - * @param password String object containing the password. - * @param firstname String object containing the firstname. - * @param lastname String object containing the lastname. - */ + + UserType(String username, String password, String firstname, String lastname){ this.username = username; + this.password = password; this.firstname = firstname; this.lastname = lastname; - - this.salt = PasswordEncryption.generateSalt(); - this.hash = PasswordEncryption.encrypt(password, salt); } - /** - * Constructor filling out all the field values with given parameters - * entered by a new user for the app. - * - * @param username String object containing the username. - * @param hash String object containing the password hash. - * @param firstname String object containing the firstname. - * @param lastname String object containing the lastname. - * @param salt String object containing the salt. - */ - UserType(String username, String hash, String salt, String firstname, String lastname){ - this.username = username; - this.firstname = firstname; - this.lastname = lastname; - - this.salt = salt; - this.hash = hash; - } - - /** - * Abstract method to get the role of each userType child in the app. - * - * @return String object specifying the role of userType. - */ public abstract String getRole(); - /** - * Gets the username field of userType. - * - * @return String of the username. - */ public String getUsername() { return username; } - /** - * Gets the hash field of userType. - * - * @return String of the hash. - */ - public String getHash() { - return hash; + public String getPassword() { + return password; } - /** - * Gets the firstname field of userType. - * - * @return String of firstname - */ public String getFirstname() { return firstname; } - /** - * Gets the lastname field of userType. - * - * @return String of lastname - */ public String getLastname() { return lastname; } - /** - * Gets the salt field of userType. - * - * @return String of salt - */ - public String getSalt() { - return salt; - } - /** - * Sets the username field with given parameters. - * - * @param username String for new username. - */ public void setUsername(String username) { //remember to call updateUser(String username, String password, String firstname, String lastname) //in activity whenever a setter is called. DBHelper requires a Context (Activity) to be initialized @@ -125,24 +47,13 @@ public abstract class UserType { } - /** - * Sets the password field with given parameters. - * - * @param password String of new password. - */ public void setPassword(String password) { //remember to call updateUser(String username, String password, String firstname, String lastname) //in activity whenever a setter is called. DBHelper requires a Context (Activity) to be initialized //so cannot be initialized in this class - this.salt = PasswordEncryption.generateSalt(); - this.hash = PasswordEncryption.encrypt(password, salt); + this.password = password; } - /** - * Sets the firstname field with given parameters. - * - * @param firstname String of new firstname. - */ public void setFirstname(String firstname) { //remember to call updateUser(String username, String password, String firstname, String lastname) //in activity whenever a setter is called. DBHelper requires a Context (Activity) to be initialized @@ -157,15 +68,12 @@ public abstract class UserType { this.lastname = lastname; } - /** - * Compares this userType and another userType to see if there fields are equal. - * - * @param other Usertype object that is compared to this userType. - */ + + + public boolean equals(UserType other){ - if(this.username.equals(other.username)&&this.hash.equals(other.hash)&& - this.firstname.equals(other.firstname)&&this.lastname.equals(other.lastname) - &&this.salt.equals(other.salt)){ + if(this.username.equals(other.username)&&this.password.equals(other.password)&& + this.firstname.equals(other.firstname)&&this.lastname.equals(other.lastname)){ return true; } return false; diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/UsersList.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/UsersList.java index f407880..4cb5afb 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/UsersList.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/UsersList.java @@ -1,129 +1,33 @@ package com.uottawa.olympus.olympusservices; -import android.content.Context; -import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.GridView; -import android.widget.TextView; import java.util.Iterator; import java.util.List; -/** - * screen for user list that the admin can access - * and manage all users in the program. Userlist is generated through - * the database using DBHelper class. - * - */ - public class UsersList extends AppCompatActivity { - /** - * on Creation of this class the app loads up the xml page for - * activity_user_list and generates a gridview using the database - * for all the users in the app. - * - * @param savedInstanceState bundle to transfer data - */ - - //field for RecyclerView - private RecyclerView mRecyclerView; - //field for adapter of Recycler view - private RecyclerView.Adapter mAdapter; - //field for layout manager of Recyler view. - private RecyclerView.LayoutManager mLayoutManager; - - private DBHelper dbHelper; - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_users_list); - dbHelper = new DBHelper(this); + DBHelper dbHelper = new DBHelper(this); List users = dbHelper.getAllUsers(); - String[] usernames = new String[(users.size())]; + String[] usernames = new String[(users.size()+1)*2]; + usernames[0] = "Username"; + usernames[1] = "User Type"; Iterator iter = users.iterator(); for (int i=0; i(this, R.layout.simple_list_item_1_customized, usernames); + GridView gridView = findViewById(R.id.Users); + gridView.setAdapter(adapter); } - - - public class MyAdapter extends RecyclerView.Adapter { - - private String[] users; - private Context context; - - // Provide a reference to the views for each data item - // Complex data items may need more than one view per item, and - // you provide access to all the views for a data item in a view holder - - // Provide a suitable constructor (depends on the kind of dataset) - public MyAdapter(String[] users, Context context) { - this.users = users; - } - - // Create new views (invoked by the layout manager) - @NonNull - @Override - public UsersHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View v = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.user_list_item, parent, false); - return new UsersHolder(v); - } - - // Replace the contents of a view (invoked by the layout manager) - @Override - public void onBindViewHolder(UsersHolder holder, int position) { - UserType user = dbHelper.findUserByUsername(users[position]); - holder.name.setText(user.getUsername()); - holder.rate.setText(user.getRole()); - - - - } - - // Return the size of your dataset (invoked by the layout manager) - @Override - public int getItemCount() { - return users.length; - } - - class UsersHolder extends RecyclerView.ViewHolder{ - - TextView name; - TextView rate; - - public UsersHolder(View row){ - super(row); - name = row.findViewById(R.id.Name); - rate = row.findViewById(R.id.Role); - } - - } - - - } - - } diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Welcome.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Welcome.java index 8ee61e6..4389f62 100644 --- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Welcome.java +++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Welcome.java @@ -6,78 +6,32 @@ import android.view.View; import android.widget.TextView; import android.content.Intent; -/** - * Welcome class creates the welcome screen for the HomeOwners and ServiceProviders - * as a temporary screen until full functionality of those two a classes are - * implemented. - * - */ public class Welcome extends AppCompatActivity { - String username; - /** - * On creation of this object the app will display the xml file for - * the welcome page which gets the role and username of the UserType - * object and welcomes the user with a message. - * - * @param savedInstanceState Bundle to transfer data - */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_welcome); Bundle bundle = getIntent().getExtras(); - username = bundle.getString("username"); + String username = bundle.getString("username"); DBHelper dbHelper = new DBHelper(this); UserType user; user = dbHelper.findUserByUsername(username); - TextView welcome = findViewById(R.id.Welcome); - welcome.setText("Welcome "+user.getFirstname()+ " you are logged in as a Home Owner"); - + TextView role = findViewById(R.id.Role); + TextView name = findViewById(R.id.name); + role.setText(user.getRole()); + name.setText(user.getFirstname()); } - - /** - * Override so that nothing occurs when pressing the - * back button on this activity of the app. - * - */ @Override public void onBackPressed(){ } - - /** - * Logs out the user and returns them back to - * main activity. End all current user activity - * for security purposes. - * - * @param view View object of current activity. - */ public void LogOut(View view){ Intent intent = new Intent(getApplicationContext(), Main.class); startActivity(intent); finish(); } - public void SeeBookings(View view){ - Intent intent = new Intent(getApplicationContext(),Bookings.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - - public void FindServiceProvider(View view){ - Intent intent = new Intent(getApplicationContext(),FindServiceProvider.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } - public void EditProfile(View view){ - Intent intent = new Intent(getApplicationContext(),HomeOwnerEditProfile.class); - intent.putExtra("username", username); - startActivity(intent); - finish(); - } } diff --git a/OlympusServices/app/src/main/res/drawable/customborder2.xml b/OlympusServices/app/src/main/res/drawable/customborder2.xml deleted file mode 100644 index 6e6dfe4..0000000 --- a/OlympusServices/app/src/main/res/drawable/customborder2.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OlympusServices/app/src/main/res/layout/activity_admin_welcome.xml b/OlympusServices/app/src/main/res/layout/activity_admin_welcome.xml index 7b91c0e..49da067 100644 --- a/OlympusServices/app/src/main/res/layout/activity_admin_welcome.xml +++ b/OlympusServices/app/src/main/res/layout/activity_admin_welcome.xml @@ -11,7 +11,7 @@ android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" android:background="@drawable/background" - tools:context=".AdminWelcome"> + tools:context=".Welcome"> - - - - - - \ No newline at end of file diff --git a/OlympusServices/app/src/main/res/layout/activity_find_service_provider.xml b/OlympusServices/app/src/main/res/layout/activity_find_service_provider.xml deleted file mode 100644 index c9b61d5..0000000 --- a/OlympusServices/app/src/main/res/layout/activity_find_service_provider.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - -