From 5a0935360261561cc0902f5aec5cb3d0ff8207e5 Mon Sep 17 00:00:00 2001 From: Michael Wagner Date: Sat, 11 Jul 2026 11:59:08 +0200 Subject: [PATCH] Korrektur Bug 161 (EH-Meldung) --- LICENSE | 674 ++++++++++++++++++ Test/FitnessePages/DjangoTest/content.txt | 13 +- Test/etc/Export.csv | 10 - Test/etc/TestExport.csv | 16 +- bin/remove-bom.sh | 10 + debian/eigenheimer-util.control | 2 +- python/eh_app/AWK/routines.py | 34 +- python/eh_app/templates/eh_app.html | 2 +- python/eh_app/templates/ehmeldung_erfolg.html | 20 + .../eh_app/templates/kassenbrief_erfolg.html | 14 +- python/eh_app/tests.py | 37 +- python/eh_app/urls.py | 3 + python/eh_app/views.py | 48 +- 13 files changed, 826 insertions(+), 57 deletions(-) create mode 100644 LICENSE delete mode 100644 Test/etc/Export.csv create mode 100755 bin/remove-bom.sh create mode 100644 python/eh_app/templates/ehmeldung_erfolg.html diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Test/FitnessePages/DjangoTest/content.txt b/Test/FitnessePages/DjangoTest/content.txt index 0e8a75e..525877f 100644 --- a/Test/FitnessePages/DjangoTest/content.txt +++ b/Test/FitnessePages/DjangoTest/content.txt @@ -1,4 +1,11 @@ +Kopiere Datenbereich von /var + !|test.util.CallScript| -|call script|!-rm -r ~/test |true -!| -|call script|cp -a /opt/mysite ~/test/| -|call script|cd ~/test/; ./manage.py test eh_app| +|call script|!-rm -r ~/tmp/svbal |true -!| +|call script|cp -a /var/mysite/eh_app/svbal /tmp/| +|call script|cp etc/TestExport.csv /tmp/svbal/quellen/| +|call script|cd /opt/mysite/; ./manage.py test eh_app| + +#|call script|!-rm -r ~/test |true -!| +#|call script|cp -a /opt/mysite ~/test/| +#|call script|cd ~/test/; ./manage.py test eh_app| diff --git a/Test/etc/Export.csv b/Test/etc/Export.csv deleted file mode 100644 index 5819ab7..0000000 --- a/Test/etc/Export.csv +++ /dev/null @@ -1,10 +0,0 @@ -"Anrede";"Vorname";"Nachname";"Straße";"Zusatzadresse";"PLZ";"Ort";"Land";"Titel";"Geschlecht";"Familienstand";"Mitglieds-Nr";"Geburtsdatum";"Eintrittsdatum";"Austrittsdatum";"Austrittsgrund";"Zahlungsart";"IBAN";"BIC";"Kontonummer";"Bankleitzahl";"Kreditinstitut";"Kontoinhaber";"Mandatsreferenz";"Debitorenkonto-Nr";"Status";"Branche";"Notfallnummer";"Notfallkontakt";"KommE-Mail_P1";"KommFax_P1";"KommMobil_P1";"KommWeb_P1";"KommTelefon_P1";"KommSkype_P1";"Abteilung_1";"Abteilungseintritt_1";"Abteilungsaustritt_1";"Abteilungsstatus_1";"Abteilungsstatus DFB_1";"Abteilungsaustrittsgrund_1";"Abteilung_2";"Abteilungseintritt_2";"Abteilungsaustritt_2";"Abteilungsstatus_2";"Abteilungsstatus DFB_2";"Abteilungsaustrittsgrund_2";"Beitragsbezeichnung_1_1";"Beitragsstart_1_1";"Beitragsende_1_1";"BeitragBerechnetBis_1_1";"BeitragZahlweise_1_1";"BeitragFälligkeitsdatum_1_1";"BeitragVariabel_1_1";"BeitragFormel_1_1";"BeitragGrundbetrag1_1_1";"BeitragGB1Gesperrt_1_1";"BeitragGrundbetrag2_1_1";"BeitragGB2Gesperrt_1_1";"BeitragGrundbetrag3_1_1";"BeitragGB3Gesperrt_1_1";"BeitragGrundbetrag4_1_1";"BeitragGB4Gesperrt_1_1";"BeitragGrundbetrag5_1_1";"BeitragGB5Gesperrt_1_1";"BeitragZahlweiseGesperrt_1_1";"Freifeldname_1";"Freifeldwert_1";"Freifeldname_2";"Freifeldwert_2";"Freifeldname_3";"Freifeldwert_3";"NotizArt_1";"NotizPrio_1";"NotizBetreff_1";"NotizInhalt_1";"NotizDatum_1" -Herr;Horsti;Acktu;"Blombergstr. 30";"";81825;München;Deutschland;;;;"14962";25.04.1948;01.01.1998;31.12.2050;;;DE24700202701780047001;HYVEDEMMXXX;"1780047000";"70020270";"UniCredit Bank - HypoVereinsbank";Acktun Horst;"10058";"10253";Aktiv;;;;;"";"";;"4317535";;Standard;01.01.1998;;Aktiv;;;;;;;;;Standard;01.01.1998;;;Jahr;;nein;;;;;;;;;;;;;;"";;"";Zeitung;"Ja";;;;; -Herr;Horsti;Acktu;"Blombergstr. 30";"";81825;München;Deutschland;;;;"14963";25.04.1948;01.01.1998;31.12.2023;;;DE24700202701780047001;HYVEDEMMXXX;"1780047000";"70020270";"UniCredit Bank - HypoVereinsbank";Acktun Horst;"10058";"10253";Aktiv;;;;;"";"";;"4317535";;Standard;01.01.1998;;Aktiv;;;;;;;;;Standard;01.01.1998;;;Jahr;;nein;;;;;;;;;;;;;;"";;"";Zeitung;"Ja";;;;; -Herr und Frau;Dr. Michael und Ingrid;Wagner;"Turfstr. 18 a";"";81929;München;Deutschland;;Jur. Person oder sächlich;;"14964";;01.04.2024;;;Lastschrift;DE54700905000004428285;GENODEF1S04;"4428285";"70090500";"Sparda-Bank München";Wagner Dr. Michael und Ingrid;"10255";"10255";Aktiv;;;;;;;;;;;;;;;;Zusatzgrundstück;01.04.2024;;Aktiv;;;;;;;;;;;;;;;;;;;;;;Partnernummer;"76736";VersichertesObjekt;"Gleiwitzer Str. 26, 81929 München";Zeitung;"Nein";;;;; -Herr und Frau;Dr. Michael und Ingrid;Wagner;"Turfstr. 18 a";"";81929;München;Deutschland;;;;"14965";;01.04.2024;;;Lastschrift;DE54700905000004428285;GENODEF1S04;"4428285";"70090500";"Sparda-Bank München";Wagner Dr. Michael und Ingrid;"10256";"10256";Aktiv;;;;;;;;;;;;;;;;Zusatzgrundstück;01.04.2024;;Aktiv;;;;;;;;;;;;;;;;;;;;;;Partnernummer;"76736";VersichertesObjekt;"Finkenweg 5, 83556 Griesstätt";Zeitung;"Nein";;;;; -Herr und Frau;Dr. Michael und Ingrid;Wagner;"Turfstr. 18 a";"";81929;München;Deutschland;;;;"76736";25.05.1965;01.12.2012;;;Lastschrift;DE54700905000004428285;GENODEF1S04;"4428285";"70090500";"Sparda-Bank München";Wagner Dr. Michael und Ingrid;"10218";"10218";Aktiv;;;;bonzius@vindelicia.de;"";"";;"99 75 94 94";;Standard;01.12.2012;;Aktiv;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"";VersichertesObjekt;"81929 München, Gleiwitzerstr. 28";Zeitung;"Ja";;;;; -Frau;Elke;Söller;"Argula-von-Grumbach-Sr. 5";"";92345;Dietfurt;Deutschland;;;;"77912";08.05.1979;01.07.2008;;;;;;;;;;"10193";"10193";Aktiv;;;;;"";"";;"084 64 / 64 21 79";;Standard;01.07.2008;;Aktiv;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"";VersichertesObjekt;"92363 Breitenbrunn, Breitenegg 1 a";Zeitung;"Ja";;;;; -Frau;Marianne;Söller;"Böhmerbrunnenstr. 27";"";92345;Dietfurt;Deutschland;;;;"76441";;01.01.1995;;;;DE98760520800570713611;BYLADEM1NMA;"570713610";"76052080";"Sparkasse Neumarkt i d OPf-Parsberg";Söllner2 Marianne;"10249";"10249";Aktiv;;;;;;;;;;;;;;;;Zusatzgrundstück;01.01.1995;;Aktiv;;;;;;;;;;;;;;;;;;;;;;Partnernummer;"75987";;"";Zeitung;"Nein";;;;; -Frau;Marianne;Söller;"Böhmerbrunnenstr. 27";"";92354;Dietfurt;Deutschland;;;;"75987";;01.01.1985;;;;DE98760520800570713611;BYLADEM1NMA;"570713610";"76052080";"Sparkasse Neumarkt i d OPf-Parsberg";Söllner Marianne;"10194";"10194";Aktiv;;;;;"";"";;"084 64 / 15 42";;Standard;01.01.1985;;Aktiv;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"";VersichertesObjekt;"92345 Dietfurt 2, Böhmerbrunnenstr. 21";Zeitung;"Ja";;;;; -Frau;Marianne;Söller;"Böhmerbrunnenstr. 27";"";92345;Dietfurt;Deutschland;;;;"76491";;01.09.1992;;;;DE98760520800570713611;BYLADEM1NMA;"570713610";"76052080";"Sparkasse Neumarkt i d OPf-Parsberg";Söllner3 Marianne;"10250";"10250";Aktiv;;;;;;;;;;;;;;;;Zusatzgrundstück;01.09.1992;;Aktiv;;;;;;;;;;;;;;;;;;;;;;Partnernummer;"75987";VersichertesObjekt;"92363 Breitbrunn, Tannenweg 6";Zeitung;"Nein";;;;; diff --git a/Test/etc/TestExport.csv b/Test/etc/TestExport.csv index 3948d46..a1c79fa 100644 --- a/Test/etc/TestExport.csv +++ b/Test/etc/TestExport.csv @@ -1,10 +1,6 @@ -"Mitglieds-Nr";Nachname;Vorname;Anrede;"Straße";PLZ;Ort;Geburtsdatum;Eintrittsdatum;Austrittsdatum;Abteilungen;Zahlungsart;IBAN;BIC;Kontoinhaber;"Mandatsreferenz";Abweichender Zahler Mitglied;Abweichender Zahler IBAN;E-Mail;Postinfo;VersichertesObjekt;Zeitung -"14962";Acktun;Horst;Herr;"Blombergstr. 30";81825;München;25.04.1948;01.01.1998;;Standard (01.01.1998 bis -);Lastschrift;DE24 7002 0270 1780 0470 00;HYVEDEMMXXX;Acktun Horst;"10058";;;;Nein;;Ja -"* 19603";Bachmann;Sonja und Horst;Herr und Frau;"Kampenwandstr. 1a";81671;München;04.12.1954;01.04.2010;31.12.2024;Zusatzgrundstück (01.04.2010 bis 31.12.2024);Lastschrift (AZ: Bachmann, Horst und Sonja);;;;"";Bachmann, Horst und Sonja;DE47 7015 0000 0080 1337 39;;Nein;81671 München, Hachinger Bach-Str. 4 c;Nein -"76491";Söllner;Marianne;Frau;"Böhmerbrunnenstr. 27";92345;Dietfurt;;01.09.1992;;Zusatzgrundstück (01.09.1992 bis -);Lastschrift (AZ: Söllner, Marianne);;;;"";Söllner, Marianne;DE98 7605 2080 0570 7136 10;;Nein;92363 Breitbrunn, Tannenweg 6;Nein -"76441";Söllner;Marianne;Frau;"Böhmerbrunnenstr. 27";92345;Dietfurt;;01.01.1995;;Zusatzgrundstück (01.01.1995 bis -);Lastschrift (AZ: Söllner, Marianne);;;;"";Söllner, Marianne;DE98 7605 2080 0570 7136 10;;Nein;;Nein -"75987";Söllner;Marianne;Frau;"Böhmerbrunnenstr. 27";92354;Dietfurt;;01.01.1985;;Standard (01.01.1985 bis -);Lastschrift;DE98 7605 2080 0570 7136 10;BYLADEM1NMA;Söllner Marianne;"10194";;;;Nein;92345 Dietfurt 2, Böhmerbrunnenstr. 21;Ja -"75723";Tungl;Inge;Frau;"Sonnwendjochstr. 79";81825;München;;01.01.1960;;Standard (01.01.1960 bis -);Überweisung;;;Tungl Inge;"";;;;Nein;;Ja -"14965";Wagner;Dr. Michael und Ingrid;;"Turfstr. 18 a";81929;München;;01.04.2024;;Zusatzgrundstück (01.04.2024 bis -);Lastschrift (AZ: Wagner, Dr. Michael und Ingrid);;;;"";Wagner, Dr. Michael und Ingrid;DE54 7009 0500 0004 4282 85;;Nein;Finkenweg 5, 83556 Griesstätt;Nein -"14964";Wagner;Dr. Michael und Ingrid;Herr und Frau;"Turfstr. 18 a";81929;München;;01.04.2024;;Zusatzgrundstück (01.04.2024 bis -);Lastschrift (AZ: Wagner, Dr. Michael und Ingrid);;;;"";Wagner, Dr. Michael und Ingrid;DE54 7009 0500 0004 4282 85;;Nein;Gleiwitzer Str. 26, 81929 München;Nein -"76736";Wagner;Dr. Michael und Ingrid;Herr und Frau;"Turfstr. 18 a";81929;München;25.05.1965;01.12.2012;;Standard (01.12.2012 bis -);Lastschrift;DE54 7009 0500 0004 4282 85;GENODEF1S04;Wagner Dr. Michael und Ingrid;"10218";;;bonzius@vindelicia.de;Nein;81929 München, Gleiwitzerstr. 28;Ja +"MitgliedschaftsNr";"Mitgliedschaftsform";"VereinsName";"Mitgliedschaftsanrede";"Vorname+Name";"Anrede1";"Zusatz1";"Nachname1";"Vorname1";"Geburtsdatum1";"Beruf1";"Strasse1";"HausNr1";"StrasseHausNr1";"Plz1";"Ort1";"Plz+Ort 1";"Land1";"Anrede2";"Zusatz2";"Nachname2";"Vorname2";"Geburtsdatum2";"Beruf2";"Strasse2";"HausNr2";"StrasseHausNr2";"Plz2";"Ort2";"Plz+Ort2";"Land2";"Objekt";"Objektart";"ObjektBewohnt";"Hochzeitsdatum";"EintrittVerein";"AustrittVerein";"EintrittVerband";"Email";"TelefonPrivat";"TelefonGeschaeft";"TelefonMobil";"Fax";"TelefonPrivat2";"TelefonGeschaeft2";"TelefonMobil2";"Email2";"Zeitungsbezirk";"ZeitungsLaufweg";"ZeitungsAnzahl";"Bezirk";"BezirkLaufweg";"Zahlungsart";"Zahlungsweise";"Bank";"IBAN";"BIC";"Kontoinhaber";"Kommentar";"MandatsReferenz";"MandatsDatum";"Briefanrede";"Weiteres Grundstück 1";"Weiteres Grundstück 2";"Weiteres Grundstück 3";"Briefpost";"benutzerdefiniert 5";"benutzerdefiniert 6";"benutzerdefiniert 7";"benutzerdefiniert 8";"benutzerdefiniert 9";"benutzerdefiniert 10" +"14962";"Vollmitglied";"Siedlervereinigung Berg am Laim e.V. ";"Herr";"Horst Acktun";"Herr";"";"Acktun";"Horst";"25.04.1948";"";"Blombergstr. 30";"";"Blombergstr. 30 ";"81825";"München";"81825 München";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"txtObjektart";"Nein";"";"01.01.1998";"";"";"";"4317535";"";"";"";"";"";"";"";"0";"";"1";"0";"";"Bankeinzug";"jährlich";"UniCredit Bank - HypoVereinsbank";"DE24 7002 0270 1780 0470 00";"HYVEDEMMXXX";"";"";"";"25.07.2025";"Sehr geehrter Herr Acktun,";"";"";"";"";"";"Nein";"Nein";"Nein";"Nein";"Nein" +"12399";"Vollmitglied";"Siedlervereinigung Berg am Laim e.V. ";"Herr und Frau";"Horst und Sonja Bachmann";"Herr und Frau";"";"Bachmann";"Horst und Sonja";"24.08.1951";"";"Kampenwandstr. 1 a";"";"Kampenwandstr. 1 a ";"81671";"München";"81671 München";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"txtObjektart";"Nein";"";"01.03.2004";"";"";"horst.m.bachmann@online.de";"40 81 81";"";"";"";"";"";"";"";"0";"";"1";"0";"";"Bankeinzug";"jährlich";"Stadtsparkasse München";"DE47 7015 0000 0080 1337 39";"SSKMDEMMXXX";"";"";"";"25.07.2025";"Sehr geehrte Damen und Herren,";"";"";"";"";"";"Nein";"Nein";"Nein";"Nein";"Nein" +"75987";"Mitgliedschaft3";"Siedlervereinigung Berg am Laim e.V. ";"Frau";"Marianne Söllner";"Frau";"";"Söllner";"Marianne";"";"";"Böhmerbrunnenstr. 27";"";"Böhmerbrunnenstr. 27 ";"92354";"Dietfurt";"92354 Dietfurt";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"txtObjektart";"Nein";"";"01.01.1985";"";"";"";"084 64 / 15 42";"";"";"";"";"";"";"";"0";"";"1";"0";"";"Bankeinzug";"jährlich";"Sparkasse Neumarkt i d OPf-Parsberg";"DE98 7605 2080 0570 7136 10";"BYLADEM1NMA";"";"";"";"25.07.2025";"Sehr geehrte Frau Söllner,";"Böhmerbrunnenstr. 21, 92345 Dietfurt";"Tannenweg 6, 92363 Breitbrunn";"";"";"";"Nein";"Nein";"Nein";"Nein";"Nein" +"75723";"Vollmitglied";"Siedlervereinigung Berg am Laim e.V. ";"Frau";"Inge Tungl";"Frau";"";"Tungl";"Inge";"";"";"Sonnwendjochstr. 79";"";"Sonnwendjochstr. 79 ";"81825";"München";"81825 München";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"txtObjektart";"Nein";"";"01.01.1960";"";"";"";"";"";"";"";"";"";"";"";"0";"";"1";"0";"";"Bar";"jährlich";"";"";"";"";"";"";"";"Sehr geehrte Frau Tungl,";"";"";"";"";"";"Nein";"Nein";"Nein";"Nein";"Nein" +"76736";"Mitgliedschaft3";"Siedlervereinigung Berg am Laim e.V. ";"Herr und Frau";"Dr. Michael und Ingrid Wagner";"Herr und Frau";"";"Wagner";"Dr. Michael und Ingrid";"25.05.1965";"";"Turfstr. 18 a";"";"Turfstr. 18 a ";"81929";"München";"81929 München";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"81929 München, Gleiwitzerstr. 28";"txtObjektart";"Nein";"";"01.12.2012";"";"";"bonzius@vindelicia.de";"99 75 94 94";"";"";"";"";"";"";"";"0";"";"1";"0";"";"Bankeinzug";"jährlich";"Sparda-Bank München";"DE54 7009 0500 0004 4282 85";"GENODEF1S04";"";"";"";"25.07.2025";"Sehr geehrte Damen und Herren,";"Finkenweg 5, 83556 Griesstätt";"Gleiwitzer Str. 26, 81929 München";"";"";"";"Nein";"Nein";"Nein";"Nein";"Nein" diff --git a/bin/remove-bom.sh b/bin/remove-bom.sh new file mode 100755 index 0000000..7fb0923 --- /dev/null +++ b/bin/remove-bom.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -e + +if [ -z "$1" ]; then + echo "usage: remove-bom FILE" + exit 6 +fi + +sed -i '1s/^\xEF\xBB\xBF//' $1 + diff --git a/debian/eigenheimer-util.control b/debian/eigenheimer-util.control index 138b18e..537ee1d 100644 --- a/debian/eigenheimer-util.control +++ b/debian/eigenheimer-util.control @@ -6,7 +6,7 @@ Build-Depends: git, mbuild Package: eigenheimer-util Architecture: all -Depends: texlive-latex-base, texlive-latex-recommended, texlive-lang-german, texlive-latex-extra, python3, apache2, libapache2-mod-wsgi-py3, python3-django +Depends: texlive-latex-base, texlive-latex-recommended, texlive-lang-german, texlive-latex-extra, python3, apache2, libapache2-mod-wsgi-py3, python3-django, python3-pypdf2, python3-reportlab Description: Mitgliederverwaltung Eigenheimerverband . diff --git a/python/eh_app/AWK/routines.py b/python/eh_app/AWK/routines.py index b26e7b2..fdc681c 100644 --- a/python/eh_app/AWK/routines.py +++ b/python/eh_app/AWK/routines.py @@ -32,7 +32,7 @@ def aktualisiere_config(config, vorlage, beitrag_data): if beitrag_data["zusatzbeitrag"]: config.setConfig("beitrag_zusatz", beitrag_data["zusatzbeitrag"]) -def erstelle_ehmeldung(data): +def erstelle_ehmeldung(data, verein): from PyPDF2 import PdfFileWriter, PdfFileReader from datetime import date import io @@ -46,6 +46,8 @@ def erstelle_ehmeldung(data): can.setFont("Helvetica", 14) can.drawString(80, 770, "Siedlervereinigung Berg am Laim") can.setFont("Helvetica", 12) + can.drawString(285, 705, data["Eintrittsdatum"]) + can.drawString(205, 685, "Siedlervereinigung Berg am Laim") can.drawString(205, 618, data["VorZuname"]) can.drawString(205, 600, data["VorZunamePartner"]) can.drawString(205, 583, data["Wohnanschrift"]) @@ -71,26 +73,34 @@ def erstelle_ehmeldung(data): #move to the beginning of the StringIO buffer packet.seek(0) + # Dateipfade + pfad = config.getInstance(verein).requireConfig("data_path") + # create a new PDF with Reportlab new_pdf = PdfFileReader(packet) # read your existing PDF - existing_pdf = PdfFileReader(open("/home/sparky2021/SVBaL/Aktuell/BeitrittserklarungSVBaL.pdf", "rb")) + existing_pdf = PdfFileReader(open(os.path.join(pfad, "upload", "BeitrittserklarungSVBaL.pdf"), "rb")) output = PdfFileWriter() # add the "watermark" (which is the new pdf) on the existing page page = existing_pdf.pages[0] page.mergePage(new_pdf.pages[0]) output.addPage(page) # finally, write "output" to a real file - output_stream = open("meldung.pdf", "wb") + output_stream = open(os.path.join(pfad, "build","meldung.pdf"), "wb") output.write(output_stream) output_stream.close() -def erstelle_ausweis(data): +def erstelle_ausweis(data, verein): from PyPDF2 import PdfFileWriter, PdfFileReader from datetime import date import io from reportlab.pdfgen import canvas from reportlab.lib.pagesizes import letter + + cf = config.getInstance(verein) + workdir = cf.requireConfig("data_path") + #build_path = os.path.join(workdir, "build") + #upload_path = os.path.join(workdir, "upload") packet = io.BytesIO() can = canvas.Canvas(packet, pagesize=letter) @@ -100,16 +110,20 @@ def erstelle_ausweis(data): can.drawString(70, 640, "Herr/Frau") can.drawString(70, 625, data["VorZuname"]) can.drawString(70, 610, data["Wohnanschrift"]) - can.drawString(70, 590, "PLZ/Ort") + #can.drawString(70, 590, "PLZ/Ort") # Datum can.setFont("Helvetica", 9) can.drawString(350, 520, "München, "+date.today().strftime('%d.%m.%Y')) # Anschreiben - can.drawString(70, 500, "Sehr geehrte/r Herr/Frau"+data["VorZuname"]+",") + can.drawString(70, 500, "Sehr geehrte/r Herr/Frau "+data["VorZuname"]+",") text = can.beginText(70, 480) - text.textLines("Hier Ihr Ausweis") + text.textLines("wir freuen uns, dass Sie der Siedlervereinigung Berg am Laim beigetreten sind.") + text.textLines("Im unteren Teil befindet sich Ihr Mitgliedsausweis.") + text.textLines(" ") + text.textLines("Viele Grüße") + text.textLines("Michael Wagner (Vorstand)") can.drawText(text) @@ -121,7 +135,7 @@ def erstelle_ausweis(data): can.drawString(330, 80, data["VorZuname"]) can.setFont("Helvetica", 9) can.drawString(400, 56, data["Geburtsdatum"]) - can.drawString(400, 42, date.today().strftime('%d.%m.%Y')) + can.drawString(400, 42, data["Eintrittsdatum"]) versichertes_object = data["VersichertesObjekt"] if versichertes_object == "": versichertes_object = data["Wohnanschrift"] @@ -135,14 +149,14 @@ def erstelle_ausweis(data): # create a new PDF with Reportlab new_pdf = PdfFileReader(packet) # read your existing PDF - existing_pdf = PdfFileReader(open("MitgliederausweisSVBaLVorlage_leer.pdf", "rb")) + existing_pdf = PdfFileReader(open(os.path.join(workdir, "upload", "MitgliederausweisSVBaLVorlage_leer.pdf"), "rb")) output = PdfFileWriter() # add the "watermark" (which is the new pdf) on the existing page page = existing_pdf.pages[0] page.mergePage(new_pdf.pages[0]) output.addPage(page) # finally, write "output" to a real file - output_stream = open("ausweis.pdf", "wb") + output_stream = open(os.path.join(workdir, "build", "ausweis.pdf"), "wb") output.write(output_stream) output_stream.close() diff --git a/python/eh_app/templates/eh_app.html b/python/eh_app/templates/eh_app.html index c288eac..0fe0ccf 100644 --- a/python/eh_app/templates/eh_app.html +++ b/python/eh_app/templates/eh_app.html @@ -7,7 +7,7 @@

Anwendung Eigenheimerverband

Funktionen für Verein {{verein_name}}

Kassenbrief erstellen

-

Meldung Eigenheimerverband

+

Meldung Eigenheimerverband und Ausweis

Liste der Mitgliedschaften

Verwendete Datenquelle:

{{fehler_quelle}}

diff --git a/python/eh_app/templates/ehmeldung_erfolg.html b/python/eh_app/templates/ehmeldung_erfolg.html new file mode 100644 index 0000000..223dee6 --- /dev/null +++ b/python/eh_app/templates/ehmeldung_erfolg.html @@ -0,0 +1,20 @@ +{% load static %} + + + + + +

Erstellung Eigenheimer-Meldung und Ausweis

+

Eigenheimer-Meldung und Ausweis wurden erfolgreich erstellt und können jetzt heruntergeladen werden.

+ +
+{% csrf_token %} + +
+ +
+{% csrf_token %} + +
+ + diff --git a/python/eh_app/templates/kassenbrief_erfolg.html b/python/eh_app/templates/kassenbrief_erfolg.html index 56fa0fb..6cfe8c2 100644 --- a/python/eh_app/templates/kassenbrief_erfolg.html +++ b/python/eh_app/templates/kassenbrief_erfolg.html @@ -4,13 +4,15 @@ -

Erstellung Kassenbrief

-

Die Kassenbriefe wurden erfolgreich erstellt und können jetzt heruntergeladen werden.

-

Anzahl: {{anzahl}}

-

Gesamtbetrag: {{gesamtbetrag}}.-

-
+

Erstellung Eigenheimer-Meldung

+

Die Meldung für den Eigenheimerverband wurde erfolgreich erstellt und kann jetzt heruntergeladen werden.

+ {% csrf_token %} - + +
+
+{% csrf_token %} +
diff --git a/python/eh_app/tests.py b/python/eh_app/tests.py index 5f6affd..ad3c2a1 100644 --- a/python/eh_app/tests.py +++ b/python/eh_app/tests.py @@ -1,7 +1,11 @@ from django.test import TestCase +#from django.contrib.auth import authenticate, login +from django.contrib.auth.models import User # Create your tests here. from .AWK import config +from django.test import Client +from django.urls import reverse class TestConfig(TestCase): def test_setter(self): @@ -16,21 +20,46 @@ class TestConfig(TestCase): val = cf.getConfig("bla") assert (val == "bar") -''' class TestQModel(TestCase): def setUp(self): cf = config.getInstance("svbal") - cf.setConfig("DataFile", "../../Test/etc/TestExport.csv") + cf.setConfig("datenquelle", "TestExport.csv") + cf.setConfig("data_path", "/tmp/svbal") def test_allinstances(self): config.getInstance("svbal") from eh_app.qmodels import Mitglied mm = Mitglied.objects.all() - assert (len(mm) == 4) + assert (len(mm) == 5) gst = mm[0].VersicherteGrundstucke() assert (len(gst) == 1) for m in mm: if m.nachname == "Wagner": gst = m.VersicherteGrundstucke() assert (len(gst) == 3) -''' \ No newline at end of file + +class TestViews(TestCase): + def setUp(self): + self.user = User(username="nutzer", password="nutzer") + self.user.save() + cf = config.getInstance("svbal") + cf.setConfig("data_path", "/tmp/svbal") + def test_index(self): + client = Client() + response = client.get(reverse('index')) + assert(response.status_code == 200) + + def test_ehmeldung_bug_161(self): + client = Client() + client.force_login(self.user) + response = client.post('/eh-app/svbal/ehmeldung/', + {"verein": "svbal", + "VorZuname": "Michael Wagner", + "Wohnanschrift": "Seestr 2, 12345 Ort", + "AnzahlWohnungen": "1" + }) + assert(response.status_code == 302) + assert(response.url == '/eh-app/svbal/ehmeldung/erfolg') + + + \ No newline at end of file diff --git a/python/eh_app/urls.py b/python/eh_app/urls.py index d5e4b7a..9edc0a6 100644 --- a/python/eh_app/urls.py +++ b/python/eh_app/urls.py @@ -12,6 +12,9 @@ urlpatterns = [ path('/kassenbrief/kein_erfolg', views.kassenbrief_kein_erfolg), path('/kassenbrief/download', views.kassenbrief_download), path('/ehmeldung/', views.ehmeldung), + path('/ehmeldung/erfolg', views.ehmeldung_erfolg), + path('/ehmeldung/download', views.ehmeldung_download), + path('/ausweis/download', views.ausweis_download), path('/vertragsliste/', views.vertragsliste), path('login/', views.login), path('login', views.login), diff --git a/python/eh_app/views.py b/python/eh_app/views.py index 2180df5..57ec14b 100644 --- a/python/eh_app/views.py +++ b/python/eh_app/views.py @@ -330,10 +330,10 @@ def ehmeldung(request, verein): # check whether it's valid: if form.is_valid(): # bei Änderungen Konfiguration aktualisieren - routines.erstelle_ehmeldung(form.cleaned_data) - routines.erstelle_ausweis(form.cleaned_data) + routines.erstelle_ehmeldung(form.cleaned_data, verein) + routines.erstelle_ausweis(form.cleaned_data, verein) # redirect to a new URL: - return HttpResponseRedirect('/thanks/') + return HttpResponseRedirect(f'/eh-app/{verein}/ehmeldung/erfolg') # if a GET (or any other method) we'll create a blank form else: @@ -341,10 +341,36 @@ def ehmeldung(request, verein): return render(request, 'ehmeldung.html', {'form': form, 'verein': verein}) +@login_required(login_url=LOGIN_URL) +def ehmeldung_erfolg(request, verein): + return render(request, 'ehmeldung_erfolg.html', { + 'verein' : verein, + }) + +@login_required(login_url=LOGIN_URL) +def ehmeldung_download(request, verein): + vconf = config.getInstance(verein) + data_path = vconf.requireConfig("data_path") + + ergebnis_datei = os.path.join(data_path, "build", "meldung.pdf") + + response = FileResponse(open(ergebnis_datei, 'rb'), as_attachment=True, filename="meldung.pdf") + return response + +@login_required(login_url=LOGIN_URL) +def ausweis_download(request, verein): + vconf = config.getInstance(verein) + data_path = vconf.requireConfig("data_path") + + ergebnis_datei = os.path.join(data_path, "build", "ausweis.pdf") + + response = FileResponse(open(ergebnis_datei, 'rb'), as_attachment=True, filename="ausweis.pdf") + return response + @login_required(login_url=LOGIN_URL) def vertragsliste(request, verein): vconf = config.getInstance(verein) - data_path = vconf.getConfig("data_path", "/var/ehapp") + data_path = vconf.requireConfig("data_path") ergebnis_datei = routines.vertragsliste_erstellen(verein, data_path) response = FileResponse(open(os.path.join(data_path, "build",ergebnis_datei), 'rb'), as_attachment=True, filename=ergebnis_datei) return response @@ -388,14 +414,12 @@ def login(request): if group.name == verein: auth.login(request, user) if request.user.is_authenticated: - print("auth login ok") - else: - print("auth not logged in") - next = request.POST.get("next", None) - if next: - return HttpResponseRedirect(next) - else: - return HttpResponseRedirect(f'/eh-app/{verein}') + auth.login(request, user) + next = request.POST.get("next", None) + if next: + return HttpResponseRedirect(next) + else: + return HttpResponseRedirect(f'/eh-app/{verein}') # login fehlgeschlagen fehlertext = "Login fehlgeschlagen" -- 2.39.5