diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1284995 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.DS_Store +*.pro.user* +*.pro.user diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..7e713a3 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,63 @@ +# Changelog +Jegliche Veräderungen werden hier dokumentiert + +## [Unveröffentlicht] +### Geändert +- Auf der Anmelde Seite ist jetzt der gesamte Text auf deutsch + +## [0.04] - 2018-07-19 +### Behoben +- Fehler beim Speiseplan, der dafür sorgte, dass der letzte Tag fehlerhaft (zu dünn) angezeigt wurde, wenn nurnoch ein Tag angezeigt wurde + +### Hinzugefügt +- Hinweis zu den Anmeldedaten beim Login +- Logos in der rechten oberen Ecke, bei einem Click darauf öffnet sich die zugehörige Webseite +- "Menü" Balken über dem Menü +- Anmation beim Öffnen / Schließen der Fehleranzeige + +### Geändert +- Im Menü ist die "abmelden" Schaltfläche jetzt rot + +## [0.03.3] - 2018-07-1 +### Behoben +- Fehler, durch den am Monatswechsel beim Speiseplan auch die vorherige Woche angezeigt wurde + + +## [0.03.2] - 2018-06-29 +### Hinzugefügt +- Animation beim clicken der heute / morgen Tasten +- Striche zwischen den einzelnen Reihen zur besseren Übersicht beim Speiseplan hinzugefügt + +### Geändert +- Die bisherige Fortschrittsanzeige durch eine kreisförmige erstezt +### Behoben +- Der Text beim Spieseplan wird nicht mehr abgeschnitten +- Beim Laden des Speiseplanes werden keine sehr großen oder kleinen Zahlen mehr angezeigt + + +## [0.03.1] - 2018-06-25 +### Behoben +- Problem, das dafür sorgte, dass die App beim Starten (im Zustand: Angemldet, Internetverbindung hergestellt) +direkt abstürzte + +## [0.03] - 2018-06-25 +### Hinzugefügt +- Bug behoben, durch den man fehlerhafter weise abgemeldet wurde, wenn die App +ohne Internetverbindung gestertet und diese dann während die app lief wieder hergestellt wurde +- Vollständige Anzeige für den Speiseplan +- Handler für den Speiseplan +- die alten pdf dateien werden vor dem herunterladen der neuen gelösch +- Heute und Morgen Knöpfe werden deaktiviert, wenn eine Fehlermeldung (window.is_error === true) vorliegt + +## [0.02] - 2018-06-22 +### Hinzugefügt +- Fortschrittsanzeigr beim Herunterladen der pdfs +### Behoben +-Rechtschreibfehler auf der Startseite + +## [0.01] - 2018-06-21 +### Hinzugefügt +- Anzeigen des Vertretungsplanes +- Anzeigen der Fanny-Webseite +- Anmelden und angemeldet bleiben +- Abmelden \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..455df6e --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 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 Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero 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) 2018 Dorian Zeder + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +. \ No newline at end of file diff --git a/android-sources/AndroidManifest.xml b/android-sources/AndroidManifest.xml new file mode 100644 index 0000000..0f0918a --- /dev/null +++ b/android-sources/AndroidManifest.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android-sources/res/drawable-hdpi/icon.png b/android-sources/res/drawable-hdpi/icon.png new file mode 100644 index 0000000..859de5e Binary files /dev/null and b/android-sources/res/drawable-hdpi/icon.png differ diff --git a/android-sources/res/drawable-ldpi/icon.png b/android-sources/res/drawable-ldpi/icon.png new file mode 100644 index 0000000..859de5e Binary files /dev/null and b/android-sources/res/drawable-ldpi/icon.png differ diff --git a/android-sources/res/drawable-mdpi/icon.png b/android-sources/res/drawable-mdpi/icon.png new file mode 100644 index 0000000..859de5e Binary files /dev/null and b/android-sources/res/drawable-mdpi/icon.png differ diff --git a/android_release.keystore b/android_release.keystore new file mode 100644 index 0000000..f330509 Binary files /dev/null and b/android_release.keystore differ diff --git a/fannyapp.pro b/fannyapp.pro new file mode 100644 index 0000000..43c9af7 --- /dev/null +++ b/fannyapp.pro @@ -0,0 +1,52 @@ +QT += qml quick quickcontrols2 xml widgets webview +CONFIG += c++11 + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which as been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +TEMPLATE = app +TARGET = fannyapp + +ICON = favicon.icns +RC_ICONS = favicon.ico + +SOURCES += \ + source/serverconn.cpp \ + source/main.cpp \ + source/appsettings.cpp + +HEADERS += \ + headers/serverconn.h \ + headers/appsettings.h + +RESOURCES += \ + qml/qml.qrc \ + shared.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Additional import path used to resolve QML modules just for Qt Quick Designer +QML_DESIGNER_IMPORT_PATH = + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target + +android { + ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources +} + +DISTFILES += \ + favicon.png \ + android-sources/AndroidManifest.xml + diff --git a/fannyapp.pro.user.736334c b/fannyapp.pro.user.736334c new file mode 100644 index 0000000..6dbd4e2 --- /dev/null +++ b/fannyapp.pro.user.736334c @@ -0,0 +1,336 @@ + + + + + + EnvironmentId + {736334c7-59b9-42fb-bb64-0bbe827a8b2c} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.10.1 clang 64bit + Desktop Qt 5.10.1 clang 64bit + qt.qt5.5101.clang_64_kit + 2 + 0 + 0 + + /Users/dorian/Documents/git/build-fannyapp-Desktop_Qt_5_10_1_clang_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /Users/dorian/Documents/git/build-fannyapp-Desktop_Qt_5_10_1_clang_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /Users/dorian/Documents/git/build-fannyapp-Desktop_Qt_5_10_1_clang_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment-Konfiguration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + fannyapp + + Qt4ProjectManager.Qt4RunConfiguration:/Users/dorian/Documents/git/fanny-app/fannyapp.pro + true + + fannyapp.pro + false + + /Users/dorian/Documents/git/build-fannyapp-Desktop_Qt_5_10_1_clang_64bit-Profile/fannyapp.app/Contents/MacOS + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/fannyapp.pro.user.a7af30b b/fannyapp.pro.user.a7af30b new file mode 100644 index 0000000..df12bab --- /dev/null +++ b/fannyapp.pro.user.a7af30b @@ -0,0 +1,882 @@ + + + + + + EnvironmentId + {a7af30b9-cb0f-45fd-9894-328c8b8b2887} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.10.1 MSVC2017 64bit + Desktop Qt 5.10.1 MSVC2017 64bit + qt.qt5.5101.win64_msvc2017_64_kit + 1 + 0 + 0 + + D:/Documents/Git/build-fannyapp-Desktop_Qt_5_10_1_MSVC2017_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/Documents/Git/build-fannyapp-Desktop_Qt_5_10_1_MSVC2017_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + D:/Documents/Git/build-fannyapp-Desktop_Qt_5_10_1_MSVC2017_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment-Konfiguration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + fannyapp + + Qt4ProjectManager.Qt4RunConfiguration:D:/Documents/Git/fanny-app/fannyapp.pro + true + + fannyapp.pro + false + + D:/Documents/Git/build-fannyapp-Desktop_Qt_5_10_1_MSVC2017_64bit-Release + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Qt 5.10.1 for UWP 32bit (MSVC 2017) + Qt 5.10.1 for UWP 32bit (MSVC 2017) + qt.qt5.5101.win64_msvc2017_winrt_x86_kit + 0 + 0 + 0 + + D:/Documents/Git/build-fannyapp-Qt_5_10_1_for_UWP_32bit_MSVC_2017-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/Documents/Git/build-fannyapp-Qt_5_10_1_for_UWP_32bit_MSVC_2017-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + D:/Documents/Git/build-fannyapp-Qt_5_10_1_for_UWP_32bit_MSVC_2017-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + + windeployqt ausführen + WinRt.BuildStep.Deploy + --qmldir D:\Documents\Git\fanny-app + + 1 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + windeployqt ausführen + + WinRTAppxDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + App-Paket ausführen + WinRt.WinRtRunConfiguration:D:/Documents/Git/fanny-app/fannyapp.pro + 3768 + false + true + false + false + true + + false + + 1 + + + + ProjectExplorer.Project.Target.2 + + Android für armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) + Android für armeabi-v7a (GCC 4.9, Qt 5.10.1 for Android armv7) + {944fd98d-a247-470d-994b-ce639c60daa2} + 0 + 0 + 0 + + D:/Documents/Git/build-fannyapp-Android_f_r_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + D:/Documents/Git/build-fannyapp-Android_f_r_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + D:/Documents/Git/build-fannyapp-Android_f_r_armeabi_v7a_GCC_4_9_Qt_5_10_1_for_Android_armv7-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Anwendungsdaten kopieren + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Android-APK erstellen + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Erstellen + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Bereinigen + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Deployment auf Android-Gerät + + Qt4ProjectManager.AndroidDeployQtStep + false + + 1 + Deployment + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deployment auf Android-Gerät + + Qt4ProjectManager.AndroidDeployConfiguration2 + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + fannyapp + fannyapp + Qt4ProjectManager.AndroidRunConfiguration:D:/Documents/Git/fanny-app/fannyapp.pro + fannyapp.pro + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 3 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/favicon.icns b/favicon.icns new file mode 100644 index 0000000..94bb507 Binary files /dev/null and b/favicon.icns differ diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..ae30f13 Binary files /dev/null and b/favicon.ico differ diff --git a/favicon.png b/favicon.png new file mode 100644 index 0000000..ac69062 Binary files /dev/null and b/favicon.png differ diff --git a/favicon.xcf b/favicon.xcf new file mode 100644 index 0000000..2b5b15b Binary files /dev/null and b/favicon.xcf differ diff --git a/graphics/Banner.png b/graphics/Banner.png new file mode 100644 index 0000000..3683f42 Binary files /dev/null and b/graphics/Banner.png differ diff --git a/graphics/Banner.xcf b/graphics/Banner.xcf new file mode 100644 index 0000000..caa50f1 Binary files /dev/null and b/graphics/Banner.xcf differ diff --git a/graphics/FannyLogo.png b/graphics/FannyLogo.png new file mode 100644 index 0000000..f963950 Binary files /dev/null and b/graphics/FannyLogo.png differ diff --git a/graphics/FannyLogo_small.png b/graphics/FannyLogo_small.png new file mode 100644 index 0000000..ac6d27a Binary files /dev/null and b/graphics/FannyLogo_small.png differ diff --git a/graphics/Icon Big.png b/graphics/Icon Big.png new file mode 100644 index 0000000..b5aa3a6 Binary files /dev/null and b/graphics/Icon Big.png differ diff --git a/graphics/TreffpunktFannyLogo.png b/graphics/TreffpunktFannyLogo.png new file mode 100644 index 0000000..b3ca429 Binary files /dev/null and b/graphics/TreffpunktFannyLogo.png differ diff --git a/graphics/chat_background.jpg b/graphics/chat_background.jpg new file mode 100644 index 0000000..fe815e1 Binary files /dev/null and b/graphics/chat_background.jpg differ diff --git a/graphics/favicon.png b/graphics/favicon.png new file mode 100644 index 0000000..4ee3fc5 Binary files /dev/null and b/graphics/favicon.png differ diff --git a/graphics/favicon.xcf b/graphics/favicon.xcf new file mode 100644 index 0000000..2f48792 Binary files /dev/null and b/graphics/favicon.xcf differ diff --git a/graphics/icon.jpg b/graphics/icon.jpg new file mode 100644 index 0000000..aaf4da4 Binary files /dev/null and b/graphics/icon.jpg differ diff --git a/graphics/icons/back.png b/graphics/icons/back.png new file mode 100644 index 0000000..d1740cd Binary files /dev/null and b/graphics/icons/back.png differ diff --git a/graphics/icons/back_black.png b/graphics/icons/back_black.png new file mode 100644 index 0000000..c55ab31 Binary files /dev/null and b/graphics/icons/back_black.png differ diff --git a/graphics/icons/drawer.png b/graphics/icons/drawer.png new file mode 100644 index 0000000..4e7899e Binary files /dev/null and b/graphics/icons/drawer.png differ diff --git a/graphics/icons/drawer_black.png b/graphics/icons/drawer_black.png new file mode 100644 index 0000000..eba3b6c Binary files /dev/null and b/graphics/icons/drawer_black.png differ diff --git a/graphics/icons/menu.png b/graphics/icons/menu.png new file mode 100644 index 0000000..5a0d148 Binary files /dev/null and b/graphics/icons/menu.png differ diff --git a/graphics/icons/menu_black.png b/graphics/icons/menu_black.png new file mode 100644 index 0000000..649c2a0 Binary files /dev/null and b/graphics/icons/menu_black.png differ diff --git a/graphics/screenshots/1_Screenshot_LoginPage.jpg b/graphics/screenshots/1_Screenshot_LoginPage.jpg new file mode 100644 index 0000000..7c3c77e Binary files /dev/null and b/graphics/screenshots/1_Screenshot_LoginPage.jpg differ diff --git a/graphics/screenshots/2_Screenshot_MainPage.jpg b/graphics/screenshots/2_Screenshot_MainPage.jpg new file mode 100644 index 0000000..eae42dd Binary files /dev/null and b/graphics/screenshots/2_Screenshot_MainPage.jpg differ diff --git a/graphics/screenshots/3_Screenshot_WebsitePage.jpg b/graphics/screenshots/3_Screenshot_WebsitePage.jpg new file mode 100644 index 0000000..519fbcc Binary files /dev/null and b/graphics/screenshots/3_Screenshot_WebsitePage.jpg differ diff --git a/graphics/screenshots/4_Screenshot_CookplanPage.jpg b/graphics/screenshots/4_Screenshot_CookplanPage.jpg new file mode 100644 index 0000000..406f2f6 Binary files /dev/null and b/graphics/screenshots/4_Screenshot_CookplanPage.jpg differ diff --git a/graphics/sheute.png b/graphics/sheute.png new file mode 100644 index 0000000..0b8f2aa Binary files /dev/null and b/graphics/sheute.png differ diff --git a/graphics/sheute_new.png b/graphics/sheute_new.png new file mode 100644 index 0000000..7b7eec8 Binary files /dev/null and b/graphics/sheute_new.png differ diff --git a/graphics/smorgen.png b/graphics/smorgen.png new file mode 100644 index 0000000..1212cc7 Binary files /dev/null and b/graphics/smorgen.png differ diff --git a/headers/appsettings.h b/headers/appsettings.h new file mode 100644 index 0000000..b5459ec --- /dev/null +++ b/headers/appsettings.h @@ -0,0 +1,26 @@ +#ifndef APPSETTINGS_H +#define APPSETTINGS_H + +#include +#include +#include + +class AppSettings : public QObject +{ + Q_OBJECT +public: + explicit AppSettings(QObject *parent = nullptr); + ~AppSettings(); + + Q_INVOKABLE QString loadSetting(const QString &key); + Q_INVOKABLE void writeSetting(const QString &key, const QVariant &variant); + + QSettings *settingsManager; + +signals: + +public slots: +}; +extern AppSettings * pGlobalAppSettings; + +#endif // APPSETTINGS_H diff --git a/headers/serverconn.h b/headers/serverconn.h new file mode 100644 index 0000000..6c09106 --- /dev/null +++ b/headers/serverconn.h @@ -0,0 +1,63 @@ +#ifndef SERVERCONN_H +#define SERVERCONN_H + +#include +#include +#include +#include +#include +#include +#include + +#include "headers/appsettings.h" + + +typedef struct strReturnData{ + int status_code; + QString text; +}ReturnData_t; + +class ServerConn : public QObject +{ + Q_OBJECT + +public: + QString username; + QString password; + QNetworkAccessManager *networkManager; + QNetworkAccessManager *refreshNetworkManager; + float progress; +public: + explicit ServerConn(QObject *parent = nullptr); + ~ServerConn(); + Q_INVOKABLE QString login(QString username, QString password, bool permanent); + Q_INVOKABLE int logout(); + Q_INVOKABLE QString getDay(QString day); + Q_INVOKABLE int checkConn(); + Q_INVOKABLE float getProgress(); + Q_INVOKABLE int getFoodPlan(); + Q_INVOKABLE QVariantMap getFoodPlanData(int index); + ReturnData_t senddata(QUrl serviceUrl, QUrlQuery postData); + +signals: + +public slots: + Q_INVOKABLE void updateProgress(qint64 read, qint64 total); + +private: + +struct Day +{ + QString Cookteam; + QString Date; + QString Main; + QString Main_veg; + QString Salad; + QString Dessert; +}; + +QList> m_weekplan; + +}; + +#endif // SERVERCONN_H diff --git a/qml/AppToolBar.qml b/qml/AppToolBar.qml new file mode 100644 index 0000000..980493a --- /dev/null +++ b/qml/AppToolBar.qml @@ -0,0 +1,69 @@ +import QtQuick 2.6 +import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 + +ToolBar { + id: toolBar + property bool showErrorBar: true + Material.theme: Material.Light + Rectangle { + id: errorField + width: parent.width + height: 30 + enabled: window.is_error & stackView.currentItem.objectName !== "LoginPage" & showErrorBar + anchors.top: parent.bottom + + color: "red" + onEnabledChanged: { + if(enabled){ + toolBar.state = 'moveIn' + } + else { + toolBar.state = 'moveOut' + } + } + + MouseArea { anchors.fill: parent; onClicked: { + toolBar.state = 'moveOut' + + console.log("clicked") + } + } + + Text { + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } + + id: errorText + font.family: "Helvetica" + color: "White" + font.pointSize: 8 + visible: parent.height !== 0 + text: window.error + } + } + + states: [ + State { + name: "moveOut" + PropertyChanges { target: errorField; height: 0 } + }, + State { + name: "moveIn" + PropertyChanges { target: errorField; height: 30 } + } + ] + + transitions: [ + Transition { + to: "moveOut" + NumberAnimation { properties: "height"; easing.type: Easing.InOutQuad; duration: 200 } + }, + Transition { + to: "moveIn" + NumberAnimation { properties: "height"; easing.type: Easing.InOutQuad; duration: 200 } + } + ] +} diff --git a/qml/FoodPlanForm.qml b/qml/FoodPlanForm.qml new file mode 100644 index 0000000..b07c89e --- /dev/null +++ b/qml/FoodPlanForm.qml @@ -0,0 +1,215 @@ +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtGraphicalEffects 1.0 + +Page { + id:root + //anchors.fill: parent + property bool cookplanChanged + title: qsTr("Speiseplan") + property string icon: "qrc:/graphics/TreffpunktFannyLogo.png" + property string link: "http://www.treffpunkt-fanny.de" + +// Image{ +// source: "qrc:/graphics/chat_background.jpg"; +// height: parent.height +// width: parent.width +// fillMode: Image.Tile +// horizontalAlignment: Image.AlignLeft +// verticalAlignment: Image.AlignTop +// } +// LinearGradient { +// anchors.fill: parent +// start: Qt.point(0, 0) +// end: Qt.point(0, parent.height) +// gradient: Gradient { +// GradientStop { position: 0.0; color: "#4db2b3" } +// GradientStop { position: 1.0; color: "#8f4dae" } +// } +// } + + Timer { + id: firstLoadTimer + interval: 1; + running: true + repeat: false + + onTriggered: { + _cppServerConn.getFoodPlan() + cookplanChanged = true + } + } + + ScrollView { + id:scroll + anchors.fill: parent + ListView { + id: listView + //width: 514 + model: 8 + spacing: 0 + property var today: new Date + anchors { + right: parent.right + left: parent.left + top: parent.top + bottom: parent.bottom + leftMargin: 5 + rightMargin: 5 + topMargin: 3 + } + + delegate: Button { + //text: getText(index, "cookteam") + width: listView.width + id: delegate + height: visible ? cookteam.height + date.height + main_dish.height + main_dish_veg.height + garnish.height + dessert.height + spacer.height + cust_spacing*9 + 5:0 + visible: listView.isDayVisible(index) + + property int cust_spacing: 5 + + Label { + anchors.left: parent.left + anchors.leftMargin: 10 + anchors.top: parent.top + anchors.topMargin: 10 + font.bold: true + id: cookteam + text: _cppServerConn.getFoodPlanData(index).cookteam + width: parent.width - 10 + wrapMode: Label.Wrap + height: text!=""? undefined:0 + } + Label { + anchors.left: parent.left + anchors.leftMargin: 10 + anchors.top: cookteam.bottom + font.bold: true + id: date + text: listView.getDateString(index) + width: parent.width - 10 + wrapMode: Label.Wrap + } + Rectangle { + anchors.top: date.bottom + anchors.topMargin: cust_spacing + anchors.left: parent.left + anchors.leftMargin: 10 + anchors.right: parent.right + anchors.rightMargin: 10 + height: 2 + color: "grey" + + } + + Label { + anchors.left: parent.left + anchors.leftMargin: 10 + anchors.top: date.bottom + anchors.topMargin: cust_spacing * 2 + width: parent.width - 10 + wrapMode: Label.Wrap + id: main_dish + text: _cppServerConn.getFoodPlanData(index).main_dish + height: text!=""? undefined:0 + } + + Rectangle { + anchors.top: main_dish.bottom + anchors.topMargin: cust_spacing + anchors.left: parent.left + anchors.leftMargin: 10 + width: parent.width / 10 + height: main_dish_veg.text!=""? 1:0 + color: "grey" + + } + + Label { + anchors.left: parent.left + anchors.leftMargin: 10 + anchors.top: main_dish.bottom + anchors.topMargin: cust_spacing * 2 + id: main_dish_veg + text: _cppServerConn.getFoodPlanData(index).main_dish_veg + width: parent.width - 10 + wrapMode: Label.Wrap + height: text!=""? undefined:0 + } + + Rectangle { + anchors.top: main_dish_veg.bottom + anchors.topMargin: cust_spacing + anchors.left: parent.left + anchors.leftMargin: 10 + width: parent.width / 10 + height: garnish.text!=""? 1:0 + color: "grey" + } + + Label { + anchors.left: parent.left + anchors.leftMargin: 10 + anchors.top: main_dish_veg.bottom + anchors.topMargin: cust_spacing * 2 + id: garnish + text: _cppServerConn.getFoodPlanData(index).garnish + width: parent.width - 10 + wrapMode: Label.Wrap + height: text!=""? undefined:0 + } + + Rectangle { + anchors.top: garnish.bottom + anchors.topMargin: cust_spacing + anchors.left: parent.left + anchors.leftMargin: 10 + width: parent.width / 10 + height: dessert.text!=""? 1:0 + color: "grey" + + } + + Label { + anchors.left: parent.left + anchors.leftMargin: 10 + anchors.top: garnish.bottom + anchors.topMargin: cust_spacing * 2 + id: dessert + text: _cppServerConn.getFoodPlanData(index).dessert + width: parent.width - 10 + wrapMode: Label.Wrap + height: text!=""? undefined:0 + } + + Label { + anchors.left: parent.left + anchors.leftMargin: 10 + anchors.top: dessert.bottom + anchors.topMargin: cust_spacing + id: spacer + text: "" + } + } + + function getDateString(index){ + var date = _cppServerConn.getFoodPlanData(index).date + //console.log(date) + if(date.getDate() === today.getDate()){ + return("Heute") + } + else if(date.getDate() === today.getDate() + 1 || (date.getDate() === 1 && date.getMonth() === today.getMonth() + 1)){ + return("Morgen") + } + else { + return(Qt.formatDateTime(_cppServerConn.getFoodPlanData(index).date, "dddd, d.M.yy")) + } + + } + function isDayVisible(index){ + var date = _cppServerConn.getFoodPlanData(index).date + return( date.getDate() >= today.getDate() && date.getMonth() >= today.getMonth()) + } + } + } +} diff --git a/qml/HomeForm.qml b/qml/HomeForm.qml new file mode 100644 index 0000000..aa9aa29 --- /dev/null +++ b/qml/HomeForm.qml @@ -0,0 +1,206 @@ +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtGraphicalEffects 1.0 + +Page { + //anchors.fill: parent + + title: qsTr("Vertretungsplan") + property string icon: "qrc:/graphics/FannyLogo_small.png" + property string link: "http://www.fanny-leicht.de/j34" + +// Image{ +// source: "qrc:/graphics/chat_background.jpg"; +// height: parent.height +// width: parent.width +// fillMode: Image.Tile +// horizontalAlignment: Image.AlignLeft +// verticalAlignment: Image.AlignTop +// } + + +// LinearGradient { +// anchors.fill: parent +// start: Qt.point(0, 0) +// end: Qt.point(0, parent.height) +// gradient: Gradient { +// GradientStop { position: 0.0; color: "#4db2b3" } +// GradientStop { position: 1.0; color: "#8f4dae" } +// } +// } + + Label { + id: laWelcome + text: "Hier kannst du dir den Vertretungsplan des Fannys anschauen" + font.pixelSize: 20 + wrapMode: Label.Wrap + width: window.width / 1.2 + color: window.text_color + anchors { + top: parent.top + topMargin: window.height / 8 - laWelcome.height / 2 + horizontalCenter: parent.horizontalCenter + } + } + + Button { + id:buttToday + enabled: window.is_error === false + anchors { + left: parent.left + leftMargin: (window.width / 4) - (buttToday.width / 2) + verticalCenter: parent.verticalCenter + } + + onClicked: { + verificationDialog.day = "sheute" + verificationDialog.open() + } + + onPressed: sheuteImage.scale = 0.9 + onReleased: sheuteImage.scale = 1.0 + + background: Image { + id: sheuteImage + source: "qrc:/graphics/sheute.png" + + Behavior on scale { + PropertyAnimation { + duration: 100 + } + } + } + } + + Button { + id: buttTomorrow + enabled: window.is_error === false + anchors { + right: parent.right + rightMargin: (window.width / 4) - (buttTomorrow.width / 2) + verticalCenter: parent.verticalCenter + } + + onClicked: { + verificationDialog.day = "smorgen" + verificationDialog.open() + } + + onPressed: smorgenImage.scale = 0.9 + onReleased: smorgenImage.scale = 1.0 + + background: Image { + id: smorgenImage + source: "qrc:/graphics/smorgen.png" + + Behavior on scale { + PropertyAnimation { + duration: 100 + } + } + } + + } + + Rectangle { + id: buttonsDisabled + anchors.left: buttToday.left + anchors.right: buttTomorrow.right + anchors.top: buttToday.top + anchors.bottom: buttToday.bottom + color: "white" + opacity: 0.7 + visible: window.is_error + } + + Dialog { + property string day + id: verificationDialog + modal: true + focus: true + title: "Bedingung" + x: (window.width - width) / 2 + y: window.height / 6 + width: Math.min(window.width, window.height) / 3 * 2 + contentHeight: aboutColumn.height + standardButtons: Dialog.Ok | Dialog.Cancel + onAccepted: { + _cppServerConn.updateProgress(0,100) + busyDialog.open() + text.visible = false + var ret = _cppServerConn.getDay(day) + progressCircle.arcEnd = 36000 + progress.text = "100%" + busyDialog.close() + text.visible = true + if(ret === "OK"){ + return + } + else if(ret === "Ungültige Benutzerdaten."){ + root.StackView.view.pop() + } + else { + error.text = ret + window.is_error = true + window.error = ret + error.visible = true + } + } + + Column { + id: aboutColumn + spacing: 20 + Label { + id: text + visible: true + width: verificationDialog.availableWidth + wrapMode: Label.Wrap + text: "Vertretungsplan, vertraulich, nur zum persönlichen Gebrauch, keine Speicherung!" + } + } + } + + Dialog { + id: busyDialog + modal: true + closePolicy: "NoAutoClose" + focus: true + //title: "Please wait..." + x: (window.width - width) / 2 + y: window.height / 6 + //width: Math.min(window.width, window.height) / 3 * 2 + height: contentHeight * 1.5 + width: contentWidth * 1.5 + contentHeight: progressCircle.height + contentWidth: progressCircle.width + + ProgressCircle { + id: progressCircle + size: 50 + lineWidth: 5 + anchors.centerIn: parent + colorCircle: "#FF3333" + colorBackground: "#E6E6E6" + showBackground: true + arcBegin: 0 + arcEnd: 0 + Label { + id: progress + anchors.centerIn: parent + text: "0%" + } + Timer { + id: refreshTimer + interval: 1; + running: busyDialog.visible + repeat: true + onTriggered: { + var ret = _cppServerConn.getProgress() + + progressCircle.arcEnd = 360 * ret * 1.2 + progress.text = Math.round( ret * 100 ) + "%" + } + } + } + } +} diff --git a/qml/LoginPage.qml b/qml/LoginPage.qml new file mode 100644 index 0000000..06549da --- /dev/null +++ b/qml/LoginPage.qml @@ -0,0 +1,165 @@ +import QtQuick 2.0 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.2 + +Page { + id: root + //anchors.fill: parent + objectName: "LoginPage"; + + header: AppToolBar { + Label { + text: "Anmeldung" + anchors.centerIn: parent + color: "white" + } + } + + Image { + id: bigLogo + source: "favicon.png" + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + anchors.margins: window.height * 0.01 + height: window.height * 0.2 + fillMode: Image.PreserveAspectFit + } + + Label { + id: infoText + text: "Bitte melde dich mit den Anmeldedaten an, die du für den Vertretungsplan erhalten hast. + Weitere Informationen" + wrapMode: Text.Wrap + onLinkActivated: { + Qt.openUrlExternally(link) + } + + anchors { + top: bigLogo.bottom + left: parent.left + right: parent.right + leftMargin: window.width * 0.05 + rightMargin: window.width * 0.05 + } + } + + ColumnLayout { + + spacing: 40 + width: parent.width + anchors.fill: parent + anchors.topMargin: bigLogo.height + infoText.height + window.height * 0.02 + anchors.bottomMargin: window.height * 0.2 + + TextField { + id: tiuname + placeholderText: "Benutzername" + anchors.horizontalCenter: parent.horizontalCenter + Keys.onReturnPressed: login(tiuname.text, tipasswd.text, cBperm.checked) + anchors.left: parent.left + anchors.margins: window.width * 0.05 + + } + + + TextField { + id: tipasswd + echoMode: TextInput.Password + placeholderText: "Passwort" + anchors.horizontalCenter: parent.horizontalCenter + Keys.onReturnPressed: login(tiuname.text, tipasswd.text, cBperm.checked) + anchors.left: parent.left + anchors.margins: window.width * 0.05 + } + + CheckDelegate { + id: cBperm + text: qsTr("Angemeldet bleiben") + checked: true + anchors.horizontalCenter: parent.horizontalCenter + } + + Button { + id: loginButton + objectName: "loginButton" + text: qsTr("Anmelden") + enabled: tiuname.length > 0 & tipasswd.length > 0 + anchors.horizontalCenter: parent.horizontalCenter + anchors.left: parent.left + anchors.margins: window.width * 0.05 + onClicked: login(tiuname.text, tipasswd.text, cBperm.checked) + } + Label { + id: laStatus + text: qsTr("") + font.pixelSize: 20 + color: "red" + anchors.horizontalCenter: parent.horizontalCenter + } + } + + function login(username, password, permanent){ + Qt.inputMethod.hide(); + busyDialog.open() + loginButton.enabled = false + loginButton.text = "Loggin in.." + console.log(username, password, permanent) + var ret = _cppServerConn.login(username, password, permanent); + busyDialog.close() + loginButton.enabled = true + loginButton.text = "Login" + if(ret === "OK"){ + _cppAppSettings.writeSetting("init", 1); + window.is_error = false; + root.StackView.view.push("MainPage.qml") + } + else{ + if(_cppAppSettings.loadSetting("permanent") === "1"){ + tiuname.text = _cppAppSettings.loadSetting("username") + tipasswd.text = _cppAppSettings.loadSetting("password") + _cppAppSettings.writeSetting("permanent", "0") + _cppAppSettings.writeSetting("username", "") + _cppAppSettings.writeSetting("password", "") + } + laStatus.text = ret + } + //root.qmlSignal(tiuname.text, tipasswd.text) + } + + Dialog { + id: busyDialog + modal: true + closePolicy: "NoAutoClose" + focus: true + title: "Please wait..." + x: (window.width - width) / 2 + y: window.height / 6 + width: Math.min(window.width, window.height) / 3 * 2 + height: 150 + contentHeight: aboutColumn.height + Column { + id: aboutColumn + spacing: 20 + RowLayout { + width: parent.width + BusyIndicator { + id: busyIndicator + visible: true + x: 22 + y: 38 + } + + Label { + width: busyDialog.availableWidth + text: "logging in..." + wrapMode: Label.Wrap + font.pixelSize: 12 + } + } + } + } + + + +} diff --git a/qml/MainPage.qml b/qml/MainPage.qml new file mode 100644 index 0000000..6e0806e --- /dev/null +++ b/qml/MainPage.qml @@ -0,0 +1,244 @@ +import QtQuick 2.9 +import QtQuick.Controls 2.2 + +import QtQuick.Layouts 1.1 +import QtQuick.Controls.Styles 1.2 + +Page { + id: root + objectName: "MainPage" + + Shortcut { + sequences: ["Esc", "Back"] + enabled: stackView.depth > 1 + onActivated: { + stackView.pop() + } + } + + header: AppToolBar { + + + Button { + id:toolButton + enabled: window.is_error === false + anchors { + left: parent.left + verticalCenter: parent.verticalCenter + leftMargin: parent.width *0.02 + } + height: parent.height - parent.height * 0.5 + width: height + + onClicked: { + if (stackView.depth > 1) { + stackView.pop() + } else { + drawer.open() + } + } + + onPressed: toolButton.scale = 0.9 + onReleased: toolButton.scale = 1.0 + + background: Image { + source: stackView.depth > 1 ? "qrc:/graphics/icons/back.png" : "qrc:/graphics/icons/drawer.png" + height: parent.height + width: parent.width + Behavior on scale { + PropertyAnimation { + duration: 100 + } + } + } + } + + Label { + text: stackView.currentItem.title + anchors { + verticalCenter: parent.verticalCenter + left: toolButton.right + leftMargin: parent.width * 0.02 + } + font.bold: true + color: "white" + } + + Image { + id: logo + source: stackView.currentItem.icon + anchors.right: parent.right + anchors.rightMargin: parent.width * 0.02 + anchors.top: parent.top + height: parent.height + fillMode: Image.PreserveAspectFit + mipmap: true + Behavior on scale { + PropertyAnimation { + duration: 100 + } + } + MouseArea { + enabled: stackView.currentItem.link !== undefined && stackView.currentItem.objectName !== "WebsitePage" + anchors.fill: parent + onPressed: logo.scale = 0.9 + onReleased: logo.scale = 1.0 + onClicked: { + stackView.push("qrc:/WebsitePage.qml",{title: "Web", link: stackView.currentItem.link, icon: stackView.currentItem.icon}) + } + } + } + } + + Drawer { + id: drawer + width: window.width * 0.66 + height: window.height + AppToolBar { + id: header + showErrorBar: false + anchors { + top: parent.top + left: parent.left + right: parent.right + } + + Label { + text: "Menü" + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: 17 + } + + font.bold: true + } + } + Column { + anchors { + top: header.bottom + bottom: parent.bottom + left: parent.left + right: parent.right + } + + + ItemDelegate { + text: qsTr("Fanny Webseite") + width: parent.width + onClicked: { + stackView.push("qrc:/WebsitePage.qml",{title: "Fanny Webseite", link: "http://www.fanny-leicht.de/j34", icon: stackView.currentItem.icon}) + drawer.close() + } + } + + ItemDelegate { + text: qsTr("Speiseplan") + width: parent.width + onClicked: { + busyDialog.open() + var ret = _cppServerConn.getFoodPlan(); + drawer.close() + busyDialog.close() + if(ret === 200 || _cppServerConn.getFoodPlanData(1).cookteam !== ""){ + stackView.push("qrc:/FoodPlanForm.qml") + } + } + } + + ItemDelegate { + Label { + text: "abmelden" + color: "red" + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: 17 + } + + font.bold: true + } + width: parent.width + + onClicked: { + confirmationDialog.open() + } + + Dialog { + id: confirmationDialog + + x: (window.width - width) / 2 + y: (window.height - height) / 2 + parent: ApplicationWindow.overlay + + + modal: true + standardButtons: Dialog.Cancel | Dialog.Ok + Column { + spacing: 20 + anchors.fill: parent + Label { + text: "Möchtest du dich wirklich abmelden?" + } + } + onAccepted: { + _cppServerConn.logout() + drawer.close() + root.StackView.view.push("qrc:/LoginPage.qml") + } + } + } + } + } + + StackView { + id: stackView + initialItem: "qrc:/HomeForm.qml" + anchors.fill: parent + } + + Dialog { + id: busyDialog + modal: true + focus: true + //title: "Please wait..." + x: (window.width - width) / 2 + y: window.height / 6 + //width: Math.min(window.width, window.height) / 3 * 2 + height: contentHeight * 1.5 + width: contentWidth * 1.5 + contentHeight: progressCircle.height + contentWidth: progressCircle.width + ProgressCircle { + id: progressCircle + size: 50 + lineWidth: 5 + anchors.centerIn: parent + colorCircle: "#FF3333" + colorBackground: "#E6E6E6" + showBackground: true + arcBegin: 0 + arcEnd: 0 + Label { + id: progress + anchors.centerIn: parent + text: "0%" + } + Timer { + id: refreshTimer + interval: 1; + running: busyDialog.visible + repeat: true + onTriggered: { + var ret = _cppServerConn.getProgress() + if(ret > 100 || ret < 0){ + ret = 0 + } + + progress.text = Math.round( ret * 100 ) + "%" + progressCircle.arcEnd = 360 * ret + } + } + } + } +} diff --git a/qml/ProgressCircle.qml b/qml/ProgressCircle.qml new file mode 100644 index 0000000..26268d3 --- /dev/null +++ b/qml/ProgressCircle.qml @@ -0,0 +1,90 @@ +import QtQuick 2.0 +import QtQml 2.2 + +Item { + id: root + + width: size + height: size + + property int size: 200 // The size of the circle in pixel + property real arcBegin: 0 // start arc angle in degree + property real arcEnd: 270 // end arc angle in degree + property real arcOffset: 0 // rotation + property bool isPie: false // paint a pie instead of an arc + property bool showBackground: false // a full circle as a background of the arc + property real lineWidth: 20 // width of the line + property string colorCircle: "#CC3333" + property string colorBackground: "#779933" + + property alias beginAnimation: animationArcBegin.enabled + property alias endAnimation: animationArcEnd.enabled + + property int animationDuration: 20 + + onArcBeginChanged: canvas.requestPaint() + onArcEndChanged: canvas.requestPaint() + + Behavior on arcBegin { + id: animationArcBegin + enabled: true + NumberAnimation { + duration: root.animationDuration + easing.type: Easing.InOutCubic + } + } + + Behavior on arcEnd { + id: animationArcEnd + enabled: true + NumberAnimation { + duration: root.animationDuration + easing.type: Easing.InOutCubic + } + } + + Canvas { + id: canvas + anchors.fill: parent + rotation: -90 + parent.arcOffset + + onPaint: { + var ctx = getContext("2d") + var x = width / 2 + var y = height / 2 + var start = Math.PI * (parent.arcBegin / 180) + var end = Math.PI * (parent.arcEnd / 180) + ctx.reset() + + if (root.isPie) { + if (root.showBackground) { + ctx.beginPath() + ctx.fillStyle = root.colorBackground + ctx.moveTo(x, y) + ctx.arc(x, y, width / 2, 0, Math.PI * 2, false) + ctx.lineTo(x, y) + ctx.fill() + } + ctx.beginPath() + ctx.fillStyle = root.colorCircle + ctx.moveTo(x, y) + ctx.arc(x, y, width / 2, start, end, false) + ctx.lineTo(x, y) + ctx.fill() + } else { + if (root.showBackground) { + ctx.beginPath(); + ctx.arc(x, y, (width / 2) - parent.lineWidth / 2, 0, Math.PI * 2, false) + ctx.lineWidth = root.lineWidth + ctx.strokeStyle = root.colorBackground + ctx.stroke() + } + ctx.beginPath(); + ctx.arc(x, y, (width / 2) - parent.lineWidth / 2, start, end, false) + ctx.lineWidth = root.lineWidth + ctx.strokeStyle = root.colorCircle + ctx.stroke() + } + } + } +} diff --git a/qml/WebsitePage.qml b/qml/WebsitePage.qml new file mode 100644 index 0000000..49b034e --- /dev/null +++ b/qml/WebsitePage.qml @@ -0,0 +1,48 @@ +import QtQuick 2.9 +import QtWebView 1.1 +import QtQuick.Controls 2.2 + +import QtWebView 1.1 +import QtQuick.Layouts 1.1 +import QtQuick.Controls.Styles 1.2 + +Page { + id:root + + objectName: "WebsitePage"; + + title: qsTr("Fanny Webseite") + property string icon: "qrc:/graphics/FannyLogo_small.png" + + property string link: "http://www.fanny-leicht.de/j34" + + ProgressBar { + id: progress + width: parent.width + anchors { + top: parent.top + } + //z: Qt.platform.os === "android" ? -1 : 1 + visible: webView.loadProgress < 100 + value: webView.loadProgress === 100 ? 0 : webView.loadProgress / 100 + } + + WebView { + id: webView + Keys.onBackPressed: webView.goBack() + z: 0 + anchors { + top: webView.loadProgress < 100 ? progress.bottom:parent.top + bottom: parent.bottom + left: parent.left + right: parent.right + } + + url: link + onLoadingChanged: { + console.log(url) + if (loadRequest.errorString) + console.error(loadRequest.errorString); + } + } +} diff --git a/qml/main.qml b/qml/main.qml new file mode 100644 index 0000000..755a319 --- /dev/null +++ b/qml/main.qml @@ -0,0 +1,133 @@ +import QtQuick 2.9 +import QtQuick.Controls 2.2 + +ApplicationWindow { + id: window + visible: true + width: 540 + height: 960 + + property bool is_error + property string error + property bool initdone: false + property bool firstinitdone: false + + property string text_color: "black" //"#424753" + property string background_color: "white" + property string toolbar_color: "#312f38" + + onBeforeRendering: { + if(!firstinitdone){ + var isinit = _cppAppSettings.loadSetting("permanent") + console.log("getinit"); + console.log(isinit); + if(isinit === "0"){ + stackView.push("qrc:/LoginPage.qml", {}); + } + } + firstinitdone = true + } + + Timer { + //runs only one time at applictaion lauch + property bool finished: true + id: initTimer + interval: 1; + running: initdone === false + repeat: finished + onTriggered: { + finished = false + var init = _cppAppSettings.loadSetting("init") + + var perm = _cppAppSettings.loadSetting("permanent") + console.log("checkoldlogin:", perm); + if(perm === "1"){ + console.log("Perm") + var ret = _cppServerConn.login(_cppAppSettings.loadSetting("username"), _cppAppSettings.loadSetting("password"), true); + if(ret === "OK"){ + initdone = true + _cppAppSettings.writeSetting("init", 1); + if(stackView.currentItem.objectName !== "MainPage"){ + stackView.push("qrc:/MainPage.qml", {}); + } + window.is_error = false; + } + else if(ret === "Keine Verbindung zum Server."){ + handleError(0) + //initTimer.interval = 1000 + finished = true + return + } + + else { + ret = _cppServerConn.checkConn() + handleError(ret) + } + } + else { + initdone = false + if(stackView.currentItem.objectName !== "LoginPage"){ + stackView.push("qrc:/LoginPage.qml") + } + } + finished = true + initdone = true + } + } + + Timer { + id: refreshTimer + interval: 1000; + running: initdone && stackView.currentItem.objectName !== "LoginPage" + repeat: true + onTriggered: { + var ret = _cppServerConn.checkConn() + handleError(ret) + } + } + + StackView { + id: stackView + initialItem: "MainPage.qml" + anchors.fill: parent + } + + function handleError(error_code){ + if(error_code === 200){ + window.is_error = false; + window.error = ""; + } + else if(error_code === 401){ + console.warn("401") + _cppAppSettings.writeSetting("permanent", 0) + _cppAppSettings.writeSetting("username", "") + _cppAppSettings.writeSetting("password", "") + if(["LoginPage"].indexOf(stackView.currentItem.objectName) < 0){ + console.log("switching to login page") + stackView.push("qrc:/LoginPage.qml"); + } + window.is_error = true; + window.error = "Nicht angemeldet!!"; + } + else if(error_code === 500){ + window.is_error = true; + window.error = "Interner Server Fehler!"; + } + else if(error_code === 0){ + window.is_error = true; + window.error = "Keine Verbindung zum Server!"; + } + else if(error_code === 404){ + //the testcon function calls a non existent file to be fast, so no error here + window.is_error = false; + } + else if(error_code === 111){ + window.is_error = true; + window.error = "Unbekannter interner Fehler!"; + } + else { + window.is_error = true; + window.error = "Unbekannter Fehler! ("+error_code+")"; + } + } +} diff --git a/qml/qml.qrc b/qml/qml.qrc new file mode 100644 index 0000000..f33724f --- /dev/null +++ b/qml/qml.qrc @@ -0,0 +1,13 @@ + + + main.qml + HomeForm.qml + qtquickcontrols2.conf + LoginPage.qml + MainPage.qml + AppToolBar.qml + WebsitePage.qml + FoodPlanForm.qml + ProgressCircle.qml + + diff --git a/qml/qtquickcontrols2.conf b/qml/qtquickcontrols2.conf new file mode 100644 index 0000000..571f1cb --- /dev/null +++ b/qml/qtquickcontrols2.conf @@ -0,0 +1,9 @@ +; This file can be edited to change the style of the application +; Read "Qt Quick Controls 2 Configuration File" for details: +; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html + +[Controls] +Style=Material + +[Material] +; Primary="#312f38" diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..c6c0277 --- /dev/null +++ b/readme.md @@ -0,0 +1,26 @@ +

Dies ist die offizielle entwicklungs - repo der Fanny-App

+

Die App bietet die Möglichkeit, komfortabel auf den Vertretungsplan des Fanny-Leicht-Gymnasiums in Stuttgart zuzugreifen.

+ +

Funktionen

+

- Zugriff auf den Vertretungsplan

+

- Anzeige des Speiseplanes des Treffpunkt Fanny

+

- Zugriff auf die Fanny-Webseite (www.fanny-leicht.de) + +

Geplante Funktionen

+

- Sortierung der Ereignsse pro Klasse

+ +

Weitere Informationen:

+

Wenn du eine Idee für eine neue Funktion hast, erstelle einfach eine issue (dafür musst du dich hier registrieren),
+oder schreibe eine Mail an development@itsblue.de.

+

Falls du dich gerne an diesem Projekt beteiligen würdest (als Programmier, Designer o.ä.),
+schreibe bitte eine Mail an contact@itsblue.de, oder frag mich in der Schule.

+
Aktueller Status:
+

Warte auf die Anpassung des Vertretungsplanes.

+ +

Downloads:

+

Jetzt bei Google Play

+

- Mac OS

+

- Windows

+
+
+Verantwortlicher Entwickler: Dorian Zedler \ No newline at end of file diff --git a/release/.DS_Store b/release/.DS_Store new file mode 100644 index 0000000..d4242c6 Binary files /dev/null and b/release/.DS_Store differ diff --git a/release/mac OS/.DS_Store b/release/mac OS/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/release/mac OS/.DS_Store differ diff --git a/release/mac OS/fannyapp.dmg b/release/mac OS/fannyapp.dmg new file mode 100644 index 0000000..91488de Binary files /dev/null and b/release/mac OS/fannyapp.dmg differ diff --git a/release/windows/fannyapp-setup.exe b/release/windows/fannyapp-setup.exe new file mode 100644 index 0000000..a5d8f92 Binary files /dev/null and b/release/windows/fannyapp-setup.exe differ diff --git a/shared.qrc b/shared.qrc new file mode 100644 index 0000000..509ba29 --- /dev/null +++ b/shared.qrc @@ -0,0 +1,14 @@ + + + favicon.png + graphics/sheute.png + graphics/smorgen.png + graphics/chat_background.jpg + graphics/FannyLogo.png + graphics/TreffpunktFannyLogo.png + graphics/icons/back.png + graphics/icons/drawer.png + graphics/icons/menu.png + graphics/FannyLogo_small.png + + diff --git a/source/appsettings.cpp b/source/appsettings.cpp new file mode 100644 index 0000000..eefda45 --- /dev/null +++ b/source/appsettings.cpp @@ -0,0 +1,37 @@ +#include "headers/appsettings.h" + +AppSettings * pGlobalAppSettings = NULL; + +AppSettings::AppSettings(QObject* parent) + :QObject(parent) +{ + QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); + qDebug(path.toLatin1()); + this->settingsManager = new QSettings(path+"/fannyapp/settings.ini", QSettings::IniFormat); + + qDebug("AppSettings konstruktor"); + if(loadSetting("init") == "false"){ + this->writeSetting("init", 0); + } +} + +QString AppSettings::loadSetting(const QString &key) +{ + this->settingsManager->beginGroup("AppSettings"); + QString value = this->settingsManager->value(key , false).toString(); + this->settingsManager->endGroup(); + return(value); +} + +void AppSettings::writeSetting(const QString &key, const QVariant &variant) +{ + this->settingsManager->beginGroup("AppSettings"); + this->settingsManager->setValue(key , variant); + this->settingsManager->endGroup(); +} + +AppSettings::~AppSettings() +{ + delete settingsManager; +} + diff --git a/source/main.cpp b/source/main.cpp new file mode 100644 index 0000000..445d69e --- /dev/null +++ b/source/main.cpp @@ -0,0 +1,56 @@ +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "headers/serverconn.h" +#include "headers/appsettings.h" + +int main(int argc, char *argv[]) +{ + ServerConn * pServerConn = new ServerConn; + AppSettings * pAppSettings = new AppSettings(); + pGlobalAppSettings = pAppSettings; + + + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + + + QGuiApplication app(argc, argv); + QtWebView::initialize(); + + QQuickStyle::setStyle("Material"); + QQmlApplicationEngine engine; + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + if (engine.rootObjects().isEmpty()) + return -1; + engine.rootContext()->setContextProperty("_cppServerConn", pServerConn); + engine.rootContext()->setContextProperty("_cppAppSettings", pAppSettings); + + int ret; + ret = app.exec(); + + delete pServerConn; + delete pAppSettings; + return(ret); +} diff --git a/source/serverconn.cpp b/source/serverconn.cpp new file mode 100644 index 0000000..819495d --- /dev/null +++ b/source/serverconn.cpp @@ -0,0 +1,353 @@ +#include "headers/serverconn.h" + + +ServerConn::ServerConn(QObject *parent) : QObject(parent) +{ + qDebug("serverconn konstruktor"); + this->networkManager = new QNetworkAccessManager(); + this->refreshNetworkManager = new QNetworkAccessManager(); +} + +ServerConn::~ServerConn() +{ + qDebug("serverconn destruktor"); + delete this->networkManager; + delete this->refreshNetworkManager; + + QString path = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); + QDir dir(path + "/.fannyapp-tmp"); + dir.removeRecursively(); +} + + +QString ServerConn::login(QString username, QString password, bool permanent) +{ +// QUrlQuery pdata; +// ReturnData_t ret = this->senddata(QUrl("http://www.fanny-leicht.de/static15/http.intern/sheute.pdf"), pdata); +// qDebug() << ret.text; + + // Create request + QNetworkRequest request; + request.setUrl( QUrl( "http://www.fanny-leicht.de/static15/http.intern/sheute.pdf" ) ); + + // Pack in credentials + QString concatenatedCredentials = username + ":" + password; + QByteArray data = concatenatedCredentials.toLocal8Bit().toBase64(); + QString headerData = "Basic " + data; + request.setRawHeader( "Authorization", headerData.toLocal8Bit() ); + + QUrlQuery pdata; + // Send request and connect all possible signals + QNetworkReply*reply = this->networkManager->post(request, pdata.toString(QUrl::FullyEncoded).toUtf8()); + //QNetworkReply*reply = networkManager->get( request ); + + QEventLoop loop; + loop.connect(this->networkManager, SIGNAL(finished(QNetworkReply*)), SLOT(quit())); + loop.exec(); + int status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); + + if(status_code == 200){ + this->username = username; + this->password = password; + if(permanent){ + qDebug() << "permanent"; + pGlobalAppSettings->writeSetting("permanent", "1"); + pGlobalAppSettings->writeSetting("username", username); + pGlobalAppSettings->writeSetting("password", password); + } + return("OK"); + } + else if(status_code == 401){ + return("Ungültige Benutzerdaten."); + } + else if(status_code == 0){ + return("Keine Verbindung zum Server."); + } + else { + QString ret = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toChar(); + ret = ret + reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toChar(); + return(ret); + } +} + +int ServerConn::logout() +{ + this->username = ""; + this->password = ""; + pGlobalAppSettings->writeSetting("permanent", "0"); + pGlobalAppSettings->writeSetting("username", ""); + pGlobalAppSettings->writeSetting("password", ""); + return(200); +} + +QString ServerConn::getDay(QString day) +{ + this->progress = 0; + // Create request + QNetworkRequest request; + request.setUrl( QUrl( "http://www.fanny-leicht.de/static15/http.intern/" + day + ".pdf" ) ); + + // Pack in credentials + // Pack in credentials + QString concatenatedCredentials = this->username + ":" + this->password; + QByteArray data = concatenatedCredentials.toLocal8Bit().toBase64(); + QString headerData = "Basic " + data; + request.setRawHeader( "Authorization", headerData.toLocal8Bit() ); + + QUrlQuery pdata; + // Send request and connect all possible signals + QNetworkReply*reply = this->networkManager->post(request, pdata.toString(QUrl::FullyEncoded).toUtf8()); + //QNetworkReply*reply = networkManager->get( request ); + + connect(reply, SIGNAL(downloadProgress(qint64, qint64)), + this, SLOT(updateProgress(qint64, qint64))); + QEventLoop loop; + loop.connect(this->networkManager, SIGNAL(finished(QNetworkReply*)), SLOT(quit())); + loop.exec(); + + this->progress = 1; + int status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); + if(status_code == 200){ + QString path = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); + + QDir dir; + dir.mkdir(path + "/.fannyapp-tmp"); + QFile file(path + "/.fannyapp-tmp/" + day + ".pdf"); + file.remove(); + + file.open(QIODevice::ReadWrite); + file.write(reply->readAll()); + file.close(); + QDesktopServices::openUrl(QUrl::fromLocalFile(path + "/.fannyapp-tmp/" + day + ".pdf")); + return("OK"); + } + else if(status_code == 401){ + return("Ungültige Benutzerdaten."); + } + else if(status_code == 0){ + return("Keine Verbindung zum Server."); + } + else { + QString ret = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toChar(); + ret = ret + " (" + reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toChar() + ")"; + return(ret); + } +} + +int ServerConn::checkConn() +{ + // Create request + QNetworkRequest request; + request.setUrl( QUrl( "http://www.fanny-leicht.de/static15/http.intern/" ) ); + + // Pack in credentials + // Pack in credentials + //ZedlerDo:LxyJQB + QString concatenatedCredentials = this->username + ":" + this->password; + QByteArray data = concatenatedCredentials.toLocal8Bit().toBase64(); + QString headerData = "Basic " + data; + request.setRawHeader( "Authorization", headerData.toLocal8Bit() ); + + QUrlQuery pdata; + // Send request and connect all possible signals + QNetworkReply*reply = this->refreshNetworkManager->post(request, pdata.toString(QUrl::FullyEncoded).toUtf8()); + //QNetworkReply*reply = networkManager->get( request ); + + QEventLoop loop; + loop.connect(this->refreshNetworkManager, SIGNAL(finished(QNetworkReply*)), SLOT(quit())); + loop.exec(); + + int status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); + return(status_code); + +} + +void ServerConn::updateProgress(qint64 read, qint64 total) +{ + int read_int = read; + int total_int = total; + float percent = ((float)read_int / (float)total_int); + this->progress = percent; + percent = (int)percent; + +// qDebug() << read << total << percent << "%"; +} + +float ServerConn::getProgress() +{ + return(this->progress); +} + +int ServerConn::getFoodPlan() +{ + this->progress = 0; + ReturnData_t ret; //this is a custom type to store the returned data + // Call the webservice + + QNetworkRequest request(QUrl("http://www.treffpunkt-fanny.de/fuer-schueler-und-lehrer/speiseplan.html")); + request.setHeader(QNetworkRequest::ContentTypeHeader, + "application/x-www-form-urlencoded"); + + //set ssl configuration + //send a POST request with the given url and data to the server + QNetworkReply* reply; + + QUrlQuery pdata; + reply = this->networkManager->post(request, pdata.toString(QUrl::FullyEncoded).toUtf8()); + + connect(reply, SIGNAL(downloadProgress(qint64, qint64)), + this, SLOT(updateProgress(qint64, qint64))); + //wait until the request has finished + QEventLoop loop; + loop.connect(this->networkManager, SIGNAL(finished(QNetworkReply*)), SLOT(quit())); + loop.exec(); + + //get the status code + QVariant status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute); + this->progress = 1; + if(status_code != 200){ + return(status_code.toInt()); + } + + //initialize the weekplan to store information to it + //m_weekplan.empty(); //empty the weekplan + QList> temp_weekplan; + + //m_weekplan is a list, that contains a list for each day, which contains: cookteam, date, main dish, vagi main dish, garnish(Beilage) and Dessert. + + ret.text = QString::fromUtf8(reply->readAll()); //read the whole website + ret.text.replace("\n",""); //remove unnecessary stuff + ret.text.replace("\r",""); + ret.text.replace("\t",""); + + QStringList stringlist_0 = ret.text.split( "" ); //split the + + //prepare the table of the first week + QString table1 = stringlist_0[1]; + + QStringList stringlist_1 = table1.split( "
" ); //remove everything after "" + table1 = stringlist_1[0]; + table1.remove(0,71); //remove "" at the beginning + table1 = table1.left(table1.length() - 13); //remove "" at the end + + QStringList table1list = table1.split(""); //split at the days to get a list of all days + table1list.takeFirst(); //remove the first item, as it is empty + + //prepare the table of the second week + QString table2 = stringlist_0[2]; + QStringList stringlist_2 = table2.split( "" ); //remove everything after "" + table2 = stringlist_2[0]; + table2.remove(0,39); //remove "" at the beginning + table2.remove(table2.length() - 13, table2.length()); //remove "" at the end + QStringList table2list = table2.split(""); //split at the days to get a list of all days + table2list.takeFirst(); //remove the first item, as it is empty + + + QStringList weeklist = table1list + table2list; //put both weeks into one big list + + for (int i = 0; i <=7; i ++){ + QString temp = weeklist[i]; //store item temporarly to edit it + weeklist[i] = temp.left(temp.length()-5); //remove "" at the and of the Item + temp = weeklist[i]; + //table list[i] looks now like: + //Red Hot Chili Peppers + //
+ //26.06.2018 + //
Gulasch mit Kartoffeln + //
Pellkartoffeln mit Quark + //
Gemischter Salat + //
Eaton Mess ( Erdbeer-Nachtisch ) + + QStringList templist = temp.split(""); //split item at strong, to get the cookteam and the date + //qDebug() << templist << "\n"; + temp = ""; + for (int i = 0; i <=2; i ++){ + temp += templist[i]; //convert the list to a big string + } + + temp.replace("
",""); + templist = temp.split("
"); + temp_weekplan.append({templist[0], templist[1]}); //store cookteam and date + temp = templist[2]; //store information in temp (looks like: "
Gulasch mit Kartoffeln
Pellkartoffeln mit Quark
Gemischter Salat
Eaton Mess ( Erdbeer-Nachtisch )") + templist = temp.split("
"); //seperate the information + templist.takeFirst(); //remove first item + + temp_weekplan[i].append(templist); + + + } + + //qDebug() << temp_weekplan; + this->m_weekplan = temp_weekplan; //write changes to global foodplan + + + return(200); +} + +QVariantMap ServerConn::getFoodPlanData(int index) +{ + //cookteam, date, main dish, vagi main dish, garnish(Beilage) and Dessert. + + QStringList ret; //list to return + //qDebug() << index; + for(int i=0;i<=5;i++){ + + if(m_weekplan.size() > index){ + //qDebug() << i << m_weekplan[index].size(); + if(m_weekplan[index].size() > i){ + ret.append(m_weekplan[index][i]); + //qDebug() << i << m_weekplan[index][i]; + } + else { + ret.append(NULL); + } + } + else { + ret.append(NULL); + } + } + QString date_string_on_db = ret[1]; + QDate Date = QDate::fromString(date_string_on_db," dd.MM.yyyy"); +//date_string_on_db + //qDebug() << Date; + return { {"cookteam", ret[0]}, {"date", Date}, {"main_dish", ret[2]}, {"main_dish_veg", ret[3]}, {"garnish", ret[4]}, {"dessert", ret[5]} }; + +} + +ReturnData_t ServerConn::senddata(QUrl serviceUrl, QUrlQuery pdata) +{ + + ReturnData_t ret; //this is a custom type to store the returned data + // Call the webservice + + QNetworkRequest request(serviceUrl); + QAuthenticator authenticator; + authenticator.setUser("ZedlerDo"); + authenticator.setPassword("LxyJQB"); + request.setHeader(QNetworkRequest::ContentTypeHeader, + "application/x-www-form-urlencoded"); + + //set ssl configuration + //send a POST request with the given url and data to the server + QNetworkReply* reply; + + reply = this->networkManager->post(request, pdata.toString(QUrl::FullyEncoded).toUtf8()); + + //wait until the request has finished + QEventLoop loop; + loop.connect(this->networkManager, SIGNAL(finished(QNetworkReply*)), SLOT(quit())); + loop.exec(); + + //get the status code + QVariant status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute); + + ret.status_code = status_code.toInt(); + if(ret.status_code == 0){ //if tehstatus code is zero, the connecion to the server was not possible + ret.status_code = 444; + } + //get the full text response + ret.text = QString::fromUtf8(reply->readAll()); + + //return the data + return(ret); +}