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/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..1253c2c 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/codeStyles/Project.xml b/OlympusServices/.idea/codeStyles/Project.xml
index 30aa626..af2f2e3 100644
--- a/OlympusServices/.idea/codeStyles/Project.xml
+++ b/OlympusServices/.idea/codeStyles/Project.xml
@@ -1,5 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
@@ -24,7 +25,7 @@
-
+
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/app/src/androidTest/java/com/uottawa/olympus/olympusservices/LogInTest.java b/OlympusServices/app/src/androidTest/java/com/uottawa/olympus/olympusservices/LogInTest.java
new file mode 100644
index 0000000..0487845
--- /dev/null
+++ b/OlympusServices/app/src/androidTest/java/com/uottawa/olympus/olympusservices/LogInTest.java
@@ -0,0 +1,22 @@
+package com.uottawa.olympus.olympusservices;
+
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(AndroidJUnit4.class)
+public class LogInTest {
+
+ @Rule
+ public ActivityTestRule mActivityTestRule = new ActivityTestRule(LogIn.class);
+
+ @Test
+ public void checkSignIn() throws Exception{
+
+ }
+}
\ No newline at end of file
diff --git a/OlympusServices/app/src/androidTest/java/com/uottawa/olympus/olympusservices/SignUpTest.java b/OlympusServices/app/src/androidTest/java/com/uottawa/olympus/olympusservices/SignUpTest.java
new file mode 100644
index 0000000..b299158
--- /dev/null
+++ b/OlympusServices/app/src/androidTest/java/com/uottawa/olympus/olympusservices/SignUpTest.java
@@ -0,0 +1,90 @@
+package com.uottawa.olympus.olympusservices;
+
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.widget.TextView;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onData;
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static android.support.test.espresso.action.ViewActions.typeText;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withSpinnerText;
+import static java.util.regex.Pattern.matches;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.AllOf.allOf;
+import static org.junit.Assert.*;
+
+@RunWith(AndroidJUnit4.class)
+public class SignUpTest {
+
+ @Rule
+ public ActivityTestRule mActivityTestRule = new ActivityTestRule(SignUp.class);
+ private SignUp mActivity=null;
+ private TextView text;
+
+ @Before
+ public void setUp() throws Exception {
+ mActivity = mActivityTestRule.getActivity();
+ }
+
+ @Test
+ public void checkSignUp1() throws Exception{
+ onView(withId(R.id.UsernameInput)).perform(typeText("John123"), closeSoftKeyboard());
+ onView(withId(R.id.PasswordInput)).perform(typeText("1234567890"), closeSoftKeyboard());
+ onView(withId(R.id.FirstNameInput)).perform(typeText("John"), closeSoftKeyboard());
+ onView(withId(R.id.LastNameInput)).perform(typeText("Doe"), closeSoftKeyboard());
+ onView(withId(R.id.SignUp)).perform(click());
+ }
+
+ @Test
+ public void checkSignUp2() throws Exception{
+ onView(withId(R.id.RoleInput)).perform(click());
+ onData(allOf(is(instanceOf(String.class)), is("Service Provider"))).perform(click());
+ onView(withId(R.id.UsernameInput)).perform(typeText("Service123"), closeSoftKeyboard());
+ onView(withId(R.id.PasswordInput)).perform(typeText("1234567890"), closeSoftKeyboard());
+ onView(withId(R.id.FirstNameInput)).perform(typeText("Jane"), closeSoftKeyboard());
+ onView(withId(R.id.LastNameInput)).perform(typeText("Doe"), closeSoftKeyboard());
+ onView(withId(R.id.SignUp)).perform(click());
+ }
+
+ @Test
+ public void checkSignUp3() throws Exception{
+ onView(withId(R.id.UsernameInput)).perform(typeText(""), closeSoftKeyboard());
+ onView(withId(R.id.PasswordInput)).perform(typeText(""), closeSoftKeyboard());
+ onView(withId(R.id.FirstNameInput)).perform(typeText(""), closeSoftKeyboard());
+ onView(withId(R.id.LastNameInput)).perform(typeText(""), closeSoftKeyboard());
+ onView(withId(R.id.SignUp)).perform(click());
+ }
+
+ @Test
+ public void checkSignUp4() throws Exception{
+ onView(withId(R.id.UsernameInput)).perform(typeText("$$$$$$"), closeSoftKeyboard());
+ onView(withId(R.id.PasswordInput)).perform(typeText("$$$$$$"), closeSoftKeyboard());
+ onView(withId(R.id.FirstNameInput)).perform(typeText("$$$$$$"), closeSoftKeyboard());
+ onView(withId(R.id.LastNameInput)).perform(typeText("$$$$$$"), closeSoftKeyboard());
+ onView(withId(R.id.SignUp)).perform(click());
+ }
+
+ public void checkSignUp5() throws Exception{
+ onView(withId(R.id.UsernameInput)).perform(typeText("user"), closeSoftKeyboard());
+ onView(withId(R.id.PasswordInput)).perform(typeText("pass"), closeSoftKeyboard());
+ onView(withId(R.id.FirstNameInput)).perform(typeText("Honda"), closeSoftKeyboard());
+ onView(withId(R.id.LastNameInput)).perform(typeText("Gokuchi"), closeSoftKeyboard());
+ onView(withId(R.id.SignUp)).perform(click());
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ mActivity=null;
+ }
+}
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/AndroidManifest.xml b/OlympusServices/app/src/main/AndroidManifest.xml
index 425603f..fe68bbe 100644
--- a/OlympusServices/app/src/main/AndroidManifest.xml
+++ b/OlympusServices/app/src/main/AndroidManifest.xml
@@ -57,10 +57,10 @@
android:label="Welcome"
android:screenOrientation="portrait" />
+ android:windowSoftInputMode="stateHidden"/>
-
-
-
-
-
+ android:screenOrientation="portrait">
+
\ 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..8b658b4 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
@@ -17,10 +17,6 @@ public class Admin extends UserType {
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
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..7ef3b65 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
@@ -7,12 +7,8 @@ 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 +23,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 = 4;
//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,7 +37,7 @@ 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";
@@ -66,9 +59,6 @@ public class DBHelper extends SQLiteOpenHelper {
//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
@@ -90,20 +80,7 @@ public class DBHelper extends SQLiteOpenHelper {
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 +93,10 @@ 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;
- }
+ addUser(new ServiceProvider("testing", "testing", "testing", "testing",
+ "testing", "0000000000", "testing", true, "testing"));
}
@Override
@@ -154,9 +128,6 @@ public class DBHelper extends SQLiteOpenHelper {
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 +"), "
@@ -184,22 +155,6 @@ public class DBHelper extends SQLiteOpenHelper {
+ 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
@@ -251,41 +206,7 @@ public class DBHelper extends SQLiteOpenHelper {
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; i0;
- }
-
+ if (cursor != null && cursor.getCount() > 0){
+ cursor.close();
+ return false;
}
cursor.close();
@@ -744,125 +589,60 @@ public class DBHelper extends SQLiteOpenHelper {
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,
+ return writeDB.delete(TABLE_SERVICEPROVIDERS,
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
+ + " 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'");
+ + "= '" + serviceProviderName + "'");
}
- /**
- * 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");
+ return getAll("SELECT " + COLUMN_SERVICEPROVIDERNAME
+ + " FROM " + TABLE_SERVICEPROVIDERS
+ + " WHERE " + COLUMN_SERVICEPROVIDERSERVICE + " = '"
+ + serviceName + "'");
}
- /**
- * 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;
@@ -892,6 +672,27 @@ public class DBHelper extends SQLiteOpenHelper {
return true;
}
+ 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);
+ }
+ }
+
+ }
+
//note that this method overwrites serviceProvider's availability if it exists
public int[][] getAvailabilities(ServiceProvider serviceProvider){
@@ -929,611 +730,9 @@ public class DBHelper extends SQLiteOpenHelper {
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,227 +750,6 @@ 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
@@ -1797,222 +775,5 @@ 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/ServiceProviderEditProfile.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditProfile.java
similarity index 89%
rename from OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderEditProfile.java
rename to OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditProfile.java
index 11eae79..57ebfe9 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderEditProfile.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditProfile.java
@@ -8,7 +8,7 @@ import android.widget.CheckBox;
import android.widget.TextView;
import android.widget.Toast;
-public class ServiceProviderEditProfile extends AppCompatActivity {
+public class EditProfile extends AppCompatActivity {
String username;
DBHelper dbHelper;
@@ -19,7 +19,7 @@ public class ServiceProviderEditProfile extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_service_provider_edit_profile);
+ setContentView(R.layout.activity_edit_profile);
Bundle bundle = getIntent().getExtras();
username = bundle.getString("username");
dbHelper = new DBHelper(this);
@@ -37,13 +37,15 @@ public class ServiceProviderEditProfile extends AppCompatActivity {
firstname.setText(user.getFirstname());
lastname.setText(user.getLastname());
- password.setText("");
+ password.setText(user.getPassword());
companyname.setText(user.getCompanyname());
address.setText(user.getAddress());
phonenumber.setText(user.getPhonenumber());
description.setText(user.getDescription());
licensed.setChecked(user.isLicensed());
+
+
}
/**
@@ -74,8 +76,7 @@ public class ServiceProviderEditProfile extends AppCompatActivity {
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
+ if(password.getText().toString().length()>=5 && 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]*")
@@ -87,7 +88,6 @@ public class ServiceProviderEditProfile extends AppCompatActivity {
&& 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
@@ -100,7 +100,7 @@ public class ServiceProviderEditProfile extends AppCompatActivity {
}
else{
- Toast.makeText(this, "Fields cannot be empty (other than description) and must be formatted correctly", Toast.LENGTH_LONG).show();
+ 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/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..690ff19 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
@@ -24,21 +24,6 @@ public class HomeOwner extends UserType {
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".
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..4fb387a 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
@@ -44,8 +44,7 @@ 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);
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/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();
+ availabilities = new int[7][4];
+ this.address = address;
+ this.phonenumber = phonenumber;
+ this.companyname = companyname;
+ this.licensed = licensed;
+ this.description = "";
}
- /**
- *
- * @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){
super(username, password, firstname, lastname);
@@ -71,36 +65,8 @@ public class ServiceProvider extends UserType {
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.
*
@@ -196,12 +162,4 @@ public class ServiceProvider extends UserType {
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/ServiceProviderServicesList.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java
index 36105c0..21b47d3 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderServicesList.java
@@ -83,6 +83,15 @@ public class ServiceProviderServicesList extends AppCompatActivity implements De
spinner.setItems(services);
+
+
+ spinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener() {
+
+ @Override public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+ Snackbar.make(view, "Clicked " + item, Snackbar.LENGTH_LONG).show();
+ }
+ });
+
}
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
index 2b34266..efa2570 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderWelcome.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProviderWelcome.java
@@ -35,6 +35,7 @@ public class ServiceProviderWelcome extends AppCompatActivity {
welcome.setText("Welcome "+user.getFirstname()+ " you are logged in as a Service Provider");
+
}
/**
@@ -60,7 +61,7 @@ public class ServiceProviderWelcome extends AppCompatActivity {
}
public void EditProfile(View view){
- Intent intent = new Intent(getApplicationContext(),ServiceProviderEditProfile.class);
+ Intent intent = new Intent(getApplicationContext(),EditProfile.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
@@ -78,12 +79,6 @@ public class ServiceProviderWelcome extends AppCompatActivity {
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/UserType.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/UserType.java
index cb6e502..98f4766 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
@@ -13,14 +13,12 @@ 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 password attached to the userType.
+ String password;
//field for the firstname attached to the userType.
String firstname;
//field for the lastname attached to the userType.
String lastname;
- //field for the salt attached to the userType.
- String salt;
/**
@@ -34,30 +32,9 @@ public abstract class UserType {
*/
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;
}
/**
@@ -77,12 +54,12 @@ public abstract class UserType {
}
/**
- * Gets the hash field of userType.
+ * Gets the password field of userType.
*
- * @return String of the hash.
+ * @return String of the password.
*/
- public String getHash() {
- return hash;
+ public String getPassword() {
+ return password;
}
/**
@@ -103,15 +80,6 @@ public abstract class UserType {
return lastname;
}
- /**
- * Gets the salt field of userType.
- *
- * @return String of salt
- */
- public String getSalt() {
- return salt;
- }
-
/**
* Sets the username field with given parameters.
*
@@ -134,8 +102,7 @@ public abstract class UserType {
//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;
}
/**
@@ -163,9 +130,8 @@ public abstract class UserType {
* @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/Welcome.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Welcome.java
index 8ee61e6..24ac48c 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
@@ -13,7 +13,6 @@ import android.content.Intent;
*
*/
public class Welcome extends AppCompatActivity {
- String username;
/**
* On creation of this object the app will display the xml file for
@@ -27,13 +26,14 @@ public class Welcome extends AppCompatActivity {
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());
}
@@ -60,24 +60,5 @@ public class Welcome extends AppCompatActivity {
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..fb775e0 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_service_provider_edit_profile.xml b/OlympusServices/app/src/main/res/layout/activity_edit_profile.xml
similarity index 98%
rename from OlympusServices/app/src/main/res/layout/activity_service_provider_edit_profile.xml
rename to OlympusServices/app/src/main/res/layout/activity_edit_profile.xml
index f234577..1ba8447 100644
--- a/OlympusServices/app/src/main/res/layout/activity_service_provider_edit_profile.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_edit_profile.xml
@@ -11,7 +11,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
- tools:context=".ServiceProviderEditProfile">
+ tools:context=".EditProfile">
@@ -136,7 +136,7 @@
android:textCursorDrawable="@color/colorWhite"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/res/layout/activity_home_owner_edit_profile.xml b/OlympusServices/app/src/main/res/layout/activity_home_owner_edit_profile.xml
deleted file mode 100644
index b572235..0000000
--- a/OlympusServices/app/src/main/res/layout/activity_home_owner_edit_profile.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- //component used from https://github.com/rengwuxian/MaterialEditText
-
-
-
- //component used from https://github.com/rengwuxian/MaterialEditText
-
-
-
- //component used from https://github.com/rengwuxian/MaterialEditText
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/res/layout/activity_make_booking.xml b/OlympusServices/app/src/main/res/layout/activity_make_booking.xml
deleted file mode 100644
index b9ba0ad..0000000
--- a/OlympusServices/app/src/main/res/layout/activity_make_booking.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/res/layout/activity_service_provider_welcome.xml b/OlympusServices/app/src/main/res/layout/activity_service_provider_welcome.xml
index 903316c..1103a39 100644
--- a/OlympusServices/app/src/main/res/layout/activity_service_provider_welcome.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_service_provider_welcome.xml
@@ -57,7 +57,6 @@
android:layout_height="60dp"
android:layout_marginTop="20dp"
android:text="Bookings"
- android:onClick="SeeBookings"
android:theme="@style/AppTheme.Button" />
+ tools:context=".Welcome">
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OlympusServices/app/src/main/res/layout/booking_list_item.xml b/OlympusServices/app/src/main/res/layout/booking_list_item.xml
deleted file mode 100644
index 3ce86bb..0000000
--- a/OlympusServices/app/src/main/res/layout/booking_list_item.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OlympusServices/app/src/main/res/layout/rating_comment_item.xml b/OlympusServices/app/src/main/res/layout/rating_comment_item.xml
deleted file mode 100644
index 1961e6b..0000000
--- a/OlympusServices/app/src/main/res/layout/rating_comment_item.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OlympusServices/app/src/main/res/layout/rating_item.xml b/OlympusServices/app/src/main/res/layout/rating_item.xml
deleted file mode 100644
index d5a2466..0000000
--- a/OlympusServices/app/src/main/res/layout/rating_item.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- //component used from https://github.com/rengwuxian/MaterialEditText
-
-
-
-
-
-
-
-
diff --git a/OlympusServices/app/src/main/res/layout/service_list_item.xml b/OlympusServices/app/src/main/res/layout/service_list_item.xml
index a543323..5cf7dd8 100644
--- a/OlympusServices/app/src/main/res/layout/service_list_item.xml
+++ b/OlympusServices/app/src/main/res/layout/service_list_item.xml
@@ -33,16 +33,4 @@
android:textColor="@color/colorBlack"
android:textSize="15sp"
android:gravity="end"/>
-
-
-
-
diff --git a/OlympusServices/app/src/main/res/layout/simple_list_item_1_customized.xml b/OlympusServices/app/src/main/res/layout/simple_list_item_1_customized.xml
index f1ed998..9befd9b 100644
--- a/OlympusServices/app/src/main/res/layout/simple_list_item_1_customized.xml
+++ b/OlympusServices/app/src/main/res/layout/simple_list_item_1_customized.xml
@@ -8,13 +8,11 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+ android:paddingStart="30dp"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
- android:paddingBottom="5dp"
android:textColor="@android:color/black"
android:background="@color/colorWhite"
android:layout_marginBottom="10dp"
- android:textSize="15sp"
-
>
diff --git a/OlympusServices/app/src/main/res/layout/sp_info_item.xml b/OlympusServices/app/src/main/res/layout/sp_info_item.xml
deleted file mode 100644
index 6d7c2fe..0000000
--- a/OlympusServices/app/src/main/res/layout/sp_info_item.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OlympusServices/app/src/main/res/values/styles.xml b/OlympusServices/app/src/main/res/values/styles.xml
index be9729a..f9401e8 100644
--- a/OlympusServices/app/src/main/res/values/styles.xml
+++ b/OlympusServices/app/src/main/res/values/styles.xml
@@ -13,11 +13,5 @@
- @color/colorBlack
-
-
-
diff --git a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/AdminTest.java b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/AdminTest.java
index f8cf183..38008b6 100644
--- a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/AdminTest.java
+++ b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/AdminTest.java
@@ -14,12 +14,13 @@ public class AdminTest {
public void testAdmin() {
Admin admin = new Admin();
String username = admin.getUsername();
+ String password = admin.getPassword();
String firstname = admin.getFirstname();
String lastname = admin.getLastname();
String role = admin.getRole();
assertEquals("Admin", role);
assertEquals("admin", username);
- assertEquals(PasswordEncryption.encrypt("admin", admin.getSalt()), admin.getHash());
+ assertEquals("admin", password);
assertEquals("Admin", firstname);
assertEquals("Admin", lastname);
}
diff --git a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/BookingTest.java b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/BookingTest.java
deleted file mode 100644
index 5e20336..0000000
--- a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/BookingTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.uottawa.olympus.olympusservices;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class BookingTest {
- HomeOwner user = new HomeOwner( "John123", "1234567890", "John", "Doe" );
- ServiceProvider serviceprovider = new ServiceProvider("Jane123", "1234567890", "Jane", "Doe", "testaddress", "8888888888", "companydotcom", true);
- Service service = new Service( "FrenchMaid", 250 );
- Booking book = new Booking(13, 30, 16, 0, 0, 0, 2019,
- serviceprovider, user, service);
-
- /**
- * tests starth input and its functions.
- */
- @Test
- public void testStarth() {
- assertEquals(13, book.getStarth());
- book.setStarth(10);
- assertNotEquals(13, book.getStarth());
- }
-
- /**
- * tests startmin input and its functions.
- */
- @Test
- public void testStartmin() {
- assertEquals(30, book.getStartmin());
- book.setStartmin(20);
- assertNotEquals(30, book.getStartmin());
- }
-
- /**
- * tests Endh input and its functions.
- */
- @Test
- public void testEndh() {
- assertEquals(16, book.getEndh());
- book.setEndh(14);
- assertNotEquals(16, book.getEndh());
- }
-
- /**
- * tests Endmin input and its functions.
- */
- @Test
- public void testEndmin() {
- assertEquals(0, book.getEndmin());
- book.setEndmin(20);
- assertNotEquals(0, book.getEndmin());
- }
-
- /**
- * tests Day input and its functions.
- */
- @Test
- public void testDay() {
- assertEquals(0, book.getDay());
- book.setDay(1);
- assertNotEquals(0, book.getDay());
- }
-
- /**
- * tests Month input and its functions.
- */
- @Test
- public void testMonth() {
- assertEquals(0, book.getMonth());
- book.setMonth(2);
- assertNotEquals(0, book.getMonth());
- }
-
- /**
- * tests Year input and its functions.
- */
- @Test
- public void testYear() {
- assertEquals(2019, book.getYear());
- book.setYear(2020);
- assertNotEquals(2019, book.getYear());
- }
-
- /**
- * tests ServiceProvider in booking class and its functions.
- */
- @Test
- public void testServiceprovider() {
- assertEquals(serviceprovider, book.getServiceprovider() );
- ServiceProvider serviceprovider2 = new ServiceProvider("Joshua123", "1234567890", "Joshua", "Doe", "testoaddress", "8888888888", "whateverdotcom", true);
- book.setServiceprovider(serviceprovider2);
- assertNotEquals(serviceprovider, book.getServiceprovider());
- }
-
- /**
- * tests HomeOwner in booking class and its functions.
- */
- @Test
- public void testHomeowner() {
- assertEquals(user, book.getHomeowner() );
- HomeOwner user2 = new HomeOwner( "Johnny123", "1234567890", "Johnny", "Dumas" );
- book.setHomeowner(user2);
- assertNotEquals(user, book.getHomeowner());
- }
-
- /**
- * tests Service in booking class and its functions.
- */
- @Test
- public void testService() {
- assertEquals(service, book.getService() );
- Service service2 = new Service( "ItalianMafia", 300 );
- book.setService(service2);
- assertNotEquals(service, book.getService());
- }
-
- /**
- * tests Status and its functions by setting it up.
- */
- @Test
- public void testStatus() {
- book.setStatus(Booking.Status.CONFIRMED);
- assertEquals(Booking.Status.CONFIRMED, book.getStatus());
- }
-
- /**
- * tests Rating and its functions by setting it up.
- */
- @Test
- public void testRating() {
- book.setRating(5);
- assertEquals(5, book.getRating());
- }
-}
\ No newline at end of file
diff --git a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/DBIntegrationTest.java b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/DBIntegrationTest.java
index 9173ce9..64b4972 100644
--- a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/DBIntegrationTest.java
+++ b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/DBIntegrationTest.java
@@ -12,22 +12,12 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.List;
-import com.uottawa.olympus.olympusservices.Booking.Status;
import static org.junit.Assert.*;
@RunWith(RobolectricTestRunner.class)
@Config(packageName = "com.uottawa.olympus.olympusservices")
public class DBIntegrationTest {
-
- /**
- * Enum for setting up before a test
- */
- private enum TestAfter{
- USER, SERVICE, LINK, AVAILABILITY, BOOKING, RATING;
- }
-
-
private DBHelper dbHelper = new DBHelper(RuntimeEnvironment.application);
//testing user login table
@@ -38,9 +28,9 @@ public class DBIntegrationTest {
UserType dbUser = dbHelper.findUserByUsername("admin");
assertEquals("Admin", dbUser.getClass().getSimpleName());
assertEquals("admin", dbUser.getUsername());
+ assertEquals("admin", dbUser.getPassword());
assertEquals("Admin", dbUser.getFirstname());
assertEquals("Admin", dbUser.getLastname());
- assertEquals(PasswordEncryption.encrypt("admin", dbUser.getSalt()), dbUser.getHash());
}
@Test
@@ -56,8 +46,7 @@ public class DBIntegrationTest {
dbUser = dbHelper.findUserByUsername("mgarzon");
assertEquals("HomeOwner", dbUser.getClass().getSimpleName());
assertEquals("mgarzon", dbUser.getUsername());
- assertEquals(originalUser.getHash(), dbUser.getHash());
- assertEquals(originalUser.getSalt(), dbUser.getSalt());
+ assertEquals("soccer", dbUser.getPassword());
assertEquals("Miguel", dbUser.getFirstname());
assertEquals("Garzon", dbUser.getLastname());
@@ -70,8 +59,7 @@ public class DBIntegrationTest {
dbUser = dbHelper.findUserByUsername("jbO4aBF4dC");
assertEquals("ServiceProvider", dbUser.getClass().getSimpleName());
assertEquals("jbO4aBF4dC", dbUser.getUsername());
- assertEquals(originalUser.getHash(), dbUser.getHash());
- assertEquals(originalUser.getSalt(), dbUser.getSalt());
+ assertEquals("seg2105", dbUser.getPassword());
assertEquals("Juan", dbUser.getFirstname());
assertEquals("Guzman", dbUser.getLastname());
@@ -173,6 +161,7 @@ public class DBIntegrationTest {
dbUser = dbHelper.findUserByUsername("jbO4aBF4dC");
assertEquals("jbO4aBF4dC", dbUser.getUsername());
+ assertEquals("soccer", dbUser.getPassword());
assertEquals("Juan", dbUser.getFirstname());
assertEquals("Guzman", dbUser.getLastname());
@@ -185,12 +174,15 @@ public class DBIntegrationTest {
@Test
public void testGetAllUsers(){
- setUp(TestAfter.USER);
+ dbHelper.addUser(new HomeOwner("jbO4aBF4dC", "soccer", "Miguel", "Garzon"));
List allUsers = dbHelper.getAllUsers();
- assertEquals(allUsers.size(), 5);
for (String[] user : allUsers){
+/* for (String s : user){
+ System.out.print(s + " ");
+ }
+ System.out.println();*/
UserType usertype = dbHelper.findUserByUsername(user[0]);
assertEquals(usertype.getFirstname(), user[1]);
assertEquals(usertype.getLastname(), user[2]);
@@ -246,7 +238,7 @@ public class DBIntegrationTest {
added = dbHelper.addService(new Service("extermiNating fLatworms", 25.00));
assertTrue(!added);
- dbHelper.deleteAll();
+ dbHelper.deleteService("Exterminating flatworms");
}
@Test
@@ -263,41 +255,55 @@ public class DBIntegrationTest {
assertEquals("exterminating flatworms", service.getName());
assertEquals(25.00, service.getRate(), 0.001);
- dbHelper.deleteAll();
+ dbHelper.deleteService("Exterminating flatworms");
}
@Test
public void testGetAllServices(){
- setUp(TestAfter.SERVICE);
+ dbHelper.addService(new Service("Exterminating flatworms", 20.00));
List allServices = dbHelper.getAllServices();
- assertTrue(allServices.size() == 3);
for (String[] service : allServices){
+/* for (String s : user){
+ System.out.print(s + " ");
+ }
+ System.out.println();*/
Service dbService = dbHelper.findService(service[0]);
assertEquals(dbService.getRate(), Double.parseDouble(service[1]), 0.001);
}
- dbHelper.deleteAll();
+ dbHelper.deleteService("Exterminating flatworms");
}
@Test
public void testAddAndDeleteServiceProvidedByUser(){
- setUp(TestAfter.SERVICE);
-
+ dbHelper.addUser(new ServiceProvider("jbO4aBF4dC", null, null, null,
+ "testaddress", "8888888888", "companydotcom", true));
+ dbHelper.addService(new Service("Hitman", 12358));
boolean added = dbHelper.addServiceProvidedByUser("jbO4aBF4dC", "hitman");
assertTrue(added);
boolean deleted = dbHelper.deleteServiceProvidedByUser("jbO4aBF4dC", "Hitman");
assertTrue(deleted);
-
- dbHelper.deleteAll();
+ dbHelper.deleteUser("jbO4aBF4dC");
+ dbHelper.deleteService("hitman");
}
@Test
public void testGetAllServicesProvidedByUserAndDeleteService(){
- setUp(TestAfter.LINK);
+ ServiceProvider serviceProvider = new ServiceProvider("jbO4aBF4dC", null, null, null,
+ "testaddress", "8888888888", "companydotcom", true);
+ dbHelper.addUser(serviceProvider);
- List servicesProvidedByUser = dbHelper.getAllServicesProvidedByUser("jbO4aBF4dC");
+ Service service1 = new Service("Hitman", 12358);
+ Service service2 = new Service("Exterminating flatworms", 392.457);
+ dbHelper.addService(service1);
+ dbHelper.addService(service2);
+
+ dbHelper.addServiceProvidedByUser(serviceProvider, service1);
+ dbHelper.addServiceProvidedByUser(serviceProvider, service2);
+
+ List servicesProvidedByUser = dbHelper.getAllServicesProvidedByUser(serviceProvider);
assertEquals(2, servicesProvidedByUser.size());
assertEquals("hitman", servicesProvidedByUser.get(0)[0]);
assertEquals(12358, Double.parseDouble(servicesProvidedByUser.get(0)[1]), 0.00001);
@@ -312,28 +318,47 @@ public class DBIntegrationTest {
servicesProvidedByUser = dbHelper.getAllServicesProvidedByUser("jbO4aBF4dC");
assertEquals(0, servicesProvidedByUser.size());
- dbHelper.deleteAll();
+ dbHelper.deleteUser("jbO4aBF4dC");
}
@Test
public void testGetAllProvidersByService(){
- setUp(TestAfter.LINK);
+ dbHelper.addService(new Service("Exterminating flatworms", 392.457));
+ dbHelper.addUser(new ServiceProvider("jbO4aBF4dC", null, null, null,
+ "testaddress", "8888888888", "companydotcom", true));
+ dbHelper.addUser(new ServiceProvider("7MuF1c59XP", null, null, null,
+ "testaddress", "8888888888", "companydotcom", true));
+
+ dbHelper.addServiceProvidedByUser("jbO4aBF4dC", "exterminating flatworms");
+ dbHelper.addServiceProvidedByUser("7MuF1c59XP", "exterminating flatworms");
List providersByService = dbHelper.getAllProvidersByService("exterminating flatworms");
assertEquals(2, providersByService.size());
assertEquals("jbO4aBF4dC", providersByService.get(0)[0]);
- assertEquals("DW44FkUsX7", providersByService.get(1)[0]);
+ assertEquals("7MuF1c59XP", providersByService.get(1)[0]);
- dbHelper.deleteAll();
+ dbHelper.deleteService("Exterminating flatworms");
+ dbHelper.deleteUser("jbO4aBF4dC");
+ dbHelper.deleteUser("7MuF1c59XP");
}
@Test
public void testDeleteServiceProvidedByUser(){
- setUp(TestAfter.LINK);
+ ServiceProvider serviceProvider = new ServiceProvider("jbO4aBF4dC", null, null, null,
+ "testaddress", "8888888888", "companydotcom", true);
+ dbHelper.addUser(serviceProvider);
- List servicesProvidedByUser = dbHelper.getAllServicesProvidedByUser("jbO4aBF4dC");
+ Service service1 = new Service("Hitman", 12358);
+ Service service2 = new Service("Exterminating flatworms", 392.457);
+ dbHelper.addService(service1);
+ dbHelper.addService(service2);
+
+ dbHelper.addServiceProvidedByUser(serviceProvider, service1);
+ dbHelper.addServiceProvidedByUser(serviceProvider, service2);
+
+ List servicesProvidedByUser = dbHelper.getAllServicesProvidedByUser(serviceProvider);
assertEquals(2, servicesProvidedByUser.size());
dbHelper.deleteServiceProvidedByUser("jbO4aBF4dC","hitman");
@@ -344,7 +369,7 @@ public class DBIntegrationTest {
servicesProvidedByUser = dbHelper.getAllServicesProvidedByUser("jbO4aBF4dC");
assertEquals(0, servicesProvidedByUser.size());
- dbHelper.deleteAll();
+ dbHelper.deleteUser("jbO4aBF4dC");
}
@@ -382,7 +407,7 @@ public class DBIntegrationTest {
assertEquals(availabilities[i][j], dbAvailabilities[i][j]);
}
}
- dbHelper.deleteAll();
+ dbHelper.deleteUser("jbO4aBF4dC");
}
@@ -407,229 +432,7 @@ public class DBIntegrationTest {
assertEquals(0, dbAvailabilities[i][j]);
}
}
- dbHelper.deleteAll();
- }
-
- @Test
- public void testGetByTime(){
- setUp(TestAfter.AVAILABILITY);
-
- //December 3 2020 is a Thursday
- List providers = dbHelper.getProvidersByTime("Exterminating flatworms", 2020,
- 12, 3, 6, 12, 10, 0);
- assertEquals(0, providers.size());
-
- providers = dbHelper.getProvidersByTime("Exterminating flatworms", 2020,
- 12, 3, 7, 12, 10, 0);
- assertEquals(1, providers.size());
- String[] firstProvider = providers.get(0);
- assertEquals("jbO4aBF4dC", firstProvider[0]);
- assertEquals("Jack", firstProvider[1]);
- assertEquals("Black", firstProvider[2]);
- assertEquals(0, Double.parseDouble(firstProvider[3]), 0.0001);
-
- //December 4 2020 is a Friday
- providers = dbHelper.getProvidersByTime("Exterminating flatworms", 2020,
- 12, 4, 10, 0, 13, 0);
- assertEquals(2, providers.size());
- }
-
-
-
- @Test
- public void testAddBooking(){
- setUp(TestAfter.AVAILABILITY);
-
- //December 1, 2020 is a Tuesday. Provider is available from 5:20 to 21:11
- boolean added = dbHelper.addBooking("jbO4aBF4dC", "7MuF1c59XP", "Hitman",
- 2020, 12, 1, 8, 12, 10, 0);
- assertTrue(added);
-
- //This booking has already been done so cannot be booked anymore
- added = dbHelper.addBooking("jbO4aBF4dC", "7MuF1c59XP", "Hitman",
- 2020, 12, 1, 8, 12, 10, 0);
- assertTrue(!added);
-
- //Provider is available from 5:20 to 21:11, but has a booking from 8:12 to 10:00
- added = dbHelper.addBooking("jbO4aBF4dC", "7MuF1c59XP", "Hitman",
- 2020, 12, 1, 9, 12, 12, 0);
- assertTrue(!added);
-
- //December 3, 2020 is a Thursday. Provider is available from 7:12 to 15:14
- added = dbHelper.addBooking("jbO4aBF4dC", "7MuF1c59XP", "Hitman",
- 2020, 12, 3, 6, 12, 7, 30);
- assertTrue(!added);
-
- //November 20, 2018 is in the past. Should not be able to add booking
- added = dbHelper.addBooking("jbO4aBF4dC", "7MuF1c59XP", "Hitman",
- 2018, 11, 20, 8, 12, 10, 0);
- assertTrue(!added);
-
- dbHelper.deleteAll();
- }
-
- @Test
- public void testViewListOfBookings(){
- setUp(TestAfter.AVAILABILITY);
-
- List bookings = dbHelper.findBookings("jbO4aBF4dC");
- assertEquals(0, bookings.size());
- bookings = dbHelper.findBookings("7MuF1c59XP");
- assertEquals(0, bookings.size());
- bookings = dbHelper.findBookings("DW44FkUsX7");
- assertEquals(0, bookings.size());
-
- dbHelper.addBooking("jbO4aBF4dC", "7MuF1c59XP", "Hitman",
- 2020, 12, 1, 8, 12, 10, 0);
- bookings = dbHelper.findBookings("jbO4aBF4dC");
- assertEquals(1, bookings.size());
- bookings = dbHelper.findBookings("7MuF1c59XP");
- assertEquals(1, bookings.size());
- bookings = dbHelper.findBookings("DW44FkUsX7");
- assertEquals(0, bookings.size());
-
- dbHelper.addBooking("DW44FkUsX7", "7MuF1c59XP", "petting cats",
- 2020, 12, 4, 10, 0, 10, 30);
- bookings = dbHelper.findBookings("jbO4aBF4dC");
- assertEquals(1, bookings.size());
- bookings = dbHelper.findBookings("7MuF1c59XP");
- assertEquals(2, bookings.size());
- bookings = dbHelper.findBookings("DW44FkUsX7");
- assertEquals(1, bookings.size());
-
- dbHelper.deleteAll();
- }
-
- @Test
- public void testConfirmAndCancelBooking(){
- setUp(TestAfter.AVAILABILITY);
-
- Booking booking = new Booking(8, 12, 10, 0,1,
- 12, 2020, (ServiceProvider)dbHelper.findUserByUsername("jbO4aBF4dC"),
- (HomeOwner)dbHelper.findUserByUsername("7MuF1c59XP"), dbHelper.findService("Hitman"));
- dbHelper.addBooking(booking);
-
- assertTrue(dbHelper.confirmBooking(booking));
- List bookings = dbHelper.findBookings("jbO4aBF4dC");
- Booking dbBooking = bookings.get(0);
- assertEquals(Status.CONFIRMED, dbBooking.getStatus());
-
- assertTrue(dbHelper.cancelBooking(booking));
- bookings = dbHelper.findBookings("jbO4aBF4dC");
- dbBooking = bookings.get(0);
- assertEquals(Status.CANCELLED, dbBooking.getStatus());
-
- bookings = dbHelper.findNonCancelledBookings("jbO4aBF4dC");
- assertEquals(0, bookings.size());
-
- dbHelper.deleteAll();
- }
-
- @Test
- public void testRating(){
- setUp(TestAfter.BOOKING);
-
- ServiceProvider serviceProvider = (ServiceProvider)dbHelper.findUserByUsername("jbO4aBF4dC");
- HomeOwner homeOwner = (HomeOwner)dbHelper.findUserByUsername("7MuF1c59XP");
- Service service = dbHelper.findService("Hitman");
-
- Booking booking = new Booking(8, 12, 10, 0,
- 2, 10, 2018,
- serviceProvider, homeOwner, service);
- boolean added = dbHelper.addRating(booking, 5, "100%");
- assertTrue(added);
-
- double rating = dbHelper.getAverageRating("jbO4aBF4dC","Hitman");
- assertEquals(5, rating, 0.0001);
-
- booking = new Booking(10, 01, 11, 0,
- 2, 10, 2018,
- serviceProvider, homeOwner, service);
- added = dbHelper.addRating(booking, 1, "Wrong target");
- assertTrue(added);
-
- rating = dbHelper.getAverageRating("jbO4aBF4dC","Hitman");
- assertEquals(3, rating, 0.0001);
-
- rating = dbHelper.getAverageRating("jbO4aBF4dC","exterminating flatworms");
- assertEquals(0, rating, 0.0001);
-
- dbHelper.deleteAll();
-
- }
-
-// @Test
-// public void printUsersTable(){
-// dbHelper.printTable("userInfo");
-// }
-
- // Ever gotten tired of adding things at the start of a test just to delete it all again?
- // I have.
- // This is a work in progress
- private void setUp(TestAfter testAfter){
- dbHelper.deleteAll();
-
- dbHelper.addUser(new Admin());
-
- ServiceProvider serviceProvider1 = new ServiceProvider("jbO4aBF4dC", null, "Jack", "Black",
- "testaddress", "8888888888", "companydotcom", true);
- dbHelper.addUser(serviceProvider1);
-
- ServiceProvider serviceProvider2 = new ServiceProvider("DW44FkUsX7", null, "Dwayne", "Johnson",
- "testaddress", "1248921742", "companydotcom", false);
- dbHelper.addUser(serviceProvider2);
-
- HomeOwner homeOwner1 = new HomeOwner("7MuF1c59XP", null, "Mufasa", "Died");
- dbHelper.addUser(homeOwner1);
-
- HomeOwner homeOwner2 = new HomeOwner("wRV3phzpl5", null, "Wren", "Phillips");
- dbHelper.addUser(homeOwner2);
-
- Service service1 = new Service("Hitman", 12358);
- dbHelper.addService(service1);
-
- Service service2 = new Service("Exterminating flatworms", 392.457);
- dbHelper.addService(service2);
-
- Service service3 = new Service("Petting cats", 0);
- dbHelper.addService(service3);
-
- if (!(testAfter.equals(TestAfter.USER) || testAfter.equals(TestAfter.SERVICE))){
- dbHelper.addServiceProvidedByUser(serviceProvider1, service1);
- dbHelper.addServiceProvidedByUser(serviceProvider1, service2);
-
- dbHelper.addServiceProvidedByUser(serviceProvider2, service3);
- dbHelper.addServiceProvidedByUser(serviceProvider2, service2);
-
- if (!testAfter.equals(TestAfter.LINK)){
- //serviceProvider1 is available on Monday, Tuesday, Thursday, and Friday
- serviceProvider1.setAvailabilities(0, 4, 18, 19, 30);
- serviceProvider1.setAvailabilities(1, 5, 20, 21, 11);
- serviceProvider1.setAvailabilities(3, 7, 12, 15, 14);
- serviceProvider1.setAvailabilities(4, 0, 0, 23, 29);
-
- dbHelper.updateAvailability(serviceProvider1);
-
- //serviceProvider2 is only available on Friday
- serviceProvider2.setAvailabilities(4, 10, 0, 23, 29);
-
- dbHelper.updateAvailability(serviceProvider2);
-
- if (!testAfter.equals(TestAfter.AVAILABILITY)){
- Booking booking1 = new Booking(8, 12, 10, 0,1,
- 12, 2020, serviceProvider1, homeOwner1, service1);
- dbHelper.addBooking(booking1);
- }
-
- if (testAfter.equals(TestAfter.BOOKING)){
- //October 2 2018 is a Tuesday
- dbHelper.forceAddBookingDONTTOUCH("jbO4aBF4dC", "7MuF1c59XP", "Hitman",
- 2018, 10, 2, 8, 12, 10, 0, Status.PENDING);
- dbHelper.forceAddBookingDONTTOUCH("jbO4aBF4dC", "7MuF1c59XP", "Hitman",
- 2018, 10, 2, 10, 01, 11, 0, Status.PENDING);
- }
- }
- }
+ dbHelper.deleteUser("jbO4aBF4dC");
}
}
diff --git a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/HomeOwnerTest.java b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/HomeOwnerTest.java
index 8135894..47d33a8 100644
--- a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/HomeOwnerTest.java
+++ b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/HomeOwnerTest.java
@@ -14,10 +14,9 @@ public class HomeOwnerTest {
public void testHomeOwner(){
UserType user = new HomeOwner( "John123", "1234567890", "John", "Doe" );
String role = user.getRole();
- String salt = user.getSalt();
assertEquals("HomeOwner", role);
assertEquals("John123", user.getUsername());
- assertEquals( PasswordEncryption.encrypt("1234567890", salt), user.getHash());
+ assertEquals("1234567890", user.getPassword());
assertEquals("John", user.getFirstname());
assertEquals("Doe", user.getLastname());
user.setUsername( "username" );
@@ -25,10 +24,7 @@ public class HomeOwnerTest {
user.setFirstname( "firstname" );
user.setLastname( "lastname" );
assertNotEquals("John123", user.getUsername());
- assertNotEquals("1234567890", user.getHash());
- assertNotEquals("password", user.getHash());
- assertNotEquals( PasswordEncryption.encrypt("1234567890", salt), user.getHash());
- assertNotEquals(PasswordEncryption.encrypt("password", salt), user.getHash());
+ assertNotEquals("1234567890", user.getPassword());
assertNotEquals("John", user.getFirstname());
assertNotEquals("Doe", user.getLastname());
}
diff --git a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/PasswordTest.java b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/PasswordTest.java
deleted file mode 100644
index 495e742..0000000
--- a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/PasswordTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.uottawa.olympus.olympusservices;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class PasswordTest {
-
- @Test
- public void testHashes(){
- String string1 = PasswordEncryption.encrypt("helloworld", "i]/S9evY\\,");
- String string2 = PasswordEncryption.encrypt("helloworld", "i]/S9evY\\,");
-
- assertTrue(PasswordEncryption.slowEquals(string1, string2));
-
- String string3 = PasswordEncryption.encrypt("helloworld", "i]/S9evY\\");
- assertTrue(!PasswordEncryption.slowEquals(string1, string3));
-
- String string4 = PasswordEncryption.encrypt("helloworl", "i]/S9evY\\,");
- assertTrue(!PasswordEncryption.slowEquals(string1, string4));
-
- }
-}
diff --git a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/ServiceProviderTest.java b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/ServiceProviderTest.java
index c7bfbe5..7f5b5e8 100644
--- a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/ServiceProviderTest.java
+++ b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/ServiceProviderTest.java
@@ -17,21 +17,17 @@ public class ServiceProviderTest {
@Test
public void testServiceProvider() {
- String salt = serviceprovider.getSalt();
- assertEquals( "John123", serviceprovider.getUsername());
- assertEquals( PasswordEncryption.encrypt("1234567890", salt), serviceprovider.getHash());
- assertEquals( "John", serviceprovider.getFirstname());
- assertEquals( "Doe", serviceprovider.getLastname());
- assertEquals( "ServiceProvider", serviceprovider.getRole());
- serviceprovider.setUsername("username");
- serviceprovider.setPassword("password");
- serviceprovider.setFirstname("firstname");
- serviceprovider.setLastname("lastname");
+ assertEquals( "John123", serviceprovider.getUsername() );
+ assertEquals( "1234567890", serviceprovider.getPassword() );
+ assertEquals( "John", serviceprovider.getFirstname() );
+ assertEquals( "Doe", serviceprovider.getLastname() );
+ assertEquals( "ServiceProvider", serviceprovider.getRole() );
+ serviceprovider.setUsername( "username" );
+ serviceprovider.setPassword( "password" );
+ serviceprovider.setFirstname( "firstname" );
+ serviceprovider.setLastname( "lastname" );
assertNotEquals("John123", serviceprovider.getUsername());
- assertNotEquals("1234567890", serviceprovider.getHash());
- assertNotEquals("password", serviceprovider.getHash());
- assertNotEquals( PasswordEncryption.encrypt("1234567890", salt), serviceprovider.getHash());
- assertNotEquals(PasswordEncryption.encrypt("password", salt), serviceprovider.getHash());
+ assertNotEquals("1234567890", serviceprovider.getPassword());
assertNotEquals("John", serviceprovider.getFirstname());
assertNotEquals("Doe", serviceprovider.getLastname());
}
diff --git a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/UserTypeTest.java b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/UserTypeTest.java
index a0eb09c..8660968 100644
--- a/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/UserTypeTest.java
+++ b/OlympusServices/app/src/test/java/com/uottawa/olympus/olympusservices/UserTypeTest.java
@@ -27,8 +27,8 @@ public class UserTypeTest {
assertNotEquals( true, useradmin );
assertNotEquals( true, serviceadmin );
assertNotEquals( true, userservice );
- user = new HomeOwner(serviceprovider.getUsername(), serviceprovider.getHash(), serviceprovider.getSalt(),
- serviceprovider.getFirstname(), serviceprovider.getLastname());
+ user.setFirstname(serviceprovider.getFirstname());
+ user.setUsername(serviceprovider.getUsername());
userservice = user.equals(serviceprovider);
assertEquals( true, userservice );
}
diff --git a/OlympusServices/build.gradle b/OlympusServices/build.gradle
index de09b28..8d3ef8e 100644
--- a/OlympusServices/build.gradle
+++ b/OlympusServices/build.gradle
@@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
+ classpath 'com.android.tools.build:gradle:3.2.1'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/OlympusServices/gradle/wrapper/gradle-wrapper.properties b/OlympusServices/gradle/wrapper/gradle-wrapper.properties
index 1bb7eb5..3d939b3 100644
--- a/OlympusServices/gradle/wrapper/gradle-wrapper.properties
+++ b/OlympusServices/gradle/wrapper/gradle-wrapper.properties
@@ -7,4 +7,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/ProjectUML.ump b/ProjectUML.ump
index 0eecca1..361d4a8 100644
--- a/ProjectUML.ump
+++ b/ProjectUML.ump
@@ -3,8 +3,7 @@ class UserType
firstname;
lastname;
username;
- salt;
- hash;
+ password;
}
class HomeOwner
@@ -26,7 +25,6 @@ isA UserType;
class Admin
{
isA UserType;
- 1 -- * Service;
}
class Service
@@ -38,23 +36,6 @@ double rate;
-class Booking
-{
- int starth;
- int startmin;
- int endh;
- int endmin;
- int day;
- int month;
- int year;
- status;
-int rating;
-comment;
-* -- 1 HomeOwner;
- * -- 1 ServiceProvider;
- * -- 1 Service;
-}
-
class UserType
{
position 475 69 141 109;
@@ -73,21 +54,10 @@ class ServiceProvider
class Admin
{
position 490 236 109 41;
- position.association Admin__Service 66,41 0,52;
- position.association Admin__Service:create 109,28 0,60;
- position.association Admin__Service:creates 109,16 0,28;
}
class Service
{
- position 849 474 112 75;
+ position 854 455 112 75;
position.association Service__ServiceProvider 65,0 65,143;
-}
-
-class Booking
-{
- position 99 433 178 194;
- position.association Booking__HomeOwner 62,0 54,41;
- position.association Booking__ServiceProvider 178,50 0,94;
- position.association Booking__Service 178,120 0,68;
-}
\ No newline at end of file
+}//$?[End_of_model]$?
\ No newline at end of file
diff --git a/README.md b/README.md
index 16726ef..a91cb3d 100644
--- a/README.md
+++ b/README.md
@@ -1,39 +1,8 @@
# SEG2105-Olympus
-SEG2105 final project, Ivana Erlich, Anshu Sharma, Batuhan Berk Başoğlu, Mary Tran
+SEG2105 final project, Ivana Erlich, Anshu Sharma, Batuhan Basoglu, Mary Tran
-https://git.batuhan.basoglu.ca/batuhan-basoglu/SEG2105-Olympus-Android-Application
-
-Build Status
-[](https://circleci.com/gh/ebivibe/SEG2105-Olympus/tree/master)
-
-APK tested on a Sony Xperia XA2, model H3123
-
-Admin account is precreated with username = admin, password = admin
-
-
-3 ServiceProvider accounts are precreated with
-username = testing, password = testing;
-username = testing1, password = testing;
-username = testing2, password = testing.
-Service providers are available for the entire day if they are available.
-There is at least one service provider available on any day.
-
-
-3 HomeOwner accounts are precreated with
-username = tester, password = tester;
-username = tester1, password = tester;
-username = tester2, password = tester
-
-
-10 services are precreated.
-All three service providers offer the Dragon Tamer service.
-No service provider offers the Maid or Butler services.
-At least one service provider offers the remaining services.
-
-
-10 bookings are precreated.
-All three service providers have been booked with the Dragon Tamer service.
-Only two home owners (tester and tester1) have made bookings.
-
-THERE BE DRAGONS
+https://github.com/ebivibe/SEG2105-Olympus
+Admin account is precreated with
+username = admin,
+password = admin
diff --git a/Screenshots.zip b/Screenshots.zip
deleted file mode 100644
index 0813c42..0000000
Binary files a/Screenshots.zip and /dev/null differ
diff --git a/TablePrintout.png b/TablePrintout.png
deleted file mode 100644
index cdb8a3e..0000000
Binary files a/TablePrintout.png and /dev/null differ
diff --git a/TablePrintout2.png b/TablePrintout2.png
deleted file mode 100644
index e34126c..0000000
Binary files a/TablePrintout2.png and /dev/null differ
diff --git a/UML Class Diagram.docx b/UML Class Diagram.docx
index ce88ead..5d4af73 100644
Binary files a/UML Class Diagram.docx and b/UML Class Diagram.docx differ
diff --git a/~$L Class Diagram.docx b/~$L Class Diagram.docx
deleted file mode 100644
index 94f7615..0000000
Binary files a/~$L Class Diagram.docx and /dev/null differ