Index: ithub/workflows/codeql.yml =================================================================== --- .github/workflows/codeql.yml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,84 +1,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ "main" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "main" ] - schedule: - - cron: '38 7 * * 4' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'java', 'javascript' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Use only 'java' to analyze code written in Java, Kotlin or both - # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - cache: 'maven' - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - #- name: Autobuild - # uses: github/codeql-action/autobuild@v2 - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - - run: | - echo "Build Application" - mvn -f eprms-model/ install - mvn -f eprms-mq/ install - mvn -f eprms-tap/ clean package - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:${{matrix.language}}" Index: itignore =================================================================== --- .gitignore (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,4 +1,0 @@ -/build/ -/target/ -.* -!/.gitignore Index: PYING =================================================================== --- COPYING (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,674 +1,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. Index: ADME.md =================================================================== --- README.md (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,29 +1,0 @@ -# EPRMS Project - -The EPRMS - Educational Project and Resources Management System is a management information system used to organize the work on student projects, their source repositories and other related resources. - -This is an open-source system, initially developed to demonstrate web application development for a course on Internet Technologies. Nowadays, it is used by the project lead in production to manage project reporting and resource allocation for 4 courses. - -Project lead: [Vangel V. Ajanovski](https://ajanovski.info) - -The system was presented at the following conferences: - -- Vangel Ajanovski. 2021. Educational Project Management and Resource Provisioning System – Project-Based Learning on a Scale. Association for the Advancement of Computing in Education (AACE), 39–44. https://www.learntechlib.org/primary/p/219637/ -- Vangel V. Ajanovski. 2022. Rapid Aspect-Oriented Assessment of Relational Database Design Assignments. In Proceedings of the 23rd Annual Conference on Information Technology Education (SIGITE '22). Association for Computing Machinery, New York, NY, USA, 86–87. DOI: https://doi.org/10.1145/3537674.3555794 - -## eprms-model - -Contains the JPA entities and model-related classes - -## eprms-tap - -The first implementation of the EPRMS was developed using the Tapestry 5 web application framework. This implementation is used in production. - -## eprms-spr - -The second implementation of the EPRMS was developed using the Spring MVC web application framework. This implementation is not intended for production use, yet. - -## eprms-net - -The third implementation of the EPRMS was developed using the ASP.Net Core web application framework. This implementation is not intended for production use, yet. - Index: rms-model/.gitignore =================================================================== --- eprms-model/.gitignore (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,4 +1,0 @@ -/build/ -/target/ -.* -!/.gitignore Index: rms-model/pom.xml =================================================================== --- eprms-model/pom.xml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,46 +1,0 @@ - - 4.0.0 - - info.ajanovski.eprms - model - 0.0.15-SNAPSHOT - - EPRMS - Educational Project and Resource Management System - Model - - jar - - - - vangel.ajanovski - Vangel V. Ajanovski - https://ajanovski.info - Europe/Skopje - - Project Lead - Main Developer - - - - - - 21 - 21 - 21 - - UTF-8 - UTF-8 - - - - - javax.persistence - javax.persistence-api - 2.2 - - - org.hibernate.validator - hibernate-validator - 6.2.5.Final - - - Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Activity.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Activity.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,142 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="activity") -public class Activity implements java.io.Serializable { - private long activityId; - private String title; - private String description; - private Date startDate; - private Date dueDate; - private Activity superActivity; - private Project project; - private List workReports = new ArrayList(); - private ActivityType activityType; - private List subActivities = new ArrayList(); - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "activity_id", unique = true, nullable = false) - public long getActivityId() { - return this.activityId; - } - - public void setActivityId(long activityId) { - this.activityId=activityId; - } - - @Column(name = "title", length = 4000) - public String getTitle() { - return this.title; - } - - public void setTitle(String title) { - this.title=title; - } - - @Column(name = "description", length = 1000000) - public String getDescription() { - return this.description; - } - - public void setDescription(String description) { - this.description=description; - } - - @Column(name = "start_date") - public Date getStartDate() { - return this.startDate; - } - - public void setStartDate(Date startDate) { - this.startDate=startDate; - } - - @Column(name = "due_date") - public Date getDueDate() { - return this.dueDate; - } - - public void setDueDate(Date dueDate) { - this.dueDate=dueDate; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "parent_activity_id", nullable = true, foreignKey = @ForeignKey(name = "fk_activity_activity")) - public Activity getSuperActivity() { - return this.superActivity; - } - - public void setSuperActivity(Activity superActivity) { - this.superActivity=superActivity; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_activity_Project")) - public Project getProject() { - return this.project; - } - - public void setProject(Project project) { - this.project=project; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "activity") - public List getWorkReports() { - return this.workReports; - } - - public void setWorkReports(List workReports) { - this.workReports=workReports; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "activity_type_id", nullable = false, foreignKey = @ForeignKey(name = "fk_activity_activity_type")) - public ActivityType getActivityType() { - return this.activityType; - } - - public void setActivityType(ActivityType activityType) { - this.activityType=activityType; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "superActivity") - public List getSubActivities() { - return this.subActivities; - } - - public void setSubActivities(List subActivities) { - this.subActivities=subActivities; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/ActivityType.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/ActivityType.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,101 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="activity_type") -public class ActivityType implements java.io.Serializable { - private long activityTypeId; - private String title; - private String description; - private String code; - private ActivityType superActivityType; - private List subActivityTypes = new ArrayList(); - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "activity_type_id", unique = true, nullable = false) - public long getActivityTypeId() { - return this.activityTypeId; - } - - public void setActivityTypeId(long activityTypeId) { - this.activityTypeId=activityTypeId; - } - - @Column(name = "title", length = 4000) - public String getTitle() { - return this.title; - } - - public void setTitle(String title) { - this.title=title; - } - - @Column(name = "description", length = 1000000) - public String getDescription() { - return this.description; - } - - public void setDescription(String description) { - this.description=description; - } - - @NotNull - @Column(name = "code", unique = true, nullable = false) - public String getCode() { - return this.code; - } - - public void setCode(String code) { - this.code=code; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "super_activity_type_id", nullable = true, foreignKey = @ForeignKey(name = "fk_activity_type_activity_type")) - public ActivityType getSuperActivityType() { - return this.superActivityType; - } - - public void setSuperActivityType(ActivityType superActivityType) { - this.superActivityType=superActivityType; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "superActivityType") - public List getSubActivityTypes() { - return this.subActivityTypes; - } - - public void setSubActivityTypes(List subActivityTypes) { - this.subActivityTypes=subActivityTypes; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Course.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Course.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,101 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="course") -public class Course implements java.io.Serializable { - private long courseId; - private String title; - private String code; - private List courseActivityTypes = new ArrayList(); - private List courseProjects = new ArrayList(); - private List courseTeachers = new ArrayList(); - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "course_id", unique = true, nullable = false) - public long getCourseId() { - return this.courseId; - } - - public void setCourseId(long courseId) { - this.courseId=courseId; - } - - @NotNull - @Column(name = "title", unique = true, nullable = false) - public String getTitle() { - return this.title; - } - - public void setTitle(String title) { - this.title=title; - } - - @NotNull - @Column(name = "code", unique = true, nullable = false) - public String getCode() { - return this.code; - } - - public void setCode(String code) { - this.code=code; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "course") - public List getCourseActivityTypes() { - return this.courseActivityTypes; - } - - public void setCourseActivityTypes(List courseActivityTypes) { - this.courseActivityTypes=courseActivityTypes; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "course") - public List getCourseProjects() { - return this.courseProjects; - } - - public void setCourseProjects(List courseProjects) { - this.courseProjects=courseProjects; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "course") - public List getCourseTeachers() { - return this.courseTeachers; - } - - public void setCourseTeachers(List courseTeachers) { - this.courseTeachers=courseTeachers; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/CourseActivityType.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/CourseActivityType.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,82 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="course_activity_type") -public class CourseActivityType implements java.io.Serializable { - private long courseActivityTypeId; - private int positionNumber; - private ActivityType activityType; - private Course course; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "course_activity_type_id", unique = true, nullable = false) - public long getCourseActivityTypeId() { - return this.courseActivityTypeId; - } - - public void setCourseActivityTypeId(long courseActivityTypeId) { - this.courseActivityTypeId=courseActivityTypeId; - } - - @NotNull - @Column(name = "position_number", nullable = false) - public int getPositionNumber() { - return this.positionNumber; - } - - public void setPositionNumber(int positionNumber) { - this.positionNumber=positionNumber; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "activity_type_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_activity_type_activity_type")) - public ActivityType getActivityType() { - return this.activityType; - } - - public void setActivityType(ActivityType activityType) { - this.activityType=activityType; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "course_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_activity_type_course")) - public Course getCourse() { - return this.course; - } - - public void setCourse(Course course) { - this.course=course; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/CourseProject.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/CourseProject.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,71 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="course_project") -public class CourseProject implements java.io.Serializable { - private long courseProjectId; - private Course course; - private Project project; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "course_project_id", unique = true, nullable = false) - public long getCourseProjectId() { - return this.courseProjectId; - } - - public void setCourseProjectId(long courseProjectId) { - this.courseProjectId=courseProjectId; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "course_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_project_course")) - public Course getCourse() { - return this.course; - } - - public void setCourse(Course course) { - this.course=course; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_project_Project")) - public Project getProject() { - return this.project; - } - - public void setProject(Project project) { - this.project=project; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/CourseTeacher.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/CourseTeacher.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,91 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="course_teacher") -public class CourseTeacher implements java.io.Serializable { - private long courseTeacherId; - private Date fromDate; - private Date toDate; - private Person teacher; - private Course course; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "course_teacher_id", unique = true, nullable = false) - public long getCourseTeacherId() { - return this.courseTeacherId; - } - - public void setCourseTeacherId(long courseTeacherId) { - this.courseTeacherId=courseTeacherId; - } - - @Column(name = "from_date") - public Date getFromDate() { - return this.fromDate; - } - - public void setFromDate(Date fromDate) { - this.fromDate=fromDate; - } - - @Column(name = "to_date") - public Date getToDate() { - return this.toDate; - } - - public void setToDate(Date toDate) { - this.toDate=toDate; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_teacher_person")) - public Person getTeacher() { - return this.teacher; - } - - public void setTeacher(Person teacher) { - this.teacher=teacher; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "course_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_teacher_course")) - public Course getCourse() { - return this.course; - } - - public void setCourse(Course course) { - this.course=course; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Database.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Database.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,160 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="database") -public class Database implements java.io.Serializable { - private long databaseId; - private String type; - private String server; - private String name; - private String owner; - private String password; - private String tunnelUser; - private String tunnelPassword; - private String port; - private String tunnelServer; - private Date dateCreated; - private Project project; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "database_id", unique = true, nullable = false) - public long getDatabaseId() { - return this.databaseId; - } - - public void setDatabaseId(long databaseId) { - this.databaseId=databaseId; - } - - @Column(name = "type") - public String getType() { - return this.type; - } - - public void setType(String type) { - this.type=type; - } - - @Column(name = "server") - public String getServer() { - return this.server; - } - - public void setServer(String server) { - this.server=server; - } - - @Column(name = "name") - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name=name; - } - - @Column(name = "owner") - public String getOwner() { - return this.owner; - } - - public void setOwner(String owner) { - this.owner=owner; - } - - @Column(name = "password") - public String getPassword() { - return this.password; - } - - public void setPassword(String password) { - this.password=password; - } - - @Column(name = "tunnel_user") - public String getTunnelUser() { - return this.tunnelUser; - } - - public void setTunnelUser(String tunnelUser) { - this.tunnelUser=tunnelUser; - } - - @Column(name = "tunnel_password") - public String getTunnelPassword() { - return this.tunnelPassword; - } - - public void setTunnelPassword(String tunnelPassword) { - this.tunnelPassword=tunnelPassword; - } - - @Column(name = "port") - public String getPort() { - return this.port; - } - - public void setPort(String port) { - this.port=port; - } - - @Column(name = "tunnel_server") - public String getTunnelServer() { - return this.tunnelServer; - } - - public void setTunnelServer(String tunnelServer) { - this.tunnelServer=tunnelServer; - } - - @Column(name = "date_created") - public Date getDateCreated() { - return this.dateCreated; - } - - public void setDateCreated(Date dateCreated) { - this.dateCreated=dateCreated; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_database_Project")) - public Project getProject() { - return this.project; - } - - public void setProject(Project project) { - this.project=project; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/DiscussionOnCourseProject.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/DiscussionOnCourseProject.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,82 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -Denotes which CourseProjects are open for discussions in the selected DiscussionSession -*/ -@Entity -@Table (schema="eprms_main", name="discussion_on_course_project") -public class DiscussionOnCourseProject implements java.io.Serializable { - private long discussionOnCourseProjectId; - private DiscussionSession discussionSession; - private CourseProject courseProject; - private List discussionPosts = new ArrayList(); - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "discussion_on_course_project_id", unique = true, nullable = false) - public long getDiscussionOnCourseProjectId() { - return this.discussionOnCourseProjectId; - } - - public void setDiscussionOnCourseProjectId(long discussionOnCourseProjectId) { - this.discussionOnCourseProjectId=discussionOnCourseProjectId; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "discussion_session_id", nullable = false, foreignKey = @ForeignKey(name = "fk_discussion_on_course_project_discussion_session")) - public DiscussionSession getDiscussionSession() { - return this.discussionSession; - } - - public void setDiscussionSession(DiscussionSession discussionSession) { - this.discussionSession=discussionSession; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "course_project_id", nullable = true, foreignKey = @ForeignKey(name = "fk_discussion_on_course_project_course_project")) - public CourseProject getCourseProject() { - return this.courseProject; - } - - public void setCourseProject(CourseProject courseProject) { - this.courseProject=courseProject; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "discussionOnCourseProject") - public List getDiscussionPosts() { - return this.discussionPosts; - } - - public void setDiscussionPosts(List discussionPosts) { - this.discussionPosts=discussionPosts; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/DiscussionPost.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/DiscussionPost.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,134 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table(schema = "eprms_main", name = "discussion_post") -public class DiscussionPost implements java.io.Serializable { - private long discussionPostId; - private String type; - private String message; - private Date postedOn; - private boolean publicPosting; - private List replies = new ArrayList(); - private DiscussionPost replyTo; - private DiscussionOnCourseProject discussionOnCourseProject; - private Person person; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "discussion_post_id", unique = true, nullable = false) - public long getDiscussionPostId() { - return this.discussionPostId; - } - - public void setDiscussionPostId(long discussionPostId) { - this.discussionPostId = discussionPostId; - } - - @Column(name = "type") - public String getType() { - return this.type; - } - - public void setType(String type) { - this.type = type; - } - - @NotNull - @Column(name = "message", nullable = false, length = 100000) - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - - @NotNull - @Column(name = "posted_on", nullable = false) - public Date getPostedOn() { - return this.postedOn; - } - - public void setPostedOn(Date postedOn) { - this.postedOn = postedOn; - } - - @NotNull - @Column(name = "public_posting", nullable = false) - public boolean getPublicPosting() { - return this.publicPosting; - } - - public void setPublicPosting(boolean publicPosting) { - this.publicPosting = publicPosting; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "replyTo") - public List getReplies() { - return this.replies; - } - - public void setReplies(List replies) { - this.replies = replies; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "reply_to_discussion_post_id", nullable = true, foreignKey = @ForeignKey(name = "fk_discussion_post_discussion_post")) - public DiscussionPost getReplyTo() { - return this.replyTo; - } - - public void setReplyTo(DiscussionPost replyTo) { - this.replyTo = replyTo; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "discussion_on_course_project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_discussion_post_discussion_on_course_project")) - public DiscussionOnCourseProject getDiscussionOnCourseProject() { - return this.discussionOnCourseProject; - } - - public void setDiscussionOnCourseProject(DiscussionOnCourseProject discussionOnCourseProject) { - this.discussionOnCourseProject = discussionOnCourseProject; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_discussion_post_person")) - public Person getPerson() { - return this.person; - } - - public void setPerson(Person person) { - this.person = person; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/DiscussionPostEvaluation.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/DiscussionPostEvaluation.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,132 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table(schema = "eprms_main", name = "discussion_post_evaluation") -public class DiscussionPostEvaluation implements java.io.Serializable { - private long discussionPostEvaluationId; - private String type; - private String message; - private Integer points; - private Date evaluatedOn; - private Boolean accepted; - private Boolean evaluatePostingAsATeam; - private Person person; - private DiscussionPost discussionPost; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "discussion_post_evaluation_id", unique = true, nullable = false) - public long getDiscussionPostEvaluationId() { - return this.discussionPostEvaluationId; - } - - public void setDiscussionPostEvaluationId(long discussionPostEvaluationId) { - this.discussionPostEvaluationId = discussionPostEvaluationId; - } - - @Column(name = "type") - public String getType() { - return this.type; - } - - public void setType(String type) { - this.type = type; - } - - @NotNull - @Column(name = "message", nullable = false, length = 100000) - public String getMessage() { - return this.message; - } - - public void setMessage(String message) { - this.message = message; - } - - @Column(name = "points") - public Integer getPoints() { - return this.points; - } - - public void setPoints(Integer points) { - this.points = points; - } - - @NotNull - @Column(name = "evaluated_on", nullable = false) - public Date getEvaluatedOn() { - return this.evaluatedOn; - } - - public void setEvaluatedOn(Date evaluatedOn) { - this.evaluatedOn = evaluatedOn; - } - - @Column(name = "accepted") - public Boolean getAccepted() { - return this.accepted; - } - - public void setAccepted(Boolean accepted) { - this.accepted = accepted; - } - - @Column(name = "evaluate_posting_as_a_team") - public Boolean getEvaluatePostingAsATeam() { - return this.evaluatePostingAsATeam; - } - - public void setEvaluatePostingAsATeam(Boolean evaluatePostingAsATeam) { - this.evaluatePostingAsATeam = evaluatePostingAsATeam; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_discussion_post_evaluation_person")) - public Person getPerson() { - return this.person; - } - - public void setPerson(Person person) { - this.person = person; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "discussion_post_id", nullable = false, foreignKey = @ForeignKey(name = "fk_discussion_post_evaluation_discussion_post")) - public DiscussionPost getDiscussionPost() { - return this.discussionPost; - } - - public void setDiscussionPost(DiscussionPost discussionPost) { - this.discussionPost = discussionPost; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/DiscussionSession.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/DiscussionSession.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,103 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="discussion_session") -public class DiscussionSession implements java.io.Serializable { - private long discussionSessionId; - private Date startDate; - private Date endDate; - private String title; - private List discussionsOnCourseProjects = new ArrayList(); - private Course course; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "discussion_session_id", unique = true, nullable = false) - public long getDiscussionSessionId() { - return this.discussionSessionId; - } - - public void setDiscussionSessionId(long discussionSessionId) { - this.discussionSessionId=discussionSessionId; - } - - @NotNull - @Column(name = "start_date", nullable = false) - public Date getStartDate() { - return this.startDate; - } - - public void setStartDate(Date startDate) { - this.startDate=startDate; - } - - @NotNull - @Column(name = "end_date", nullable = false) - public Date getEndDate() { - return this.endDate; - } - - public void setEndDate(Date endDate) { - this.endDate=endDate; - } - - @NotNull - @Column(name = "title", nullable = false) - public String getTitle() { - return this.title; - } - - public void setTitle(String title) { - this.title=title; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "discussionSession") - public List getDiscussionsOnCourseProjects() { - return this.discussionsOnCourseProjects; - } - - public void setDiscussionsOnCourseProjects(List discussionsOnCourseProjects) { - this.discussionsOnCourseProjects=discussionsOnCourseProjects; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "course_id", nullable = true, foreignKey = @ForeignKey(name = "fk_discussion_session_course")) - public Course getCourse() { - return this.course; - } - - public void setCourse(Course course) { - this.course=course; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Person.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Person.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,110 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="person") -public class Person implements java.io.Serializable { - private long personId; - private String firstName; - private String lastName; - private String email; - private String userName; - private String authString; - private boolean active; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "person_id", unique = true, nullable = false) - public long getPersonId() { - return this.personId; - } - - public void setPersonId(long personId) { - this.personId=personId; - } - - @Column(name = "first_name") - public String getFirstName() { - return this.firstName; - } - - public void setFirstName(String firstName) { - this.firstName=firstName; - } - - @Column(name = "last_name") - public String getLastName() { - return this.lastName; - } - - public void setLastName(String lastName) { - this.lastName=lastName; - } - - @Column(name = "email") - public String getEmail() { - return this.email; - } - - public void setEmail(String email) { - this.email=email; - } - - @Column(name = "user_name", unique = true) - public String getUserName() { - return this.userName; - } - - public void setUserName(String userName) { - this.userName=userName; - } - - @Column(name = "auth_string") - public String getAuthString() { - return this.authString; - } - - public void setAuthString(String authString) { - this.authString=authString; - } - - @NotNull - @Column(name = "active", nullable = false) - public boolean getActive() { - return this.active; - } - - public void setActive(boolean active) { - this.active=active; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/PersonRole.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/PersonRole.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,71 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_util", name="person_role") -public class PersonRole implements java.io.Serializable { - private long personRoleId; - private Person person; - private Role role; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "person_role_id", unique = true, nullable = false) - public long getPersonRoleId() { - return this.personRoleId; - } - - public void setPersonRoleId(long personRoleId) { - this.personRoleId=personRoleId; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_person_role_person")) - public Person getPerson() { - return this.person; - } - - public void setPerson(Person person) { - this.person=person; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "role_id", nullable = false, foreignKey = @ForeignKey(name = "fk_person_role_role")) - public Role getRole() { - return this.role; - } - - public void setRole(Role role) { - this.role=role; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Project.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Project.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,181 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="Project") -public class Project implements java.io.Serializable { - private long projectId; - private String title; - private String description; - private Date startDate; - private Date finishDate; - private String code; - private String status; - private Boolean acceptingNewResponsibilities; - private Integer maxResponsibilities; - private List responsibilities = new ArrayList(); - private List repositories = new ArrayList(); - private List databases = new ArrayList(); - private List activities = new ArrayList(); - private List courseProjects = new ArrayList(); - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "project_id", unique = true, nullable = false) - public long getProjectId() { - return this.projectId; - } - - public void setProjectId(long projectId) { - this.projectId=projectId; - } - - @NotNull - @Column(name = "title", unique = true, nullable = false, length = 4000) - public String getTitle() { - return this.title; - } - - public void setTitle(String title) { - this.title=title; - } - - @Column(name = "description", length = 1000000) - public String getDescription() { - return this.description; - } - - public void setDescription(String description) { - this.description=description; - } - - @Column(name = "start_date") - public Date getStartDate() { - return this.startDate; - } - - public void setStartDate(Date startDate) { - this.startDate=startDate; - } - - @Column(name = "finish_date") - public Date getFinishDate() { - return this.finishDate; - } - - public void setFinishDate(Date finishDate) { - this.finishDate=finishDate; - } - - @NotNull - @Column(name = "code", nullable = false) - public String getCode() { - return this.code; - } - - public void setCode(String code) { - this.code=code; - } - - @Column(name = "status") - public String getStatus() { - return this.status; - } - - public void setStatus(String status) { - this.status=status; - } - - @Column(name = "accepting_new_responsibilities") - public Boolean getAcceptingNewResponsibilities() { - return this.acceptingNewResponsibilities; - } - - public void setAcceptingNewResponsibilities(Boolean acceptingNewResponsibilities) { - this.acceptingNewResponsibilities=acceptingNewResponsibilities; - } - - @Column(name = "max_responsibilities") - public Integer getMaxResponsibilities() { - return this.maxResponsibilities; - } - - public void setMaxResponsibilities(Integer maxResponsibilities) { - this.maxResponsibilities=maxResponsibilities; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "project") - public List getResponsibilities() { - return this.responsibilities; - } - - public void setResponsibilities(List responsibilities) { - this.responsibilities=responsibilities; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "project") - public List getRepositories() { - return this.repositories; - } - - public void setRepositories(List repositories) { - this.repositories=repositories; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "project") - public List getDatabases() { - return this.databases; - } - - public void setDatabases(List databases) { - this.databases=databases; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "project") - public List getActivities() { - return this.activities; - } - - public void setActivities(List activities) { - this.activities=activities; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "project") - public List getCourseProjects() { - return this.courseProjects; - } - - public void setCourseProjects(List courseProjects) { - this.courseProjects=courseProjects; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Repository.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Repository.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,122 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="repository") -public class Repository implements java.io.Serializable { - private long repositoryId; - private String title; - private String url; - private Date dateCreated; - private String type; - private Person person; - private Team team; - private Project project; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "repository_id", unique = true, nullable = false) - public long getRepositoryId() { - return this.repositoryId; - } - - public void setRepositoryId(long repositoryId) { - this.repositoryId=repositoryId; - } - - @Column(name = "title") - public String getTitle() { - return this.title; - } - - public void setTitle(String title) { - this.title=title; - } - - @Column(name = "url") - public String getUrl() { - return this.url; - } - - public void setUrl(String url) { - this.url=url; - } - - @Column(name = "date_created") - public Date getDateCreated() { - return this.dateCreated; - } - - public void setDateCreated(Date dateCreated) { - this.dateCreated=dateCreated; - } - - @Column(name = "type") - public String getType() { - return this.type; - } - - public void setType(String type) { - this.type=type; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "person_id", nullable = true, foreignKey = @ForeignKey(name = "fk_repository_person")) - public Person getPerson() { - return this.person; - } - - public void setPerson(Person person) { - this.person=person; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "team_id", nullable = true, foreignKey = @ForeignKey(name = "fk_repository_team")) - public Team getTeam() { - return this.team; - } - - public void setTeam(Team team) { - this.team=team; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "project_id", nullable = true, foreignKey = @ForeignKey(name = "fk_repository_Project")) - public Project getProject() { - return this.project; - } - - public void setProject(Project project) { - this.project=project; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Responsibility.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Responsibility.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,71 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="responsibility") -public class Responsibility implements java.io.Serializable { - private long responsibilityId; - private Project project; - private Team team; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "responsibility_id", unique = true, nullable = false) - public long getResponsibilityId() { - return this.responsibilityId; - } - - public void setResponsibilityId(long responsibilityId) { - this.responsibilityId=responsibilityId; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_responsibility_Project")) - public Project getProject() { - return this.project; - } - - public void setProject(Project project) { - this.project=project; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "team_id", nullable = false, foreignKey = @ForeignKey(name = "fk_responsibility_team")) - public Team getTeam() { - return this.team; - } - - public void setTeam(Team team) { - this.team=team; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Role.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Role.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,59 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_util", name="role") -public class Role implements java.io.Serializable { - private long roleId; - private String name; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "role_id", unique = true, nullable = false) - public long getRoleId() { - return this.roleId; - } - - public void setRoleId(long roleId) { - this.roleId=roleId; - } - - @Column(name = "name") - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name=name; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/SystemParameter.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/SystemParameter.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,82 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_util", name="system_parameters") -public class SystemParameter implements java.io.Serializable { - private long systemParameterId; - private String code; - private String value; - private String type; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "system_parameter_id", unique = true, nullable = false) - public long getSystemParameterId() { - return this.systemParameterId; - } - - public void setSystemParameterId(long systemParameterId) { - this.systemParameterId=systemParameterId; - } - - @NotNull - @Column(name = "code", unique = true, nullable = false) - public String getCode() { - return this.code; - } - - public void setCode(String code) { - this.code=code; - } - - @NotNull - @Column(name = "value", nullable = false) - public String getValue() { - return this.value; - } - - public void setValue(String value) { - this.value=value; - } - - @NotNull - @Column(name = "type", nullable = false) - public String getType() { - return this.type; - } - - public void setType(String type) { - this.type=type; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Team.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Team.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,139 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="team") -public class Team implements java.io.Serializable { - private long teamId; - private String name; - private String status; - private Date createdDate; - private Date statusDate; - private String description; - private Boolean openForNewMembers; - private Integer maxMembers; - private List teamMembers = new ArrayList(); - private List responsibilities = new ArrayList(); - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "team_id", unique = true, nullable = false) - public long getTeamId() { - return this.teamId; - } - - public void setTeamId(long teamId) { - this.teamId=teamId; - } - - @Column(name = "name", length = 2000) - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name=name; - } - - @Column(name = "status") - public String getStatus() { - return this.status; - } - - public void setStatus(String status) { - this.status=status; - } - - @Column(name = "created_date") - public Date getCreatedDate() { - return this.createdDate; - } - - public void setCreatedDate(Date createdDate) { - this.createdDate=createdDate; - } - - @Column(name = "status_date") - public Date getStatusDate() { - return this.statusDate; - } - - public void setStatusDate(Date statusDate) { - this.statusDate=statusDate; - } - - @Column(name = "description", length = 1000000) - public String getDescription() { - return this.description; - } - - public void setDescription(String description) { - this.description=description; - } - - @Column(name = "open_for_new_members") - public Boolean getOpenForNewMembers() { - return this.openForNewMembers; - } - - public void setOpenForNewMembers(Boolean openForNewMembers) { - this.openForNewMembers=openForNewMembers; - } - - @Column(name = "max_members") - public Integer getMaxMembers() { - return this.maxMembers; - } - - public void setMaxMembers(Integer maxMembers) { - this.maxMembers=maxMembers; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "team") - public List getTeamMembers() { - return this.teamMembers; - } - - public void setTeamMembers(List teamMembers) { - this.teamMembers=teamMembers; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "team") - public List getResponsibilities() { - return this.responsibilities; - } - - public void setResponsibilities(List responsibilities) { - this.responsibilities=responsibilities; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/TeamMember.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/TeamMember.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,121 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="team_member") -public class TeamMember implements java.io.Serializable { - private long teamMemberId; - private Integer positionNumber; - private String role; - private String status; - private Date createdDate; - private Date statusDate; - private Person person; - private Team team; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "team_member_id", unique = true, nullable = false) - public long getTeamMemberId() { - return this.teamMemberId; - } - - public void setTeamMemberId(long teamMemberId) { - this.teamMemberId=teamMemberId; - } - - @Column(name = "position_number") - public Integer getPositionNumber() { - return this.positionNumber; - } - - public void setPositionNumber(Integer positionNumber) { - this.positionNumber=positionNumber; - } - - @Column(name = "role") - public String getRole() { - return this.role; - } - - public void setRole(String role) { - this.role=role; - } - - @Column(name = "status") - public String getStatus() { - return this.status; - } - - public void setStatus(String status) { - this.status=status; - } - - @Column(name = "created_date") - public Date getCreatedDate() { - return this.createdDate; - } - - public void setCreatedDate(Date createdDate) { - this.createdDate=createdDate; - } - - @Column(name = "status_date") - public Date getStatusDate() { - return this.statusDate; - } - - public void setStatusDate(Date statusDate) { - this.statusDate=statusDate; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_team_member_person")) - public Person getPerson() { - return this.person; - } - - public void setPerson(Person person) { - this.person=person; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "team_id", nullable = false, foreignKey = @ForeignKey(name = "fk_team_member_team")) - public Team getTeam() { - return this.team; - } - - public void setTeam(Team team) { - this.team=team; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/Translation.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/Translation.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,104 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_util", name="translations") -public class Translation implements java.io.Serializable { - private long translationId; - private String className; - private long originalObjectId; - private String locale; - private String attributeCode; - private String translatedText; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "translation_id", unique = true, nullable = false) - public long getTranslationId() { - return this.translationId; - } - - public void setTranslationId(long translationId) { - this.translationId=translationId; - } - - @NotNull - @Column(name = "class_name", nullable = false) - public String getClassName() { - return this.className; - } - - public void setClassName(String className) { - this.className=className; - } - - @NotNull - @Column(name = "original_object_id", nullable = false) - public long getOriginalObjectId() { - return this.originalObjectId; - } - - public void setOriginalObjectId(long originalObjectId) { - this.originalObjectId=originalObjectId; - } - - @NotNull - @Column(name = "locale", nullable = false) - public String getLocale() { - return this.locale; - } - - public void setLocale(String locale) { - this.locale=locale; - } - - @NotNull - @Column(name = "attribute_code", nullable = false) - public String getAttributeCode() { - return this.attributeCode; - } - - public void setAttributeCode(String attributeCode) { - this.attributeCode=attributeCode; - } - - @NotNull - @Column(name = "translated_text", nullable = false) - public String getTranslatedText() { - return this.translatedText; - } - - public void setTranslatedText(String translatedText) { - this.translatedText=translatedText; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkEvaluation.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkEvaluation.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,132 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="work_evaluation") -public class WorkEvaluation implements java.io.Serializable { - private long workEvaluationId; - private String title; - private String description; - private Float percentEvaluated; - private Float points; - private Date evaluationDate; - private String status; - private WorkReport workReport; - private Person person; - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "work_evaluation_id", unique = true, nullable = false) - public long getWorkEvaluationId() { - return this.workEvaluationId; - } - - public void setWorkEvaluationId(long workEvaluationId) { - this.workEvaluationId=workEvaluationId; - } - - @Column(name = "title", length = 4000) - public String getTitle() { - return this.title; - } - - public void setTitle(String title) { - this.title=title; - } - - @Column(name = "description", length = 1000000) - public String getDescription() { - return this.description; - } - - public void setDescription(String description) { - this.description=description; - } - - @Column(name = "percent_evaluated") - public Float getPercentEvaluated() { - return this.percentEvaluated; - } - - public void setPercentEvaluated(Float percentEvaluated) { - this.percentEvaluated=percentEvaluated; - } - - @Column(name = "points") - public Float getPoints() { - return this.points; - } - - public void setPoints(Float points) { - this.points=points; - } - - @Column(name = "evaluation_date") - public Date getEvaluationDate() { - return this.evaluationDate; - } - - public void setEvaluationDate(Date evaluationDate) { - this.evaluationDate=evaluationDate; - } - - @NotNull - @Column(name = "status", nullable = false) - public String getStatus() { - return this.status; - } - - public void setStatus(String status) { - this.status=status; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "work_report_id", nullable = false, foreignKey = @ForeignKey(name = "fk_work_evaluation_work_report")) - public WorkReport getWorkReport() { - return this.workReport; - } - - public void setWorkReport(WorkReport workReport) { - this.workReport=workReport; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_work_evaluation_person")) - public Person getPerson() { - return this.person; - } - - public void setPerson(Person person) { - this.person=person; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkReport.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/entities/WorkReport.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,143 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.model.entities; - -import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.*; - -/* -*/ -@Entity -@Table (schema="eprms_main", name="work_report") -public class WorkReport implements java.io.Serializable { - private long workReportId; - private String title; - private String description; - private Float percentReported; - private Date submissionDate; - private Activity activity; - private Person person; - private WorkReport continuationOfWorkReport; - private Team team; - private List workEvaluations = new ArrayList(); - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - - @NotNull - @Column(name = "work_report_id", unique = true, nullable = false) - public long getWorkReportId() { - return this.workReportId; - } - - public void setWorkReportId(long workReportId) { - this.workReportId=workReportId; - } - - @Column(name = "title", length = 4000) - public String getTitle() { - return this.title; - } - - public void setTitle(String title) { - this.title=title; - } - - @Column(name = "description", length = 1000000) - public String getDescription() { - return this.description; - } - - public void setDescription(String description) { - this.description=description; - } - - @Column(name = "percent_reported") - public Float getPercentReported() { - return this.percentReported; - } - - public void setPercentReported(Float percentReported) { - this.percentReported=percentReported; - } - - @Column(name = "submission_date") - public Date getSubmissionDate() { - return this.submissionDate; - } - - public void setSubmissionDate(Date submissionDate) { - this.submissionDate=submissionDate; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "activity_id", nullable = false, foreignKey = @ForeignKey(name = "fk_work_report_activity")) - public Activity getActivity() { - return this.activity; - } - - public void setActivity(Activity activity) { - this.activity=activity; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_work_report_person")) - public Person getPerson() { - return this.person; - } - - public void setPerson(Person person) { - this.person=person; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "continuation_of_work_report_id", nullable = true, foreignKey = @ForeignKey(name = "fk_work_report_work_report")) - public WorkReport getContinuationOfWorkReport() { - return this.continuationOfWorkReport; - } - - public void setContinuationOfWorkReport(WorkReport continuationOfWorkReport) { - this.continuationOfWorkReport=continuationOfWorkReport; - } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "team_id", nullable = true, foreignKey = @ForeignKey(name = "fk_work_report_team")) - public Team getTeam() { - return this.team; - } - - public void setTeam(Team team) { - this.team=team; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "workReport") - public List getWorkEvaluations() { - return this.workEvaluations; - } - - public void setWorkEvaluations(List workEvaluations) { - this.workEvaluations=workEvaluations; - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/ActivityComparatorViaType.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/ActivityComparatorViaType.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,11 +1,0 @@ -package info.ajanovski.eprms.model.util; - -import java.util.Comparator; - -import info.ajanovski.eprms.model.entities.Activity; - -public class ActivityComparatorViaType implements Comparator { - public int compare(Activity a1, Activity a2) { - return a1.getActivityType().getCode().compareTo(a2.getActivityType().getCode()); - } -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/ActivityTypeHierarchicalComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/ActivityTypeHierarchicalComparator.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,19 +1,0 @@ -package info.ajanovski.eprms.model.util; - -import java.util.Comparator; - -import info.ajanovski.eprms.model.entities.ActivityType; - -public class ActivityTypeHierarchicalComparator implements Comparator { - public String getPath(ActivityType at) { - if (at.getSuperActivityType() != null) { - return getPath(at.getSuperActivityType()) + "." + at.getCode(); - } else { - return at.getCode(); - } - } - - public int compare(ActivityType a1, ActivityType a2) { - return getPath(a1).compareTo(getPath(a2)); - } -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/ComparatorDiscussionPostByReplyTo.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/ComparatorDiscussionPostByReplyTo.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,26 +1,0 @@ -package info.ajanovski.eprms.model.util; - -import java.text.SimpleDateFormat; -import java.util.Comparator; - -import info.ajanovski.eprms.model.entities.DiscussionPost; - -public class ComparatorDiscussionPostByReplyTo implements Comparator { - - public String getCoding(DiscussionPost i) { - SimpleDateFormat dt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); - if (i.getReplyTo() == null) { - return dt.format(i.getPostedOn()) + "-"; - } else { - return getCoding(i.getReplyTo()) + dt.format(i.getPostedOn()) + "-"; - } - } - - @Override - public int compare(DiscussionPost o1, DiscussionPost o2) { - String hier1 = getCoding(o1); - String hier2 = getCoding(o2); - return hier1.compareTo(hier2); - } - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/CourseActivityTypeHierarchicalComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/CourseActivityTypeHierarchicalComparator.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,20 +1,0 @@ -package info.ajanovski.eprms.model.util; - -import java.util.Comparator; - -import info.ajanovski.eprms.model.entities.ActivityType; -import info.ajanovski.eprms.model.entities.CourseActivityType; - -public class CourseActivityTypeHierarchicalComparator implements Comparator { - public String getPath(ActivityType at) { - if (at.getSuperActivityType() != null) { - return getPath(at.getSuperActivityType()) + "." + at.getCode(); - } else { - return at.getCode(); - } - } - - public int compare(CourseActivityType a1, CourseActivityType a2) { - return getPath(a1.getActivityType()).compareTo(getPath(a2.getActivityType())); - } -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/CourseComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/CourseComparator.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,11 +1,0 @@ -package info.ajanovski.eprms.model.util; - -import java.util.Comparator; - -import info.ajanovski.eprms.model.entities.Course; - -public class CourseComparator implements Comparator { - public int compare(Course a1, Course a2) { - return a1.getTitle().compareTo(a2.getTitle()); - } -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/ModelConstants.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/ModelConstants.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,94 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.model.util; - -public class ModelConstants { - - public static final String BooleanTRUEasCHAR = "T"; - public static final String BooleanFALSEasCHAR = "F"; - - public static final String EmailUnknown = "EMAIL@UNKNOWN"; - - public static final String RoleAdministrator = "ADMINISTRATOR"; - public static final String RoleInstructor = "INSTRUCTOR"; - public static final String RoleStudent = "STUDENT"; - - public static final String ProjectStatusProposed = "PROPOSED"; - public static final String ProjectStatusCreation = "CREATION"; - public static final String ProjectStatusStarted = "STARTED"; - public static final String ProjectStatusActive = "ACTIVE"; - public static final String ProjectStatusPaused = "PAUSED"; - public static final String ProjectStatusStopped = "STOPPED"; - public static final String ProjectStatusFinished = "FINISHED"; - public static final String ProjectStatusFailed = "FAILED"; - - public static final String[] AllProjectStatuses = { ProjectStatusProposed, ProjectStatusCreation, - ProjectStatusStarted, ProjectStatusActive, ProjectStatusPaused, ProjectStatusStopped, ProjectStatusFinished, - ProjectStatusFailed }; - - public static final String EvaluationStatusCreated = "CREATED"; - public static final String EvaluationStatusPublished = "PUBLISHED"; - - public static final String[] AllEvaluationStatuses = { EvaluationStatusCreated, EvaluationStatusPublished }; - - public static final String CourseUnknown = "CourseNA"; - - public static final String TeamMemberRoleCoordinator = "COORDINATOR"; - public static final String TeamMemberRoleMember = "MEMBER"; - public static final String TeamMemberRoleSupervisor = "SUPERVISOR"; - - public static final String[] AllTeamMemberRoles = { TeamMemberRoleCoordinator, TeamMemberRoleMember, - TeamMemberRoleSupervisor }; - - public static final String TeamStatusProposed = "PROPOSED"; - public static final String TeamStatusAccepted = "ACTIVE"; - public static final String TeamStatusPaused = "PAUSED"; - public static final String TeamStatusFinished = "FINISHED"; - - public static final String[] AllTeamStatuses = { TeamStatusProposed, TeamStatusAccepted, TeamStatusPaused, - TeamStatusFinished }; - - public static final String TeamMemberStatusProposed = "PROPOSED"; - public static final String TeamMemberStatusAccepted = "ACTIVE"; - public static final String TeamMemberStatusPaused = "PAUSED"; - public static final String TeamMemberStatusFinished = "FINISHED"; - public static final String TeamMemberStatusQuit = "QUIT"; - - public static final String[] AllTeamMemberStatuses = { TeamMemberStatusProposed, TeamMemberStatusAccepted, - TeamMemberStatusPaused, TeamMemberStatusFinished, TeamMemberStatusQuit }; - - public static final String DiscussionPostTypeBug = "BUG"; - public static final String DiscussionPostTypeImprovement = "IMPROVEMENT"; - public static final String DiscussionPostTypeTask = "TASK"; - public static final String DiscussionPostTypeOther = "OTHER"; - public static final String[] AllDiscussionPostTypes = { DiscussionPostTypeBug, DiscussionPostTypeImprovement, - DiscussionPostTypeTask, DiscussionPostTypeOther }; - - public static final String DiscussionPostEvaluationTypeIdea = "IDEA"; - public static final String DiscussionPostEvaluationTypeModel = "MODEL"; - public static final String DiscussionPostEvaluationTypeFunctionality = "FUNCTIONALITY"; - public static final String DiscussionPostEvaluationTypeBug = "BUG"; - public static final String DiscussionPostEvaluationTypeOther = "OTHER"; - public static final String[] AllDiscussionPostEvaluationTypes = { DiscussionPostEvaluationTypeIdea, - DiscussionPostEvaluationTypeModel, DiscussionPostEvaluationTypeFunctionality, - DiscussionPostEvaluationTypeBug, DiscussionPostEvaluationTypeOther }; - -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/ProjectActiveComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/ProjectActiveComparator.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,30 +1,0 @@ -package info.ajanovski.eprms.model.util; - -import java.util.Comparator; - -import info.ajanovski.eprms.model.entities.Activity; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.WorkEvaluation; -import info.ajanovski.eprms.model.entities.WorkReport; - -public class ProjectActiveComparator implements Comparator { - public Float mostActive(Project p) { - Float sum = 0F; - for (Activity a : p.getActivities()) { - Float max = 0F; - for (WorkReport wr : a.getWorkReports()) { - for (WorkEvaluation we : wr.getWorkEvaluations()) { - if (we.getPoints() > max) { - max = we.getPoints(); - } - } - } - sum += max; - } - return sum; - } - - public int compare(Project p1, Project p2) { - return mostActive(p1).compareTo(mostActive(p2)); - } -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/ProjectCodeComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/ProjectCodeComparator.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,11 +1,0 @@ -package info.ajanovski.eprms.model.util; - -import java.util.Comparator; - -import info.ajanovski.eprms.model.entities.Project; - -public class ProjectCodeComparator implements Comparator { - public int compare(Project p1, Project p2) { - return p1.getCode().toLowerCase().compareTo(p2.getCode().toLowerCase()); - } -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/WorkEvaluationComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/WorkEvaluationComparator.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,11 +1,0 @@ -package info.ajanovski.eprms.model.util; - -import java.util.Comparator; - -import info.ajanovski.eprms.model.entities.WorkEvaluation; - -public class WorkEvaluationComparator implements Comparator { - public int compare(WorkEvaluation w1, WorkEvaluation w2) { - return Long.valueOf(w1.getWorkEvaluationId()).compareTo(Long.valueOf(w2.getWorkEvaluationId())); - } -} Index: rms-model/src/main/java/info/ajanovski/eprms/model/util/WorkReportComparator.java =================================================================== --- eprms-model/src/main/java/info/ajanovski/eprms/model/util/WorkReportComparator.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,11 +1,0 @@ -package info.ajanovski.eprms.model.util; - -import java.util.Comparator; - -import info.ajanovski.eprms.model.entities.WorkReport; - -public class WorkReportComparator implements Comparator { - public int compare(WorkReport w1, WorkReport w2) { - return Long.valueOf(w1.getWorkReportId()).compareTo(Long.valueOf(w2.getWorkReportId())); - } -} Index: rms-mq/pom.xml =================================================================== --- eprms-mq/pom.xml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,52 +1,0 @@ - - 4.0.0 - info.ajanovski.eprms - mq - 0.0.2-SNAPSHOT - - - - vangel.ajanovski - Vangel V. Ajanovski - https://ajanovski.info - Europe/Skopje - - Project Lead - Main Developer - - - - - - 17 - 17 - 17 - UTF-8 - UTF-8 - - - - - info.ajanovski.eprms - model - 0.0.10-SNAPSHOT - - - com.rabbitmq - amqp-client - 5.20.0 - - - javax.inject - javax.inject - 1 - - - org.glassfish - javax.json - 1.1.4 - - - Index: rms-mq/src/main/java/info/ajanovski/eprms/mq/MessagingService.java =================================================================== --- eprms-mq/src/main/java/info/ajanovski/eprms/mq/MessagingService.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,17 +1,0 @@ -package info.ajanovski.eprms.mq; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.model.entities.WorkEvaluation; - -public interface MessagingService { - - public void setupMQHost(String host); - - public void sendWorkEvaluationNotification(WorkEvaluation we); - - public void sendDatabaseNotification(Database newDb); - - public void sendRepositoryNotification(Repository newRp); - -} Index: rms-mq/src/main/java/info/ajanovski/eprms/mq/MessagingServiceImpl.java =================================================================== --- eprms-mq/src/main/java/info/ajanovski/eprms/mq/MessagingServiceImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,93 +1,0 @@ -package info.ajanovski.eprms.mq; - -import java.io.ByteArrayOutputStream; - -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; - -import org.slf4j.Logger; - -import com.rabbitmq.client.Channel; -import com.rabbitmq.client.Connection; -import com.rabbitmq.client.ConnectionFactory; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.model.entities.WorkEvaluation; - -public class MessagingServiceImpl implements MessagingService { - - @Inject - private Logger logger; - - private ConnectionFactory factory; - - private static String exchangeMain = "EPRMS"; - - public MessagingServiceImpl() { - factory = new ConnectionFactory(); - } - - public void setupMQHost(String host) { - factory.setHost(host); - } - - public JsonValue processValue(String value) { - return ((value == null) ? JsonValue.NULL : Json.createValue(value)); - } - - public void prepareAndSendMessage(JsonObject jsonObject, String tag, String destination) { - try (Connection connection = factory.newConnection(); Channel channel = connection.createChannel()) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - Json.createWriter(baos).writeObject(jsonObject); - channel.exchangeDeclare(destination, "topic", true); - channel.basicPublish(destination, tag, null, baos.toByteArray()); - } catch (Exception e) { - throw new RuntimeException(e.getMessage()); - } - } - - public void sendWorkEvaluationNotification(WorkEvaluation we) { - JsonObjectBuilder builder = Json.createObjectBuilder(); - builder.add("title", processValue(we.getTitle())); - builder.add("description", processValue(we.getDescription())); - builder.add("points", processValue(we.getPoints().toString())); - builder.add("action", "create"); - prepareAndSendMessage(builder.build(), "workeval.create", exchangeMain); - } - - @Override - public void sendDatabaseNotification(Database newDb) { - JsonObjectBuilder builder = Json.createObjectBuilder(); - builder.add("dbType", processValue(newDb.getType())); - builder.add("dbServer", processValue(newDb.getServer())); - builder.add("dbPort", processValue(newDb.getPort())); - builder.add("dbName", processValue(newDb.getName())); - builder.add("dbOwner", processValue(newDb.getOwner())); - builder.add("dbPass", processValue(newDb.getPassword())); - builder.add("dbTunServer", processValue(newDb.getTunnelServer())); - builder.add("dbTunUser", processValue(newDb.getTunnelUser())); - builder.add("dbTunPassword", processValue(newDb.getTunnelPassword())); - builder.add("action", "create"); - prepareAndSendMessage(builder.build(), "db.create", exchangeMain); - } - - @Override - public void sendRepositoryNotification(Repository newRp) { - JsonObjectBuilder builder = Json.createObjectBuilder(); - builder.add("rpName", processValue(newRp.getTitle())); - builder.add("rpType", processValue(newRp.getType())); - builder.add("rpUrl", processValue(newRp.getUrl())); - if (newRp.getPerson() != null) { - builder.add("rpOwner", processValue(newRp.getPerson().getUserName())); - } else { - builder.add("rpOwner", processValue(null)); - } - builder.add("action", "create"); - prepareAndSendMessage(builder.build(), "repo.create", exchangeMain); - } - -} Index: rms-net/.gitignore =================================================================== --- eprms-net/.gitignore (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,6 +1,0 @@ -/bin/ -/obj/ -/node_modules/ -/wwwroot/vendor.* -.* -!/.gitignore Index: rms-net/AssemblyInfo.cs =================================================================== --- eprms-net/AssemblyInfo.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,5 +1,0 @@ -using System.Reflection; -using Microsoft.Extensions.Localization; - -[assembly: ResourceLocation("Resources")] -[assembly: RootNamespace("info.ajanovski.eprms.net")] Index: rms-net/COPYING =================================================================== --- eprms-net/COPYING (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,674 +1,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. Index: rms-net/Controllers/LanguageController.cs =================================================================== --- eprms-net/Controllers/LanguageController.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,48 +1,0 @@ -using System; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Localization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Logging; - -namespace info.ajanovski.eprms.net.Controllers { - - public class LanguageController : Controller { - - private readonly IStringLocalizer _localizer; - private readonly ILogger logger; - - public LanguageController(IStringLocalizer localizer, - ILogger logger) { - logger.LogInformation("constructor"); - this._localizer = localizer; - this.logger = logger; - } - - [HttpGet("~/setculture")] - public IActionResult SetCulture(string id = "en") { - logger.LogInformation("set culture"); - string culture = id; - Response.Cookies.Append( - CookieRequestCultureProvider.DefaultCookieName, - CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture)), - new CookieOptions { Expires = DateTimeOffset.UtcNow.AddYears(1) } - ); - ViewData["Message"] = "Culture set to " + culture; - return View("Index"); - } - - [HttpPost("~/setlanguage")] - public IActionResult SetLanguage(string culture, string returnUrl) { - logger.LogInformation("set language"); - Response.Cookies.Append( - CookieRequestCultureProvider.DefaultCookieName, - CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture)), - new CookieOptions { Expires = DateTimeOffset.UtcNow.AddYears(1) } - ); - return RedirectToPage("/Index"); - } - - } - -} Index: rms-net/Controllers/LoginController.cs =================================================================== --- eprms-net/Controllers/LoginController.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,54 +1,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Localization; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; -using info.ajanovski.eprms.net.Extensions; -using Microsoft.AspNetCore.Authorization; - -namespace info.ajanovski.eprms.net.Controllers { - - public class LoginController : Controller { - - private readonly IStringLocalizer _localizer; - private readonly ILogger logger; - - public LoginController(IStringLocalizer localizer, - ILogger logger) { - this.logger = logger; - this._localizer = localizer; - } - - [HttpGet("~/login")] - public async Task SignIn() => View("Login", await HttpContext.GetExternalProvidersAsync()); - - [HttpPost("~/login")] - public async Task SignIn([FromForm] string provider) { - logger.LogInformation("entered login with provider: " + provider); - if (string.IsNullOrWhiteSpace(provider)) { - return BadRequest(); - } - if (!await HttpContext.IsProviderSupportedAsync(provider)) { - return BadRequest(); - } - return Challenge(new AuthenticationProperties { RedirectUri = "/" }, provider); - } - - [AllowAnonymous] - [Route("~/login")] - public async Task Login(string returnUrl) { - var props = new AuthenticationProperties { RedirectUri = returnUrl }; - await HttpContext.ChallengeAsync("CAS", props); - } - - [HttpGet("~/logout")] - [HttpPost("~/logout")] - public override SignOutResult SignOut() { - logger.LogInformation("entered logout"); - return SignOut(new AuthenticationProperties { RedirectUri = "/" }, - CookieAuthenticationDefaults.AuthenticationScheme); - } - } -} Index: rms-net/Controllers/UserController.cs =================================================================== --- eprms-net/Controllers/UserController.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,34 +1,0 @@ -using System.Security.Claims; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; -using Microsoft.AspNetCore.Localization; -using Microsoft.Extensions.Localization; - -namespace info.ajanovski.eprms.net.Controllers { - [Route("[controller]")] - public class UserController : Controller { - - private readonly IStringLocalizer _localizer; - private readonly ILogger logger; - - public UserController(IStringLocalizer localizer, - ILogger logger) - { - this._localizer = localizer; - this.logger = logger; - } - - [HttpGet] - public ActionResult Get() { - logger.LogInformation("get accessed"); - if (User.Identity.IsAuthenticated) { - string cId = User.FindFirst(c => c.Type == ClaimTypes.NameIdentifier)?.Value; - string cName = User.FindFirst(c => c.Type == ClaimTypes.Name)?.Value; - string cEmail = User.FindFirst(c => c.Type == ClaimTypes.Email)?.Value; - return Json(new { name = cName, id=cId, email=cEmail }); - } else { - return new EmptyResult(); - } - } - } -} Index: rms-net/Data/EPRMSNetDbContext.cs =================================================================== --- eprms-net/Data/EPRMSNetDbContext.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,439 +1,0 @@ -using Microsoft.EntityFrameworkCore; -using info.ajanovski.eprms.net.Models; - -#nullable disable - -namespace info.ajanovski.eprms.net.Data { - public partial class EPRMSNetDbContext : DbContext { - - public EPRMSNetDbContext() { - } - - public EPRMSNetDbContext(DbContextOptions options) - : base(options) { - } - - public virtual DbSet Activities { get; set; } - public virtual DbSet ActivityTypes { get; set; } - public virtual DbSet Courses { get; set; } - public virtual DbSet CourseProjects { get; set; } - public virtual DbSet Databases { get; set; } - public virtual DbSet People { get; set; } - public virtual DbSet PersonRoles { get; set; } - public virtual DbSet Projects { get; set; } - public virtual DbSet Repositories { get; set; } - public virtual DbSet Responsibilities { get; set; } - public virtual DbSet Roles { get; set; } - public virtual DbSet Teams { get; set; } - public virtual DbSet TeamMembers { get; set; } - public virtual DbSet WorkEvaluations { get; set; } - public virtual DbSet WorkReports { get; set; } - - protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.HasAnnotation("Relational:Collation", "en_US.UTF-8"); - - modelBuilder.Entity(entity => { - entity.ToTable("activity", "epm_main"); - - entity.Property(e => e.ActivityId).HasColumnName("activity_id"); - - entity.Property(e => e.ActivityTypeId).HasColumnName("activity_type_id"); - - entity.Property(e => e.Description) - .HasMaxLength(255) - .HasColumnName("description"); - - entity.Property(e => e.ParentActivityId).HasColumnName("parent_activity_id"); - - entity.Property(e => e.ProjectId).HasColumnName("project_id"); - - entity.Property(e => e.Title) - .HasMaxLength(255) - .HasColumnName("title"); - - entity.HasOne(d => d.ActivityType) - .WithMany(p => p.Activities) - .HasForeignKey(d => d.ActivityTypeId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_activity_activity_type"); - - entity.HasOne(d => d.ParentActivity) - .WithMany(p => p.InverseParentActivity) - .HasForeignKey(d => d.ParentActivityId) - .HasConstraintName("fk_activity_activity"); - - entity.HasOne(d => d.Project) - .WithMany(p => p.Activities) - .HasForeignKey(d => d.ProjectId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_activity_project"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("activity_type", "epm_main"); - - entity.Property(e => e.ActivityTypeId).HasColumnName("activity_type_id"); - - entity.Property(e => e.Description) - .HasMaxLength(255) - .HasColumnName("description"); - - entity.Property(e => e.Title) - .HasMaxLength(255) - .HasColumnName("title"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("course", "epm_main"); - - entity.HasIndex(e => e.Title, "uk_msgoex7rold2eqqf1cllhk02i") - .IsUnique(); - - entity.Property(e => e.CourseId).HasColumnName("course_id"); - - entity.Property(e => e.Title) - .IsRequired() - .HasMaxLength(255) - .HasColumnName("title"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("course_project", "epm_main"); - - entity.Property(e => e.CourseProjectId).HasColumnName("course_project_id"); - - entity.Property(e => e.CourseId).HasColumnName("course_id"); - - entity.Property(e => e.ProjectId).HasColumnName("project_id"); - - entity.HasOne(d => d.Course) - .WithMany(p => p.CourseProjects) - .HasForeignKey(d => d.CourseId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_course_project_course"); - - entity.HasOne(d => d.Project) - .WithMany(p => p.CourseProjects) - .HasForeignKey(d => d.ProjectId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_course_project_project"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("database", "epm_main"); - - entity.Property(e => e.DatabaseId).HasColumnName("database_id"); - - entity.Property(e => e.DateCreated).HasColumnName("date_created"); - - entity.Property(e => e.Name) - .HasMaxLength(255) - .HasColumnName("name"); - - entity.Property(e => e.Owner) - .HasMaxLength(255) - .HasColumnName("owner"); - - entity.Property(e => e.Password) - .HasMaxLength(255) - .HasColumnName("password"); - - entity.Property(e => e.Port) - .HasMaxLength(255) - .HasColumnName("port"); - - entity.Property(e => e.ProjectId).HasColumnName("project_id"); - - entity.Property(e => e.Server) - .HasMaxLength(255) - .HasColumnName("server"); - - entity.Property(e => e.TunnelPassword) - .HasMaxLength(255) - .HasColumnName("tunnel_password"); - - entity.Property(e => e.TunnelServer) - .HasMaxLength(255) - .HasColumnName("tunnel_server"); - - entity.Property(e => e.TunnelUser) - .HasMaxLength(255) - .HasColumnName("tunnel_user"); - - entity.Property(e => e.Type) - .HasMaxLength(255) - .HasColumnName("type"); - - entity.HasOne(d => d.Project) - .WithMany(p => p.Databases) - .HasForeignKey(d => d.ProjectId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_database_project"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("person", "epm_main"); - - entity.Property(e => e.PersonId).HasColumnName("person_id"); - - entity.Property(e => e.AuthString) - .HasMaxLength(255) - .HasColumnName("auth_string"); - - entity.Property(e => e.Email) - .HasMaxLength(255) - .HasColumnName("email"); - - entity.Property(e => e.FirstName) - .HasMaxLength(255) - .HasColumnName("first_name"); - - entity.Property(e => e.LastName) - .HasMaxLength(255) - .HasColumnName("last_name"); - - entity.Property(e => e.UserName) - .HasMaxLength(255) - .HasColumnName("user_name"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("person_role", "epm_util"); - - entity.Property(e => e.PersonRoleId).HasColumnName("person_role_id"); - - entity.Property(e => e.PersonId).HasColumnName("person_id"); - - entity.Property(e => e.RoleId).HasColumnName("role_id"); - - entity.HasOne(d => d.Person) - .WithMany(p => p.PersonRoles) - .HasForeignKey(d => d.PersonId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_person_role_person"); - - entity.HasOne(d => d.Role) - .WithMany(p => p.PersonRoles) - .HasForeignKey(d => d.RoleId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_person_role_role"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("project", "epm_main"); - - entity.Property(e => e.ProjectId).HasColumnName("project_id"); - - entity.Property(e => e.Description) - .HasMaxLength(255) - .HasColumnName("description"); - - entity.Property(e => e.FinishDate).HasColumnName("finish_date"); - - entity.Property(e => e.StartDate).HasColumnName("start_date"); - - entity.Property(e => e.Title) - .IsRequired() - .HasMaxLength(255) - .HasColumnName("title"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("repository", "epm_main"); - - entity.Property(e => e.RepositoryId).HasColumnName("repository_id"); - - entity.Property(e => e.DateCreated).HasColumnName("date_created"); - - entity.Property(e => e.PersonId).HasColumnName("person_id"); - - entity.Property(e => e.ProjectId).HasColumnName("project_id"); - - entity.Property(e => e.TeamId).HasColumnName("team_id"); - - entity.Property(e => e.Title) - .HasMaxLength(255) - .HasColumnName("title"); - - entity.Property(e => e.Type) - .HasMaxLength(255) - .HasColumnName("type"); - - entity.Property(e => e.Url) - .HasMaxLength(255) - .HasColumnName("url"); - - entity.HasOne(d => d.Person) - .WithMany(p => p.Repositories) - .HasForeignKey(d => d.PersonId) - .HasConstraintName("fk_repository_person"); - - entity.HasOne(d => d.Project) - .WithMany(p => p.Repositories) - .HasForeignKey(d => d.ProjectId) - .HasConstraintName("fk_repository_project"); - - entity.HasOne(d => d.Team) - .WithMany(p => p.Repositories) - .HasForeignKey(d => d.TeamId) - .HasConstraintName("fk_repository_team"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("responsibility", "epm_main"); - - entity.Property(e => e.ResponsibilityId).HasColumnName("responsibility_id"); - - entity.Property(e => e.ProjectId).HasColumnName("project_id"); - - entity.Property(e => e.TeamId).HasColumnName("team_id"); - - entity.HasOne(d => d.Project) - .WithMany(p => p.Responsibilities) - .HasForeignKey(d => d.ProjectId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_responsibility_project"); - - entity.HasOne(d => d.Team) - .WithMany(p => p.Responsibilities) - .HasForeignKey(d => d.TeamId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_responsibility_team"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("role", "epm_util"); - - entity.Property(e => e.RoleId).HasColumnName("role_id"); - - entity.Property(e => e.Name) - .HasMaxLength(255) - .HasColumnName("name"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("team", "epm_main"); - - entity.Property(e => e.TeamId).HasColumnName("team_id"); - - entity.Property(e => e.Name) - .HasMaxLength(255) - .HasColumnName("name"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("team_member", "epm_main"); - - entity.Property(e => e.TeamMemberId).HasColumnName("team_member_id"); - - entity.Property(e => e.PersonId).HasColumnName("person_id"); - - entity.Property(e => e.PositionNumber).HasColumnName("position_number"); - - entity.Property(e => e.Role) - .HasMaxLength(255) - .HasColumnName("role"); - - entity.Property(e => e.TeamId).HasColumnName("team_id"); - - entity.HasOne(d => d.Person) - .WithMany(p => p.TeamMembers) - .HasForeignKey(d => d.PersonId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_team_member_person"); - - entity.HasOne(d => d.Team) - .WithMany(p => p.TeamMembers) - .HasForeignKey(d => d.TeamId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_team_member_team"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("work_evaluation", "epm_main"); - - entity.Property(e => e.WorkEvaluationId).HasColumnName("work_evaluation_id"); - - entity.Property(e => e.Description) - .HasMaxLength(255) - .HasColumnName("description"); - - entity.Property(e => e.EvaluationDate).HasColumnName("evaluation_date"); - - entity.Property(e => e.PercentEvaluated).HasColumnName("percent_evaluated"); - - entity.Property(e => e.PersonId).HasColumnName("person_id"); - - entity.Property(e => e.Points).HasColumnName("points"); - - entity.Property(e => e.Title) - .HasMaxLength(255) - .HasColumnName("title"); - - entity.Property(e => e.WorkReportId).HasColumnName("work_report_id"); - - entity.HasOne(d => d.Person) - .WithMany(p => p.WorkEvaluations) - .HasForeignKey(d => d.PersonId) - .HasConstraintName("fk_work_evaluation_person"); - - entity.HasOne(d => d.WorkReport) - .WithMany(p => p.WorkEvaluations) - .HasForeignKey(d => d.WorkReportId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_work_evaluation_work_report"); - }); - - modelBuilder.Entity(entity => { - entity.ToTable("work_report", "epm_main"); - - entity.Property(e => e.WorkReportId).HasColumnName("work_report_id"); - - entity.Property(e => e.ActivityId).HasColumnName("activity_id"); - - entity.Property(e => e.ContinuationOfWorkReportId).HasColumnName("continuation_of_work_report_id"); - - entity.Property(e => e.Description) - .HasMaxLength(255) - .HasColumnName("description"); - - entity.Property(e => e.PercentReported).HasColumnName("percent_reported"); - - entity.Property(e => e.PersonId).HasColumnName("person_id"); - - entity.Property(e => e.SubmissionDate).HasColumnName("submission_date"); - - entity.Property(e => e.TeamId).HasColumnName("team_id"); - - entity.Property(e => e.Title) - .HasMaxLength(255) - .HasColumnName("title"); - - entity.HasOne(d => d.Activity) - .WithMany(p => p.WorkReports) - .HasForeignKey(d => d.ActivityId) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("fk_work_report_activity"); - - entity.HasOne(d => d.ContinuationOfWorkReport) - .WithMany(p => p.InverseContinuationOfWorkReport) - .HasForeignKey(d => d.ContinuationOfWorkReportId) - .HasConstraintName("fk_work_report_work_report"); - - entity.HasOne(d => d.Person) - .WithMany(p => p.WorkReports) - .HasForeignKey(d => d.PersonId) - .HasConstraintName("fk_work_report_person"); - - entity.HasOne(d => d.Team) - .WithMany(p => p.WorkReports) - .HasForeignKey(d => d.TeamId) - .HasConstraintName("fk_work_report_team"); - }); - - OnModelCreatingPartial(modelBuilder); - } - - partial void OnModelCreatingPartial(ModelBuilder modelBuilder); - } -} Index: rms-net/Data/PersonDao.cs =================================================================== --- eprms-net/Data/PersonDao.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,42 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; - -namespace info.ajanovski.eprms.net.Data { - - public interface PersonDao { - public List getAllPersons(); - - public Person getPersonByUsername(string username); - - public string getPersonFullName(Person person); - - public string getPersonFullNameWithId(Person person); - - public List getPersonByFilter(string filter); - - public List getPersonRolesForPerson(long personId); - - public Person getPersonByEmail(string email); - } -} Index: rms-net/Data/PersonDaoImpl.cs =================================================================== --- eprms-net/Data/PersonDaoImpl.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,75 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -using System; -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; -using Microsoft.Extensions.Logging; -using System.Linq; - -namespace info.ajanovski.eprms.net.Data { - public class PersonDaoImpl : PersonDao { - - private readonly EPRMSNetDbContext session; - - private readonly ILogger logger; - - public PersonDaoImpl(EPRMSNetDbContext session, ILogger logger) { - this.session = session; - this.logger = logger; - } - - public List getAllPersons() { - try { - return session.People.OrderBy(p => p.LastName).ToList(); - } catch (Exception e) { - logger.LogError("Exception occurs : {} on complete getAllPersons()." + e); - return null; - } - } - - public Person getPersonByUsername(string username) { - return session.People.Where(p => p.UserName == username).FirstOrDefault(); - } - - public List getPersonByFilter(string filter) { - // String f = "%" + filter.toLowerCase() + "%"; - // .createQuery("select p from Person p where (lower(concat(userName,firstName,lastName)) like :filter)"); - return session.People.Where(p => p.UserName.Contains(filter.ToLower())).OrderBy(p => p.LastName).ToList(); - } - - public List getPersonRolesForPerson(long personId) { - return session.PersonRoles.Where(pr => pr.Person.PersonId == personId).ToList(); - } - - public string getPersonFullName(Person person) { - return person.LastName + " " + person.FirstName; - } - - public string getPersonFullNameWithId(Person person) { - return person.LastName + " " + person.FirstName + " [" + person.UserName + "]"; - } - - public Person getPersonByEmail(string email) { - return session.People.Where(p => p.Email.Equals(email)).FirstOrDefault(); - } - } -} Index: rms-net/Data/ProjectDao.cs =================================================================== --- eprms-net/Data/ProjectDao.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,40 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; - -namespace info.ajanovski.eprms.net.Data { - - public interface ProjectDao { - - public List getAllProjectsOrderByTitle(); - - public List getProjectCourses(Project p); - - public List getCourseProjectsOrderByTitle(Course selectedCourse); - - public List getProjectByPerson(long? personId); - - public void addCoursesToProject(List inCourses, Project p); - - } -} Index: rms-net/Data/ProjectDaoImpl.cs =================================================================== --- eprms-net/Data/ProjectDaoImpl.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,110 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; -using Microsoft.Extensions.Logging; -using System.Linq; -using Microsoft.Data.SqlClient; -using Microsoft.EntityFrameworkCore; - -namespace info.ajanovski.eprms.net.Data { - public class ProjectDaoImpl : ProjectDao { - - - private readonly EPRMSNetDbContext session; - - private readonly ILogger logger; - - public ProjectDaoImpl(EPRMSNetDbContext session, ILogger logger) { - this.session = session; - this.logger = logger; - } - - - public List getAllProjectsOrderByTitle() { - return session.Projects.OrderBy(p => p.Title).ToList(); - } - - public List getProjectCourses(Project p) { - if (p != null) { - return session.CourseProjects.Where(cp => cp.Project.ProjectId == p.ProjectId).ToList(); - } else { - return null; - } - } - - public List getCourseProjectsOrderByTitle(Course selectedCourse) { - if (selectedCourse != null) { - return session.Projects.FromSqlRaw(@" - select p - from Project p - join p.courseProjects cp - join cp.course c - where c.courseId=@courseId - order by p.title - ", new SqlParameter("@courseId", selectedCourse.CourseId)).ToList(); - } else { - return null; - } - } - - public List getProjectByPerson(long? personId) { - if (personId != null) { - return session.Projects.FromSqlRaw(@" - select p - from Project p - join p.responsibilities r - join r.team t - join t.teamMembers tm - join tm.person person - where person.personId=@personId - order by p.title - ", new SqlParameter("@personId", personId)).ToList(); - } else { - return null; - } - } - - public void addCoursesToProject(List inCourses, Project p) { - List projectCourses = getProjectCourses(p); - //List coursesFromProjectCourses = projectCourses.stream().map(cp -> cp.getCourse()); - List coursesFromProjectCourses = projectCourses.Select(cp => cp.Course).ToList(); - foreach (Course c in inCourses) { - if (!coursesFromProjectCourses.Contains(c)) { - CourseProject cp = new CourseProject(); - cp.Course = c; - cp.Project = p; - session.CourseProjects.Add(cp); - session.SaveChanges(); - } - } - foreach (CourseProject cp in projectCourses) { - if (!inCourses.Contains(cp.Course)) { - session.CourseProjects.Remove(cp); - session.SaveChanges(); - } - } - } - - - } -} Index: rms-net/Data/ResourceDao.cs =================================================================== --- eprms-net/Data/ResourceDao.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,38 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; - -namespace info.ajanovski.eprms.net.Data { - - public interface ResourceDao { - - public List getRepositoriesByPerson(long personId); - - public List getRepositoriesByTeam(long personId); - - public List getRepositoriesByProject(long personId); - - public List getDatabasesByProject(long personId); - - } -} Index: rms-net/Data/ResourceDaoImpl.cs =================================================================== --- eprms-net/Data/ResourceDaoImpl.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,98 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; -using Microsoft.Extensions.Logging; -using System; -using System.Linq; -using Microsoft.Data.SqlClient; -using Microsoft.EntityFrameworkCore; -using Npgsql; - -namespace info.ajanovski.eprms.net.Data { - - public class ResourceDaoImpl : ResourceDao { - - - private readonly EPRMSNetDbContext session; - - private readonly ILogger logger; - - public ResourceDaoImpl(EPRMSNetDbContext session, ILogger logger) { - this.session = session; - this.logger = logger; - } - - public List getRepositoriesByPerson(long personId) { - try { - return session.Repositories.Where(r => r.Person.PersonId == personId).ToList(); - } catch (Exception e) { - logger.LogError(e.ToString()); - return new List(); - } - } - - public List getRepositoriesByTeam(long personId) { - try { - return session.Repositories.FromSqlRaw(@" - select r from Repository r join r.team t, TeamMember tm join tm.person p - where tm.team.teamId=t.teamId and r.person.personId=:personId - ", new NpgsqlParameter("@personId", personId)).ToList(); - } catch (Exception e) { - logger.LogError(e.ToString()); - return new List(); - } - } - - public List getRepositoriesByProject(long personId) { - try { - return session.Repositories.FromSqlRaw(@" - select r from Repository r join r.project pr, - Responsibility res join res.team t, TeamMember tm join tm.person p - where pr.projectId=res.project.projectId and tm.team.teamId=t.teamId and - tm.person.personId=@personId - ", new NpgsqlParameter("@personId", personId)).ToList(); - } catch (Exception e) { - logger.LogError(e.ToString()); - return new List(); - } - } - - public List getDatabasesByProject(long personId) { - try { - return session.Databases.FromSqlRaw(@" - select d.* from epm_main.Database d - join epm_main.project pr on d.project_id=pr.project_id - join epm_main.Responsibility res on res.project_id=pr.project_id - join epm_main.team t on t.team_id=res.team_id - join epm_main.Team_Member tm on tm.team_id=t.team_id - join epm_main.person p on tm.person_id=p.person_id - where p.person_Id=@personId - ", new NpgsqlParameter("@personId", personId)).ToList(); - } catch (Exception e) { - logger.LogError(e.ToString()); - return null; - } - - } - } -} Index: rms-net/Extensions/ClaimTransformer.cs =================================================================== --- eprms-net/Extensions/ClaimTransformer.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,34 +1,0 @@ -using System.Security.Claims; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authentication; -using Microsoft.Extensions.Logging; -using info.ajanovski.eprms.net.Data; -using System.Linq; - -public class ClaimsTransformer : IClaimsTransformation { - - private readonly EPRMSNetDbContext context; - private readonly ILogger logger; - - public ClaimsTransformer(EPRMSNetDbContext context, - ILogger logger) { - this.logger = logger; - this.context = context; - } - - public Task TransformAsync(ClaimsPrincipal principal) { - var ci = (ClaimsIdentity)principal.Identity; - logger.LogInformation("Principal identity name: "+ci.Name); - var user = context.People.Where(p => p.UserName.Equals(ci.Name)).FirstOrDefault(); - if (user!=null) { - foreach (var r in user.PersonRoles) { - var c = new Claim(ci.RoleClaimType, r.Role.Name); - ci.AddClaim(c); - } - return Task.FromResult(principal); - } else { - logger.LogError("Can not find user"); - return null; - } - } -} Index: rms-net/Extensions/HttpContextExtensions.cs =================================================================== --- eprms-net/Extensions/HttpContextExtensions.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,33 +1,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; - -namespace info.ajanovski.eprms.net.Extensions { - - public static class HttpContextExtensions { - public static async Task GetExternalProvidersAsync(this HttpContext context) { - if (context == null) { - throw new ArgumentNullException(nameof(context)); - } - - var schemes = context.RequestServices.GetRequiredService(); - - return (from scheme in await schemes.GetAllSchemesAsync() - where !string.IsNullOrEmpty(scheme.DisplayName) - select scheme).ToArray(); - } - - public static async Task IsProviderSupportedAsync(this HttpContext context, string provider) { - if (context == null) { - throw new ArgumentNullException(nameof(context)); - } - - return (from scheme in await context.GetExternalProvidersAsync() - where string.Equals(scheme.Name, provider, StringComparison.OrdinalIgnoreCase) - select scheme).Any(); - } - } -} Index: rms-net/INSTALL.md =================================================================== --- eprms-net/INSTALL.md (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,140 +1,0 @@ -# eprms-net build from source instructions - -## Testing Database and Authentication Server - -For testing purposes, you can use Docker/Podman to run all the needed services in containers. - -### Database - -The system is developed and tested against a PostgreSQL 12 started as a Docker/Podman container, but in general it is database agnostic and uses only Hibernate APIs, so you can switch to another database. - -To start a containerized PostgreSQL instance that stores all it's data in a local folder follow the instructions to create the folder and map the container to use that folder: - - $ mkdir DatabaseFolder - $ podman run \ - --cgroup-manager=cgroupfs \ - -d \ - -e POSTGRES_USER=postgres \ - -e POSTGRES_PASSWORD=CHANGE_THIS_PASSWORD \ - --network "host" \ - --privileged \ - --mount type=bind,source=./DatabaseFolder,target=/var/lib/postgresql/data \ - --name postgres_for_eprms \ - postgres:12 - -This will create a PostgreSQL server instance container, that stores it's data in the DatabaseFolder. The data will survive container restarts or removals. By default, the DB instance listens on port 5432. The DatabaseFolder privileges will be changed so that it functions properly under the container, and will no longer be accessible to you directly. - -Check that the container is running. - - podman ps - -Then connect to the container console, to create the initial empty database. - - $ podman exec -i -t postgres_for_eprms bash - -... type the same password that you typed in the starting script above, you will get a root user prompt, from which you can connect to the postgres instance in order to create the database. - - # psql -h localhost -U postgres -W postgres - -Create a database user owner for the database, then the database and two needed schemas, owned by the database owner. - - postgres=# - create user eprms_owner encrypted password 'DB_PASSWORD_CHANGE_IT'; - create database eprms owner eprms_owner; - create schema epm_main; - create schema epm_util; - alter schema epm_main owner to eprms_owner; - alter schema epm_util owner to eprms_owner; - -### Web Authentication Server - -For testing purposes it is recommended to use Apache Tomcat as a Java web application server, and you can also run it in a separate container. - - $ mkdir WebAppsFolder - $ podman run \ - --name tomcat-cas \ - --privileged \ - --mount type=bind,source=./webapps,target=/usr/local/tomcat/webapps \ - -p 8080:8080 \ - -d \ - tomcat:9.0 - -The Tomcat container should be running at this moment, check: - - podman ps - -You can use the WebAppsFolder to place the packaged web application archives (WAR files). - -The application uses Apereo CAS for authentication. Copy the provided *cas.war* to the *WebAppsFolder* to initiate a demo instance of Apereo CAS, where all usernames are valid and anyone can log in provided the password that is entered is the same as the username. - -Check if CAS is working: - - http://localhost:8080/cas - - - -## Build the web application - -The application will be built from source using dotnet. -You will also need node.js and npm, to get the needed dependencies (Bootstrap, JQuery, ...) - -### .Net profile configuration - -Some configuration parameters can be confidential or can differ from one envirement to another, so we are not providing them with the source. Instead a maven user profile should be configured outside the project, that will be used during the building of the project. Follow the instructions. - -Configure settings for the connection string to the created PostgreSQL database in the container. These settings are used to configure the link to the database needed in the following steps, and also needed when starting the application. - - dotnet user-secrets set ConnectionStrings:EPRMSDB "Host=127.0.0.1;Port=5432;Database=epm;Username=epm_owner;Password=lozinka" - -Configure settings for the CAS base url: - - dotnet user-secrets set CAS:CasBaseUrl "http://localhost:8080/cas" - -The application optionally uses OAuth2 and is prepared to use GitHub or ORCID as authorization providers. The application needs to be registered at GitHub and/or ORCID to be able to use them as OAuth2 providers and the received registration CliendID and ClientSecret should be configured here, before the build. In addition, the source can be changed to enable other providers. - - dotnet user-secrets set GitHub:ClientId "____" - dotnet user-secrets set GitHub:ClientSecret "____" - dotnet user-secrets set ORCID:ClientId "____" - dotnet user-secrets set ORCID:ClientSecret "____" - - - -### Build the source and prepare the runtime - -Run the following commands from the project source folder - -To check all css/js dependencies: - - npm install - -To check all .Net dependencies: - - dotnet restore - -To start the web application: - - dotnet watch run - - The application will be running at: http://localhost:8081 - -To install the dotnet-ef tool for reverse engineering the database model - - dotnet tool install --global dotnet-ef - -The following commands reverse engineer the Database into a dbcontext class and the mapping Model classes - - dotnet-ef dbcontext scaffold Name=ConnectionStrings:EPRMSDB Npgsql.EntityFrameworkCore.PostgreSQL -f -v -c EPRMSNetDbContext --context-dir Data/ -o Models/ - -In case you need to install some additional libraried, run this: - - dotnet add package library.name - -Optionally, you can install the ASP.NET code generator in case you need some ready made source examples - - dotnet tool install --global dotnet-aspnet-codegenerator - -Optionally, create EF ready razor pages via the code generator - - dotnet aspnet-codegenerator razorpage -m Repository -dc EPRMSNetDbContext -udl -outDir Pages/RepositoryPage --referenceScriptLibraries - -Finished! Index: rms-net/Models/Activity.cs =================================================================== --- eprms-net/Models/Activity.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,29 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class Activity - { - public Activity() - { - InverseParentActivity = new HashSet(); - WorkReports = new HashSet(); - } - - public long ActivityId { get; set; } - public string Description { get; set; } - public string Title { get; set; } - public long ActivityTypeId { get; set; } - public long? ParentActivityId { get; set; } - public long ProjectId { get; set; } - - public virtual ActivityType ActivityType { get; set; } - public virtual Activity ParentActivity { get; set; } - public virtual Project Project { get; set; } - public virtual ICollection InverseParentActivity { get; set; } - public virtual ICollection WorkReports { get; set; } - } -} Index: rms-net/Models/ActivityType.cs =================================================================== --- eprms-net/Models/ActivityType.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,21 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class ActivityType - { - public ActivityType() - { - Activities = new HashSet(); - } - - public long ActivityTypeId { get; set; } - public string Description { get; set; } - public string Title { get; set; } - - public virtual ICollection Activities { get; set; } - } -} Index: rms-net/Models/Course.cs =================================================================== --- eprms-net/Models/Course.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,20 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class Course - { - public Course() - { - CourseProjects = new HashSet(); - } - - public long CourseId { get; set; } - public string Title { get; set; } - - public virtual ICollection CourseProjects { get; set; } - } -} Index: rms-net/Models/CourseProject.cs =================================================================== --- eprms-net/Models/CourseProject.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,17 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class CourseProject - { - public long CourseProjectId { get; set; } - public long CourseId { get; set; } - public long ProjectId { get; set; } - - public virtual Course Course { get; set; } - public virtual Project Project { get; set; } - } -} Index: rms-net/Models/Database.cs =================================================================== --- eprms-net/Models/Database.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,25 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class Database - { - public long DatabaseId { get; set; } - public string Name { get; set; } - public string Owner { get; set; } - public string Password { get; set; } - public string Port { get; set; } - public string Server { get; set; } - public string TunnelPassword { get; set; } - public string TunnelServer { get; set; } - public string TunnelUser { get; set; } - public string Type { get; set; } - public long ProjectId { get; set; } - public DateTime? DateCreated { get; set; } - - public virtual Project Project { get; set; } - } -} Index: rms-net/Models/Person.cs =================================================================== --- eprms-net/Models/Person.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,32 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class Person - { - public Person() - { - PersonRoles = new HashSet(); - Repositories = new HashSet(); - TeamMembers = new HashSet(); - WorkEvaluations = new HashSet(); - WorkReports = new HashSet(); - } - - public long PersonId { get; set; } - public string Email { get; set; } - public string FirstName { get; set; } - public string LastName { get; set; } - public string UserName { get; set; } - public string AuthString { get; set; } - - public virtual ICollection PersonRoles { get; set; } - public virtual ICollection Repositories { get; set; } - public virtual ICollection TeamMembers { get; set; } - public virtual ICollection WorkEvaluations { get; set; } - public virtual ICollection WorkReports { get; set; } - } -} Index: rms-net/Models/PersonRole.cs =================================================================== --- eprms-net/Models/PersonRole.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,17 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class PersonRole - { - public long PersonRoleId { get; set; } - public long PersonId { get; set; } - public long RoleId { get; set; } - - public virtual Person Person { get; set; } - public virtual Role Role { get; set; } - } -} Index: rms-net/Models/Project.cs =================================================================== --- eprms-net/Models/Project.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,31 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class Project - { - public Project() - { - Activities = new HashSet(); - CourseProjects = new HashSet(); - Databases = new HashSet(); - Repositories = new HashSet(); - Responsibilities = new HashSet(); - } - - public long ProjectId { get; set; } - public string Description { get; set; } - public string Title { get; set; } - public DateTime? FinishDate { get; set; } - public DateTime? StartDate { get; set; } - - public virtual ICollection Activities { get; set; } - public virtual ICollection CourseProjects { get; set; } - public virtual ICollection Databases { get; set; } - public virtual ICollection Repositories { get; set; } - public virtual ICollection Responsibilities { get; set; } - } -} Index: rms-net/Models/Repository.cs =================================================================== --- eprms-net/Models/Repository.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,23 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class Repository - { - public long RepositoryId { get; set; } - public string Title { get; set; } - public string Url { get; set; } - public long? PersonId { get; set; } - public long? ProjectId { get; set; } - public long? TeamId { get; set; } - public DateTime? DateCreated { get; set; } - public string Type { get; set; } - - public virtual Person Person { get; set; } - public virtual Project Project { get; set; } - public virtual Team Team { get; set; } - } -} Index: rms-net/Models/Responsibility.cs =================================================================== --- eprms-net/Models/Responsibility.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,17 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class Responsibility - { - public long ResponsibilityId { get; set; } - public long ProjectId { get; set; } - public long TeamId { get; set; } - - public virtual Project Project { get; set; } - public virtual Team Team { get; set; } - } -} Index: rms-net/Models/Role.cs =================================================================== --- eprms-net/Models/Role.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,20 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class Role - { - public Role() - { - PersonRoles = new HashSet(); - } - - public long RoleId { get; set; } - public string Name { get; set; } - - public virtual ICollection PersonRoles { get; set; } - } -} Index: rms-net/Models/Team.cs =================================================================== --- eprms-net/Models/Team.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,26 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class Team - { - public Team() - { - Repositories = new HashSet(); - Responsibilities = new HashSet(); - TeamMembers = new HashSet(); - WorkReports = new HashSet(); - } - - public long TeamId { get; set; } - public string Name { get; set; } - - public virtual ICollection Repositories { get; set; } - public virtual ICollection Responsibilities { get; set; } - public virtual ICollection TeamMembers { get; set; } - public virtual ICollection WorkReports { get; set; } - } -} Index: rms-net/Models/TeamMember.cs =================================================================== --- eprms-net/Models/TeamMember.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,19 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class TeamMember - { - public long TeamMemberId { get; set; } - public long? PositionNumber { get; set; } - public string Role { get; set; } - public long PersonId { get; set; } - public long TeamId { get; set; } - - public virtual Person Person { get; set; } - public virtual Team Team { get; set; } - } -} Index: rms-net/Models/WorkEvaluation.cs =================================================================== --- eprms-net/Models/WorkEvaluation.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,22 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class WorkEvaluation - { - public long WorkEvaluationId { get; set; } - public string Description { get; set; } - public float? PercentEvaluated { get; set; } - public float? Points { get; set; } - public string Title { get; set; } - public long WorkReportId { get; set; } - public DateTime? EvaluationDate { get; set; } - public long? PersonId { get; set; } - - public virtual Person Person { get; set; } - public virtual WorkReport WorkReport { get; set; } - } -} Index: rms-net/Models/WorkReport.cs =================================================================== --- eprms-net/Models/WorkReport.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,33 +1,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace info.ajanovski.eprms.net.Models -{ - public partial class WorkReport - { - public WorkReport() - { - InverseContinuationOfWorkReport = new HashSet(); - WorkEvaluations = new HashSet(); - } - - public long WorkReportId { get; set; } - public string Description { get; set; } - public float? PercentReported { get; set; } - public string Title { get; set; } - public long ActivityId { get; set; } - public long? ContinuationOfWorkReportId { get; set; } - public long? PersonId { get; set; } - public long? TeamId { get; set; } - public DateTime? SubmissionDate { get; set; } - - public virtual Activity Activity { get; set; } - public virtual WorkReport ContinuationOfWorkReport { get; set; } - public virtual Person Person { get; set; } - public virtual Team Team { get; set; } - public virtual ICollection InverseContinuationOfWorkReport { get; set; } - public virtual ICollection WorkEvaluations { get; set; } - } -} Index: rms-net/Pages/Error.cshtml =================================================================== --- eprms-net/Pages/Error.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,27 +1,0 @@ -@page -@namespace info.ajanovski.eprms.net.Pages -@model ErrorModel -@{ - ViewData["Title"] = "Error"; -} - -

Error.

-

An error occurred while processing your request.

- -@if (Model.ShowRequestId) -{ -

- Request ID: @Model.RequestId -

-} - -

Development Mode

-

- Swapping to the Development environment displays detailed information about the error that occurred. -

-

- The Development environment shouldn't be enabled for deployed applications. - It can result in displaying sensitive information from exceptions to end users. - For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development - and restarting the app. -

Index: rms-net/Pages/Error.cshtml.cs =================================================================== --- eprms-net/Pages/Error.cshtml.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,44 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -using System.Diagnostics; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.Extensions.Logging; - -namespace info.ajanovski.eprms.net.Pages { - [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] - public class ErrorModel : PageModel { - public string RequestId { get; set; } - - public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - - private readonly ILogger _logger; - - public ErrorModel(ILogger logger) { - _logger = logger; - } - - public void OnGet() { - RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; - } - } -} Index: rms-net/Pages/Index.cshtml =================================================================== --- eprms-net/Pages/Index.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,31 +1,0 @@ -@page -@using Microsoft.AspNetCore.Mvc.Localization -@inject IHtmlLocalizer Localizer -@namespace info.ajanovski.eprms.net.Pages -@model IndexModel -@{ - ViewData["Title"] = Localizer["greeting"]; -} - -
- -
- -
-
-
- @Localizer["greeting"] -
-
-
- -
-

@Localizer["greeting-title"]

-

@Localizer["greeting"]

- @Localizer["greeting-url"] -
- -
- -
Index: rms-net/Pages/Index.cshtml.cs =================================================================== --- eprms-net/Pages/Index.cshtml.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,52 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Logging; - -namespace info.ajanovski.eprms.net.Pages { - - [AllowAnonymous] - public class IndexModel : PageModel { - - private readonly IStringLocalizer _localizer; - private readonly ILogger logger; - - public IndexModel(IStringLocalizer localizer, - ILogger logger) { - this.logger = logger; - this._localizer = localizer; - } - - public async Task OnGetAsync() { - logger.LogInformation("get async index"); - await Task.Run(() => { - }); - return Page(); - } - - } - -} Index: rms-net/Pages/MyDatabases.cshtml =================================================================== --- eprms-net/Pages/MyDatabases.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,53 +1,0 @@ -@page -@using Microsoft.AspNetCore.Mvc.Localization -@inject IHtmlLocalizer Localizer -@namespace info.ajanovski.eprms.net.Pages -@model MyDatabasesModel -@{ - ViewData["Title"] = Localizer["greeting"]; -} - -

@Localizer["MyDatabases-pagelink"]

- -@foreach (var database in Model.projectDatabases) { -
-
-
-

Project: @database.Project.Title

-

Database: @database.Name

-
-

Please use the following parameters to connect to this - database

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SSH tunnel server:@database.TunnelServer
SSH tunnel user:@database.TunnelUser
SSH tunnel password:@database.TunnelPassword
Database Server:@database.Server
Database Name:@database.Name
Database User:@database.Owner
Database Password:@database.Password
-
-
-} Index: rms-net/Pages/MyDatabases.cshtml.cs =================================================================== --- eprms-net/Pages/MyDatabases.cshtml.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,83 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Security.Claims; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Logging; -using info.ajanovski.eprms.net.Models; -using info.ajanovski.eprms.net.Services; - -namespace info.ajanovski.eprms.net.Pages { - - [Authorize] - public class MyDatabasesModel : PageModel { - - private readonly IStringLocalizer _localizer; - private readonly ILogger logger; - private ResourceManager resourceManager; - private PersonManager personManager; - - public MyDatabasesModel(IStringLocalizer localizer, - ILogger logger, ResourceManager resourceManager, - PersonManager personManager) { - this.logger = logger; - this._localizer = localizer; - this.resourceManager = resourceManager; - this.personManager = personManager; - } - - public Person getLoggedInPerson() { - if (User.Identity.IsAuthenticated) { - string cName = User.FindFirst(c => c.Type == ClaimTypes.Name)?.Value; - return personManager.getPersonByUsername(cName); - } else { - return null; - } - } - - public List projectDatabases { get; set; } - - public void updateProjectDatabases(long personId) { - projectDatabases = resourceManager.getActiveDatabasesByProject(personId); - } - - public async Task OnGetAsync() { - logger.LogInformation("get async index"); - await Task.Run(() => { - if (getLoggedInPerson()!=null) { - updateProjectDatabases( - getLoggedInPerson().PersonId - ); - } else { - logger.LogError("USER IS NOT LOGGED IN"); - } - }); - return Page(); - } - - } - -} Index: rms-net/Pages/MyProfile.cshtml =================================================================== --- eprms-net/Pages/MyProfile.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,33 +1,0 @@ -@page -@using Microsoft.AspNetCore.Mvc.Localization -@inject IHtmlLocalizer Localizer -@namespace info.ajanovski.eprms.net.Pages -@{ - ViewData["Title"] = Localizer["greeting"]; -} - - -
- -
- -
-
-
- -
-
-
- -
-

[[#{greeting-title}]] [[${userInfo.userName}]]

-

- -
- -
- -
- Index: rms-net/Pages/MyRepositories.cshtml =================================================================== --- eprms-net/Pages/MyRepositories.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,36 +1,0 @@ -@page -@using Microsoft.AspNetCore.Mvc.Localization -@inject IHtmlLocalizer Localizer -@namespace info.ajanovski.eprms.net.Pages -@{ - ViewData["Title"] = Localizer["greeting"]; -} - -

@Localizer["MyRepositories-pagelink"]

- -

[[#{Personal-label}]]

- - - - - - -
[[${repository.title}]][[${repository.url}]][[${repository.dateCreated}]]
- -

@Localizer["project-label"]

- - - - - - -
[[${repository.title}]][[${repository.url}]][[${repository.dateCreated}]]
- -

@Localizer["team-label"]

- - - - - - -
[[${repository.title}]][[${repository.url}]][[${repository.dateCreated}]]
Index: rms-net/Pages/MyRepositoryAuth.cshtml =================================================================== --- eprms-net/Pages/MyRepositoryAuth.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,29 +1,0 @@ -@page -@using Microsoft.AspNetCore.Mvc.Localization -@inject IHtmlLocalizer Localizer -@namespace info.ajanovski.eprms.net.Pages -@{ - ViewData["Title"] = Localizer["greeting"]; -} - -

Repository Authentication

- -

Please enter your new password for repository authentication.

- -
- -
- -
- -
- -
- - - -
- Index: rms-net/Pages/Shared/Login.cshtml =================================================================== --- eprms-net/Pages/Shared/Login.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,23 +1,0 @@ -@using Microsoft.AspNetCore.Authentication -@model AuthenticationScheme[] -@{ - ViewData["Title"] = "Login"; -} - -
-
-

@ViewData["Title"]

-

Sign in using one of these external providers:

- -

- @foreach (var scheme in Model.OrderBy(p => p.DisplayName)) - { -

- - - -
- } -

-
-
Index: rms-net/Pages/Shared/_Layout.cshtml =================================================================== --- eprms-net/Pages/Shared/_Layout.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,149 +1,0 @@ -@using Microsoft.AspNetCore.Mvc.Localization -@using Microsoft.AspNetCore.Http -@inject IHtmlLocalizer Localizer - - - - - - - - @ViewData["Title"] - - - - - - - - - - - - - - - - - -
-
-
-

-

-
- - -
@RenderBody()
- - -
- -
- - - @RenderSection("Scripts", required: false) - - - - - - - Index: rms-net/Pages/Shared/_SelectLanguagePartial.cshtml =================================================================== --- eprms-net/Pages/Shared/_SelectLanguagePartial.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,25 +1,0 @@ -@using Microsoft.AspNetCore.Builder -@using Microsoft.AspNetCore.Http.Features -@using Microsoft.AspNetCore.Localization -@using Microsoft.AspNetCore.Mvc.Localization -@using Microsoft.Extensions.Options - -@inject IOptions LocOptions -@inject IHtmlLocalizer Localizer - -@{ - var requestCulture = Context.Features.Get(); - var cultureItems = LocOptions.Value.SupportedUICultures - .Select(c => new SelectListItem { Value = c.Name, Text = c.DisplayName }) - .ToList(); - var returnUrl = string.IsNullOrEmpty(Context.Request.Path) ? "~/" : $"~{Context.Request.Path.Value}"; -} - -
-
- -
-
Index: rms-net/Pages/Shared/_ValidationScriptsPartial.cshtml =================================================================== --- eprms-net/Pages/Shared/_ValidationScriptsPartial.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,2 +1,0 @@ - - Index: rms-net/Pages/_ViewImports.cshtml =================================================================== --- eprms-net/Pages/_ViewImports.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,5 +1,0 @@ -@using info.ajanovski.eprms.net -@using info.ajanovski.eprms.net.Models -@using Microsoft.AspNetCore.Identity -@using Microsoft.Extensions.Localization; -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers Index: rms-net/Pages/_ViewStart.cshtml =================================================================== --- eprms-net/Pages/_ViewStart.cshtml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,3 +1,0 @@ -@{ - Layout = "_Layout"; -} Index: rms-net/Program.cs =================================================================== --- eprms-net/Program.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,22 +1,0 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using info.ajanovski.eprms.net; - -namespace net { - public class Program { - public static void Main(string[] args) { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureLogging(logging => { - logging.ClearProviders(); - logging.AddConsole(); - }) - .ConfigureWebHostDefaults(webBuilder => { - webBuilder.UseStartup(); - }); - } -} Index: rms-net/Properties/launchSettings.json =================================================================== --- eprms-net/Properties/launchSettings.json (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,27 +1,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:57112", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "eprms-net": { - "commandName": "Project", - "launchBrowser": true, - "applicationUrl": "http://localhost:8081", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} Index: rms-net/README.md =================================================================== --- eprms-net/README.md (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,16 +1,0 @@ -# EPRMS Project - -The EPRMS - Educational Project and Resources Management System is a management information system used to organize the work on student projects, their source repositories and other related resources. - -This is an open-source system, initially developed to demonstrate web application development for a course on Internet Technologies. - -The project is still under construction. - -Project lead: [Vangel V. Ajanovski](https://ajanovski.info) - -## eprms-net - -The third implementation of the EPRMS was developed using the ASP.Net Core web application framework. - -Partially working instance can be compiled from source for testing purposes. - Index: rms-net/Resources/SharedResource.en.resx =================================================================== --- eprms-net/Resources/SharedResource.en.resx (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,163 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - The EPRMS - Educational Project and Resources Management System is a management information system covering student projects, source repositories and other related resources. This is an open-source system, initially developed as a demonstrational web application for a course on Internet Technologies. - - Edit - Login - Имајте предвид дека CAS системот служи за да ја задржи вашата најава сѐ додека имате потреба од користење на различните факултетски сервиси. Одјавата од оваа апликација, не ве одјави од CAS системот. Така со влез во било кој факултетски сервис автоматски ќе бидете најавени во истиот. - Vangel V. Ajanovski - Password - Vangel V. Ajanovski - Manage Repositories - Language - My Databases - Одјавени сте од оваа апликација. Сите ваши сесиски податоци се избришани од серверот. Можете да продолжите со користење на останатите сервиси. - The EPRMS - Educational Project and Resources Management System is a management information system covering student projects, source repositories and other related resources. This is an open-source system, initially developed as a demonstrational web application for a course on Internet Technologies. - EPRMS - Remove - Application Logout - 2021 - Manage Databases - Целосна одјава од CAS - Доколку сакате ЦЕЛОСНО да се одјавите од CAS системот и од сите факултетски сервиси кои го користат кликнете на копчето: - https://ajanovski.info - Create - Admin - Personal - My Repositories - Logout - Repositories - Projects - На крај, препорачано е да го затворите вашиот интернет прелистувач, сите негови прозорци и сите негови таб листови. - Repository - Repository Auth - Home - Project - CAS Logout - Team - Team member - Add - Welcome - Database - Confirm Password - Teams - https://github.com/ajanovski/eprms - Index: rms-net/Resources/SharedResource.en.txt =================================================================== --- eprms-net/Resources/SharedResource.en.txt (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,50 +1,0 @@ -# This is where global application properties go. -# You can also have individual message catalogs for each page and each -# component that override these defaults. -# The name of this file is based on the element in web. - -index-pagelink=Home -myprojectreports-pagelink=My Project Reports -myrepositories-pagelink=My Repositories -myrepositoryauth-pagelink=Repository Auth -mydatabases-pagelink=My Databases -admin/ManageTeams-pagelink=Teams -admin/ManageProjects-pagelink=Projects -admin/ManageRepositories-pagelink=Manage Repositories -admin/ManageDatabases-pagelink=Manage Databases -admin/ProjectActivities-pagelink=Manage Project Activities -admin/OverallCourseReport-pagelink=Overall Course Report - -admin-label=Admin -app-title-short=EPRMS -activity-label=Activity -lang-label=Language -team-label=Team -teammember-label=Team member -project-label=Project -repository-label=Repository -database-label=Database -new-label=Create -add-label=Add -remove-label=Remove -personal-label=Personal -repositories-label=Repositories -edit-label=Edit -newActivity-label=New Activity -activities-label=Activities -copy-label=Copy -paste-label=Paste -reset-label=Reset -report-label=Report -description-label=Description -percentReported-label=Reported % of total work in this activity -evaluation-label=Evaluation -percentEvaluated-label=Evaluated % of total work in this activity -points-label=Points - -Logout-label=Logout -logout-page=Logout - -copyrightYear=2021 -copyrightHolder=Vangel V. Ajanovski -back-label=Back Index: rms-net/Resources/SharedResource.mk.resx =================================================================== --- eprms-net/Resources/SharedResource.mk.resx (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,169 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Измени - Управување со проектни активности - Вангел В. Ајановски - Ресет - ЕПМ - Извештај - Копирај - Управување со репозиториуми - Language - Улога - Мои Извештаи - Управување со Тимови - Лични - Име - Мои бази на податоци - Член на тимот - 2021 - Управување со бази на податоци - Управување со Проекти - Опис - Проект - Мои репозиториуми - Корисничко име - Админ - Бр. активност - Известуваме дека се изработени % од вкупната работа на оваа активност - Тим - Извештај - Презиме - Одјава - База на податоци - Евалуација - Креирај - Автентикација за репо - Почетна - Одјава - Назив - Репозиториум - Активности - Репозиториуми - Додади - назад - Points - Позиција број - Активност - Евалуирано е дека се изработени % од вкупната работа на оваа активност - Нова активност - Отстрани - Избери тип активност - Index: rms-net/Resources/SharedResource.mk.txt =================================================================== --- eprms-net/Resources/SharedResource.mk.txt (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,54 +1,0 @@ - -activities-label=\u0410\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442\u0438 -activityId-label=\u0411\u0440. \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 -activity-label=\u0410\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 -add-label=\u0414\u043E\u0434\u0430\u0434\u0438 -admin-label=\u0410\u0434\u043C\u0438\u043D -admin/ManageDatabases-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u0431\u0430\u0437\u0438 \u043D\u0430 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 -admin/ManageProjects-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u041F\u0440\u043E\u0435\u043A\u0442\u0438 -admin/ManageRepositories-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 -admin/ManageTeams-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u0422\u0438\u043C\u043E\u0432\u0438 -admin/OverallCourseReport-pagelink=\u0418\u0437\u0432\u0435\u0448\u0442\u0430\u0458 -admin/ProjectActivities-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u043D\u0438 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442\u0438 -app-title=\u0415\u041F\u041C -back-label=\u043D\u0430\u0437\u0430\u0434 -# component that override these defaults. -copy-label=\u041A\u043E\u043F\u0438\u0440\u0430\u0458 -copyrightHolder=\u0412\u0430\u043D\u0433\u0435\u043B \u0412. \u0410\u0458\u0430\u043D\u043E\u0432\u0441\u043A\u0438 -copyrightYear=2021 -database-label=\u0411\u0430\u0437\u0430 \u043D\u0430 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 -description-label=\u041E\u043F\u0438\u0441 -edit-label=\u0418\u0437\u043C\u0435\u043D\u0438 -evaluation-label=\u0415\u0432\u0430\u043B\u0443\u0430\u0446\u0438\u0458\u0430 -firstName-label=\u0418\u043C\u0435 -index-pagelink=\u041F\u043E\u0447\u0435\u0442\u043D\u0430 -lang-label=Language -lastName-label=\u041F\u0440\u0435\u0437\u0438\u043C\u0435 -Logout-label=\u041E\u0434\u0458\u0430\u0432\u0430 -logout-page=\u041E\u0434\u0458\u0430\u0432\u0430 -mydatabases-pagelink=\u041C\u043E\u0438 \u0431\u0430\u0437\u0438 \u043D\u0430 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 -myprojectreports-pagelink=\u041C\u043E\u0438 \u0418\u0437\u0432\u0435\u0448\u0442\u0430\u0438 -myrepositories-pagelink=\u041C\u043E\u0438 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 -myrepositoryauth-pagelink=\u0410\u0432\u0442\u0435\u043D\u0442\u0438\u043A\u0430\u0446\u0438\u0458\u0430 \u0437\u0430 \u0440\u0435\u043F\u043E -newActivity-label=\u041D\u043E\u0432\u0430 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 -new-label=\u041A\u0440\u0435\u0438\u0440\u0430\u0458 -percentEvaluated-label=\u0415\u0432\u0430\u043B\u0443\u0438\u0440\u0430\u043D\u043E \u0435 \u0434\u0435\u043A\u0430 \u0441\u0435 \u0438\u0437\u0440\u0430\u0431\u043E\u0442\u0435\u043D\u0438 % \u043E\u0434 \u0432\u043A\u0443\u043F\u043D\u0430\u0442\u0430 \u0440\u0430\u0431\u043E\u0442\u0430 \u043D\u0430 \u043E\u0432\u0430\u0430 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 -percentReported-label=\u0418\u0437\u0432\u0435\u0441\u0442\u0443\u0432\u0430\u043C\u0435 \u0434\u0435\u043A\u0430 \u0441\u0435 \u0438\u0437\u0440\u0430\u0431\u043E\u0442\u0435\u043D\u0438 % \u043E\u0434 \u0432\u043A\u0443\u043F\u043D\u0430\u0442\u0430 \u0440\u0430\u0431\u043E\u0442\u0430 \u043D\u0430 \u043E\u0432\u0430\u0430 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 -personal-label=\u041B\u0438\u0447\u043D\u0438 -points-label=Points -positionNumber-label=\u041F\u043E\u0437\u0438\u0446\u0438\u0458\u0430 \u0431\u0440\u043E\u0458 -project-label=\u041F\u0440\u043E\u0435\u043A\u0442 -remove-label=\u041E\u0442\u0441\u0442\u0440\u0430\u043D\u0438 -report-label=\u0418\u0437\u0432\u0435\u0448\u0442\u0430\u0458 -repositories-label=\u0420\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 -repository-label=\u0420\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C -reset-label=\u0420\u0435\u0441\u0435\u0442 -role-label=\u0423\u043B\u043E\u0433\u0430 -selectActivityType-label=\u0418\u0437\u0431\u0435\u0440\u0438 \u0442\u0438\u043F \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442 -team-label=\u0422\u0438\u043C -teammember-label=\u0427\u043B\u0435\u043D \u043D\u0430 \u0442\u0438\u043C\u043E\u0442 -# The name of this file is based on the element in web. -# This is where global application properties go. -title-label=\u041D\u0430\u0437\u0438\u0432 -userName-label=\u041A\u043E\u0440\u0438\u0441\u043D\u0438\u0447\u043A\u043E \u0438\u043C\u0435 -# You can also have individual message catalogs for each page and each Index: rms-net/Services/PersonManager.cs =================================================================== --- eprms-net/Services/PersonManager.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,43 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; - -namespace info.ajanovski.eprms.net.Services { - - public interface PersonManager { - - public List getAllPersons(); - - public Person getPersonByUsername(string username); - - public string getPersonFullName(Person person); - - public string getPersonFullNameWithId(Person person); - - public List getPersonByFilter(string filter); - - public List getPersonRolesForPerson(long personId); - - public Person getPersonByEmail(string email); - - } -} Index: rms-net/Services/PersonManagerImpl.cs =================================================================== --- eprms-net/Services/PersonManagerImpl.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,69 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; -using info.ajanovski.eprms.net.Data; - -namespace info.ajanovski.eprms.net.Services { - - public class PersonManagerImpl : PersonManager { - - private readonly PersonDao personDao; - - public PersonManagerImpl(PersonDao personDao) { - this.personDao = personDao; - } - - - public List getAllPersons() { - return this.personDao.getAllPersons(); - } - - public Person getPersonByUsername(string username) { - return this.personDao.getPersonByUsername(username); - } - - // public Person getPersonById(long personId) { - // return genericService.getByPK(Person.class, personId); - // } - - public List getPersonByFilter(string filter) { - return personDao.getPersonByFilter(filter); - } - - public List getPersonRolesForPerson(long personId) { - return personDao.getPersonRolesForPerson(personId); - } - - public string getPersonFullName(Person person) { - return personDao.getPersonFullName(person); - } - - public string getPersonFullNameWithId(Person person) { - return personDao.getPersonFullNameWithId(person); - } - - public Person getPersonByEmail(string email) { - return personDao.getPersonByEmail(email); - } - - } -} Index: rms-net/Services/ProjectManager.cs =================================================================== --- eprms-net/Services/ProjectManager.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,40 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; - -namespace info.ajanovski.eprms.net.Services { - - public interface ProjectManager { - - public List getAllProjectsOrderByTitle(); - - public List getProjectCourses(Project p); - - public void addCoursesToProject(List inCourses, Project p); - - - public List getCourseProjectsOrderByTitle(Course selectedCourse); - - public List getProjectByPerson(long? personId); - - } -} Index: rms-net/Services/ProjectManagerImpl.cs =================================================================== --- eprms-net/Services/ProjectManagerImpl.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,56 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; -using info.ajanovski.eprms.net.Data; - -namespace info.ajanovski.eprms.net.Services { - - public class ProjectManagerImpl : ProjectManager { - - private readonly ProjectDao projectDao; - - public ProjectManagerImpl(ProjectDao projectDao) { - this.projectDao = projectDao; - } - - public List getAllProjectsOrderByTitle() { - return projectDao.getAllProjectsOrderByTitle(); - } - - public List getProjectCourses(Project p) { - return projectDao.getProjectCourses(p); - } - - public void addCoursesToProject(List inCourses, Project p) { - projectDao.addCoursesToProject(inCourses, p); - } - - public List getCourseProjectsOrderByTitle(Course selectedCourse) { - return projectDao.getCourseProjectsOrderByTitle(selectedCourse); - } - - public List getProjectByPerson(long? personId) { - return projectDao.getProjectByPerson(personId); - } - - } -} Index: rms-net/Services/ResourceManager.cs =================================================================== --- eprms-net/Services/ResourceManager.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,45 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; - -namespace info.ajanovski.eprms.net.Services { - - public interface ResourceManager { - - public List getRepositoriesByPerson(long personId); - - public List getRepositoriesByTeam(long personId); - - public List getRepositoriesByProject(long personId); - - public List getActiveRepositoriesByPerson(long personId); - - public List getActiveRepositoriesByTeam(long personId); - - public List getActiveRepositoriesByProject(long personId); - - public List getDatabasesByProject(long personId); - - public List getActiveDatabasesByProject(long personId); - - } -} Index: rms-net/Services/ResourceManagerImpl.cs =================================================================== --- eprms-net/Services/ResourceManagerImpl.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,67 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -using System.Collections.Generic; -using info.ajanovski.eprms.net.Models; -using info.ajanovski.eprms.net.Data; - -namespace info.ajanovski.eprms.net.Services { - public class ResourceManagerImpl : ResourceManager { - - private ResourceDao repositoryDao; - - public ResourceManagerImpl(ResourceDao repositoryDao) { - this.repositoryDao = repositoryDao; - } - - public List getRepositoriesByPerson(long personId) { - return repositoryDao.getRepositoriesByPerson(personId); - } - - public List getRepositoriesByTeam(long personId) { - return repositoryDao.getRepositoriesByTeam(personId); - } - - public List getRepositoriesByProject(long personId) { - return repositoryDao.getRepositoriesByProject(personId); - } - - public List getActiveRepositoriesByPerson(long personId) { - return getRepositoriesByPerson(personId).FindAll(p => p.DateCreated != null); - } - - public List getActiveRepositoriesByTeam(long personId) { - return getRepositoriesByTeam(personId).FindAll(p => p.DateCreated != null); - } - - public List getActiveRepositoriesByProject(long personId) { - return getRepositoriesByProject(personId).FindAll(p => p.DateCreated != null); - } - - public List getDatabasesByProject(long personId) { - return repositoryDao.getDatabasesByProject(personId); - } - - public List getActiveDatabasesByProject(long personId) { - return getDatabasesByProject(personId); - } - - } -} Index: rms-net/SharedResource.cs =================================================================== --- eprms-net/SharedResource.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,6 +1,0 @@ -namespace info.ajanovski.eprms.net -{ - public class SharedResource - { - } -} Index: rms-net/Startup.cs =================================================================== --- eprms-net/Startup.cs (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,166 +1,0 @@ -using System.Net.Http; -using System.Net.Http.Headers; -using System.Text.Json; -using System.Security.Claims; -using System; - -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc.Razor; -using Microsoft.AspNetCore.Authentication.OAuth; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -using info.ajanovski.eprms.net.Data; -using info.ajanovski.eprms.net.Services; -using AspNetCore.Security.CAS; - -namespace info.ajanovski.eprms.net { - public class Startup { - public Startup(IConfiguration configuration) { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - public void ConfigureServices(IServiceCollection services) { - services.AddDatabaseDeveloperPageExceptionFilter(); - - services.AddDbContext(options => { - options.UseLazyLoadingProxies().UseNpgsql(Configuration.GetConnectionString("EPRMSDB") - ); - }); - - services.AddDistributedMemoryCache(); - - services.AddSession(options => { - options.IdleTimeout = TimeSpan.FromSeconds(10); - options.Cookie.HttpOnly = true; - options.Cookie.IsEssential = true; - }); - - services.AddLocalization(options => options.ResourcesPath = "Resources"); - - services.AddRazorPages(); - - services - .AddAuthentication(options => { - options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme; - }) - .AddCookie(options => { - options.LoginPath = "/login"; - options.LogoutPath = "/logout"; - }) - .AddOAuth("GitHub", options => { - readAndSetOauthOptionsFromConfig("GitHub", options); - }) - .AddOAuth("ORCID", options => { - readAndSetOauthOptionsFromConfig("ORCID", options); - }) - .AddCAS("CAS", options => { - readAndSetCASOptionsFromConfig("CAS", options); - }); - - services.AddAuthorization(); - - services.AddMvc() - .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix) - .AddDataAnnotationsLocalization(); - - services.AddControllers(); - - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - - services.AddScoped(); - - services.Configure(options => { - var supportedCultures = new[] { "en", "mk" }; - options.SetDefaultCulture(supportedCultures[0]) - .AddSupportedCultures(supportedCultures) - .AddSupportedUICultures(supportedCultures); - }); - - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { - if (env.IsDevelopment()) { - app.UseDeveloperExceptionPage(); - app.UseMigrationsEndPoint(); - } else { - app.UseExceptionHandler("/Error"); - app.UseHsts(); - } - - app.UseHttpsRedirection(); - - var supportedCultures = new[] { "en", "mk" }; - var localizationOptions = new RequestLocalizationOptions().SetDefaultCulture(supportedCultures[0]) - .AddSupportedCultures(supportedCultures) - .AddSupportedUICultures(supportedCultures); - - app.UseRequestLocalization(localizationOptions); - app.UseStaticFiles(); - - app.UseRouting(); - - app.UseAuthentication(); - app.UseAuthorization(); - - app.UseSession(); - - app.UseEndpoints(endpoints => { - endpoints.MapRazorPages(); - endpoints.MapControllers(); - }); - - app.UseRequestLocalization(); - - } - - public void readAndSetOauthOptionsFromConfig(string ProviderName, OAuthOptions o) { - o.ClaimsIssuer = ProviderName; - o.ClientId = Configuration[ProviderName + ":ClientId"]; - o.ClientSecret = Configuration[ProviderName + ":ClientSecret"]; - - o.AuthorizationEndpoint = Configuration[ProviderName + ":AuthorizationEndpoint"]; - o.TokenEndpoint = Configuration[ProviderName + ":TokenEndpoint"]; - o.UserInformationEndpoint = Configuration[ProviderName + ":UserInformationEndpoint"]; - o.CallbackPath = new PathString(Configuration[ProviderName + ":CallbackPath"]); - - o.ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, Configuration[ProviderName + ":NameId"]); - o.ClaimActions.MapJsonKey(ClaimTypes.Name, Configuration[ProviderName + ":Name"]); - o.ClaimActions.MapJsonKey(ClaimTypes.Email, Configuration[ProviderName + ":Email"]); - - o.Scope.Add("openid"); - - o.Events = new OAuthEvents { - OnCreatingTicket = async context => { - var request = new HttpRequestMessage(HttpMethod.Get, context.Options.UserInformationEndpoint); - request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", context.AccessToken); - var response = await context.Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, context.HttpContext.RequestAborted); - response.EnsureSuccessStatusCode(); - using (var user = JsonDocument.Parse(await response.Content.ReadAsStringAsync())) { - context.RunClaimActions(user.RootElement); - } - } - }; - } - - public void readAndSetCASOptionsFromConfig(string ProviderName, CasOptions o) { - o.CasServerUrlBase = Configuration[ProviderName + ":CasBaseUrl"]; - } - - } -} Index: rms-net/appsettings.Development.json =================================================================== --- eprms-net/appsettings.Development.json (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,29 +1,0 @@ -{ - "Logging": { - "IncludeScopes": true, - "LogLevel": { - "Default": "Information", - "Microsoft": "Information", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*", - "GitHub": { - "AuthorizationEndpoint": "https://github.com/login/oauth/authorize", - "TokenEndpoint": "https://github.com/login/oauth/access_token", - "UserInformationEndpoint": "https://api.github.com/user", - "CallbackPath": "/login/oauth2/code/GitHub", - "NameId": "id", - "Name": "name", - "Email": "email" - }, - "ORCID": { - "AuthorizationEndpoint": "https://sandbox.orcid.org/oauth/authorize", - "TokenEndpoint": "https://sandbox.orcid.org/oauth/token", - "UserInformationEndpoint": "https://sandbox.orcid.org/oauth/userinfo", - "CallbackPath": "/login/oauth2/code/ORCID", - "NameId": "id", - "Name": "sub", - "Email": "email" - } -} Index: rms-net/appsettings.json =================================================================== --- eprms-net/appsettings.json (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,29 +1,0 @@ -{ - "Logging": { - "IncludeScopes": true, - "LogLevel": { - "Default": "Information", - "Microsoft": "Information", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*", - "GitHub": { - "AuthorizationEndpoint": "https://github.com/login/oauth/authorize", - "TokenEndpoint": "https://github.com/login/oauth/access_token", - "UserInformationEndpoint": "https://api.github.com/user", - "CallbackPath": "/login/oauth2/code/GitHub", - "NameId": "id", - "Name": "name", - "Email": "email" - }, - "ORCID": { - "AuthorizationEndpoint": "https://sandbox.orcid.org/oauth/authorize", - "TokenEndpoint": "https://sandbox.orcid.org/oauth/token", - "UserInformationEndpoint": "https://sandbox.orcid.org/oauth/userinfo", - "CallbackPath": "/login/oauth2/code/ORCID", - "NameId": "id", - "Name": "sub", - "Email": "email" - } -} Index: rms-net/bundleconfig.json =================================================================== --- eprms-net/bundleconfig.json (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,19 +1,0 @@ -[ - { - "outputFileName": "wwwroot/vendor.min.css", - "inputFiles": [ - "node_modules/bootstrap/dist/css/bootstrap.min.css" - ], - "minify": { "enabled": false } - }, - { - "outputFileName": "wwwroot/vendor.min.js", - "inputFiles": [ - "node_modules/jquery/dist/jquery.min.js", - "node_modules/popper.js/dist/umd/popper.min.js", - "node_modules/bootstrap/dist/js/bootstrap.min.js" - ], - "minify": { "enabled": false } - } - ] - Index: rms-net/eprms-net.csproj =================================================================== --- eprms-net/eprms-net.csproj (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,34 +1,0 @@ - - - - net5.0 - info.ajanovski.eprms.net - db755e3b-216c-47d8-997c-1edb7be13317 - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - Index: rms-net/eprms-net.csproj.user =================================================================== --- eprms-net/eprms-net.csproj.user (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,12 +1,0 @@ - - - - Project - /home/ajan/src/msbuild/.dotnet/dotnet - watch run - - - - http://localhost:8081 - - Index: rms-net/eprms-net.sln =================================================================== --- eprms-net/eprms-net.sln (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,22 +1,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eprms-net", "eprms-net.csproj", "{1569C7F2-F3D2-45D2-8AC3-E7FB10AA8764}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1569C7F2-F3D2-45D2-8AC3-E7FB10AA8764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1569C7F2-F3D2-45D2-8AC3-E7FB10AA8764}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1569C7F2-F3D2-45D2-8AC3-E7FB10AA8764}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1569C7F2-F3D2-45D2-8AC3-E7FB10AA8764}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - Policies = $0 - $0.DotNetNamingPolicy = $1 - $1.DirectoryNamespaceAssociation = PrefixedHierarchical - EndGlobalSection -EndGlobal Index: rms-net/package-lock.json =================================================================== --- eprms-net/package-lock.json (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,55 +1,0 @@ -{ - "name": "asp.net", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "asp.net", - "version": "1.0.0", - "devDependencies": { - "bootstrap": "5.0.2", - "jquery": "3.6.0", - "js-cookie": "2.2.1", - "popper.js": "1.16.1" - } - }, - "node_modules/bootstrap": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.2.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - }, - "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" - } - }, - "node_modules/jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", - "dev": true - }, - "node_modules/js-cookie": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz", - "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==", - "dev": true - }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - } - } -} Index: rms-net/package.json =================================================================== --- eprms-net/package.json (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,11 +1,0 @@ -{ - "version": "1.0.0", - "name": "asp.net", - "private": true, - "devDependencies": { - "bootstrap": "5.0.2", - "jquery": "3.6.0", - "popper.js": "1.16.1", - "js-cookie": "2.2.1" - } -} Index: rms-net/wwwroot/css/site-overrides.css =================================================================== --- eprms-net/wwwroot/css/site-overrides.css (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,77 +1,0 @@ -:root { - --ck-z-default: 100; - --ck-z-modal: calc( var(--ck-z-default) + 999 ); - - /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ - --color-incorrect: #c71c2c; - - /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ - --color-correct: #74b979; - - --color-noevaluation: #white; - --color-exception: #404040; -} - -body, -h1, -h2, -h3, -h4, -h5, -h6, -.h1, -.h2, -.h3, -.h4, -.h5, -.h6 { - font-family: 'Fira Sans', Helvetica, Arial, sans-serif !important; -} - -code { - font-family: 'Fira Mono', monospace, mono !important; -} - -.color-queryError { - background: var(--color-incorrect); - color: white; -} - -.color-queryCorrect { - background: var(--color-correct); - color: black; -} - -.centered-hv { - text-align: center; - vertical-align: middle; -} - -p.comment { - background: #ffff80; -} - -.inlinecomment { - background: #ffffa0; - margin-left:5rem; - border-left: 1px solid black; - padding-left:0.5rem; -} - -@keyframes slidein { - from { background: white; } - 50% { background: #ffffa0; } - to { background: white; } -} - -.pagination li { - margin-left:0.5em; -} - -svg { - fill: transparent; - stroke: currentColor; - stroke-width: 0.1em; - stroke-linecap: round; - stroke-linejoin: round; -} Index: rms-net/wwwroot/css/site.css =================================================================== --- eprms-net/wwwroot/css/site.css (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,71 +1,0 @@ -/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification -for details on configuring this project to bundle and minify static web assets. */ - -a.navbar-brand { - white-space: normal; - text-align: center; - word-break: break-all; -} - -/* Provide sufficient contrast against white background */ -a { - color: #0366d6; -} - -.btn-primary { - color: #fff; - background-color: #1b6ec2; - border-color: #1861ac; -} - -.nav-pills .nav-link.active, .nav-pills .show > .nav-link { - color: #fff; - background-color: #1b6ec2; - border-color: #1861ac; -} - -/* Sticky footer styles --------------------------------------------------- */ -html { - font-size: 14px; -} -@media (min-width: 768px) { - html { - font-size: 16px; - } -} - -.border-top { - border-top: 1px solid #e5e5e5; -} -.border-bottom { - border-bottom: 1px solid #e5e5e5; -} - -.box-shadow { - box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); -} - -button.accept-policy { - font-size: 1rem; - line-height: inherit; -} - -/* Sticky footer styles --------------------------------------------------- */ -html { - position: relative; - min-height: 100%; -} - -body { - /* Margin bottom by footer height */ - margin-bottom: 60px; -} -.footer { - position: absolute; - bottom: 0; - width: 100%; - white-space: nowrap; - line-height: 60px; /* Vertically center the text there */ -} Index: rms-net/wwwroot/images/feather-sprite.svg =================================================================== --- eprms-net/wwwroot/images/feather-sprite.svg (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,1 +1,0 @@ - Index: rms-net/wwwroot/js/site.js =================================================================== --- eprms-net/wwwroot/js/site.js (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,4 +1,0 @@ -// Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification -// for details on configuring this project to bundle and minify static web assets. - -// Write your Javascript code. Index: rms-spr/COPYING =================================================================== --- eprms-spr/COPYING (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,674 +1,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. Index: rms-spr/INSTALL.md =================================================================== --- eprms-spr/INSTALL.md (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,140 +1,0 @@ -# eprms-spr build from source instructions - -## Testing Database and Web App Server - -For testing purposes, you can use Docker/Podman to run all the needed services in containers. - -### Database - -The system is developed and tested against a PostgreSQL 12 started as a Docker/Podman container, but in general it is database agnostic and uses only Hibernate APIs, so you can switch to another database. - -To start a containerized PostgreSQL instance that stores all it's data in a local folder follow the instructions to create the folder and map the container to use that folder: - - $ mkdir DatabaseFolder - $ podman run \ - --cgroup-manager=cgroupfs \ - -d \ - -e POSTGRES_USER=postgres \ - -e POSTGRES_PASSWORD=CHANGE_THIS_PASSWORD \ - --network "host" \ - --privileged \ - --mount type=bind,source=./DatabaseFolder,target=/var/lib/postgresql/data \ - --name postgres_for_eprms \ - postgres:12 - -This will create a PostgreSQL server instance container, that stores it's data in the DatabaseFolder. The data will survive container restarts or removals. By default, the DB instance listens on port 5432. The DatabaseFolder privileges will be changed so that it functions properly under the container, and will no longer be accessible to you directly. - -Check that the container is running. - - podman ps - -Then connect to the container console, to create the initial empty database. - - $ podman exec -i -t postgres_for_eprms bash - -... type the same password that you typed in the starting script above, you will get a root user prompt, from which you can connect to the postgres instance in order to create the database. - - # psql -h localhost -U postgres -W postgres - -Create a database user owner for the database, then the database and two needed schemas, owned by the database owner. - - postgres=# - create user eprms_owner encrypted password 'DB_PASSWORD_CHANGE_IT'; - create database eprms owner eprms_owner; - create schema epm_main; - create schema epm_util; - alter schema epm_main owner to eprms_owner; - alter schema epm_util owner to eprms_owner; - -### Web Application Server - -For testing purposes it is recommended to use Apache Tomcat as a Java web application server, and you can also run in a separate container. - - $ mkdir WebAppsFolder - $ podman run \ - --name tomcat-cas \ - --privileged \ - --mount type=bind,source=./webapps,target=/usr/local/tomcat/webapps \ - -p 8080:8080 \ - -d \ - tomcat:9.0 - -The Tomcat container should be running at this moment, check: - - podman ps - -You can use the WebAppsFolder to place the packaged web application archives (WAR files). - - - -## Build the web application - -The application will be built from source using Maven. - -### Maven profile configuration - -For Maven to build the project you need to setup a maven profile in - - $HOME/.m2/settings.xml - -You can use the following example: - - - development-eprms - - - env - development-eprms - - - - org.postgresql.Driver - jdbc:postgresql://localhost:5432/eprms - jdbc:postgresql://localhost:5432/eprms - eprms_owner - DB_PASSWORD_CHANGE_IT - epm_main - update - org.hibernate.dialect.PostgreSQL94Dialect - false - http://localhost:8080 - http://localhost:8080 - http://localhost:8080 - false - - INFO,Console - CHANGE_THIS_ALSO - - - -### Compile and package the source into a WAR package - -Run the following command from the project source folder - - mvn -P development-eprms clean package - -You will get an eprms.war package in the *target* folder - -Copy the built *eprms.war* to the *WebAppsFolder* created in the preceeding preparatory steps. - -The application uses Apereo CAS for authentication. You cn copy the provided *cas.war* to the same *WebAppsFolder* to initiate a demo instance of Apereo CAS, where all usernames are valid and can log in provided the password that is entered is the same as the username. - -After a short initializaion period you will be able to access the application at: - - http://localhost:8080/epm - -Clicking on the login should redirect to the CAS system at: - - http://localhost:8080/cas/... - -### Create Users and Roles - -On the first start of the application, empty database tables will be created. - -So, initially you won't have any access rights, and you need to fill-in the database with: - - * sample users in the table epm_main.person - * roles - ADMINISTRATOR, INSTRUCTOR, STUDENT in the table epm_util.roles - * assign user roles for the created users in the table epm_util.person_role - -Finished! Index: rms-spr/README.md =================================================================== --- eprms-spr/README.md (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,16 +1,0 @@ -# EPRMS Project - -The EPRMS - Educational Project and Resources Management System is a management information system used to organize the work on student projects, their source repositories and other related resources. - -This is an open-source system, initially developed to demonstrate web application development for a course on Internet Technologies. - -The project is still under construction. - -Project lead: [Vangel V. Ajanovski](https://ajanovski.info) - -## eprms-spr - -The second implementation of the EPRMS was developed using the Spring MVC web application framework. - -Partially working instance can be compiled from source for testing purposes. - Index: rms-spr/pom.xml =================================================================== --- eprms-spr/pom.xml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,240 +1,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.4.5 - - - - info.ajanovski.eprms - spr - 0.0.3-SNAPSHOT - EPRMS - Educational Project and Resource Management System - - war - - - - vangel.ajanovski - Vangel V. Ajanovski - https://ajanovski.info - Europe/Skopje - - Project Lead - Main Developer - - - - - - 17 - 17 - 17 - - 42.4.0 - 3.0.1 - - UTF-8 - UTF-8 - - - - - info.ajanovski.eprms - model - 0.0.10-SNAPSHOT - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - nz.net.ultraq.thymeleaf - thymeleaf-layout-dialect - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - - org.springframework.boot - spring-boot-devtools - true - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.security - spring-security-cas - - - - - org.postgresql - postgresql - - - - - javax.servlet - javax.servlet-api - provided - - - - org.freedesktop.tango - tango-icon-theme - 0.8.90 - - - org.webjars.npm - fontsource-fira-sans - 3.0.5 - - - org.webjars - jquery - 2.2.4 - - - org.webjars - bootstrap - 5.0.2 - - - org.webjars - webjars-locator - 0.40 - - - org.webjars - js-cookie - 2.1.0 - - - org.webjars - webjars-locator-core - - - - javax.inject - javax.inject - 1 - - - - - epm - - - - true - src/main/resources - - hibernate.cfg.xml - persistence.xml - application.properties - AppConfig.properties - log4j.properties - - - - - false - src/main/resources - - hibernate.cfg.xml - persistence.xml - application.properties - AppConfig.properties - log4j.properties - - - - - ${basedir}/src/main/webapp/WEB-INF - true - - web.xml - - ${project.build.directory} - - - - src/main/webapp/WEB-INF - false - - web.xml - - - - - - - true - src/test/resources - - persistence.xml - hibernate.cfg.xml - application.properties - - - - - false - src/test/resources - - persistence.xml - hibernate.cfg.xml - application.properties - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - epm - - - - maven-resources-plugin - - UTF-8 - - - - - - - Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/EprmsSprApplication.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/EprmsSprApplication.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,52 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.Bean; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -@SpringBootApplication -@EntityScan(basePackages = "info.ajanovski.eprms.model.entities") -@EnableTransactionManagement -public class EprmsSprApplication { - - private static final Logger logger = LoggerFactory.getLogger(EprmsSprApplication.class); - - public static void main(String[] args) { - SpringApplication.run(EprmsSprApplication.class, args); - } - - @Bean(name = "studentPageNames") - public String[] getStudentPageNames() { - return new String[] { "MyDatabases", "MyRepositories", "MyRepositoryAuth", "admin/ManageDatabases" }; - } - - @Bean(name = "adminPageNames") - public String[] getAdminPageNames() { - return new String[] { "admin/Projects", "admin/Teams", "admin/ManageDatabases", "admin/ManageRepositories" }; - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/ServletInitializer.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/ServletInitializer.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,37 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -public class ServletInitializer extends SpringBootServletInitializer { - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(EprmsSprApplication.class); - } - - public static void main(String[] args) { - SpringApplication.run(EprmsSprApplication.class, args); - } -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/configurations/CASConfig.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/configurations/CASConfig.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,101 +1,0 @@ -package info.ajanovski.eprms.spr.configurations; - -import java.util.Arrays; - -import javax.servlet.http.HttpSessionEvent; - -import org.jasig.cas.client.session.SingleSignOutFilter; -import org.jasig.cas.client.session.SingleSignOutHttpSessionListener; -import org.jasig.cas.client.validation.Cas20ServiceTicketValidator; -import org.jasig.cas.client.validation.TicketValidator; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.event.EventListener; -import org.springframework.security.authentication.ProviderManager; -import org.springframework.security.cas.ServiceProperties; -import org.springframework.security.cas.authentication.CasAuthenticationProvider; -import org.springframework.security.cas.web.CasAuthenticationEntryPoint; -import org.springframework.security.cas.web.CasAuthenticationFilter; -import org.springframework.security.web.authentication.logout.LogoutFilter; -import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; - -import info.ajanovski.eprms.spr.services.CustomUserDetailsService; -import info.ajanovski.eprms.spr.util.AppConfig; - -@Configuration -public class CASConfig { - - private final CustomUserDetailsService customUserDetailsService; - - @Autowired - public CASConfig(CustomUserDetailsService customUserDetailsService) { - this.customUserDetailsService = customUserDetailsService; - } - - @Bean - public ServiceProperties serviceProperties() { - ServiceProperties serviceProperties = new ServiceProperties(); - serviceProperties.setService(AppConfig.getString("app.server") + "/login/cas"); - serviceProperties.setSendRenew(false); - return serviceProperties; - } - - @Bean - public CasAuthenticationEntryPoint casAuthenticationEntryPoint(ServiceProperties serviceProperties) { - CasAuthenticationEntryPoint entryPoint = new CasAuthenticationEntryPoint(); - entryPoint.setLoginUrl(AppConfig.getString("cas.server") + "/cas/login"); - entryPoint.setServiceProperties(serviceProperties); - return entryPoint; - } - - @Bean - public TicketValidator ticketValidator() { - return new Cas20ServiceTicketValidator(AppConfig.getString("cas.server") + "/cas"); - } - - @Bean - public CasAuthenticationProvider casAuthenticationProvider() { - CasAuthenticationProvider provider = new CasAuthenticationProvider(); - provider.setServiceProperties(this.serviceProperties()); - provider.setTicketValidator(this.ticketValidator()); - provider.setUserDetailsService(this.customUserDetailsService); - provider.setKey("CAS_PROVIDER_LOCALHOST_8080"); - return provider; - } - - @Bean - public CasAuthenticationFilter casAuthenticationFilter(ServiceProperties serviceProperties) throws Exception { - CasAuthenticationFilter filter = new CasAuthenticationFilter(); - filter.setServiceProperties(serviceProperties); - filter.setAuthenticationManager(new ProviderManager(Arrays.asList(this.casAuthenticationProvider()))); - return filter; - } - - @Bean - public SecurityContextLogoutHandler securityContextLogoutHandler() { - return new SecurityContextLogoutHandler(); - } - - @Bean - public LogoutFilter logoutFilter() { - LogoutFilter logoutFilter = new LogoutFilter(AppConfig.getString("cas.server") + "/cas/logout", - this.securityContextLogoutHandler()); - logoutFilter.setFilterProcessesUrl(AppConfig.getString("app.server") + "/logout/cas"); - return logoutFilter; - } - - @Bean - public SingleSignOutFilter singleSignOutFilter() { - SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter(); - singleSignOutFilter.setLogoutCallbackPath(AppConfig.getString("cas.server") + "/cas"); - singleSignOutFilter.setIgnoreInitConfiguration(true); - return singleSignOutFilter; - } - - @EventListener - public SingleSignOutHttpSessionListener singleSignOutHttpSessionListener(HttpSessionEvent event) { - return new SingleSignOutHttpSessionListener(); - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/configurations/SecurityConfig.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/configurations/SecurityConfig.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,69 +1,0 @@ -package info.ajanovski.eprms.spr.configurations; - -import javax.servlet.http.HttpServletResponse; - -import org.jasig.cas.client.session.SingleSignOutFilter; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.cas.authentication.CasAuthenticationProvider; -import org.springframework.security.cas.web.CasAuthenticationEntryPoint; -import org.springframework.security.cas.web.CasAuthenticationFilter; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.authentication.logout.LogoutFilter; -import org.springframework.security.web.csrf.CookieCsrfTokenRepository; - -@Configuration -@EnableWebSecurity -@EnableGlobalMethodSecurity(securedEnabled = true) -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - private final CasAuthenticationProvider casAuthenticationProvider; - private final CasAuthenticationEntryPoint casAuthenticationEntryPoint; - private final LogoutFilter logoutFilter; - private final SingleSignOutFilter singleSignOutFilter; - - @Autowired - public SecurityConfig(CasAuthenticationProvider casAuthenticationProvider, - CasAuthenticationEntryPoint casAuthenticationEntryPoint, LogoutFilter logoutFilter, - SingleSignOutFilter singleSignOutFilter) { - this.casAuthenticationProvider = casAuthenticationProvider; - this.casAuthenticationEntryPoint = casAuthenticationEntryPoint; - this.logoutFilter = logoutFilter; - this.singleSignOutFilter = singleSignOutFilter; - } - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.authenticationProvider(this.casAuthenticationProvider); - } - -// @Bean -// public PasswordEncoder passwordEncoder() { -// return new BCryptPasswordEncoder(); -// } - - @Override - protected void configure(HttpSecurity http) throws Exception { - http.csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()); - http.authorizeRequests().regexMatchers("/My.*", "/admin/.*").authenticated(); - http.httpBasic().authenticationEntryPoint(this.casAuthenticationEntryPoint); -// http.formLogin(); - http.logout().logoutSuccessHandler((httpServletRequest, httpServletResponse, authentication) -> { - httpServletResponse.addHeader("Set-Cookie", - "JSESSIONID=; Max-Age=0; Expires=Thu, 01-Jan-1970 00:00:10 GMT"); - httpServletResponse.addHeader("Set-Cookie", - "XSRF-TOKEN=; Max-Age=0; Expires=Thu, 01-Jan-1970 00:00:10 GMT"); - httpServletResponse.setStatus(HttpServletResponse.SC_OK); - }); - http.addFilterBefore(this.logoutFilter, LogoutFilter.class); - http.addFilterBefore(this.singleSignOutFilter, CasAuthenticationFilter.class); - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/Index.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/Index.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,38 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; - -@Controller -public class Index { - private static final Logger logger = LoggerFactory.getLogger(Index.class); - - @GetMapping(path = { "Index", "/" }) - public String Index(Model model) { - return "Index"; - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/LoginLogout.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/LoginLogout.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,61 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.authentication.logout.CookieClearingLogoutHandler; -import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; -import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; - -import info.ajanovski.eprms.spr.util.AppConfig; - -@Controller -public class LoginLogout { - private final Logger logger = LoggerFactory.getLogger(LoginLogout.class); - - @GetMapping("Login") - public String login() { - logger.info("Login called"); - return "redirect:/MyProfile"; - } - - @GetMapping(path = { "Logout" }) - public String logout(HttpServletRequest request, HttpServletResponse response, - SecurityContextLogoutHandler logoutHandler, Model model) { - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - logoutHandler.logout(request, response, auth); - new CookieClearingLogoutHandler(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY) - .logout(request, response, auth); - model.addAttribute("casLogoutLink", - AppConfig.getString("cas.server") + "/cas/logout?service=" + AppConfig.getString("app.server")); - return "Logout"; - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/MyDatabases.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/MyDatabases.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,83 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers; - -import java.util.List; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.SessionAttributes; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.spr.services.ModelConstructor; -import info.ajanovski.eprms.spr.services.PersonManager; -import info.ajanovski.eprms.spr.services.ResourceManager; -import info.ajanovski.eprms.spr.util.UserInfo; - -@Controller -@SessionAttributes("userInfo") -public class MyDatabases { - private final Logger logger = LoggerFactory.getLogger(MyDatabases.class); - - @Inject - private ModelConstructor modelOps; - - @Inject - public HttpServletRequest request; - - @Inject - public PersonManager personManager; - - @ModelAttribute("userInfo") - public UserInfo userInfo() { - return new UserInfo(personManager); - } - - @GetMapping(path = { "MyDatabases" }) - public String MyDatabases(Model model, @ModelAttribute("userInfo") UserInfo userInfo) { - model = modelOps.addMainModelAttribs("EPM - MyDatabases", model, userInfo); - model.addAttribute("projectDatabases", getProjectDatabases(userInfo.getPersonId())); - return "MyDatabases"; - } - - public String getClassForPageName() { - return "active"; - } - - public String getPageNameTitle(String pageName) { - return pageName + "-pagelink"; - } - - @Inject - private ResourceManager resourceManager; - - public List getProjectDatabases(long personId) { - return resourceManager.getActiveDatabasesByProject(personId); - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/MyProfile.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/MyProfile.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,63 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.SessionAttributes; - -import info.ajanovski.eprms.spr.services.ModelConstructor; -import info.ajanovski.eprms.spr.services.PersonManager; -import info.ajanovski.eprms.spr.util.UserInfo; - -@Controller -@SessionAttributes("userInfo") -public class MyProfile { - private final Logger logger = LoggerFactory.getLogger(LoginLogout.class); - - @Inject - private ModelConstructor modelOps; - - @Inject - public HttpServletRequest request; - - @Inject - public PersonManager personManager; - - @ModelAttribute("userInfo") - public UserInfo userInfo() { - return new UserInfo(personManager); - } - - @GetMapping(path = { "MyProfile" }) - public String Index(Model model, @ModelAttribute("userInfo") UserInfo userInfo) { - model = modelOps.addMainModelAttribs("EPM - MyDatabases", model, userInfo); - return "MyProfile"; - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/MyRepositories.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/MyRepositories.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,94 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers; - -import java.util.List; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.access.annotation.Secured; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.SessionAttributes; - -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.spr.services.ModelConstructor; -import info.ajanovski.eprms.spr.services.PersonManager; -import info.ajanovski.eprms.spr.services.ResourceManager; -import info.ajanovski.eprms.spr.util.UserInfo; - -@Controller -@SessionAttributes("userInfo") -public class MyRepositories { - private final Logger logger = LoggerFactory.getLogger(MyDatabases.class); - - @Inject - private ModelConstructor modelOps; - - @Inject - public HttpServletRequest request; - - @Inject - public PersonManager personManager; - - @ModelAttribute("userInfo") - public UserInfo userInfo() { - return new UserInfo(personManager); - } - - @GetMapping(path = { "MyRepositories" }) - public String MyRepositories(Model model, @ModelAttribute("userInfo") UserInfo userInfo) { - model = modelOps.addMainModelAttribs("EPM - MyRepositories", model, userInfo); - model.addAttribute("personalRepositories", getPersonalRepositories(userInfo.getPersonId())); - model.addAttribute("teamRepositories", getTeamRepositories(userInfo.getPersonId())); - model.addAttribute("projectRepositories", getProjectRepositories(userInfo.getPersonId())); - return "MyRepositories"; - } - - public String getClassForPageName() { - return "active"; - } - - public String getPageNameTitle(String pageName) { - return pageName + "-pagelink"; - } - - @Inject - private ResourceManager resourceManager; - - public List getPersonalRepositories(long personId) { - return resourceManager.getActiveRepositoriesByPerson(personId); - } - - public List getTeamRepositories(long personId) { - return resourceManager.getActiveRepositoriesByTeam(personId); - } - - public List getProjectRepositories(long personId) { - return resourceManager.getActiveRepositoriesByProject(personId); - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/MyRepositoryAuth.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/MyRepositoryAuth.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,108 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers; - -import java.security.MessageDigest; -import java.util.Base64; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.transaction.Transactional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.SessionAttributes; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.spr.services.GenericService; -import info.ajanovski.eprms.spr.services.ModelConstructor; -import info.ajanovski.eprms.spr.services.PersonManager; -import info.ajanovski.eprms.spr.util.UserInfo; - -@Controller -@SessionAttributes("userInfo") -public class MyRepositoryAuth { - private static final Logger logger = LoggerFactory.getLogger(MyRepositoryAuth.class); - - @Inject - private ModelConstructor modelOps; - - @Inject - public HttpServletRequest request; - - @Inject - public PersonManager personManager; - - @ModelAttribute("userInfo") - public UserInfo userInfo() { - return new UserInfo(personManager); - } - - @Inject - private GenericService genericService; - - @GetMapping(path = { "MyRepositoryAuth" }) - public String MyDatabases(Model model, @ModelAttribute("userInfo") UserInfo userInfo) { - model = modelOps.addMainModelAttribs("EPM - MyRepositoryAuth", model, userInfo); - return "MyRepositoryAuth"; - } - - @PostMapping(path = "MyRepositoryAuth") - @Transactional - public String MyRepositoryAuth(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @RequestParam(defaultValue = "", required = true, name = "password") String password, - @RequestParam(defaultValue = "", required = true, name = "confirmPassword") String confirmPassword) { - model = modelOps.addMainModelAttribs("EPM - MyRepositoryAuth", model, userInfo); - - if (password != null && confirmPassword != null && password.equals(confirmPassword)) { - Person myself = genericService.getByPK(Person.class, userInfo.getPersonId()); - try { - MessageDigest md = MessageDigest.getInstance("SHA-1"); - md.reset(); - md.update(password.getBytes("UTF-8")); - String newp = "{SHA}" + Base64.getEncoder().encodeToString(md.digest()); - myself.setAuthString(newp); - genericService.save(myself); - } catch (Exception e) { - logger.error("Exception {}", e); - } - } else { - logger.debug("empty pass supplied by {}", userInfo.getUserName()); - } - - return "MyRepositoryAuth"; - } - - public String getClassForPageName() { - return "active"; - } - - public String getPageNameTitle(String pageName) { - return pageName + "-pagelink"; - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/admin/ManageDatabases.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/admin/ManageDatabases.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,144 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers.admin; - -import java.util.List; -import java.util.stream.Collectors; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.transaction.Transactional; - -import org.springframework.security.access.annotation.Secured; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.SessionAttributes; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.spr.services.GenericService; -import info.ajanovski.eprms.spr.services.ModelConstructor; -import info.ajanovski.eprms.spr.services.PersonManager; -import info.ajanovski.eprms.spr.util.UserInfo; - -@Controller -@SessionAttributes({ "userInfo", "isOnlyShowNotCreated" }) -@Secured("ROLE_ADMINISTRATOR") -public class ManageDatabases { - - @Inject - private ModelConstructor modelOps; - - @Inject - public HttpServletRequest request; - - @Inject - public PersonManager personManager; - - @ModelAttribute("userInfo") - public UserInfo userInfo() { - return new UserInfo(personManager); - } - - @ModelAttribute("isOnlyShowNotCreated") - public Boolean isOnlyShowNotCreated() { - return Boolean.FALSE; - } - - @GetMapping(path = { "admin/ManageDatabases" }) - public String ManageDatabases(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("isOnlyShowNotCreated") Boolean isOnlyShowNotCreated) { - model = modelOps.addMainModelAttribs("EPM - Admin - ManageDatabases", model, userInfo); - model.addAttribute("databases", getDatabases(isOnlyShowNotCreated)); - model.addAttribute("isOnlyShowNotCreated", isOnlyShowNotCreated); - return "admin/ManageDatabases"; - } - - @GetMapping(path = { "admin/ManageDatabases.toggle" }) - public String ManageDatabasesToggle(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("isOnlyShowNotCreated") Boolean isOnlyShowNotCreated) { - model = modelOps.addMainModelAttribs("EPM - Admin - Teams", model, userInfo); - isOnlyShowNotCreated = !isOnlyShowNotCreated; - model.addAttribute("databases", getDatabases(isOnlyShowNotCreated)); - model.addAttribute("isOnlyShowNotCreated", isOnlyShowNotCreated); - return "admin/ManageDatabases"; - } - - @GetMapping(path = { "admin/ManageDatabases.delete" }) - @Transactional - public String deleteDatabase(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("isOnlyShowNotCreated") Boolean isOnlyShowNotCreated, - @RequestParam(name = "databaseId") long databaseId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Teams", model, userInfo); - model.addAttribute("databases", getDatabases(isOnlyShowNotCreated)); - model.addAttribute("isOnlyShowNotCreated", isOnlyShowNotCreated); - - genericService.deleteByPK(Database.class, databaseId); - - return "redirect:admin/ManageDatabases"; - } - - @GetMapping(path = { "admin/ManageDatabases.edit" }) - public String editDatabase(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("isOnlyShowNotCreated") Boolean isOnlyShowNotCreated, - @RequestParam(name = "databaseId") long databaseId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Teams", model, userInfo); - model.addAttribute("isOnlyShowNotCreated", isOnlyShowNotCreated); - model.addAttribute("databases", getDatabases(isOnlyShowNotCreated)); - - Database editDatabase = genericService.getByPK(Database.class, databaseId); - model.addAttribute("editDatabase", editDatabase); - - return "admin/ManageDatabases"; - } - - @PostMapping(path = "admin/ManageDatabases.saveDatabaseForm") - @Transactional - public String saveDatabaseForm(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("isOnlyShowNotCreated") Boolean isOnlyShowNotCreated, - @ModelAttribute("editDatabase") Database editDatabase) { - model = modelOps.addMainModelAttribs("EPM - Admin - Teams", model, userInfo); - model.addAttribute("isOnlyShowNotCreated", isOnlyShowNotCreated); - model.addAttribute("databases", getDatabases(isOnlyShowNotCreated)); - - Database databaseToSave = genericService.getByPK(Database.class, editDatabase.getDatabaseId()); - databaseToSave.setName(editDatabase.getName()); - databaseToSave.setOwner(editDatabase.getOwner()); - genericService.save(databaseToSave); - return "redirect:admin/ManageDatabases"; - } - - @Inject - private GenericService genericService; - - public List getDatabases(Boolean isOnlyShowNotCreated) { - List ls = (List) genericService.getAll(Database.class); - if (isOnlyShowNotCreated) { - return ls.stream().filter(p -> p.getDateCreated() == null).collect(Collectors.toList()); - } else { - return ls; - } - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/admin/ManageRepositories.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/admin/ManageRepositories.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,118 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers.admin; - -import java.util.List; -import java.util.stream.Collectors; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.transaction.Transactional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.access.annotation.Secured; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.SessionAttributes; - -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.spr.services.GenericService; -import info.ajanovski.eprms.spr.services.ModelConstructor; -import info.ajanovski.eprms.spr.services.PersonManager; -import info.ajanovski.eprms.spr.util.UserInfo; - -@Controller -@SessionAttributes({ "userInfo", "isOnlyShowNotCreated" }) -@Secured("ROLE_ADMINISTRATOR") -public class ManageRepositories { - private static final Logger logger = LoggerFactory.getLogger(ManageRepositories.class); - - @Inject - private ModelConstructor modelOps; - - @Inject - public HttpServletRequest request; - - @Inject - public PersonManager personManager; - - @ModelAttribute("userInfo") - public UserInfo userInfo() { - return new UserInfo(personManager); - } - - @ModelAttribute("isOnlyShowNotCreated") - public Boolean isOnlyShowNotCreated() { - logger.info("setup session attribute isOnlyShowNotCreated"); - return Boolean.FALSE; - } - - @Inject - private GenericService genericService; - - @GetMapping(path = { "admin/ManageRepositories" }) - public String ManageRepositories(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("isOnlyShowNotCreated") Boolean isOnlyShowNotCreated) { - model = modelOps.addMainModelAttribs("EPM - Admin - ManageRepositories", model, userInfo); - model.addAttribute("isOnlyShowNotCreated", isOnlyShowNotCreated); - model.addAttribute("repositories", getRepositories(isOnlyShowNotCreated)); - return "admin/ManageRepositories"; - } - - @GetMapping(path = { "admin/ManageRepositories.toggle" }) - public String ManageRepositoriesToggle(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("isOnlyShowNotCreated") Boolean isOnlyShowNotCreated) { - model = modelOps.addMainModelAttribs("EPM - Admin - Teams", model, userInfo); - isOnlyShowNotCreated = !isOnlyShowNotCreated; - model.addAttribute("isOnlyShowNotCreated", isOnlyShowNotCreated); - model.addAttribute("repositories", getRepositories(isOnlyShowNotCreated)); - return "admin/ManageRepositories"; - } - - @GetMapping(path = { "admin/Managerepositories.delete" }) - @Transactional - public String onDeleteRepository(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("isOnlyShowNotCreated") Boolean isOnlyShowNotCreated, - @RequestParam(name = "repositoryId") long repositoryId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Teams", model, userInfo); - model.addAttribute("isOnlyShowNotCreated", isOnlyShowNotCreated); - model.addAttribute("repositories", getRepositories(isOnlyShowNotCreated)); - deleteRepository(repositoryId); - return "redirect:admin/ManageRepositories"; - } - - public void deleteRepository(long repositoryId) { - genericService.deleteByPK(Repository.class, repositoryId); - } - - public List getRepositories(Boolean isOnlyShowNotCreated) { - List ls = (List) genericService.getAll(Repository.class); - if (isOnlyShowNotCreated) { - return ls.stream().filter(p -> p.getDateCreated() == null).collect(Collectors.toList()); - } else { - return ls; - } - } -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/admin/Projects.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/admin/Projects.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,267 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers.admin; - -import java.util.ArrayList; -import java.util.List; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.transaction.Transactional; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.access.annotation.Secured; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.SessionAttributes; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.model.entities.Responsibility; -import info.ajanovski.eprms.model.entities.Team; -import info.ajanovski.eprms.model.entities.TeamMember; -import info.ajanovski.eprms.spr.services.GenericService; -import info.ajanovski.eprms.spr.services.ModelConstructor; -import info.ajanovski.eprms.spr.services.PersonManager; -import info.ajanovski.eprms.spr.util.UserInfo; - -@Controller -@SessionAttributes({ "userInfo", "selectedProject" }) -@Secured("ROLE_ADMINISTRATOR") -public class Projects { - private static final Logger logger = LoggerFactory.getLogger(Projects.class); - - @Inject - private ModelConstructor modelOps; - - @Inject - public HttpServletRequest request; - - @Inject - public PersonManager personManager; - - @ModelAttribute("userInfo") - public UserInfo userInfo() { - return new UserInfo(personManager); - } - - @ModelAttribute("selectedProject") - public Project selectedProject() { - return null; - } - - @Inject - public GenericService genericService; - - private void addProjectRelatedAttributesToModel(Model model, Project selectedProject) { - model.addAttribute("allprojects", getAllProjects()); - model.addAttribute("selectedProject", selectedProject); - model.addAttribute("listProjects", getProjects(selectedProject)); - } - - @GetMapping(path = { "admin/Projects" }) - public String Projects(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - return "/admin/Projects"; - } - - @GetMapping(path = { "admin/Projects.newProject" }) - public String newProject(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - model.addAttribute("newProject", new Project()); - return "/admin/Projects"; - } - - @PostMapping(path = { "admin/Projects.onSuccessFromNewProjectForm" }) - @Transactional - public String onSuccessFromNewProjectForm(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, - @ModelAttribute(name = "newProject") Project newProject) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - - Project projectToSave = new Project(); - projectToSave.setTitle(newProject.getTitle()); - projectToSave.setDescription(newProject.getDescription()); - genericService.save(projectToSave); - - addProjectRelatedAttributesToModel(model, projectToSave); - return "redirect:/admin/Projects"; - } - - @PostMapping(path = { "admin/Projects.selectProject" }) - public String SelectProject(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @RequestParam(name = "newSelectedProject") long newSelectedProjectId, - @ModelAttribute("selectedProject") Project selectedProject) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - if (newSelectedProjectId == -1) { - selectedProject = null; - } else { - selectedProject = genericService.getByPK(Project.class, newSelectedProjectId); - } - - addProjectRelatedAttributesToModel(model, selectedProject); - return "/admin/Projects"; - } - - @GetMapping(path = { "admin/Projects.addTeamMember" }) - public String onActionFromAddTeamMember(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, @RequestParam("inTeam") long inTeamId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - - TeamMember newTm = new TeamMember(); - newTm.setTeam(genericService.getByPK(Team.class, inTeamId)); - model.addAttribute("newTm", newTm); - model.addAttribute("listPersons", getPersons()); - return "/admin/Projects"; - } - - @GetMapping(path = { "admin/Projects.newTeam" }) - public String onActionFromNewTeam(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, - @RequestParam(name = "inProject") long inProjectId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - Team newTeam = new Team(); - model.addAttribute("newTeam", newTeam); - model.addAttribute("inProject", inProjectId); - return "/admin/Projects"; - } - - @GetMapping(path = { "admin/Projects.newDatabase" }) - public String onActionFromNewDatabase(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, - @RequestParam(name = "inProject") long inProjectId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - Database newDb = new Database(); - model.addAttribute("newDb", newDb); - model.addAttribute("inProject", inProjectId); - return "/admin/Projects"; - } - - @GetMapping(path = { "admin/Projects.newRepository" }) - public String onActionFromNewRepository(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, - @RequestParam(name = "inProject") long inProjectId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - Repository newRp = new Repository(); - model.addAttribute("newRp", newRp); - model.addAttribute("inProject", inProjectId); - return "/admin/Projects"; - } - - @PostMapping(path = { "admin/Projects.onSuccessFromNewTeamForm" }) - @Transactional - public String onSuccessFromNewTeamForm(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, @ModelAttribute("newTeam") Team newTeam, - @ModelAttribute("inProject") long inProjectId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - Team teamToSave = new Team(); - teamToSave.setName(newTeam.getName()); - Responsibility teamResponsibility = new Responsibility(); - teamResponsibility.setTeam(teamToSave); - teamResponsibility.setProject(genericService.getByPK(Project.class, inProjectId)); - genericService.save(teamToSave); - genericService.save(teamResponsibility); - return "redirect:/admin/Projects"; - } - - @GetMapping(path = { "admin/Projects.deleteTeamMember" }) - @Transactional - public String deleteTeamMember(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, - @RequestParam("teamMemberId") long teamMemberId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - genericService.deleteByPK(TeamMember.class, teamMemberId); - return "redirect:/admin/Projects"; - } - - @PostMapping(path = { "admin/Projects.onSuccessFromNewTeamMemberForm" }) - @Transactional - public String onSuccessFromNewTeamMemberForm(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, @ModelAttribute("newTm") TeamMember newTm, - @RequestParam(name = "newSelectedPerson") long newSelectedPersonId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - newTm.setPerson(genericService.getByPK(Person.class, newSelectedPersonId)); - genericService.save(newTm); - return "redirect:/admin/Projects"; - } - - @PostMapping(path = { "admin/Projects.onSuccessFromNewDatabaseForm" }) - @Transactional - public String onSuccessFromNewDatabaseForm(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, @ModelAttribute("newDb") Database newDb, - @RequestParam("inProject") Long inProjectId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - newDb.setProject(genericService.getByPK(Project.class, inProjectId)); - genericService.save(newDb); - return "redirect:/admin/Projects"; - } - - @PostMapping(path = { "admin/Projects.onSuccessFromNewRepositoryForm" }) - @Transactional - public String onSuccessFromNewRepositoryForm(Model model, @ModelAttribute("userInfo") UserInfo userInfo, - @ModelAttribute("selectedProject") Project selectedProject, @ModelAttribute("newRp") Repository newRp, - @RequestParam("inProject") Long inProjectId) { - model = modelOps.addMainModelAttribs("EPM - Admin - Projects", model, userInfo); - addProjectRelatedAttributesToModel(model, selectedProject); - newRp.setProject(genericService.getByPK(Project.class, inProjectId)); - genericService.save(newRp); - - return "redirect:/admin/Projects"; - } - - public List getPersons() { - return (List) genericService.getAll(Person.class); - } - - public List getAllProjects() { - return (List) genericService.getAll(Project.class); - } - - public List getProjects(Project selectedProject) { - if (selectedProject != null) { - List ls = new ArrayList(); - ls.add(genericService.getByPK(Project.class, selectedProject.getProjectId())); - return ls; - } else { - return getAllProjects(); - } - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/admin/Teams.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/controllers/admin/Teams.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,78 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.controllers.admin; - -import java.util.List; - -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.access.annotation.Secured; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.SessionAttributes; - -import info.ajanovski.eprms.model.entities.Team; -import info.ajanovski.eprms.spr.services.GenericService; -import info.ajanovski.eprms.spr.services.ModelConstructor; -import info.ajanovski.eprms.spr.services.PersonManager; -import info.ajanovski.eprms.spr.util.UserInfo; - -@Controller -@SessionAttributes("userInfo") -@Secured("ROLE_ADMINISTRATOR") -public class Teams { - private static final Logger logger = LoggerFactory.getLogger(Teams.class); - - @Inject - private ModelConstructor modelOps; - - @Inject - public HttpServletRequest request; - - @Inject - public PersonManager personManager; - - @ModelAttribute("userInfo") - public UserInfo userInfo() { - return new UserInfo(personManager); - } - - @GetMapping(path = { "admin/Teams" }) - public String adminTeams(Model model, @ModelAttribute("userInfo") UserInfo userInfo) { - model = modelOps.addMainModelAttribs("EPM - Admin - Teams", model, userInfo); - model.addAttribute("teams", getTeams()); - return "admin/Teams"; - } - - // Generic part - - @Inject - private GenericService genericService; - - public List getTeams() { - return (List) genericService.getAll(Team.class); - } -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/data/GenericDao.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/data/GenericDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,44 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.spr.data; - -import java.util.List; - -public interface GenericDao { - public Object getByPK(Class classToLoad, long id); - - public void deleteByPK(Class classToLoad, long id); - - public void delete(Object object); - - public List getQueryResult(String guery); - - public void saveOrUpdate(Object object); - - public Object save(Object object); - - public List getAll(Class classToLoad); - - public Object getByCode(Class classToLoad, String code); - - public List getByTitleSubstring(Class classToSearch, String searchSubString); -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/data/GenericDaoImpl.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/data/GenericDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,136 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.spr.data; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; - -import org.hibernate.exception.DataException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -@Service -public class GenericDaoImpl implements GenericDao { - - private final Logger logger = LoggerFactory.getLogger(GenericDaoImpl.class); - - @PersistenceContext - EntityManager entityManager; - - @Override - public Object getByPK(Class classToLoad, long id) { - return entityManager.find(classToLoad, id); - } - - @Override - public void deleteByPK(Class classToLoad, long id) { - entityManager.remove(getByPK(classToLoad, id)); - } - - @Override - public void delete(Object object) { - entityManager.remove(object); - } - - @Override - public List getQueryResult(String guery) { - try { - Query q = entityManager.createQuery(guery); - List l = new ArrayList(); - - for (Iterator it = q.getResultList().iterator(); it.hasNext();) { - Object[] row = (Object[]) it.next(); - for (int i = 0; i < row.length; i++) { - l.add(row[i]); - } - l.add(" | "); - } - - return l; - - } catch (DataException e) { - // Critical errors : database unreachable, etc. - logger.error("Exception - DataAccessException occurs : {} on complete getQueryResult().", e.getMessage()); - return null; - } - } - - @Override - public void saveOrUpdate(Object object) { - entityManager.persist(object); - } - - @Override - public Object save(Object object) { - // Object a = session.merge(object); - entityManager.persist(object); - return object; - } - - @Override - public List getAll(Class classToLoad) { - return entityManager.createQuery("from " + classToLoad.getName()).getResultList(); - } - - @Override - public Object getByCode(Class classToLoad, String code) { - if (code != null) { - CriteriaBuilder cb = entityManager.getCriteriaBuilder(); - CriteriaQuery criteriaQuery = cb.createQuery(classToLoad.getClass()); - Root root = criteriaQuery.from(classToLoad.getClass()); - criteriaQuery.select(root).where(cb.equal(root.get("code"), code)); - Query query = entityManager.createQuery(criteriaQuery); - List results = query.getResultList(); - if (results.size() > 0) { - return results.get(0); - } else { - return null; - } - } else { - return null; - } - } - - @Override - public List getByTitleSubstring(Class classToSearch, String searchSubString) { - if (searchSubString != null) { - CriteriaBuilder cb = entityManager.getCriteriaBuilder(); - CriteriaQuery criteriaQuery = cb.createQuery(classToSearch.getClass()); - Root root = criteriaQuery.from(classToSearch.getClass()); - criteriaQuery.select(root).where(cb.like(root.get("title"), "%" + searchSubString + "%")); - Query query = entityManager.createQuery(criteriaQuery); - List results = query.getResultList(); - return results; - } else { - return null; - } - } -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/data/PersonDao.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/data/PersonDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,45 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.spr.data; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.entities.Role; - -public interface PersonDao { - public List getAllPersons(); - - public Person getPersonByUsername(String username); - - public String getPersonFullName(Person person); - - public String getPersonFullNameWithId(Person person); - - public List getPersonByFilter(String filter); - - public List getPersonRolesForPerson(long personId); - - public List getRolesForPerson(long personId); - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/data/PersonDaoImpl.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/data/PersonDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,95 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.spr.data; - -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.entities.Role; - -@Service -public class PersonDaoImpl implements PersonDao { - private final Logger logger = LoggerFactory.getLogger(PersonDaoImpl.class); - - @PersistenceContext - EntityManager entityManager; - - @Override - public List getAllPersons() { - try { - return (List) entityManager.createQuery("from Person order by lastName, firstName, userName") - .getResultList(); - } catch (Exception e) { - return null; - } - } - - @Override - public Person getPersonByUsername(String username) { - try { - return (Person) entityManager.createQuery("from Person where userName=:userName") - .setParameter("userName", username).getSingleResult(); - } catch (Exception e) { - logger.error("Person with userName:{} was not found.", username); - return null; - } - } - - @Override - public List getPersonByFilter(String filter) { - String f = "%" + filter.toLowerCase() + "%"; - return entityManager - .createQuery("select p from Person p where (lower(concat(userName,firstName,lastName)) like :filter)") - .setParameter("filter", f).getResultList(); - } - - @Override - public List getPersonRolesForPerson(long personId) { - return entityManager.createQuery("select pr from PersonRole pr " + "join pr.role r " + "join pr.person p " - + "where p.personId=:personId").setParameter("personId", personId).getResultList(); - } - - @Override - public List getRolesForPerson(long personId) { - return entityManager.createQuery("select pr.role from PersonRole pr where pr.person.personId=:personId") - .setParameter("personId", personId).getResultList(); - } - - @Override - public String getPersonFullName(Person person) { - return person.getLastName() + " " + person.getFirstName(); - } - - @Override - public String getPersonFullNameWithId(Person person) { - return person.getLastName() + " " + person.getFirstName() + " [" + person.getUserName() + "]"; - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/data/ProjectDao.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/data/ProjectDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,26 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.spr.data; - -public interface ProjectDao { - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/data/ProjectDaoImpl.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/data/ProjectDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,29 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.spr.data; - -import org.springframework.stereotype.Service; - -@Service -public class ProjectDaoImpl implements ProjectDao { - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/data/ResourceDao.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/data/ResourceDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,39 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.spr.data; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; - -public interface ResourceDao { - - public List getRepositoriesByPerson(long personId); - - public List getRepositoriesByTeam(long personId); - - public List getRepositoriesByProject(long personId); - - public List getDatabasesByProject(long personId); - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/data/ResourceDaoImpl.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/data/ResourceDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,91 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.spr.data; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.springframework.stereotype.Service; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; - -@Service -public class ResourceDaoImpl implements ResourceDao { - - @PersistenceContext - EntityManager entityManager; - - @Override - public List getRepositoriesByPerson(long personId) { - try { - return entityManager.createQuery("from Repository r where r.person.personId=:personId") - .setParameter("personId", personId).getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - } - - @Override - public List getRepositoriesByTeam(long personId) { - try { - return entityManager.createQuery(""" - select r from Repository r join r.team t, TeamMember tm join tm.person p - where tm.team.teamId=t.teamId and r.person.personId=:personId - """).setParameter("personId", personId).getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - } - - @Override - public List getRepositoriesByProject(long personId) { - try { - return entityManager.createQuery(""" - select r from Repository r join r.project pr, - Responsibility res join res.team t, TeamMember tm join tm.person p - where pr.projectId=res.project.projectId and tm.team.teamId=t.teamId and - tm.person.personId=:personId - """).setParameter("personId", personId).getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - } - - @Override - public List getDatabasesByProject(long personId) { - try { - return entityManager.createQuery(""" - select d from Database d join d.project pr, - Responsibility res join res.team t, TeamMember tm join tm.person p - where pr.projectId=res.project.projectId and tm.team.teamId=t.teamId and - tm.person.personId=:personId - """).setParameter("personId", personId).getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - - } -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/CustomUserDetailsService.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/CustomUserDetailsService.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,7 +1,0 @@ -package info.ajanovski.eprms.spr.services; - -import org.springframework.security.core.userdetails.UserDetailsService; - -public interface CustomUserDetailsService extends UserDetailsService { - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/CustomUserDetailsServiceImpl.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/CustomUserDetailsServiceImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,57 +1,0 @@ -package info.ajanovski.eprms.spr.services; - -import java.util.ArrayList; -import java.util.List; - -import javax.inject.Inject; - -import org.apache.logging.log4j.util.Strings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Service; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.Role; -import info.ajanovski.eprms.model.util.ModelConstants; - -@Service -public class CustomUserDetailsServiceImpl implements CustomUserDetailsService { - - private final Logger logger = LoggerFactory.getLogger(CustomUserDetailsServiceImpl.class); - - @Inject - public CustomUserDetailsServiceImpl(PersonManager personManager) { - this.personManager = personManager; - } - - private PersonManager personManager; - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - logger.info("Login attempted by: {}", username); - Person person = personManager.getPersonByUsername(username); - if (person != null) { - List authList = new ArrayList(); - for (Role r : personManager.getRolesForPerson(person.getPersonId())) { - if (r.getName().equals(ModelConstants.RoleAdministrator)) { - authList.add("ROLE_ADMINISTRATOR"); - } else if (r.getName().equals(ModelConstants.RoleInstructor)) { - authList.add("ROLE_INSTRUCTOR"); - } else if (r.getName().equals(ModelConstants.RoleStudent)) { - authList.add("ROLE_STUDENT"); - } - } - logger.info("Roles by {} :{}", username, Strings.join(authList, ',')); - return new User(person.getUserName(), "", true, true, true, true, - AuthorityUtils.commaSeparatedStringToAuthorityList(Strings.join(authList, ','))); - } else { - logger.error("Username {} not found! Throwing exception.", username); - throw new UsernameNotFoundException("UserName Not Found"); - } - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/GenericService.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/GenericService.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,44 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.services; - -import java.util.List; - -public interface GenericService { - public void delete(Object object); - - public void deleteByPK(Class classToDelete, long id); - - public List getAll(Class classToLoad); - - public T getByCode(Class classToLoad, String code); - - public T getByPK(Class classToLoad, long id); - - public List getQueryResult(String guery); - - public Object save(Object object); - - public void saveOrUpdate(Object object); - - public List getByTitleSubstring(Class classToSearch, String searchSubString); - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/GenericServiceImpl.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/GenericServiceImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,84 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.services; - -import java.util.List; - -import javax.inject.Inject; - -import org.springframework.stereotype.Service; - -import info.ajanovski.eprms.spr.data.GenericDao; - -@Service -public class GenericServiceImpl implements GenericService { - - @Inject - private GenericDao genericDao; - - @SuppressWarnings("unchecked") - @Override - public T getByPK(Class classToLoad, long id) { - return (T) genericDao.getByPK(classToLoad, id); - } - - @Override - public void deleteByPK(Class classToDelete, long id) { - genericDao.deleteByPK(classToDelete, id); - } - - @Override - public void delete(Object object) { - genericDao.delete(object); - } - - @Override - public void saveOrUpdate(Object object) { - genericDao.saveOrUpdate(object); - } - - @Override - public Object save(Object object) { - return genericDao.save(object); - } - - @Override - public List getQueryResult(String guery) { - return genericDao.getQueryResult(guery); - } - - @Override - public List getAll(Class classToLoad) { - return genericDao.getAll(classToLoad); - } - - @SuppressWarnings("unchecked") - @Override - public T getByCode(Class classToLoad, String code) { - return (T) genericDao.getByCode(classToLoad, code); - } - - @Override - public List getByTitleSubstring(Class classToSearch, String searchSubString) { - return genericDao.getByTitleSubstring(classToSearch, searchSubString); - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/ModelConstructor.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/ModelConstructor.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,69 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.services; - -import javax.inject.Inject; - -import org.springframework.stereotype.Component; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.ModelAttribute; - -import info.ajanovski.eprms.spr.util.UserInfo; - -@Component -public class ModelConstructor { - - @Inject - public String[] studentPageNames; - - @Inject - public String[] adminPageNames; - - public Model addMainModelAttribs(String title, Model model, @ModelAttribute("userInfo") UserInfo userInfo) { - model.addAttribute("title", title); - model.addAttribute("studentPageNames", studentPageNames); - model.addAttribute("adminPageNames", adminPageNames); - model.addAttribute("classForPageName", "nav-link"); - model.addAttribute("displayLanguage", "en"); - if (userInfo != null) { - model.addAttribute("userName", userInfo.getUserName()); - model.addAttribute("userInfo", userInfo); - } - return model; - } - - public Model addMainModelNoUserAttribs(String title, Model model) { - model.addAttribute("title", title); - model.addAttribute("studentPageNames", studentPageNames); - model.addAttribute("adminPageNames", adminPageNames); - model.addAttribute("classForPageName", "nav-link"); - model.addAttribute("displayLanguage", "en"); - return model; - } - - public Model addPublicModelAttribs(String title, Model model) { - model.addAttribute("title", title); - model.addAttribute("classForPageName", "nav-link"); - model.addAttribute("displayLanguage", "en"); - return model; - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/PersonManager.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/PersonManager.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,45 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.services; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.entities.Role; - -public interface PersonManager { - - public List getAllPersons(); - - public Person getPersonByUsername(String username); - - public String getPersonFullName(Person person); - - public String getPersonFullNameWithId(Person person); - - public List getPersonByFilter(String filter); - - public List getPersonRolesForPerson(long personId); - - public List getRolesForPerson(long personId); - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/PersonManagerImpl.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/PersonManagerImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,82 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.services; - -import java.util.List; - -import javax.inject.Inject; - -import org.springframework.stereotype.Service; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.entities.Role; -import info.ajanovski.eprms.spr.data.PersonDao; - -@Service -public class PersonManagerImpl implements PersonManager { - - @Inject - private GenericService genericService; - - @Inject - private PersonDao personDao; - - @Override - public List getAllPersons() { - return this.personDao.getAllPersons(); - } - - @Override - public Person getPersonByUsername(String username) { - return this.personDao.getPersonByUsername(username); - } - - public Person getPersonById(long personId) { - return genericService.getByPK(Person.class, personId); - } - - @Override - public List getPersonByFilter(String filter) { - return personDao.getPersonByFilter(filter); - } - - @Override - public List getPersonRolesForPerson(long personId) { - return personDao.getPersonRolesForPerson(personId); - } - - @Override - public List getRolesForPerson(long personId) { - return personDao.getRolesForPerson(personId); - } - - @Override - public String getPersonFullName(Person person) { - return personDao.getPersonFullName(person); - } - - @Override - public String getPersonFullNameWithId(Person person) { - return personDao.getPersonFullNameWithId(person); - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/ProjectManager.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/ProjectManager.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,25 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.services; - -public interface ProjectManager { - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/ProjectManagerImpl.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/ProjectManagerImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,28 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.services; - -import org.springframework.stereotype.Service; - -@Service -public class ProjectManagerImpl implements ProjectManager { - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/ResourceManager.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/ResourceManager.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,46 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.services; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; - -public interface ResourceManager { - - public List getRepositoriesByPerson(long personId); - - public List getRepositoriesByTeam(long personId); - - public List getRepositoriesByProject(long personId); - - public List getActiveRepositoriesByPerson(long personId); - - public List getActiveRepositoriesByTeam(long personId); - - public List getActiveRepositoriesByProject(long personId); - - public List getDatabasesByProject(long personId); - - public List getActiveDatabasesByProject(long personId); - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/services/ResourceManagerImpl.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/services/ResourceManagerImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,84 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.services; - -import java.util.List; -import java.util.stream.Collectors; - -import javax.inject.Inject; - -import org.springframework.stereotype.Service; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.spr.data.ResourceDao; - -@Service -public class ResourceManagerImpl implements ResourceManager { - - @Inject - private ResourceDao resourceDao; - - @Override - public List getRepositoriesByPerson(long personId) { - return resourceDao.getRepositoriesByPerson(personId); - } - - @Override - public List getRepositoriesByTeam(long personId) { - return resourceDao.getRepositoriesByTeam(personId); - } - - @Override - public List getRepositoriesByProject(long personId) { - return resourceDao.getRepositoriesByProject(personId); - } - - @Override - public List getActiveRepositoriesByPerson(long personId) { - return getRepositoriesByPerson(personId).stream().filter(p -> p.getDateCreated() != null) - .collect(Collectors.toList()); - } - - @Override - public List getActiveRepositoriesByTeam(long personId) { - return getRepositoriesByTeam(personId).stream().filter(p -> p.getDateCreated() != null) - .collect(Collectors.toList()); - } - - @Override - public List getActiveRepositoriesByProject(long personId) { - return getRepositoriesByProject(personId).stream().filter(p -> p.getDateCreated() != null) - .collect(Collectors.toList()); - } - - @Override - public List getDatabasesByProject(long personId) { - return resourceDao.getDatabasesByProject(personId); - } - - @Override - public List getActiveDatabasesByProject(long personId) { - return getDatabasesByProject(personId).stream().filter(p -> p.getDateCreated() != null) - .collect(Collectors.toList()); - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/util/AppConfig.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/util/AppConfig.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,56 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.util; - -import java.io.UnsupportedEncodingException; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class AppConfig { - private static final String BUNDLE_NAME = "AppConfig"; - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); - - private AppConfig() { - } - - public static String getString(String key) { - try { - return new String(RESOURCE_BUNDLE.getString(key).getBytes("ISO-8859-1"), "UTF-8"); - } catch (MissingResourceException e) { - throw e; - } catch (UnsupportedEncodingException e) { - return RESOURCE_BUNDLE.getString(key); - } - } - - public static Float getFloat(String key) { - return Float.parseFloat(getString(key)); - } - - public static Long getLong(String key) { - return Long.parseLong(getString(key)); - } - - public static Integer getInteger(String key) { - return Integer.parseInt(getString(key)); - } -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/util/AppConstants.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/util/AppConstants.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,27 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.util; - -public class AppConstants { - - public final static String PageIndex = "Index"; - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/util/UTF8Filter.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/util/UTF8Filter.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,55 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.util; - -import java.io.IOException; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -public class UTF8Filter implements Filter { - - private String encoding; - - @Override - public void init(FilterConfig config) throws ServletException { - encoding = config.getInitParameter("requestEncoding"); - if (encoding == null) { - encoding = "UTF-8"; - } - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain next) - throws IOException, ServletException { - request.setCharacterEncoding(encoding); - next.doFilter(request, response); - } - - @Override - public void destroy() { - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/util/UsefulMethods.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/util/UsefulMethods.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,38 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.util; - - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -public class UsefulMethods { - - public static List castList(Class clazz, Collection c) { - List r = new ArrayList(c.size()); - for (Object o : c) { - r.add(clazz.cast(o)); - } - return r; - } - -} Index: rms-spr/src/main/java/info/ajanovski/eprms/spr/util/UserInfo.java =================================================================== --- eprms-spr/src/main/java/info/ajanovski/eprms/spr/util/UserInfo.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,118 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.spr.util; - -import java.util.ArrayList; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.spr.services.PersonManager; - -public class UserInfo { - enum UserRole { - NONE, STUDENT, INSTRUCTOR, ADMINISTRATOR - }; - - private String userName; - private Long personId; - private List userRoles; - - private PersonManager pm; - private static final Logger logger = LoggerFactory.getLogger(UserInfo.class); - - public UserInfo(PersonManager pm) { - if (pm != null) { - this.pm = pm; - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if (auth.getPrincipal() != null) { - logger.info("Login by: {}", auth.getPrincipal()); - userName = ((UserDetails) auth.getPrincipal()).getUsername(); - this.setupUser(); - } else { - userName = null; - } - } else { - userName = null; - } - } - - private void setupUser() { - if (userName != null) { - userRoles = new ArrayList(); - Person p = pm.getPersonByUsername(userName); - if (p == null) { - personId = null; - userRoles.clear(); - } else { - this.personId = Long.valueOf(p.getPersonId()); - if (personId != null) { - for (PersonRole pr : pm.getPersonRolesForPerson(personId)) { - if (pr.getRole().getName().equals(ModelConstants.RoleAdministrator)) { - userRoles.add(UserRole.ADMINISTRATOR); - } else if (pr.getRole().getName().equals(ModelConstants.RoleInstructor)) { - userRoles.add(UserRole.INSTRUCTOR); - } else if (pr.getRole().getName().equals(ModelConstants.RoleStudent)) { - userRoles.add(UserRole.STUDENT); - } - } - if (userRoles.size() == 0) { - userRoles.add(UserRole.NONE); - } - } - } - } - - } - - public String getUserName() { - return userName; - } - - public Long getPersonId() { - return personId; - } - - public boolean isNone() { - return userRoles.contains(UserRole.NONE); - } - - public boolean isStudent() { - return userRoles.contains(UserRole.STUDENT); - } - - public boolean isAdministrator() { - return userRoles.contains(UserRole.ADMINISTRATOR); - } - - public void impersonate(String inUsername) throws Exception { - this.userName = inUsername; - this.setupUser(); - } - -} Index: rms-spr/src/main/resources/AppConfig.properties =================================================================== --- eprms-spr/src/main/resources/AppConfig.properties (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,32 +1,0 @@ -#configure these parameters in your maven .m2 settings.xml file -#warning utf-8 is not truly supported this way, but there is a workarround -#that will do an automatic conversion of the string bytestream if it was written with utf-8 -#this can sometimes result with an error - -cas.server=@cas.server@ -app.server=@app.server@ -cas.war.file=@cas.war.file@ -cas.war.context=@cas.war.context@ -logout.redirectToServer=@logout.redirectToServer@ - -date.upload.submission.format=yyyyMMdd-HHmmss -date.audit.format=yyyy-MM-dd'T'HH:mm:ss -date.audit.dateonlyformat=yyyy-MM-dd -date.gui.format=dd.MM.yyyy -time.gui.format=HH:mm - -additionalFiles.path=@additionalFiles.path@ -fonts.path=@fonts.path@ -data.path=@data.path@ -xls.path=@xls.path@ -xls.sheet.password=@xls.sheet.password@ -upload.path.submissions=@upload.path.submissions@ - -fonts.serif=DejaVuSerif.ttf -fonts.sans=DejaVuSans.ttf -fonts.mono=DejaVuSans.ttf - -production.mode=@production.mode@ -techsupport.url=@techsupport.url@ - -tapestry.hmac-passphrase=@tapestry.hmac-passphrase@ Index: rms-spr/src/main/resources/app.properties =================================================================== --- eprms-spr/src/main/resources/app.properties (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,57 +1,0 @@ -# This is where global application properties go. -# You can also have individual message catalogs for each page and each -# component that override these defaults. -# The name of this file is based on the element in web. - -index-pagelink=Home -myrepositories-pagelink=My Repositories -MyRepositories-pagelink=My Repositories -myrepositoryauth-pagelink=Repository Auth -mydatabases-pagelink=My Databases -MyDatabases-pagelink=My Databases -admin/Teams-pagelink=Teams -admin/Projects-pagelink=Projects -admin/ManageRepositories-pagelink=Manage Repositories -admin/ManageDatabases-pagelink=Manage Databases -application-logout=Application Logout - -login-label=CAS Login -admin-label=Admin -app-title-short=EPRMS -lang-label=Language -team-label=Team -Team-label=Team -TeamMember-label=Team member -project-label=Project -Project-label=Project -repository-label=repository -Repository-label=Repository -database-label=database -Database-label=Database -new-label=Create -add-label=Add -remove-label=Remove -personal-label=Personal -Personal-label=Personal -repositories-label=Repositories -edit-label=Edit -password=Password -confirmPassword=Confirm Password - -Logout-label=Logout -logout-page=CAS Logout -logout-info-application=\u041E\u0434\u0458\u0430\u0432\u0435\u043D\u0438 \u0441\u0442\u0435 \u043E\u0434 \u043E\u0432\u0430\u0430 \u0430\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u0458\u0430. \u0421\u0438\u0442\u0435 \u0432\u0430\u0448\u0438 \u0441\u0435\u0441\u0438\u0441\u043A\u0438 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 \u0441\u0435 \u0438\u0437\u0431\u0440\u0438\u0448\u0430\u043D\u0438 \u043E\u0434 \u0441\u0435\u0440\u0432\u0435\u0440\u043E\u0442. \u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u0435 \u0441\u043E \u043A\u043E\u0440\u0438\u0441\u0442\u0435\u045A\u0435 \u043D\u0430 \u043E\u0441\u0442\u0430\u043D\u0430\u0442\u0438\u0442\u0435 \u0441\u0435\u0440\u0432\u0438\u0441\u0438. -logout-info-total=\u0418\u043C\u0430\u0458\u0442\u0435 \u043F\u0440\u0435\u0434\u0432\u0438\u0434 \u0434\u0435\u043A\u0430 CAS \u0441\u0438\u0441\u0442\u0435\u043C\u043E\u0442 \u0441\u043B\u0443\u0436\u0438 \u0437\u0430 \u0434\u0430 \u0458\u0430 \u0437\u0430\u0434\u0440\u0436\u0438 \u0432\u0430\u0448\u0430\u0442\u0430 \u043D\u0430\u0458\u0430\u0432\u0430 \u0441\u0450 \u0434\u043E\u0434\u0435\u043A\u0430 \u0438\u043C\u0430\u0442\u0435 \u043F\u043E\u0442\u0440\u0435\u0431\u0430 \u043E\u0434 \u043A\u043E\u0440\u0438\u0441\u0442\u0435\u045A\u0435 \u043D\u0430 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u0438\u0442\u0435 \u0444\u0430\u043A\u0443\u043B\u0442\u0435\u0442\u0441\u043A\u0438 \u0441\u0435\u0440\u0432\u0438\u0441\u0438. \u041E\u0434\u0458\u0430\u0432\u0430\u0442\u0430 \u043E\u0434 \u043E\u0432\u0430\u0430 \u0430\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u0458\u0430, \u043D\u0435 \u0432\u0435 \u043E\u0434\u0458\u0430\u0432\u0438 \u043E\u0434 CAS \u0441\u0438\u0441\u0442\u0435\u043C\u043E\u0442. \u0422\u0430\u043A\u0430 \u0441\u043E \u0432\u043B\u0435\u0437 \u0432\u043E \u0431\u0438\u043B\u043E \u043A\u043E\u0458 \u0444\u0430\u043A\u0443\u043B\u0442\u0435\u0442\u0441\u043A\u0438 \u0441\u0435\u0440\u0432\u0438\u0441 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0441\u043A\u0438 \u045C\u0435 \u0431\u0438\u0434\u0435\u0442\u0435 \u043D\u0430\u0458\u0430\u0432\u0435\u043D\u0438 \u0432\u043E \u0438\u0441\u0442\u0438\u043E\u0442. -logout-desc-total=\u0414\u043E\u043A\u043E\u043B\u043A\u0443 \u0441\u0430\u043A\u0430\u0442\u0435 \u0426\u0415\u041B\u041E\u0421\u041D\u041E \u0434\u0430 \u0441\u0435 \u043E\u0434\u0458\u0430\u0432\u0438\u0442\u0435 \u043E\u0434 CAS \u0441\u0438\u0441\u0442\u0435\u043C\u043E\u0442 \u0438 \u043E\u0434 \u0441\u0438\u0442\u0435 \u0444\u0430\u043A\u0443\u043B\u0442\u0435\u0442\u0441\u043A\u0438 \u0441\u0435\u0440\u0432\u0438\u0441\u0438 \u043A\u043E\u0438 \u0433\u043E \u043A\u043E\u0440\u0438\u0441\u0442\u0430\u0442 \u043A\u043B\u0438\u043A\u043D\u0435\u0442\u0435 \u043D\u0430 \u043A\u043E\u043F\u0447\u0435\u0442\u043E: -logout-desc-total-cont=\u041D\u0430 \u043A\u0440\u0430\u0458, \u043F\u0440\u0435\u043F\u043E\u0440\u0430\u0447\u0430\u043D\u043E \u0435 \u0434\u0430 \u0433\u043E \u0437\u0430\u0442\u0432\u043E\u0440\u0438\u0442\u0435 \u0432\u0430\u0448\u0438\u043E\u0442 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442 \u043F\u0440\u0435\u043B\u0438\u0441\u0442\u0443\u0432\u0430\u0447, \u0441\u0438\u0442\u0435 \u043D\u0435\u0433\u043E\u0432\u0438 \u043F\u0440\u043E\u0437\u043E\u0440\u0446\u0438 \u0438 \u0441\u0438\u0442\u0435 \u043D\u0435\u0433\u043E\u0432\u0438 \u0442\u0430\u0431 \u043B\u0438\u0441\u0442\u043E\u0432\u0438. -logout-desc-total-title=\u0426\u0435\u043B\u043E\u0441\u043D\u0430 \u043E\u0434\u0458\u0430\u0432\u0430 \u043E\u0434 CAS - -copyrightYear=2021 -copyrightHolder=Vangel V. Ajanovski -main-developer-name=Vangel V. Ajanovski -main-developer-url=https://ajanovski.info - -greeting-title=Welcome -greeting=The EPRMS - Educational Project and Resources Management System is a management information system covering student projects, source repositories and other related resources. This is an open-source system, initially developed as a demonstrational web application for a course on Internet Technologies. -system-description=The EPRMS - Educational Project and Resources Management System is a management information system covering student projects, source repositories and other related resources. This is an open-source system, initially developed as a demonstrational web application for a course on Internet Technologies. -greeting-url=https://github.com/ajanovski/eprms Index: rms-spr/src/main/resources/app_mk.properties =================================================================== --- eprms-spr/src/main/resources/app_mk.properties (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,56 +1,0 @@ -# This is where global application properties go. -# You can also have individual message catalogs for each page and each -# component that override these defaults. -# The name of this file is based on the element in web. - -index-pagelink=\u041F\u043E\u0447\u0435\u0442\u043D\u0430 -myrepositories-pagelink=\u041C\u043E\u0438 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 -myrepositoryauth-pagelink=\u0410\u0432\u0442\u0435\u043D\u0442\u0438\u043A\u0430\u0446\u0438\u0458\u0430 \u0437\u0430 \u0440\u0435\u043F\u043E -mydatabases-pagelink=\u041C\u043E\u0438 \u0431\u0430\u0437\u0438 \u043D\u0430 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 -admin/teams-pagelink=\u0422\u0438\u043C\u043E\u0432\u0438 -admin/projects-pagelink=\u041F\u0440\u043E\u0435\u043A\u0442\u0438 -admin/ManageRepositories-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 -admin/ManageDatabases-pagelink=\u0423\u043F\u0440\u0430\u0432\u0443\u0432\u0430\u045A\u0435 \u0441\u043E \u0431\u0430\u0437\u0438 \u043D\u0430 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 - -login-label=\u041D\u0430\u0458\u0430\u0432\u0430 -delete-confirmation-label=Are you sure you want to delete this item? - -admin-label=\u0410\u0434\u043C\u0438\u043D -app-title=\u0415\u041F\u041C -lang-label=Language -team-label=\u0422\u0438\u043C -teammember-label=\u0427\u043B\u0435\u043D \u043D\u0430 \u0442\u0438\u043C\u043E\u0442 -project-label=\u041F\u0440\u043E\u0435\u043A\u0442 -repository-label=\u0420\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C -database-label=\u0411\u0430\u0437\u0430 \u043D\u0430 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 -Database-label=\u0411\u0430\u0437\u0430 \u043D\u0430 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 -new-label=\u041A\u0440\u0435\u0438\u0440\u0430\u0458 -add-label=\u0414\u043E\u0434\u0430\u0434\u0438 -remove-label=\u041E\u0442\u0441\u0442\u0440\u0430\u043D\u0438 -personal-label=\u041B\u0438\u0447\u043D\u0438 -repositories-label=\u0420\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 -edit-label=\u0418\u0437\u043C\u0435\u043D\u0438 -password=Password -confirmPassword=Confirm Password - -Logout-label=\u041E\u0434\u0458\u0430\u0432\u0430 -logout-page=CAS Logout -logout-info-application=\u041E\u0434\u0458\u0430\u0432\u0435\u043D\u0438 \u0441\u0442\u0435 \u043E\u0434 \u043E\u0432\u0430\u0430 \u0430\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u0458\u0430. \u0421\u0438\u0442\u0435 \u0432\u0430\u0448\u0438 \u0441\u0435\u0441\u0438\u0441\u043A\u0438 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 \u0441\u0435 \u0438\u0437\u0431\u0440\u0438\u0448\u0430\u043D\u0438 \u043E\u0434 \u0441\u0435\u0440\u0432\u0435\u0440\u043E\u0442. \u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u0435 \u0441\u043E \u043A\u043E\u0440\u0438\u0441\u0442\u0435\u045A\u0435 \u043D\u0430 \u043E\u0441\u0442\u0430\u043D\u0430\u0442\u0438\u0442\u0435 \u0441\u0435\u0440\u0432\u0438\u0441\u0438. -logout-info-total=\u0418\u043C\u0430\u0458\u0442\u0435 \u043F\u0440\u0435\u0434\u0432\u0438\u0434 \u0434\u0435\u043A\u0430 CAS \u0441\u0438\u0441\u0442\u0435\u043C\u043E\u0442 \u0441\u043B\u0443\u0436\u0438 \u0437\u0430 \u0434\u0430 \u0458\u0430 \u0437\u0430\u0434\u0440\u0436\u0438 \u0432\u0430\u0448\u0430\u0442\u0430 \u043D\u0430\u0458\u0430\u0432\u0430 \u0441\u0450 \u0434\u043E\u0434\u0435\u043A\u0430 \u0438\u043C\u0430\u0442\u0435 \u043F\u043E\u0442\u0440\u0435\u0431\u0430 \u043E\u0434 \u043A\u043E\u0440\u0438\u0441\u0442\u0435\u045A\u0435 \u043D\u0430 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u0438\u0442\u0435 \u0444\u0430\u043A\u0443\u043B\u0442\u0435\u0442\u0441\u043A\u0438 \u0441\u0435\u0440\u0432\u0438\u0441\u0438. \u041E\u0434\u0458\u0430\u0432\u0430\u0442\u0430 \u043E\u0434 \u043E\u0432\u0430\u0430 \u0430\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u0458\u0430, \u043D\u0435 \u0432\u0435 \u043E\u0434\u0458\u0430\u0432\u0438 \u043E\u0434 CAS \u0441\u0438\u0441\u0442\u0435\u043C\u043E\u0442. \u0422\u0430\u043A\u0430 \u0441\u043E \u0432\u043B\u0435\u0437 \u0432\u043E \u0431\u0438\u043B\u043E \u043A\u043E\u0458 \u0444\u0430\u043A\u0443\u043B\u0442\u0435\u0442\u0441\u043A\u0438 \u0441\u0435\u0440\u0432\u0438\u0441 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0441\u043A\u0438 \u045C\u0435 \u0431\u0438\u0434\u0435\u0442\u0435 \u043D\u0430\u0458\u0430\u0432\u0435\u043D\u0438 \u0432\u043E \u0438\u0441\u0442\u0438\u043E\u0442. -logout-desc-total=\u0414\u043E\u043A\u043E\u043B\u043A\u0443 \u0441\u0430\u043A\u0430\u0442\u0435 \u0426\u0415\u041B\u041E\u0421\u041D\u041E \u0434\u0430 \u0441\u0435 \u043E\u0434\u0458\u0430\u0432\u0438\u0442\u0435 \u043E\u0434 CAS \u0441\u0438\u0441\u0442\u0435\u043C\u043E\u0442 \u0438 \u043E\u0434 \u0441\u0438\u0442\u0435 \u0444\u0430\u043A\u0443\u043B\u0442\u0435\u0442\u0441\u043A\u0438 \u0441\u0435\u0440\u0432\u0438\u0441\u0438 \u043A\u043E\u0438 \u0433\u043E \u043A\u043E\u0440\u0438\u0441\u0442\u0430\u0442 \u043A\u043B\u0438\u043A\u043D\u0435\u0442\u0435 \u043D\u0430 \u043A\u043E\u043F\u0447\u0435\u0442\u043E: -logout-desc-total-cont=\u041D\u0430 \u043A\u0440\u0430\u0458, \u043F\u0440\u0435\u043F\u043E\u0440\u0430\u0447\u0430\u043D\u043E \u0435 \u0434\u0430 \u0433\u043E \u0437\u0430\u0442\u0432\u043E\u0440\u0438\u0442\u0435 \u0432\u0430\u0448\u0438\u043E\u0442 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442 \u043F\u0440\u0435\u043B\u0438\u0441\u0442\u0443\u0432\u0430\u0447, \u0441\u0438\u0442\u0435 \u043D\u0435\u0433\u043E\u0432\u0438 \u043F\u0440\u043E\u0437\u043E\u0440\u0446\u0438 \u0438 \u0441\u0438\u0442\u0435 \u043D\u0435\u0433\u043E\u0432\u0438 \u0442\u0430\u0431 \u043B\u0438\u0441\u0442\u043E\u0432\u0438. -logout-desc-total-title=\u0426\u0435\u043B\u043E\u0441\u043D\u0430 \u043E\u0434\u0458\u0430\u0432\u0430 \u043E\u0434 CAS - -copyrightYear=2021 -copyrightHolder=\u0412\u0430\u043D\u0433\u0435\u043B \u0412. \u0410\u0458\u0430\u043D\u043E\u0432\u0441\u043A\u0438 - -positionNumber-label=\u041F\u043E\u0437\u0438\u0446\u0438\u0458\u0430 \u0431\u0440\u043E\u0458 -lastName-label=\u041F\u0440\u0435\u0437\u0438\u043C\u0435 -firstName-label=\u0418\u043C\u0435 -userName-label=\u041A\u043E\u0440\u0438\u0441\u043D\u0438\u0447\u043A\u043E \u0438\u043C\u0435 -role-label=\u0423\u043B\u043E\u0433\u0430 - - -greeting-title=\u0414\u043E\u0431\u0440\u043E\u0434\u043E\u0458\u0434\u043E\u0432\u0442\u0435 -greeting=\u0415\u041F\u0420\u041C\u0421 - \u0415\u0434\u0443\u043A\u0430\u0442\u0438\u0432\u0435\u043D \u041F\u0440\u043E\u0435\u043A\u0442\u0435\u043D \u041C\u0435\u043D\u0430\u045F\u043C\u0435\u043D\u0442 \u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0441\u043A\u0438 \u0441\u0438\u0441\u0442\u0435\u043C \u0437\u0430 \u043C\u0435\u043D\u0430\u045F\u0438\u0440\u0430\u045A\u0435 \u043D\u0430 \u0441\u0442\u0443\u0434\u0435\u043D\u0442\u0441\u043A\u0438 \u043F\u0440\u043E\u0435\u043A\u0442\u0438, \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 \u043D\u0430 \u0438\u0437\u0432\u043E\u0440\u0435\u043D \u043A\u043E\u0434 \u0438 \u0434\u0440\u0443\u0433\u0438 \u043F\u043E\u0432\u0440\u0437\u0430\u043D\u0438 \u0440\u0435\u0441\u0443\u0440\u0441\u0438 \u0441\u043E \u043F\u0440\u043E\u0446\u0435\u0441\u043E\u0442 \u043D\u0430 \u0440\u0430\u0437\u0432\u043E\u0458 \u043D\u0430 \u0441\u0442\u0443\u0434\u0435\u043D\u0442\u0441\u043A\u0438\u0442\u0435 \u043F\u0440\u043E\u0435\u043A\u0442\u0438. \u041E\u0432\u0430 \u0435 \u0441\u0438\u0441\u0442\u0435\u043C \u0441\u043E \u043E\u0442\u0432\u043E\u0440\u0435\u043D \u043A\u043E\u0434, \u0438\u043D\u0438\u0446\u0438\u0458\u0430\u043B\u043D\u043E \u0440\u0430\u0437\u0432\u0438\u0435\u043D \u043A\u0430\u043A\u043E \u043F\u0440\u0438\u043C\u0435\u0440 \u0432\u0435\u0431 \u0430\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u0458\u0430 \u043F\u043E\u043A\u0440\u0438\u0435\u043D\u0430 \u0432\u043E \u043D\u0430\u0441\u0442\u0430\u0432\u0430\u0442\u0430 \u043D\u0430 \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u043E\u0442 \u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442 \u0422\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0438 \u043D\u0430 \u0424\u0418\u041D\u041A\u0418. -system-description=\u0415\u041F\u0420\u041C\u0421 - \u0415\u0434\u0443\u043A\u0430\u0442\u0438\u0432\u0435\u043D \u041F\u0440\u043E\u0435\u043A\u0442\u0435\u043D \u041C\u0435\u043D\u0430\u045F\u043C\u0435\u043D\u0442 \u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0441\u043A\u0438 \u0441\u0438\u0441\u0442\u0435\u043C \u0437\u0430 \u043C\u0435\u043D\u0430\u045F\u0438\u0440\u0430\u045A\u0435 \u043D\u0430 \u0441\u0442\u0443\u0434\u0435\u043D\u0442\u0441\u043A\u0438 \u043F\u0440\u043E\u0435\u043A\u0442\u0438, \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u0443\u043C\u0438 \u043D\u0430 \u0438\u0437\u0432\u043E\u0440\u0435\u043D \u043A\u043E\u0434 \u0438 \u0434\u0440\u0443\u0433\u0438 \u043F\u043E\u0432\u0440\u0437\u0430\u043D\u0438 \u0440\u0435\u0441\u0443\u0440\u0441\u0438 \u0441\u043E \u043F\u0440\u043E\u0446\u0435\u0441\u043E\u0442 \u043D\u0430 \u0440\u0430\u0437\u0432\u043E\u0458 \u043D\u0430 \u0441\u0442\u0443\u0434\u0435\u043D\u0442\u0441\u043A\u0438\u0442\u0435 \u043F\u0440\u043E\u0435\u043A\u0442\u0438. \u041E\u0432\u0430 \u0435 \u0441\u0438\u0441\u0442\u0435\u043C \u0441\u043E \u043E\u0442\u0432\u043E\u0440\u0435\u043D \u043A\u043E\u0434, \u0438\u043D\u0438\u0446\u0438\u0458\u0430\u043B\u043D\u043E \u0440\u0430\u0437\u0432\u0438\u0435\u043D \u043A\u0430\u043A\u043E \u043F\u0440\u0438\u043C\u0435\u0440 \u0432\u0435\u0431 \u0430\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u0458\u0430 \u043F\u043E\u043A\u0440\u0438\u0435\u043D\u0430 \u0432\u043E \u043D\u0430\u0441\u0442\u0430\u0432\u0430\u0442\u0430 \u043D\u0430 \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u043E\u0442 \u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442 \u0422\u0435\u0445\u043D\u043E\u043B\u043E\u0433\u0438\u0438 \u043D\u0430 \u0424\u0418\u041D\u041A\u0418. Index: rms-spr/src/main/resources/application.properties =================================================================== --- eprms-spr/src/main/resources/application.properties (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,16 +1,0 @@ -spring.jpa.open-in-view=true - -spring.datasource.url=@jdbc.url@ -spring.datasource.username=@jdbc.username@ -spring.datasource.password=@jdbc.password@ -spring.datasource.driver-class-name=@jdbc.driver@ - -spring.jpa.properties.hibernate.default_schema=@jdbc.default_schema@ -spring.jpa.properties.hibernate.dialect=@hib.dialect@ -spring.jpa.database-platform=@hib.dialect@ -spring.jpa.hibernate.ddl-auto=@hib.hbm2ddlauto@ - -spring.data.jpa.repositories.enabled=true - -spring.messages.basename=app -spring.messages.fallback-to-system-locale=true Index: rms-spr/src/main/resources/application.yml =================================================================== --- eprms-spr/src/main/resources/application.yml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,3 +1,0 @@ -server: - port: 8081 - Index: rms-spr/src/main/resources/static/site-overrides.css =================================================================== --- eprms-spr/src/main/resources/static/site-overrides.css (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,77 +1,0 @@ -:root { - --ck-z-default: 100; - --ck-z-modal: calc( var(--ck-z-default) + 999 ); - - /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ - --color-incorrect: #c71c2c; - - /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ - --color-correct: #74b979; - - --color-noevaluation: #white; - --color-exception: #404040; -} - -body, -h1, -h2, -h3, -h4, -h5, -h6, -.h1, -.h2, -.h3, -.h4, -.h5, -.h6 { - font-family: 'Fira Sans', Helvetica, Arial, sans-serif !important; -} - -code { - font-family: 'Fira Mono', monospace, mono !important; -} - -.color-queryError { - background: var(--color-incorrect); - color: white; -} - -.color-queryCorrect { - background: var(--color-correct); - color: black; -} - -.centered-hv { - text-align: center; - vertical-align: middle; -} - -p.comment { - background: #ffff80; -} - -.inlinecomment { - background: #ffffa0; - margin-left:5rem; - border-left: 1px solid black; - padding-left:0.5rem; -} - -@keyframes slidein { - from { background: white; } - 50% { background: #ffffa0; } - to { background: white; } -} - -.pagination li { - margin-left:0.5em; -} - -svg { - fill: transparent; - stroke: currentColor; - stroke-width: 0.1em; - stroke-linecap: round; - stroke-linejoin: round; -} Index: rms-spr/src/main/resources/templates/Index.html =================================================================== --- eprms-spr/src/main/resources/templates/Index.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,35 +1,0 @@ - - - - - - - -
- -
- -
- -
-
-
- -
-
-
- -
-

-

- -
- -
- -
- -
- Index: rms-spr/src/main/resources/templates/Logout.html =================================================================== --- eprms-spr/src/main/resources/templates/Logout.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,29 +1,0 @@ - - - - - - - -
- -

[[#{logout-page}]]

- -

[[#{application-logout}]]

- -

[[#{logout-info-application}]]

- -

[[#{logout-page}]]

-

- [[#{logout-info-total}]] -

-

- [[#{logout-desc-total}]]
[[#{logout-desc-total-title}]]
- [[#{logout-desc-total-cont}]] -

- -
- - Index: rms-spr/src/main/resources/templates/MyDatabases.html =================================================================== --- eprms-spr/src/main/resources/templates/MyDatabases.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,54 +1,0 @@ - - - - - - - -
- -

[[#{MyDatabases-pagelink}]]

- -
-
-
-

Project: [[${database.project.title}]]

-

Database: [[${database.name}]]

-
-

Please use the following parameters to connect to this - database

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SSH tunnel server:[[${database.tunnelServer}]]
SSH tunnel user:[[${database.tunnelUser}]]
SSH tunnel password:[[${database.tunnelPassword}]]
Database Server:[[${database.server}]]
Database Name:[[${database.name}]]
Database User:[[${database.owner}]]
Database Password:[[${database.password}]]
-
-
-
- - Index: rms-spr/src/main/resources/templates/MyProfile.html =================================================================== --- eprms-spr/src/main/resources/templates/MyProfile.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,35 +1,0 @@ - - - - - - - -
- -
- -
- -
-
-
- -
-
-
- -
-

[[#{greeting-title}]] [[${userInfo.userName}]]

-

- -
- -
- -
- -
- Index: rms-spr/src/main/resources/templates/MyRepositories.html =================================================================== --- eprms-spr/src/main/resources/templates/MyRepositories.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,40 +1,0 @@ - - - - - - - -
- -

[[#{MyRepositories-pagelink}]]

- -

[[#{Personal-label}]]

- - - - - - -
[[${repository.title}]][[${repository.url}]][[${repository.dateCreated}]]
- -

[[#{project-label}]]

- - - - - - -
[[${repository.title}]][[${repository.url}]][[${repository.dateCreated}]]
- -

[[#{team-label}]]

- - - - - - -
[[${repository.title}]][[${repository.url}]][[${repository.dateCreated}]]
-
- - Index: rms-spr/src/main/resources/templates/MyRepositoryAuth.html =================================================================== --- eprms-spr/src/main/resources/templates/MyRepositoryAuth.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,33 +1,0 @@ - - - - - - - -
- -

Repository Authentication

- -

Please enter your new password for repository authentication.

- -
- -
- -
- -
- -
- - - -
- -
- - Index: rms-spr/src/main/resources/templates/admin/ManageDatabases.html =================================================================== --- eprms-spr/src/main/resources/templates/admin/ManageDatabases.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,94 +1,0 @@ - - - - - - - -
- -

[[#{admin/ManageDatabases-pagelink}]]

- - -
-
- Show - databases for creation: [[${isOnlyShowNotCreated}]] -
- -
-
-

[[#{database-label}]]

-
- -
- -
-
- -
- -
-
-
-
- -
- -

- ./create_database.sh "[[${database.name}]]" "[[${database.owner}]]" - "[[${database.password}]]"
-

- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
typeserverportnameownerpasswordtunnelUsertunnelPasswordtunnelServertunnelServerAction
[[${database.type}]][[${database.server}]][[${database.port}]][[${database.name}]][[${database.owner}]][[${database.password}]][[${database.tunnelUser}]][[${database.tunnelPassword}]][[${database.tunnelServer}]][[${database.dateCreated}]][[#{edit-label}]] - [[#{remove-label}]]
-
- -
- - - - Index: rms-spr/src/main/resources/templates/admin/ManageRepositories.html =================================================================== --- eprms-spr/src/main/resources/templates/admin/ManageRepositories.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,56 +1,0 @@ - - - - - - - -
- - -

[[#{admin/ManageRepositories-pagelink}]]

- -
- Show - repositories for creation: [[${isOnlyShowNotCreated}]] -
- -
- - ./create_repository.sh - "${repository.title}" "${repository.url}"
- - -
-
- - - - - - - - - - - - - - - -
titleurldate createdAction
[[${repository.title}]][[${repository.url}]][[${repository.dateCreated}]][[#{edit-label}]] - [[#{remove-label}]]
-
- - -
- - - - Index: rms-spr/src/main/resources/templates/admin/Projects.html =================================================================== --- eprms-spr/src/main/resources/templates/admin/Projects.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,251 +1,0 @@ - - - - - - - -
-

[[#{admin/Projects-pagelink}]]

- -
-
-
-
-
-
- -
- -
-
-
-
- -
-
-
-

[[#{Project-label}]]

-
-
- -
-
- -
- -
-
-
- -
-
-

[[#{Team-label}]]

-
- -
- -
- -
-
-
- -
-
-

[[#{TeamMember-label}]]

-
- -
- -
-
- -
-
- -
- -
-
-
- -
-
-

[[#{Database-label}]]

-
- -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- -
-
-
- -
-
-

[[#{Repository-label}]]

-
- -
- -
-
- -
- -
-
-
- - -
-
- -
-
-
-

[[${project.title}]]

-
-
-
-
-

- [[#{repository-label}]]
[[${repository.url}]] -

-

- - [[#{repository-label}]] - -

- -

- [[#{database-label}]]
[[${database.name}]] -

-

- - - [[#{database-label}]] - -

- -
-
-
-
- -

- - [[#{add-label}]] [[#{TeamMember-label}]] -

-
- - [[#{Team-label}]] -
-
-
-
-
- -
- - Index: rms-spr/src/main/resources/templates/admin/Teams.html =================================================================== --- eprms-spr/src/main/resources/templates/admin/Teams.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,20 +1,0 @@ - - - - - - - -
- -

[[#{admin/Teams-pagelink}]]

- - - - - - -
[[${team.name}]][[${team.name}]]
-
- - Index: rms-spr/src/main/resources/templates/error/401.html =================================================================== --- eprms-spr/src/main/resources/templates/error/401.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,23 +1,0 @@ - - - - - - - -
- -
- -
-
-

Unrecognized user

-
-
- -
- -
- - - Index: rms-spr/src/main/resources/templates/error/403.html =================================================================== --- eprms-spr/src/main/resources/templates/error/403.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,23 +1,0 @@ - - - -ERROR - - - -
- -
- -
-
-

Access Denied

-
-
- -
- -
- - - Index: rms-spr/src/main/resources/templates/error/404.html =================================================================== --- eprms-spr/src/main/resources/templates/error/404.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,23 +1,0 @@ - - - -ERROR - - - -
- -
- -
-
-

Resource not found

-
-
- -
- -
- - - Index: rms-spr/src/main/resources/templates/error/500.html =================================================================== --- eprms-spr/src/main/resources/templates/error/500.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,23 +1,0 @@ - - - -ERROR - - - -
- -
- -
-
-

Internal server error

-
-
- -
- -
- - - Index: rms-spr/src/main/resources/templates/error/error.html =================================================================== --- eprms-spr/src/main/resources/templates/error/error.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,23 +1,0 @@ - - - - - - - -
- -
- -
-
-

Error

-
-
- -
- -
- - - Index: rms-spr/src/main/resources/templates/fragments/SVGIcon.html =================================================================== --- eprms-spr/src/main/resources/templates/fragments/SVGIcon.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,11 +1,0 @@ - - - - - - - - - Index: rms-spr/src/main/resources/templates/fragments/TeamMembersGrid.html =================================================================== --- eprms-spr/src/main/resources/templates/fragments/TeamMembersGrid.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,40 +1,0 @@ - - - -
- -
[[#{Team-label}]] - [[${team.name}]]
- - - - - - - - - - - - - - - - - - - - - - -
positionlast namefirst nameuser nameroleactions
[[${teamMember.positionNumber}]][[${teamMember.person.lastName}]][[${teamMember.person.firstName}]][[${teamMember.person.userName}]][[${teamMember.role}]] - [[#{remove-label}]] -
- -
- - Index: rms-spr/src/main/resources/templates/fragments/layout.html =================================================================== --- eprms-spr/src/main/resources/templates/fragments/layout.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,102 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

-

-
- - -
- - -
-
-

- Copyright © -

-
-
- - - Index: rms-spr/src/main/resources/templates/fragments/layoutGuest.html =================================================================== --- eprms-spr/src/main/resources/templates/fragments/layoutGuest.html (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,75 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

-

-
- - -
- - -
-
-

- Copyright © -

-
-
- - - Index: rms-spr/src/main/webapp/images/feather-sprite.svg =================================================================== --- eprms-spr/src/main/webapp/images/feather-sprite.svg (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,1 +1,0 @@ - Index: rms-spr/src/test/java/info/ajanovski/eprms/spr/EprmsSprApplicationTests.java =================================================================== --- eprms-spr/src/test/java/info/ajanovski/eprms/spr/EprmsSprApplicationTests.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,13 +1,0 @@ -package info.ajanovski.eprms.spr; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class EprmsSprApplicationTests { - - @Test - void contextLoads() { - } - -} Index: eprms-tap/INSTALL.md =================================================================== --- eprms-tap/INSTALL.md (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/INSTALL.md (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -1,13 +1,13 @@ -# eprms-tap build from source instructions +#eprms-tap build from source instructions -## Testing Database and Web App and Authentication Server +##Testing Database and Web App Server -For testing purposes, you can use Docker/Podman to run all the needed services in containers. +For testing purposes, you can use Podman or Docker to run all the needed services in containers. -### Database +###Database -The system is developed and tested against a PostgreSQL 12 started as a Docker/Podman container, but in general it is database agnostic and uses only Hibernate APIs, so you can switch to another database. +The system is developed and tested against a PostgreSQL 12 started as Podman container, but in general it is database agnostic and uses only Hibernate APIs, so you can switch to another database. -To start a containerized PostgreSQL instance that stores all it's data in a local folder follow the instructions to create the folder and map the container to use that folder: +To start a containerized PostgreSQL instance follow the instructions: $ mkdir DatabaseFolder @@ -47,7 +47,7 @@ alter schema epm_util owner to eprms_owner; -### Web Application and Authentication Server +###Web Application Server -For testing purposes it is recommended to use Apache Tomcat as a Java web application server, and you can also run it in a separate container. +For testing purposes it is recommended to use Apache Tomcat as a Java web application server, and you can also run in a separate container. $ mkdir WebAppsFolder @@ -66,17 +66,11 @@ You can use the WebAppsFolder to place the packaged web application archives (WAR files). -The application uses Apereo CAS for authentication. Copy the provided *cas.war* to the *WebAppsFolder* to initiate a demo instance of Apereo CAS, where all usernames are valid and anyone can log in provided the password that is entered is the same as the username. -Check if CAS is working: - http://localhost:8080/cas - -## Build the web application +##Build the web application The application will be built from source using Maven. -### Maven profile configuration - -Some configuration parameters can be confidential or can differ from one envirement to another, so we are not providing them with the source. Instead a maven user profile should be configured outside the project, that will be used during the building of the project. Follow the instructions. +###Maven profile configuration For Maven to build the project you need to setup a maven profile in @@ -114,9 +108,7 @@ +###Compile and package the source into a WAR - -### Build the source and prepare the runtime into a standard Java WAR package - -Run the following commands from the project source folder +Run the following command from the project source folder mvn -P development-eprms clean package @@ -126,13 +118,11 @@ Copy the built *eprms.war* to the *WebAppsFolder* created in the preceeding preparatory steps. +Copy the provided *cas.war* to the same *WebAppsFolder*. + After a short initializaion period you will be able to access the application at: - http://localhost:8080/epm + http://localhost:8080 -Clicking on the login should redirect to the CAS system at: - - http://localhost:8080/cas/... - -### Create Users and Roles +###Create Users and Roles On the first start of the application, empty database tables will be created. Index: eprms-tap/pom.xml =================================================================== --- eprms-tap/pom.xml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/pom.xml (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -1,14 +1,18 @@ - + + 4.0.0 org.springframework.boot spring-boot-starter-parent - 3.1.3 - + 2.3.9.RELEASE + info.ajanovski.eprms eprms-tap - 0.0.17-SNAPSHOT + 0.0.1-SNAPSHOT EPRMS - Educational Project and Resource Management System @@ -28,27 +32,23 @@ - + 15 + 5.7.1 + 1.0.4 + 1.0.1 + 2.12.1 + 2.3.1 + 2.33.3 + 1.1.4 + 3.141.59 + 3.0.1 + 1.3-groovy-2.5 + 2.3.9.RELEASE + 1.0.8 + + 42.2.19 + 3.6.2 UTF-8 UTF-8 - - 3.13.0 - 3.5.0 - 3.0.0 - 21 - 21 - 21 - - 3.1.3 - 5.9.0 - 2.18.3 - 2.24.0 - 5.8.2 - 2.0.4 - 5.0.0 - 1.1.4 - - 42.7.7 - 4.0.4 @@ -61,14 +61,4 @@ - - info.ajanovski.eprms - model - 0.0.15-SNAPSHOT - - - info.ajanovski.eprms - mq - 0.0.3-SNAPSHOT - @@ -92,90 +82,114 @@ spring-boot-starter-logging + + + + org.springframework.boot + spring-boot-starter-log4j2 + compile + + + + org.apache.tapestry + tapestry-core + ${tapestry-version} + compile + + + + org.apache.tapestry + tapestry-webresources + ${tapestry-version} + compile + + + org.apache.tapestry + tapestry-hibernate + ${tapestry-version} + compile + + + org.apache.tapestry + tapestry-beanvalidator + ${tapestry-version} + compile + + + org.apache.tapestry + tapestry-upload + ${tapestry-version} + compile + + + + org.apache.tapestry + tapestry-test + ${tapestry-version} + test + + + org.testng + testng + + + + + net.sourceforge.tapestrytestify + tapestry-testify + ${tapestry-testify-version} + test + + + net.sourceforge.tapestryxpath + tapestry-xpath + ${tapestry-xpath-version} + test + + + org.spockframework + spock-core + ${spock-version} + test + + + org.spockframework + spock-spring + ${spock-version} + test + + + + org.springframework.boot + spring-boot-starter-test + test + org.springframework.boot - spring-boot-starter-tomcat + spring-boot-starter-logging - org.springframework.boot - spring-boot-starter-log4j2 - compile - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - - org.apache.tapestry - tapestry-core-jakarta - ${tapestry-version} - compile - - - - org.apache.tapestry - tapestry-webresources-jakarta - ${tapestry-version} - compile - - - - - org.apache.tapestry - tapestry-hibernate-jakarta - ${tapestry-version} - compile - - - org.apache.tapestry - tapestry-beanvalidator-jakarta - ${tapestry-version} - compile - - - org.apache.tapestry - tapestry-upload-jakarta - ${tapestry-version} - compile - - - - org.apache.tapestry - tapestry-test-jakarta - ${tapestry-version} - test - - - org.junit.jupiter - junit-jupiter - ${junit-version} + org.gebish + geb-spock + ${geb-version} + test + + + org.seleniumhq.selenium + selenium-support + ${selenium-version} + test + + + org.seleniumhq.selenium + htmlunit-driver + ${htmlunit-driver-version} test - - org.apache.logging.log4j - log4j-api - ${log4j-version} - - - org.apache.logging.log4j - log4j-core - ${log4j-version} - org.apache.logging.log4j log4j-slf4j-impl - ${log4j-version} @@ -185,4 +199,9 @@ + org.glassfish + javax.json + ${json-version} + + com.fasterxml.jackson.core jackson-core @@ -200,10 +219,9 @@ - jakarta.servlet - jakarta.servlet-api - ${servlet-version} + javax.servlet + javax.servlet-api + ${servlet-api-version} provided - @@ -213,44 +231,23 @@ - com.zaxxer - HikariCP - 6.2.1 - - org.hibernate - hibernate-hikaricp - 5.4.33.Final - - - - org.apereo.cas.client + hibernate-core + 5.1.17.Final + + + org.hibernate + hibernate-validator + 5.4.3.Final + + + org.jasig.cas.client cas-client-core ${cas-client-version} - - - - jakarta.xml.bind - jakarta.xml.bind-api - 2.3.3 - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.9 - - - - org.glassfish - javax.json - ${json-version} - - - - - org.webjars - webjars-locator - 0.52 + + + org.freedesktop.tango + tango-icon-theme + 0.8.90 @@ -259,34 +256,8 @@ 3.0.5 - - org.webjars.npm - feather-icons - 4.29.1 - - - org.webjars - ckeditor - 4.19.0 - - - org.webjars.npm - firacode - 1.205.0 - - - - - - org.hibernate.orm - hibernate-core - 5.4.33.Final - - - - - eprms + epm @@ -349,115 +320,25 @@ - org.apache.maven.plugins - maven-enforcer-plugin - ${maven-enforcer-version} - - - enforce-maven - - enforce - - - - - 3.5.0 - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-version} - - ${java.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-version} - - - firefox - - - - - org.apache.maven.surefire - surefire-junit-platform - ${maven-surefire-version} - - - org.apache.maven.surefire - surefire-testng - ${maven-surefire-version} - - - - org.springframework.boot spring-boot-maven-plugin - org.apache.maven.plugins maven-resources-plugin 2.6 + + UTF-8 + - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - generate-test-sources - - unpack - - - - - org.webjars.npm - fontsource-fira-sans - jar - META-INF/resources/webjars/**/* - - ${project.basedir}/target/classes/META-INF/assets/ - - - org.webjars.npm - firacode - jar - META-INF/resources/webjars/**/* - - ${project.basedir}/target/classes/META-INF/assets/ - - - org.webjars.npm - feather-icons - jar - META-INF/resources/webjars/**/* - - ${project.basedir}/target/classes/META-INF/assets/ - - - org.webjars - ckeditor - jar - META-INF/resources/webjars/**/* - - ${project.basedir}/target/classes/META-INF/assets/ - - - - - - - + - - Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/App.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/App.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/App.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -25,4 +25,5 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; @SpringBootApplication @@ -36,5 +37,5 @@ public static void main(String[] args) throws Exception { SpringApplication application = new SpringApplication(App.class); - // application.setApplicationContextClass(AnnotationConfigWebApplicationContext.class); + application.setApplicationContextClass(AnnotationConfigWebApplicationContext.class); SpringApplication.run(App.class, args); } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/AppConfiguration.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/AppConfiguration.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/AppConfiguration.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -23,13 +23,19 @@ import java.util.EnumSet; +import javax.servlet.DispatcherType; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.SessionTrackingMode; + import org.apache.tapestry5.TapestryFilter; -import org.apereo.cas.client.authentication.AuthenticationFilter; -import org.apereo.cas.client.session.SingleSignOutFilter; -import org.apereo.cas.client.session.SingleSignOutHttpSessionListener; -import org.apereo.cas.client.util.HttpServletRequestWrapperFilter; -import org.apereo.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter; +import org.jasig.cas.client.authentication.AuthenticationFilter; +import org.jasig.cas.client.session.SingleSignOutFilter; +import org.jasig.cas.client.session.SingleSignOutHttpSessionListener; +import org.jasig.cas.client.util.HttpServletRequestWrapperFilter; +import org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter; +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.server.ErrorPage; -import org.springframework.boot.web.server.ErrorPageRegistrar; import org.springframework.boot.web.servlet.ServletContextInitializer; +import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -39,8 +45,4 @@ import info.ajanovski.eprms.tap.util.AppConfig; import info.ajanovski.eprms.tap.util.UTF8Filter; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.SessionTrackingMode; @Configuration @@ -57,11 +59,16 @@ "info.ajanovski.eprms.tap.services.DevelopmentModule"); servletContext.setInitParameter("tapestry.qa-modules", "info.ajanovski.eprms.tap.services.QaModule"); - //servletContext.setInitParameter("tapestry.use-external-spring-context", "true"); + // servletContext.setInitParameter("tapestry.use-external-spring-context", + // "true"); servletContext.setInitParameter("artifactParameterName", "ticket"); + servletContext.setInitParameter("casServerLogoutUrl", AppConfig.getString("cas.server") + "/cas/logout"); + servletContext.setInitParameter("casServerLoginUrl", AppConfig.getString("cas.server") + "/cas/login"); + servletContext.setInitParameter("casServerUrlPrefix", AppConfig.getString("cas.server") + "/cas"); + servletContext.setInitParameter("service", AppConfig.getString("app.server") + servletContext.getContextPath()); @@ -73,10 +80,13 @@ .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); + servletContext.addFilter("CAS Authentication Filter", AuthenticationFilter.class) .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); + servletContext.addFilter("CAS Validation Filter", Cas20ProxyReceivingTicketValidationFilter.class) .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); + servletContext.addFilter("CAS HttpServletRequest Wrapper Filter", HttpServletRequestWrapperFilter.class) .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, @@ -88,6 +98,9 @@ servletContext.addListener(SingleSignOutHttpSessionListener.class); - //servletContext.addFilter("app", TapestrySpringFilter.class).addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); + servletContext.setSessionTrackingModes(EnumSet.of(SessionTrackingMode.COOKIE)); + // servletContext.addFilter("app", + // TapestrySpringFilter.class).addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, + // DispatcherType.ERROR), false, "/*"); servletContext.setSessionTrackingModes(EnumSet.of(SessionTrackingMode.COOKIE)); } @@ -95,32 +108,9 @@ } - @Bean - public ErrorPageRegistrar errorPageRegistrar() { - return registry -> { - registry.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/error404")); - }; - } - - // @Bean -// public ConfigurableServletWebServerFactory webServerFactory() { -// TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(); -// factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/error404")); -// return factory; -// } - -// @Bean(name = "messageSource") -// public MessageSource getMessageResource() { -// ReloadableResourceBundleMessageSource messageResource = new ReloadableResourceBundleMessageSource(); -// messageResource.setBasename("classpath:app"); -// messageResource.setDefaultEncoding("UTF-8"); -// return messageResource; -// } -// -// @Bean(name = "localeResolver") -// public LocaleResolver getLocaleResolver() { -// CookieLocaleResolver resolver = new CookieLocaleResolver(); -// resolver.setCookieDomain("localeCookie"); -// resolver.setCookieMaxAge(60 * 60); -// return resolver; -// } + @Bean + public ConfigurableServletWebServerFactory webServerFactory() { + TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(); + factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/error404")); + return factory; + } } Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/components/Backlink.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Backlink.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,37 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.components; - -import org.apache.tapestry5.BindingConstants; -import org.apache.tapestry5.annotations.Parameter; -import org.apache.tapestry5.annotations.Property; - -public class Backlink { - - @Property - @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL) - private String page; - - @Property - @Parameter(required = false, defaultPrefix = BindingConstants.PROP) - private Object context; - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/components/IconActionLink.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/IconActionLink.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,50 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.components; - -import org.apache.tapestry5.BindingConstants; -import org.apache.tapestry5.annotations.Parameter; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.corelib.components.Any; - -public class IconActionLink extends Any { - - @Property - @Parameter(required = false, defaultPrefix = BindingConstants.PROP) - private Object context; - - @Property - @Parameter(required = false, defaultPrefix = BindingConstants.LITERAL) - private String path; - - @Property - @Parameter(required = false, defaultPrefix = BindingConstants.LITERAL, name = "class") - private String theClass; - - @Property - @Parameter(required = false, defaultPrefix = BindingConstants.LITERAL) - private Boolean async; - - @Property - @Parameter(required = false, defaultPrefix = BindingConstants.LITERAL) - private String[] mixins; - -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Layout.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Layout.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/Layout.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -36,10 +36,11 @@ import org.slf4j.Logger; -import info.ajanovski.eprms.model.entities.Person; +import info.ajanovski.eprms.tap.entities.Person; import info.ajanovski.eprms.tap.services.GenericService; import info.ajanovski.eprms.tap.services.PersonManager; import info.ajanovski.eprms.tap.util.UserInfo; -@Import(stylesheet = { "site-overrides.css" }, module = { "bootstrap/dropdown", "bootstrap/collapse" }) +@Import(stylesheet = { + "site-overrides.css" }, module = { "bootstrap/dropdown", "bootstrap/collapse" }) public class Layout { @@ -81,26 +82,10 @@ public String[] getStudentPageNames() { - if (userInfo.isStudent() || userInfo.isAdministrator() || userInfo.isInstructor()) { - return new String[] { "user/MyProjects", "user/MyProjectReports", "user/Discussions", "user/MyDatabases", - "user/MyRepositories", "user/MyRepositoryAuth" }; - } else { - return null; - } - } - - public String[] getProjectManagerPageNames() { - if (userInfo.isAdministrator() || userInfo.isInstructor()) { - return new String[] { "projectmanager/ProjectOverviewTickets", "projectmanager/ProjectOverviewTimeline", - "admin/ManageCourses", "admin/ManageProjects", "admin/OverallCourseReport" }; - } else { - return null; - } + return new String[] { "Index", "MyDatabases", "MyRepositories", "MyRepositoryAuth" }; } public String[] getAdminPageNames() { if (userInfo.isAdministrator()) { - return new String[] { "admin/ManageActivityTypes", "admin/ManagePersons", "admin/ManageTeams", - "admin/ProjectAutomation", "admin/Translations", "admin/SystemParameters", "admin/ManageDatabases", - "admin/ManageRepositories" }; + return new String[] { "admin/Projects", "admin/Teams", "admin/ManageDatabases", "admin/ManageRepositories" }; } else { return null; @@ -126,21 +111,22 @@ private PersistentLocale persistentLocale; - void setupRender() { - if (persistentLocale.get() == null) { + void onActionFromLocaleToggle() { + if (persistentLocale.isSet()) { + if ("mk".equalsIgnoreCase(persistentLocale.get().getLanguage())) { + persistentLocale.set(new Locale("en")); + } else { + persistentLocale.set(new Locale("mk")); + } + } else { persistentLocale.set(new Locale("mk")); } } - public Object onActionFromLocaleToggle() { - if ("en".equalsIgnoreCase(persistentLocale.get().getLanguage())) { - persistentLocale.set(new Locale("mk")); - } else { - persistentLocale.set(new Locale("en")); - } - return this; - } - public String getDisplayLanguage() { - return persistentLocale.get().toLanguageTag(); + Locale loc = persistentLocale.get(); + if (loc == null) + return ""; + else + return loc.getLanguage().toUpperCase(); } Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/components/ModalBox.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/ModalBox.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,64 +1,0 @@ -package info.ajanovski.eprms.tap.components; - -//Based on http://readyareyou.blogspot.com.au/2012/11/tapestry5-bootstrap-modal-dialog.html . - - -import org.apache.tapestry5.BindingConstants; -import org.apache.tapestry5.ClientElement; -import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.Parameter; -import org.apache.tapestry5.http.services.Request; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.json.JSONObject; -import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; -import org.apache.tapestry5.services.ajax.JavaScriptCallback; -import org.apache.tapestry5.services.javascript.JavaScriptSupport; - - -@Import(module = { "ModalBox" }) -public class ModalBox implements ClientElement { - - @Parameter(name = "componentClientId", value = "prop:componentResources.id", defaultPrefix = BindingConstants.LITERAL) - private String componentClientId; - @Parameter(required = false, defaultPrefix = BindingConstants.LITERAL) - private String closeBox; - - @Inject - private JavaScriptSupport javaScriptSupport; - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - @Inject - private Request request; - - @Override - public String getClientId() { - return componentClientId; - } - - public String getCloseBox() { - return closeBox; - } - - void afterRender() { - JSONObject json = new JSONObject(); - json.put("keyboard", false); - json.put("backdrop", "true"); - json.put("focus", true); - javaScriptSupport.require("ModalBox").invoke("activate").with(componentClientId, json); - } - - public void hide() { - if (request.isXHR()) { - ajaxResponseRenderer.addCallback(makeScriptToHideModal()); - } - } - - private JavaScriptCallback makeScriptToHideModal() { - return new JavaScriptCallback() { - public void run(JavaScriptSupport javascriptSupport) { - javaScriptSupport.require("ModalBox").invoke("hide").with(componentClientId); - } - }; - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/components/PublicLayout.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/PublicLayout.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,104 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.components; - -import java.util.Locale; - -import org.apache.tapestry5.BindingConstants; -import org.apache.tapestry5.ComponentResources; -import org.apache.tapestry5.SymbolConstants; -import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.Parameter; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.commons.Messages; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.ioc.annotations.Symbol; -import org.apache.tapestry5.services.PersistentLocale; -import org.slf4j.Logger; - -import info.ajanovski.eprms.tap.annotations.PublicPage; - -@Import(stylesheet = { "site-overrides.css" }, module = { "bootstrap/dropdown", "bootstrap/collapse" }) -@PublicPage -public class PublicLayout { - - @Inject - private ComponentResources resources; - - @Property - @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL) - private String title; - - @Property - private String pageName; - - @Property - @Inject - @Symbol(SymbolConstants.APPLICATION_VERSION) - private String appVersion; - - @Inject - private Logger logger; - - public String[] getPublicPageNames() { - return new String[] {}; - } - - public String getClassForPageName() { - logger.debug("respgname:{}", resources.getPageName() + " " + resources.getCompleteId()); - if (resources.getPageName().equalsIgnoreCase(pageName)) { - return "active"; - } else { - return " "; - } - } - - @Inject - private Messages messages; - - public String getPageNameTitle() { - return messages.get(pageName + "-pagelink"); - } - - @Inject - private PersistentLocale persistentLocale; - - void onActionFromLocaleToggle() { - if (persistentLocale.isSet()) { - if ("mk".equalsIgnoreCase(persistentLocale.get().getLanguage())) { - persistentLocale.set(new Locale("en")); - } else { - persistentLocale.set(new Locale("mk")); - } - } else { - persistentLocale.set(new Locale("mk")); - } - } - - public String getDisplayLanguage() { - Locale loc = persistentLocale.get(); - if (loc == null) - return ""; - else - return loc.getLanguage().toUpperCase(); - } - -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/SVGIcon.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/SVGIcon.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/SVGIcon.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -22,17 +22,10 @@ import org.apache.tapestry5.BindingConstants; -import org.apache.tapestry5.annotations.Mixin; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SupportsInformalParameters; -import org.apache.tapestry5.corelib.mixins.RenderInformals; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.AssetSource; -@SupportsInformalParameters public class SVGIcon { - - @Mixin - private RenderInformals renderInformals; @Property @@ -55,4 +48,8 @@ private AssetSource assetSource; + public String getImageURL() { + return assetSource.getClasspathAsset("org/freedesktop/tango/" + path).toClientURL(); + } + public void setupRender() { if (title == null) { @@ -66,6 +63,6 @@ } if (width == null && height == null) { - height = "1.2em"; - width = "1.2em"; + height = "1.5em"; + width = "1.5em"; } } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/TeamMembersGrid.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/TeamMembersGrid.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/TeamMembersGrid.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -34,6 +34,6 @@ import org.apache.tapestry5.ioc.annotations.Inject; -import info.ajanovski.eprms.model.entities.Team; -import info.ajanovski.eprms.model.entities.TeamMember; +import info.ajanovski.eprms.tap.entities.Team; +import info.ajanovski.eprms.tap.entities.TeamMember; import info.ajanovski.eprms.tap.services.GenericService; import info.ajanovski.eprms.tap.util.UserInfo; @@ -50,16 +50,4 @@ @Parameter(required = true, defaultPrefix = BindingConstants.PROP) private Team team; - - @Property - @Parameter(required = false, defaultPrefix = BindingConstants.PROP, value = "false") - private boolean actions; - - @Property - @Parameter(required = false, defaultPrefix = BindingConstants.PROP, value = "false") - private boolean dates; - - @Property - @Parameter(required = false, defaultPrefix = BindingConstants.PROP, value = "true") - private boolean title; @Property @@ -87,15 +75,9 @@ BeanModel bm = beanModelSource.createDisplayModel(TeamMember.class, messages); bm.exclude("teamMemberId"); - bm.add("email", pcs.create(TeamMember.class, "person.email")); bm.add("userName", pcs.create(TeamMember.class, "person.userName")); bm.add("lastName", pcs.create(TeamMember.class, "person.lastName")); bm.add("firstName", pcs.create(TeamMember.class, "person.firstName")); - bm.reorder("positionNumber", "role", "lastName", "firstName", "userName", "email"); - if (actions) { - bm.add("actions", null); - } - if (!dates) { - bm.exclude("createdDate", "statusDate"); - } + bm.reorder("positionNumber", "lastName", "role"); + bm.add("actions",null); return bm; } Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/DiscussionDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/DiscussionDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,19 +1,0 @@ -package info.ajanovski.eprms.tap.data; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.DiscussionPost; -import info.ajanovski.eprms.model.entities.DiscussionPostEvaluation; -import info.ajanovski.eprms.model.entities.DiscussionSession; -import info.ajanovski.eprms.model.entities.Person; - -public interface DiscussionDao { - - List getPersonsActiveInDiscussionSession(DiscussionSession discussionSession); - - List getPersonsDiscussionPostsInDiscussionSession(DiscussionSession discussionSession, - Person person); - - List getDiscussionPostEvaluations(long discussionPostId); - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/DiscussionDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/DiscussionDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,86 +1,0 @@ -package info.ajanovski.eprms.tap.data; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.tapestry5.ioc.annotations.Inject; -import org.hibernate.Session; - -import info.ajanovski.eprms.model.entities.DiscussionPost; -import info.ajanovski.eprms.model.entities.DiscussionPostEvaluation; -import info.ajanovski.eprms.model.entities.DiscussionSession; -import info.ajanovski.eprms.model.entities.Person; - -public class DiscussionDaoImpl implements DiscussionDao { - - @Inject - private Session session; - - private Session getEntityManager() { - return session.getSession(); - } - - @Override - public List getPersonsActiveInDiscussionSession(DiscussionSession discussionSession) { - try { - return getEntityManager().createQuery(""" - select distinct p - from - DiscussionPost dp - join dp.person p - join dp.discussionOnCourseProject dcp - join dcp.discussionSession ds - where ds.discussionSessionId=:discussionSessionId - """).setParameter("discussionSessionId", discussionSession.getDiscussionSessionId()) - .getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - } - - @Override - public List getPersonsDiscussionPostsInDiscussionSession(DiscussionSession discussionSession, - Person person) { - if (person != null) { - try { - return getEntityManager().createQuery(""" - select distinct dp - from - DiscussionPost dp - join dp.person p - join dp.discussionOnCourseProject docp - join docp.discussionSession ds - where ds.discussionSessionId=:discussionSessionId and - p.personId=:personId - """).setParameter("discussionSessionId", discussionSession.getDiscussionSessionId()) - .setParameter("personId", person.getPersonId()).getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - } else { - return new ArrayList(); - } - } - - @Override - public List getDiscussionPostEvaluations(long discussionPostId) { - try { - List l = getEntityManager().createQuery(""" - select dpe - from - DiscussionPostEvaluation dpe - join dpe.discussionPost dp - where dp.discussionPostId=:discussionPostId - order by dpe.evaluatedOn - """).setParameter("discussionPostId", discussionPostId).getResultList(); - if (l != null && l.size() > 0) { - return l; - } else { - return null; - } - } catch (Exception e) { - return null; - } - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/GenericDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/GenericDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,44 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource Management - * System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.tap.data; - -import java.util.List; - -public interface GenericDao { - public Object getByPK(Class classToLoad, long id); - - public void deleteByPK(Class classToLoad, long id); - - public void delete(Object object); - - public List getQueryResult(String guery); - - public void saveOrUpdate(Object object); - - public Object save(Object object); - - public List getAll(Class classToLoad); - - public Object getByCode(Class classToLoad, String code); - - public List getByTitleSubstring(Class classToSearch, String searchSubString); -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/GenericDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/GenericDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,121 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.tap.data; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.apache.tapestry5.ioc.annotations.Inject; -import org.hibernate.Session; -import org.hibernate.exception.DataException; -import org.slf4j.Logger; - -public class GenericDaoImpl implements GenericDao { - - @Inject - private Session session; - - private Session getEntityManager() { - return session.getSession(); - } - - @Inject - private Logger logger; - - @Override - public Object getByPK(Class classToLoad, long id) { - return session.get(classToLoad, id); - } - - @Override - public void deleteByPK(Class classToLoad, long id) { - session.delete(getByPK(classToLoad, id)); - } - - @Override - public void delete(Object object) { - session.delete(object); - } - - @Override - public List getQueryResult(String guery) { - try { - javax.persistence.Query q = getEntityManager().createQuery(guery); - List l = new ArrayList(); - - for (Iterator it = q.getResultList().iterator(); it.hasNext();) { - Object[] row = (Object[]) it.next(); - for (int i = 0; i < row.length; i++) { - l.add(row[i]); - } - l.add(" | "); - } - - return l; - - } catch (DataException e) { - // Critical errors : database unreachable, etc. - logger.error( - "Exception - DataAccessException occurs : " + e.getMessage() + " on complete getQueryResult()."); - return null; - } - } - - @Override - public void saveOrUpdate(Object object) { - session.saveOrUpdate(object); - } - - @Override - public Object save(Object object) { - // Object a = session.merge(object); - return session.save(object); - } - - @Override - public List getAll(Class classToLoad) { - return getEntityManager().createQuery("from " + classToLoad.getName()).getResultList(); - } - - @Override - public Object getByCode(Class classToLoad, String code) { - List l = getEntityManager().createQuery("from " + classToLoad.getName() + " where code=:code") - .setParameter("code", code).getResultList(); - if (l.size() > 0) { - return l.get(0); - } else { - return null; - } - } - - @Override - public List getByTitleSubstring(Class classToSearch, String searchSubString) { - if (searchSubString != null) { - return (List) getEntityManager() - .createQuery("from " + classToSearch.getName() + "where title ilike :searchSubString") - .setParameter("searchSubString", searchSubString).getResultList(); - } else { - return null; - } - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/PersonDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/PersonDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,47 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.tap.data; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.entities.Role; - -public interface PersonDao { - public List getAllPersons(); - - public Person getPersonByUsername(String username); - - public String getPersonFullName(Person person); - - public String getPersonFullNameWithId(Person person); - - public List getPersonByFilter(String filter); - - public List getPersonRolesForPerson(long personId); - - public List getRolesForPerson(long personId); - - public List getAllPersonsFromRole(String roleName); - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/PersonDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/PersonDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,103 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.tap.data; - -import java.util.List; - -import org.apache.tapestry5.ioc.annotations.Inject; -import org.hibernate.Session; -import org.hibernate.exception.DataException; -import org.hibernate.query.Query; -import org.slf4j.Logger; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.entities.Role; -import info.ajanovski.eprms.tap.util.UsefulMethods; - -public class PersonDaoImpl implements PersonDao { - @Inject - private Logger logger; - - @Inject - private Session session; - - private Session getEntityManager() { - return session.getSession(); - } - - @Override - public List getAllPersons() { - try { - return UsefulMethods.castList(Person.class, - getEntityManager().createQuery("from Person order by lastName").getResultList()); - } catch (DataException e) { - logger.error("Exception - DataAccessException occurs : {} on complete getAllPersons().", e.getMessage()); - return null; - } - } - - @Override - public Person getPersonByUsername(String username) { - return (Person) getEntityManager().createQuery("from Person where userName=:username") - .setParameter("username", username).setReadOnly(true).setCacheable(true).uniqueResult(); - } - - @Override - public List getPersonByFilter(String filter) { - String f = "%" + filter.toLowerCase() + "%"; - Query q = getEntityManager() - .createQuery("select p from Person p where (lower(concat(userName,firstName,lastName)) like :filter)"); - q.setParameter("filter", f); - return UsefulMethods.castList(Person.class, q.getResultList()); - } - - @Override - public List getPersonRolesForPerson(long personId) { - return (List) getEntityManager() - .createQuery("from PersonRole pr where pr.person.personId=:personId").setParameter("personId", personId) - .getResultList(); - } - - @Override - public String getPersonFullName(Person person) { - return person.getLastName() + " " + person.getFirstName(); - } - - @Override - public String getPersonFullNameWithId(Person person) { - return person.getLastName() + " " + person.getFirstName() + " [" + person.getUserName() + "]"; - } - - @Override - public List getRolesForPerson(long personId) { - return getEntityManager().createQuery("select pr.role from PersonRole pr where pr.person.personId=:personId") - .setParameter("personId", personId).getResultList(); - } - - @Override - public List getAllPersonsFromRole(String roleName) { - return getEntityManager().createQuery("select pr.person from PersonRole pr where pr.role.name=:roleName") - .setParameter("roleName", roleName).getResultList(); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,45 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.tap.data; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.entities.CourseProject; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.TeamMember; - -public interface ProjectDao { - - public List getAllProjects(); - - public List getProjectCourses(Project p); - - public Float sumPoints(Project p); - - public List getAllProjectsInCourse(Course selectedCourse); - - public List getProjectByPerson(Long personId); - - public List getTeamMembershipOfPerson(Long personId); - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,143 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.tap.data; - -import java.util.List; - -import org.apache.tapestry5.ioc.annotations.Inject; -import org.hibernate.Session; - -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.entities.CourseProject; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.TeamMember; - -public class ProjectDaoImpl implements ProjectDao { - - @Inject - private Session session; - - private Session getEntityManager() { - return session.getSession(); - } - - @Override - @SuppressWarnings("unchecked") - public List getAllProjects() { - return getEntityManager().createQuery(""" - from Project order by lower(title) - """, Project.class).getResultList(); - } - - @Override - @SuppressWarnings("unchecked") - public List getProjectCourses(Project p) { - if (p != null) { - return getEntityManager().createQuery(""" - from CourseProject cp where cp.project.projectId=:projectId - """).setParameter("projectId", p.getProjectId()).getResultList(); - } else { - return null; - } - } - - @Override - @SuppressWarnings("unchecked") - public Float sumPoints(Project p) { - if (p != null) { - List lista = getEntityManager().createQuery(""" - select max(we.points) as maxpoints - from WorkEvaluation as we - join we.workReport as wr - join wr.activity as a - join a.project as p - where p.projectId=:projectId - group by a - """).setParameter("projectId", p.getProjectId()).getResultList(); - Float output = 0.0f; - for (Float o : lista) { - if (o != null) { - output += o; - } - } - return output; - } else { - return null; - } - } - - @Override - @SuppressWarnings("unchecked") - public List getAllProjectsInCourse(Course selectedCourse) { - if (selectedCourse != null) { - return getEntityManager().createNativeQuery(""" - select p.* - from {h-schema}course_project cp - join {h-schema}project p on cp.project_id=p.project_id - join {h-schema}course c on cp.course_id=c.course_id - where c.course_id=:courseId - order by - ( - select min(submission_date) - from {h-schema}work_report wr - join {h-schema}activity a on wr.activity_id=a.activity_id - where a.project_id=p.project_id and - not exists (select * from {h-schema}work_evaluation we - where we.work_report_id=wr.work_report_id) - ), p.title - """, Project.class).setParameter("courseId", selectedCourse.getCourseId()).getResultList(); - } else { - return null; - } - } - - @Override - @SuppressWarnings("unchecked") - public List getProjectByPerson(Long personId) { - if (personId != null) { - return getEntityManager().createQuery(""" - select p - from Project p - join p.responsibilities r - join r.team t - join t.teamMembers tm - join tm.person person - where person.personId=:personId - order by p.title - """).setParameter("personId", personId).getResultList(); - } else { - return null; - } - } - - @Override - public List getTeamMembershipOfPerson(Long personId) { - return getEntityManager().createQuery(""" - select tm - from Team t - join t.teamMembers tm - join tm.person p - where p.personId=:personId - """).setParameter("personId", personId).getResultList(); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/ResourceDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ResourceDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,39 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.tap.data; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; - -public interface ResourceDao { - - public List getRepositoriesByPerson(long personId); - - public List getRepositoriesByTeam(long personId); - - public List getRepositoriesByProject(long personId); - - public List getDatabasesByProject(long personId); - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/ResourceDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ResourceDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,92 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.tap.data; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.tapestry5.ioc.annotations.Inject; -import org.hibernate.Session; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; - -public class ResourceDaoImpl implements ResourceDao { - - @Inject - private Session session; - - private Session getEntityManager() { - return session.getSession(); - } - - @Override - public List getRepositoriesByPerson(long personId) { - try { - return getEntityManager().createQuery("from Repository r where r.person.personId=:personId") - .setParameter("personId", personId).getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - } - - @Override - public List getRepositoriesByTeam(long personId) { - try { - return getEntityManager().createQuery(""" - select r from Repository r join r.team t, TeamMember tm join tm.person p - where tm.team.teamId=t.teamId and r.person.personId=:personId - """).setParameter("personId", personId).getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - } - - @Override - public List getRepositoriesByProject(long personId) { - try { - return getEntityManager().createQuery(""" - select r from Repository r join r.project pr, - Responsibility res join res.team t, TeamMember tm join tm.person p - where pr.projectId=res.project.projectId and tm.team.teamId=t.teamId and - tm.person.personId=:personId - """).setParameter("personId", personId).getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - } - - @Override - public List getDatabasesByProject(long personId) { - try { - return getEntityManager().createQuery(""" - select d from Database d join d.project pr, - Responsibility res join res.team t, TeamMember tm join tm.person p - where pr.projectId=res.project.projectId and tm.team.teamId=t.teamId and - tm.person.personId=:personId - """).setParameter("personId", personId).getResultList(); - } catch (Exception e) { - return new ArrayList(); - } - - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDao.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,7 +1,0 @@ -package info.ajanovski.eprms.tap.data; - -public interface TranslationDao { - - public String getTranslation(String className, String AttributeCode, long originalObjectId, String locale); - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDaoImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,38 +1,0 @@ -package info.ajanovski.eprms.tap.data; - -import org.apache.tapestry5.ioc.annotations.Inject; -import org.hibernate.Session; - -import info.ajanovski.eprms.model.entities.Translation; - -public class TranslationDaoImpl implements TranslationDao { - - @Inject - private Session session; - - @Inject - private GenericDao genericDao; - - private Session getEntityManager() { - return session.getSession(); - } - - @Override - public String getTranslation(String className, String attributeCode, long originalObjectId, String locale) { - try { - Translation t = (Translation) getEntityManager().createQuery(""" - from Translation - where className=:className and - attributeCode=:attributeCode and - originalObjectId=:originalObjectId and - locale=:locale - """).setParameter("className", className).setParameter("attributeCode", attributeCode) - .setParameter("originalObjectId", originalObjectId).setParameter("locale", locale) - .getSingleResult(); - return t.getTranslatedText(); - } catch (Exception e) { - return null; - } - } - -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Activity.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Activity.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Activity.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,100 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="activity") +public class Activity implements java.io.Serializable { + private long activityId; + private String title; + private String description; + private Activity parentActivity; + private ActivityType activityType; + private Project project; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "activity_id", unique = true, nullable = false) + public long getActivityId() { + return this.activityId; + } + + public void setActivityId(long activityId) { + this.activityId=activityId; + } + + @Column(name = "title") + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title=title; + } + + @Column(name = "description") + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description=description; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "parent_activity_id", nullable = false, foreignKey = @ForeignKey(name = "fk_activity_activity")) + public Activity getParentActivity() { + return this.parentActivity; + } + + public void setParentActivity(Activity parentActivity) { + this.parentActivity=parentActivity; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "activity_type_id", nullable = false, foreignKey = @ForeignKey(name = "fk_activity_activity_type")) + public ActivityType getActivityType() { + return this.activityType; + } + + public void setActivityType(ActivityType activityType) { + this.activityType=activityType; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_activity_Project")) + public Project getProject() { + return this.project; + } + + public void setProject(Project project) { + this.project=project; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/ActivityType.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/ActivityType.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/ActivityType.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="activity_type") +public class ActivityType implements java.io.Serializable { + private long activityTypeId; + private String title; + private String description; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "activity_type_id", unique = true, nullable = false) + public long getActivityTypeId() { + return this.activityTypeId; + } + + public void setActivityTypeId(long activityTypeId) { + this.activityTypeId=activityTypeId; + } + + @Column(name = "title") + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title=title; + } + + @Column(name = "description") + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description=description; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Course.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Course.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Course.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="course") +public class Course implements java.io.Serializable { + private long courseId; + private String title; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "course_id", unique = true, nullable = false) + public long getCourseId() { + return this.courseId; + } + + public void setCourseId(long courseId) { + this.courseId=courseId; + } + + @Column(name = "title", unique = true, nullable = false) + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title=title; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/CourseProject.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/CourseProject.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/CourseProject.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="course_project") +public class CourseProject implements java.io.Serializable { + private long courseProjectId; + private Course course; + private Project project; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "course_project_id", unique = true, nullable = false) + public long getCourseProjectId() { + return this.courseProjectId; + } + + public void setCourseProjectId(long courseProjectId) { + this.courseProjectId=courseProjectId; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "course_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_project_course")) + public Course getCourse() { + return this.course; + } + + public void setCourse(Course course) { + this.course=course; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_course_project_Project")) + public Project getProject() { + return this.project; + } + + public void setProject(Project project) { + this.project=project; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Database.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Database.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Database.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,157 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table(schema = "", name = "database") +public class Database implements java.io.Serializable { + private long databaseId; + private String type; + private String server; + private String name; + private String owner; + private String password; + private String tunnelUser; + private String tunnelPassword; + private String port; + private String tunnelServer; + private Project project; + private Date dateCreated; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "database_id", unique = true, nullable = false) + public long getDatabaseId() { + return this.databaseId; + } + + public void setDatabaseId(long databaseId) { + this.databaseId = databaseId; + } + + @Column(name = "type") + public String getType() { + return this.type; + } + + public void setType(String type) { + this.type = type; + } + + @Column(name = "server") + public String getServer() { + return this.server; + } + + public void setServer(String server) { + this.server = server; + } + + @Column(name = "name") + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + @Column(name = "owner") + public String getOwner() { + return this.owner; + } + + public void setOwner(String owner) { + this.owner = owner; + } + + @Column(name = "password") + public String getPassword() { + return this.password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Column(name = "tunnel_user") + public String getTunnelUser() { + return this.tunnelUser; + } + + public void setTunnelUser(String tunnelUser) { + this.tunnelUser = tunnelUser; + } + + @Column(name = "tunnel_password") + public String getTunnelPassword() { + return this.tunnelPassword; + } + + public void setTunnelPassword(String tunnelPassword) { + this.tunnelPassword = tunnelPassword; + } + + @Column(name = "port") + public String getPort() { + return this.port; + } + + public void setPort(String port) { + this.port = port; + } + + @Column(name = "tunnel_server") + public String getTunnelServer() { + return this.tunnelServer; + } + + public void setTunnelServer(String tunnelServer) { + this.tunnelServer = tunnelServer; + } + + @Column(name = "date_created") + public Date getDateCreated() { + return this.dateCreated; + } + + public void setDateCreated(Date created) { + this.dateCreated = created; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_database_Project")) + public Project getProject() { + return this.project; + } + + public void setProject(Project project) { + this.project = project; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Person.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Person.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Person.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,96 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table(schema = "epm_main", name = "person") +public class Person implements java.io.Serializable { + private long personId; + private String firstName; + private String lastName; + private String email; + private String userName; + private String authString; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "person_id", unique = true, nullable = false) + public long getPersonId() { + return this.personId; + } + + public void setPersonId(long personId) { + this.personId = personId; + } + + @Column(name = "first_name") + public String getFirstName() { + return this.firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + @Column(name = "last_name") + public String getLastName() { + return this.lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + @Column(name = "email") + public String getEmail() { + return this.email; + } + + public void setEmail(String email) { + this.email = email; + } + + @Column(name = "user_name") + public String getUserName() { + return this.userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Column(name = "auth_string") + public String getAuthString() { + return this.authString; + } + + public void setAuthString(String authString) { + this.authString = authString; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/PersonRole.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/PersonRole.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/PersonRole.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_util", name="person_role") +public class PersonRole implements java.io.Serializable { + private long personRoleId; + private Person person; + private Role role; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "person_role_id", unique = true, nullable = false) + public long getPersonRoleId() { + return this.personRoleId; + } + + public void setPersonRoleId(long personRoleId) { + this.personRoleId=personRoleId; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_person_role_person")) + public Person getPerson() { + return this.person; + } + + public void setPerson(Person person) { + this.person=person; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "role_id", nullable = false, foreignKey = @ForeignKey(name = "fk_person_role_role")) + public Role getRole() { + return this.role; + } + + public void setRole(Role role) { + this.role=role; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Project.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Project.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Project.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,107 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="Project") +public class Project implements java.io.Serializable { + private long projectId; + private String title; + private String description; + private List responsibilities = new ArrayList(); + private List repositories = new ArrayList(); + private List databases = new ArrayList(); + private List activities = new ArrayList(); + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "project_id", unique = true, nullable = false) + public long getProjectId() { + return this.projectId; + } + + public void setProjectId(long projectId) { + this.projectId=projectId; + } + + @Column(name = "title", unique = true, nullable = false) + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title=title; + } + + @Column(name = "description") + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description=description; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "project") + public List getResponsibilities() { + return this.responsibilities; + } + + public void setResponsibilities(List responsibilities) { + this.responsibilities=responsibilities; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "project") + public List getRepositories() { + return this.repositories; + } + + public void setRepositories(List repositories) { + this.repositories=repositories; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "project") + public List getDatabases() { + return this.databases; + } + + public void setDatabases(List databases) { + this.databases=databases; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "project") + public List getActivities() { + return this.activities; + } + + public void setActivities(List activities) { + this.activities=activities; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Repository.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Repository.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Repository.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,119 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table(schema = "epm_main", name = "repository") +public class Repository implements java.io.Serializable { + private long repositoryId; + private String title; + private String url; + private Date dateCreated; + private String type; + private Person person; + private Team team; + private Project project; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "repository_id", unique = true, nullable = false) + public long getRepositoryId() { + return this.repositoryId; + } + + public void setRepositoryId(long repositoryId) { + this.repositoryId = repositoryId; + } + + @Column(name = "title") + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title = title; + } + + @Column(name = "url") + public String getUrl() { + return this.url; + } + + public void setUrl(String url) { + this.url = url; + } + + @Column(name = "type") + public String getType() { + return this.type; + } + + public void setType(String type) { + this.type = type; + } + + @Column(name = "date_created") + public Date getDateCreated() { + return this.dateCreated; + } + + public void setDateCreated(Date created) { + this.dateCreated = created; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "person_id", nullable = true, foreignKey = @ForeignKey(name = "fk_repository_person")) + public Person getPerson() { + return this.person; + } + + public void setPerson(Person person) { + this.person = person; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_id", nullable = true, foreignKey = @ForeignKey(name = "fk_repository_team")) + public Team getTeam() { + return this.team; + } + + public void setTeam(Team team) { + this.team = team; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "project_id", nullable = true, foreignKey = @ForeignKey(name = "fk_repository_Project")) + public Project getProject() { + return this.project; + } + + public void setProject(Project project) { + this.project = project; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Responsibility.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Responsibility.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Responsibility.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="responsibility") +public class Responsibility implements java.io.Serializable { + private long responsibilityId; + private Project project; + private Team team; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "responsibility_id", unique = true, nullable = false) + public long getResponsibilityId() { + return this.responsibilityId; + } + + public void setResponsibilityId(long responsibilityId) { + this.responsibilityId=responsibilityId; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "project_id", nullable = false, foreignKey = @ForeignKey(name = "fk_responsibility_Project")) + public Project getProject() { + return this.project; + } + + public void setProject(Project project) { + this.project=project; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_id", nullable = false, foreignKey = @ForeignKey(name = "fk_responsibility_team")) + public Team getTeam() { + return this.team; + } + + public void setTeam(Team team) { + this.team=team; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Role.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Role.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Role.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_util", name="role") +public class Role implements java.io.Serializable { + private long roleId; + private String name; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "role_id", unique = true, nullable = false) + public long getRoleId() { + return this.roleId; + } + + public void setRoleId(long roleId) { + this.roleId=roleId; + } + + @Column(name = "name") + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name=name; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Team.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Team.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/Team.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="team") +public class Team implements java.io.Serializable { + private long teamId; + private String name; + private List teamMembers = new ArrayList(); + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "team_id", unique = true, nullable = false) + public long getTeamId() { + return this.teamId; + } + + public void setTeamId(long teamId) { + this.teamId=teamId; + } + + @Column(name = "name") + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name=name; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "team") + public List getTeamMembers() { + return this.teamMembers; + } + + public void setTeamMembers(List teamMembers) { + this.teamMembers=teamMembers; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/TeamMember.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/TeamMember.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/TeamMember.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,89 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="team_member") +public class TeamMember implements java.io.Serializable { + private long teamMemberId; + private Long positionNumber; + private String role; + private Person person; + private Team team; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "team_member_id", unique = true, nullable = false) + public long getTeamMemberId() { + return this.teamMemberId; + } + + public void setTeamMemberId(long teamMemberId) { + this.teamMemberId=teamMemberId; + } + + @Column(name = "position_number") + public Long getPositionNumber() { + return this.positionNumber; + } + + public void setPositionNumber(Long positionNumber) { + this.positionNumber=positionNumber; + } + + @Column(name = "role") + public String getRole() { + return this.role; + } + + public void setRole(String role) { + this.role=role; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "person_id", nullable = false, foreignKey = @ForeignKey(name = "fk_team_member_person")) + public Person getPerson() { + return this.person; + } + + public void setPerson(Person person) { + this.person=person; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_id", nullable = false, foreignKey = @ForeignKey(name = "fk_team_member_team")) + public Team getTeam() { + return this.team; + } + + public void setTeam(Team team) { + this.team=team; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/WorkEvaluation.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/WorkEvaluation.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/WorkEvaluation.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,98 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="work_evaluation") +public class WorkEvaluation implements java.io.Serializable { + private long workEvaluationId; + private String title; + private String description; + private Float percentEvaluated; + private Float points; + private WorkReport workReport; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "work_evaluation_id", unique = true, nullable = false) + public long getWorkEvaluationId() { + return this.workEvaluationId; + } + + public void setWorkEvaluationId(long workEvaluationId) { + this.workEvaluationId=workEvaluationId; + } + + @Column(name = "title") + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title=title; + } + + @Column(name = "description") + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description=description; + } + + @Column(name = "percent_evaluated") + public Float getPercentEvaluated() { + return this.percentEvaluated; + } + + public void setPercentEvaluated(Float percentEvaluated) { + this.percentEvaluated=percentEvaluated; + } + + @Column(name = "points") + public Float getPoints() { + return this.points; + } + + public void setPoints(Float points) { + this.points=points; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "work_report_id", nullable = false, foreignKey = @ForeignKey(name = "fk_work_evaluation_work_report")) + public WorkReport getWorkReport() { + return this.workReport; + } + + public void setWorkReport(WorkReport workReport) { + this.workReport=workReport; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/WorkReport.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/WorkReport.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/entities/WorkReport.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,121 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.entities; + +import java.util.*; +import javax.persistence.*; + +/* +*/ +@Entity +@Table (schema="epm_main", name="work_report") +public class WorkReport implements java.io.Serializable { + private long workReportId; + private String title; + private String description; + private Float percentReported; + private Activity activity; + private Person person; + private WorkReport continuationOfWorkReport; + private Team team; + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + + @Column(name = "work_report_id", unique = true, nullable = false) + public long getWorkReportId() { + return this.workReportId; + } + + public void setWorkReportId(long workReportId) { + this.workReportId=workReportId; + } + + @Column(name = "title") + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title=title; + } + + @Column(name = "description") + public String getDescription() { + return this.description; + } + + public void setDescription(String description) { + this.description=description; + } + + @Column(name = "percent_reported") + public Float getPercentReported() { + return this.percentReported; + } + + public void setPercentReported(Float percentReported) { + this.percentReported=percentReported; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "activity_id", nullable = false, foreignKey = @ForeignKey(name = "fk_work_report_activity")) + public Activity getActivity() { + return this.activity; + } + + public void setActivity(Activity activity) { + this.activity=activity; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "person_id", nullable = true, foreignKey = @ForeignKey(name = "fk_work_report_person")) + public Person getPerson() { + return this.person; + } + + public void setPerson(Person person) { + this.person=person; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "continuation_of_work_report_id", nullable = true, foreignKey = @ForeignKey(name = "fk_work_report_work_report")) + public WorkReport getContinuationOfWorkReport() { + return this.continuationOfWorkReport; + } + + public void setContinuationOfWorkReport(WorkReport continuationOfWorkReport) { + this.continuationOfWorkReport=continuationOfWorkReport; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_id", nullable = true, foreignKey = @ForeignKey(name = "fk_work_report_team")) + public Team getTeam() { + return this.team; + } + + public void setTeam(Team team) { + this.team=team; + } + +} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/mixins/WebEditor.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/mixins/WebEditor.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,58 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the dbLearnStar system (hereinafter: dbLearn*). - * - * dbLearn* 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. - * - * dbLearn* 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 dbLearn*. If not, see . - * - ******************************************************************************/ - -package info.ajanovski.eprms.tap.mixins; - -import org.apache.tapestry5.Asset; -import org.apache.tapestry5.BindingConstants; -import org.apache.tapestry5.annotations.InjectContainer; -import org.apache.tapestry5.annotations.Parameter; -import org.apache.tapestry5.annotations.Path; -import org.apache.tapestry5.corelib.components.TextArea; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.json.JSONObject; -import org.apache.tapestry5.services.javascript.JavaScriptSupport; - -public class WebEditor { - - @InjectContainer - private TextArea field; - - @Parameter(defaultPrefix = BindingConstants.LITERAL) - String areaType; - - @Inject - private JavaScriptSupport javaScriptSupport; - - @Inject - @Path("webeditor-custom.css") - private Asset asset; - - public void afterRender() { - JSONObject json = new JSONObject(); - json.put("id", field.getClientId()); - json.put("csspath", asset.toClientURL()); - if (areaType.equals("ADMIN")) { - javaScriptSupport.require("webeditor-config-admin").with(json); - } else { - javaScriptSupport.require("webeditor-config").with(json); - } - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/model/ActivityTypeSelectModel.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/model/ActivityTypeSelectModel.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,46 +1,0 @@ -package info.ajanovski.eprms.tap.model; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.tapestry5.OptionGroupModel; -import org.apache.tapestry5.OptionModel; -import org.apache.tapestry5.internal.OptionModelImpl; -import org.apache.tapestry5.util.AbstractSelectModel; - -import info.ajanovski.eprms.model.entities.ActivityType; - -public class ActivityTypeSelectModel extends AbstractSelectModel { - private List activityTypes; - - public ActivityTypeSelectModel(List activityTypes) { - if (activityTypes == null) { - this.activityTypes = new ArrayList(); - } else { - this.activityTypes = activityTypes; - } - } - - @Override - public List getOptionGroups() { - return null; - } - - public int getDepth(ActivityType at) { - if (at.getSuperActivityType() != null) { - return getDepth(at.getSuperActivityType()) + 1; - } else { - return 0; - } - } - - @Override - public List getOptions() { - List options = new ArrayList(); - for (ActivityType at : activityTypes) { - String name = (new String("-")).repeat(3 * getDepth(at)) + at.getTitle(); - options.add(new OptionModelImpl(name, at)); - } - return options; - } -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/Index.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/Index.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/Index.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -21,8 +21,16 @@ package info.ajanovski.eprms.tap.pages; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; + import info.ajanovski.eprms.tap.annotations.PublicPage; +import info.ajanovski.eprms.tap.util.UserInfo; @PublicPage public class Index { + @SessionState + @Property + private UserInfo userInfo; + } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/Logout.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/Logout.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/Logout.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + ******************************************************************************/ + +package info.ajanovski.eprms.tap.pages; + +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.commons.Messages; +import org.apache.tapestry5.http.services.Context; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; +import org.apache.tapestry5.http.services.Session; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.Cookies; +import org.slf4j.Logger; + +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.annotations.StudentPage; +import info.ajanovski.eprms.tap.util.AppConfig; +import info.ajanovski.eprms.tap.util.UserInfo; + +@StudentPage +@InstructorPage +@AdministratorPage +public class Logout { + @Inject + private Logger logger; + + @Inject + private Request request; + + @Inject + private RequestGlobals requestGlobals; + + @Inject + private Cookies cookies; + + @Persist + @Property + private UserInfo userInfo; + + @Inject + private Context ctx; + + @Property + private String casServer; + @Property + private String appServer; + @Property + private String logoutRedirectToServer; + + @Inject + private Messages messages; + + void onActivate() { + casServer = ctx.getInitParameter("casServerLogoutUrl"); + appServer = ctx.getInitParameter("service"); + logoutRedirectToServer = AppConfig.getString("logout.redirectToServer"); + + // Clear session + Session session = request.getSession(false); + if (session != null) { + session.invalidate(); + userInfo = null; + logger.debug("Session successfully invalidated!"); + } + + clearCookie(); + } + + private void clearCookie() { + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyDatabases.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyDatabases.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyDatabases.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + ******************************************************************************/ + +package info.ajanovski.eprms.tap.pages; + +import java.util.List; + +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.ioc.annotations.Inject; + +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.annotations.StudentPage; +import info.ajanovski.eprms.tap.entities.Database; +import info.ajanovski.eprms.tap.services.GenericService; +import info.ajanovski.eprms.tap.services.ResourceManager; +import info.ajanovski.eprms.tap.util.UserInfo; + +@StudentPage +@InstructorPage +@AdministratorPage +public class MyDatabases { + @Property + @SessionState + private UserInfo userInfo; + + @Inject + private GenericService genericService; + + @Inject + private ResourceManager resourceManager; + + @Property + private Database database; + + public List getProjectDatabases() { + return resourceManager.getActiveDatabasesByProject(userInfo.getPersonId()); + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyRepositories.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyRepositories.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyRepositories.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + ******************************************************************************/ + +package info.ajanovski.eprms.tap.pages; + +import java.util.List; + +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.ioc.annotations.Inject; + +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.annotations.StudentPage; +import info.ajanovski.eprms.tap.entities.Repository; +import info.ajanovski.eprms.tap.services.GenericService; +import info.ajanovski.eprms.tap.services.ResourceManager; +import info.ajanovski.eprms.tap.util.UserInfo; + +@StudentPage +@InstructorPage +@AdministratorPage +public class MyRepositories { + + @Property + @SessionState + private UserInfo userInfo; + + @Inject + private GenericService genericService; + + @Inject + private ResourceManager resourceManager; + + public List getPersonalRepositories() { + return resourceManager.getActiveRepositoriesByPerson(userInfo.getPersonId()); + } + + public List getTeamRepositories() { + return resourceManager.getActiveRepositoriesByTeam(userInfo.getPersonId()); + } + + public List getProjectRepositories() { + return resourceManager.getActiveRepositoriesByProject(userInfo.getPersonId()); + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyRepositoryAuth.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyRepositoryAuth.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/MyRepositoryAuth.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,91 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + ******************************************************************************/ + +package info.ajanovski.eprms.tap.pages; + +import java.security.MessageDigest; +import java.util.Base64; + +import javax.validation.constraints.NotNull; + +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.corelib.components.Form; +import org.apache.tapestry5.corelib.components.PasswordField; +import org.apache.tapestry5.hibernate.annotations.CommitAfter; +import org.apache.tapestry5.ioc.annotations.Inject; + +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.annotations.StudentPage; +import info.ajanovski.eprms.tap.entities.Person; +import info.ajanovski.eprms.tap.services.GenericService; +import info.ajanovski.eprms.tap.util.UserInfo; + +@StudentPage +@InstructorPage +@AdministratorPage +public class MyRepositoryAuth { + + @Property + @SessionState + private UserInfo userInfo; + + @Inject + private GenericService genericService; + + @Property + @NotNull + private String password; + + @Property + @NotNull + private String confirmPassword; + + @InjectComponent("AuthForm") + private Form authForm; + + @InjectComponent("confirmPassword") + private PasswordField pfConfirmPassword; + + public void onValidateFromAuthForm() { + if (password != null && confirmPassword != null && !password.equals(confirmPassword)) { + authForm.recordError(pfConfirmPassword, "Enter two identical and non-empty passwords."); + } + } + + @CommitAfter + public void onSuccessFromAuthForm() { + if (password != null && confirmPassword != null && password.equals(confirmPassword)) { + Person myself = genericService.getByPK(Person.class, userInfo.getPersonId()); + try { + MessageDigest md = MessageDigest.getInstance("SHA-1"); + md.reset(); + md.update(password.getBytes("UTF-8")); + myself.setAuthString("{SHA}" + Base64.getEncoder().encodeToString(md.digest())); + genericService.save(myself); + } catch (Exception e) { + System.out.println(e); + } + } + } + +} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,76 +1,0 @@ -package info.ajanovski.eprms.tap.pages.admin; - -import java.util.List; - -import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.SelectModelFactory; - -import info.ajanovski.eprms.model.entities.Activity; -import info.ajanovski.eprms.model.entities.ActivityType; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.services.GenericService; - -@AdministratorPage -public class ManageActivities { - - @Persist - @Property - private Project selectedProject; - - @Persist - @Property - private Activity newActivity; - - @Property - private Activity activity; - - @Inject - private GenericService genericService; - - public void onActivate() { - if (selectedProject != null) { - selectedProject = genericService.getByPK(Project.class, selectedProject.getProjectId()); - } - } - - public void onActivate(Project p) { - selectedProject = genericService.getByPK(Project.class, p.getProjectId()); - } - - public void onActionFromNewActivity() { - newActivity = new Activity(); - newActivity.setProject(selectedProject); - } - - @InjectComponent - private Zone zoneActivities; - - @CommitAfter - public void onSuccessFromNewActivityForm() { - genericService.save(newActivity); - newActivity = null; - } - - @Inject - private SelectModelFactory selectModelFactory; - - public SelectModel getListTypes() { - return selectModelFactory.create(genericService.getAll(ActivityType.class), "title"); - } - - public List getAllActivities() { - return selectedProject.getActivities(); - } - - @CommitAfter - void onDeleteActivity(Activity a) { - genericService.delete(a); - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,119 +1,0 @@ -package info.ajanovski.eprms.tap.pages.admin; - -import java.util.List; - -import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.http.services.Request; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.SelectModelFactory; -import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; - -import info.ajanovski.eprms.model.entities.ActivityType; -import info.ajanovski.eprms.model.util.ActivityTypeHierarchicalComparator; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.model.ActivityTypeSelectModel; -import info.ajanovski.eprms.tap.services.GenericService; - -@AdministratorPage -@InstructorPage -public class ManageActivityTypes { - - @InjectComponent - private Zone zoneActivityTypes; - - @Inject - private GenericService genericService; - - @Inject - private SelectModelFactory selectModelFactory; - - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - @Inject - private Request request; - - @Property - private ActivityType activityType; - - @Property - private ActivityType superActivityType; - - @InjectComponent - private Zone editFormZone; - - @Persist - @Property - private ActivityType newActivityType; - - public void onNewActivityType() { - newActivityType = new ActivityType(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(editFormZone); - } - } - - public void onEditActivityType(ActivityType at) { - newActivityType = at; - superActivityType = newActivityType.getSuperActivityType(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(editFormZone); - } - } - - public SelectModel getListTypes() { - List list = (List) genericService.getAll(ActivityType.class); - ActivityTypeHierarchicalComparator athc = new ActivityTypeHierarchicalComparator(); - list.sort(athc); - return new ActivityTypeSelectModel(list); - } - - public List getAllActivityTypes() { - ActivityTypeHierarchicalComparator athc = new ActivityTypeHierarchicalComparator(); - List lista = (List) genericService.getAll(ActivityType.class); - lista.sort(athc); - return lista; - } - - public Long getDepth(ActivityType at) { - if (at.getSuperActivityType() != null) { - return getDepth(at.getSuperActivityType()) + 1; - } else { - return 0L; - } - } - - public long getHierarchicalDepth() { - return (3 * getDepth(activityType)); - } - - public void onActivate() { - if (newActivityType != null) { - newActivityType = genericService.getByPK(ActivityType.class, newActivityType.getActivityTypeId()); - } - } - - @CommitAfter - public void onSuccessFromNewActivityTypeForm() { - genericService.saveOrUpdate(newActivityType); - newActivityType = null; - } - - void onCancelNewActivityTypeForm() { - newActivityType = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(editFormZone); - } - } - - @CommitAfter - void onDeleteActivityType(ActivityType at) { - genericService.delete(at); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageCourses.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageCourses.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,238 +1,0 @@ -package info.ajanovski.eprms.tap.pages.admin; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.ValueEncoder; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.SelectModelFactory; -import org.slf4j.Logger; - -import info.ajanovski.eprms.model.entities.ActivityType; -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.entities.CourseActivityType; -import info.ajanovski.eprms.model.entities.CourseTeacher; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.util.ActivityTypeHierarchicalComparator; -import info.ajanovski.eprms.model.util.CourseActivityTypeHierarchicalComparator; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.services.CourseManager; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.PersonManager; -import info.ajanovski.eprms.tap.util.UserInfo; - -@AdministratorPage -@InstructorPage -public class ManageCourses { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private Logger logger; - - @Inject - private SelectModelFactory selectModelFactory; - - @Inject - private GenericService genericService; - - @Inject - private CourseManager courseManager; - - @Property - private Course course; - - @Property - @Persist - private Course addActivityTypeForCourse; - - @Property - @Persist - private Course addTeacherForCourse; - - @Property - private ActivityType activityType; - @Property - private ActivityType selectParentActivityType; - @Property - private CourseActivityType courseActivityType; - - @Persist - @Property - private Course editCourse; - - @Persist - @Property - private List inActivityTypes; - - public List getAllCourses() { - return courseManager.getAllCoursesByPerson(userInfo.getPersonId()); - } - - public List getCourseCourseActivityTypes() { - List list = course.getCourseActivityTypes(); - - CourseActivityTypeHierarchicalComparator comparator = new CourseActivityTypeHierarchicalComparator(); - list.sort(comparator); - - return list; - } - - void onActionFromEditCourse(Course c) { - editCourse = c; - } - - @CommitAfter - void onDeleteCourse(Course c) { - genericService.delete(c); - } - - void onActionFromAddCourseActivityType(Course c) { - addActivityTypeForCourse = c; - } - - void onActionFromAddCourseTeacher(Course c) { - addTeacherForCourse = c; - } - - @CommitAfter - void onActionFromDeleteCourseActivityType(CourseActivityType cat) { - genericService.delete(cat); - } - - @CommitAfter - void onActionFromDeleteCourseTeacher(CourseTeacher ct) { - genericService.delete(ct); - } - - public boolean isAllowDeleteCourse() { - return (course.getCourseActivityTypes() == null || course.getCourseActivityTypes().size() == 0) - && (course.getCourseProjects() == null || course.getCourseProjects().size() == 0); - } - - @CommitAfter - void onSuccessFromFrmEditCourse() { - genericService.saveOrUpdate(editCourse); - editCourse = null; - } - - public ValueEncoder getActivityTypeEncoder() { - return new ValueEncoder() { - @Override - public String toClient(ActivityType value) { - return String.valueOf(value.getActivityTypeId()); - } - - @Override - public ActivityType toValue(String id) { - return genericService.getByPK(ActivityType.class, Long.parseLong(id)); - } - }; - } - - public void onActivate() { - if (inActivityTypes == null) { - inActivityTypes = new ArrayList(); - } - } - - public SelectModel getActivityTypeModel() { - return selectModelFactory.create(getAllActivityTypes().stream().filter(at -> at.getSubActivityTypes() != null) - .collect(Collectors.toList()), "title"); - } - - public List getAllActivityTypes() { - ActivityTypeHierarchicalComparator athc = new ActivityTypeHierarchicalComparator(); - List lista = (List) genericService.getAll(ActivityType.class); - lista.sort(athc); - return lista; - } - - public Long getDepth(ActivityType at) { - if (at.getSuperActivityType() != null) { - return getDepth(at.getSuperActivityType()) + 1; - } else { - return 0L; - } - } - - public long getHierarchicalDepth() { - return (3 * getDepth(courseActivityType.getActivityType())); - } - - private boolean cancelFrmAddActivityType; - - void onSelectedFromSubmitSelectParentActivityType() { - cancelFrmAddActivityType = false; - } - - void onSelectedFromCancelSelectParentActivityType() { - cancelFrmAddActivityType = true; - } - - @CommitAfter - public void onSuccessFromFrmAddActivityType() { - if (!cancelFrmAddActivityType) { - int pos = 1; - for (ActivityType at : selectParentActivityType.getSubActivityTypes()) { - CourseActivityType cat = new CourseActivityType(); - cat.setCourse(addActivityTypeForCourse); - cat.setActivityType(at); - cat.setPositionNumber(pos); - pos++; - genericService.saveOrUpdate(cat); - } - addActivityTypeForCourse = null; - } else { - addActivityTypeForCourse = null; - } - } - - public void onActionFromAddCourse() { - editCourse = new Course(); - } - - void onCancelEditCourse() { - editCourse = null; - } - - @Inject - private PersonManager personManager; - - public SelectModel getTeacherModel() { - return selectModelFactory.create(personManager.getAllPersonsFromRole(ModelConstants.RoleInstructor), - "userName"); - } - - @Property - private Person selectTeacher; - - public List getCourseTeachers() { - return course.getCourseTeachers(); - } - - @Property - private CourseTeacher courseTeacher; - - void onCancelSelectTeacher() { - addTeacherForCourse = null; - } - - @CommitAfter - public void onSuccessFromFrmAddTeacher() { - CourseTeacher ct = new CourseTeacher(); - ct.setCourse(addTeacherForCourse); - ct.setTeacher(selectTeacher); - genericService.save(ct); - addTeacherForCourse = null; - } -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageDatabases.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageDatabases.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageDatabases.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -1,5 +1,4 @@ package info.ajanovski.eprms.tap.pages.admin; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -10,10 +9,8 @@ import org.apache.tapestry5.ioc.annotations.Inject; -import info.ajanovski.eprms.model.entities.Database; import info.ajanovski.eprms.tap.annotations.AdministratorPage; import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.entities.Database; import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.AppConstants; @AdministratorPage @@ -23,7 +20,4 @@ @Inject private GenericService genericService; - - @Inject - private SystemConfigService systemConfigService; @Property @@ -60,11 +54,4 @@ @CommitAfter - public void onActionFromActivateDatabases() { - for (Database db : getDatabases()) { - db.setDateCreated(new Date()); - } - } - - @CommitAfter public void onSuccessFromEditDatabaseForm() { genericService.saveOrUpdate(editDatabase); @@ -81,12 +68,3 @@ } - public String getDBCreationCommand() { - return systemConfigService.getString(AppConstants.SystemParameterDBCreationCommand); - } - - - public String getDBSSHTunnelUserCreationCommand() { - return systemConfigService.getString(AppConstants.SystemParameterDBSSHTunnelUserCreationCommand); - } - } Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManagePersons.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManagePersons.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,210 +1,0 @@ -package info.ajanovski.eprms.tap.pages.admin; - -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.corelib.components.Form; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.SelectModelFactory; -import org.slf4j.Logger; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.entities.Role; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.PersonManager; -import info.ajanovski.eprms.tap.util.UserInfo; - -@AdministratorPage -public class ManagePersons { - - @SessionState - private UserInfo userInfo; - - @Inject - private SelectModelFactory selectModelFactory; - - @Inject - private PersonManager personManager; - - @Inject - private GenericService genericService; - - @Inject - private Logger logger; - - @InjectComponent - private Form frmImport; - - private Boolean cancelForm = false; - - @Property - private Person person; - - @Persist - @Property - private Person personToEdit; - - @Property - @Persist - private String personListToImport; - - @Property - @Persist - private String searchString; - - @Persist - @Property - private Person personToAddRole; - - @Persist - @Property - private Role selectRole; - - @Property - private PersonRole personRole; - - @Persist - @Property - private String errors; - - public List getAllPersons() { - List list = personManager.getAllPersons(); - if (searchString == null || searchString.equals("")) { - return list; - } else { - return list.stream().filter( - p -> (p.getFirstName() + p.getLastName() + p.getEmail() + p.getUserName()).contains(searchString)) - .collect(Collectors.toList()); - } - } - - public void onActionFromImportPersons() { - personListToImport = "firstName,lastName,email,userName"; - } - - @CommitAfter - public void onSuccessFromFrmImport() { - if (personListToImport != null) { - errors = new String(); - Role r = (Role) genericService.getAll(Role.class).stream() - .filter(role -> ((Role) role).getName().equals(ModelConstants.RoleStudent)).findFirst().get(); - if (r != null) { - for (String line : personListToImport.split("\\r?\\n")) { - logger.info(">>> Importing {} <<<", line); - String[] lineFields = line.split("[,\t]"); - Person p; - try { - p = personManager.getPersonByUsername(lineFields[3]); - if (p != null) { - errors += ">>> Person " + p.getUserName() - + " already exists, skipping creation, activating."; - p.setActive(true); - genericService.saveOrUpdate(p); - } else { - p = new Person(); - p.setFirstName(lineFields[0]); - p.setLastName(lineFields[1]); - p.setEmail(lineFields[2]); - p.setUserName(lineFields[3]); - p.setActive(true); - genericService.save(p); - PersonRole pr = new PersonRole(); - pr.setPerson(p); - pr.setRole(r); - genericService.save(pr); - } - } catch (Exception e) { - errors += ">>> Person " + lineFields[3] + " can not be imported due to: " - + e.getLocalizedMessage(); - } - } - } else { - errors += "Role STUDENT does not exist"; - } - if (!(errors.length() > 0)) { - errors = "OK"; - } - } - } - - @CommitAfter - public void onActionFromDeletePerson(Person p) { - for (PersonRole pr : personManager.getPersonRolesForPerson(p.getPersonId())) { - genericService.delete(pr); - } - genericService.delete(p); - } - - @CommitAfter - void onActionFromTogglePersonStatus(Person p) { - p.setActive(!p.getActive()); - genericService.saveOrUpdate(p); - } - - public void onActionFromNewPerson() { - personToEdit = new Person(); - } - - public void onActionFromEditPerson(Person p) { - personToEdit = p; - } - - @CommitAfter - public void saveChanges() { - genericService.saveOrUpdate(personToEdit); - } - - public void onCanceledFromFrmNewPerson() { - cancelForm = true; - } - - public void onValidateFromFrmNewPerson() { - if (!cancelForm) { - saveChanges(); - } - } - - public void onSuccessFromFrmNewPerson() { - personToEdit = null; - } - - public SelectModel getRolesModel() { - return selectModelFactory.create(genericService.getAll(Role.class), "name"); - } - - void onAddRole(Person p) { - personToAddRole = p; - } - - void onCancelAddRole() { - personToAddRole = null; - } - - public List getPersonRoles() { - return personManager.getPersonRolesForPerson(person.getPersonId()); - } - - @CommitAfter - public void onSuccessFromFrmSelectRole() { - PersonRole pr = new PersonRole(); - pr.setRole(selectRole); - pr.setPerson(personToAddRole); - genericService.save(pr); - personToAddRole = null; - } - - @CommitAfter - public void onRemoveRole(PersonRole personRole) { - genericService.delete(personRole); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageProjects.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageProjects.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,493 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.admin; - -import java.math.BigInteger; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.ValueEncoder; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.commons.Messages; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.PersistentLocale; -import org.apache.tapestry5.services.SelectModelFactory; -import org.slf4j.Logger; - -import info.ajanovski.eprms.model.entities.Activity; -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.entities.CourseProject; -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.model.entities.Responsibility; -import info.ajanovski.eprms.model.entities.Team; -import info.ajanovski.eprms.model.entities.TeamMember; -import info.ajanovski.eprms.model.util.ActivityComparatorViaType; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.mq.MessagingService; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.services.CourseManager; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.PersonManager; -import info.ajanovski.eprms.tap.services.ProjectManager; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.services.TranslationService; -import info.ajanovski.eprms.tap.util.AppConfig; -import info.ajanovski.eprms.tap.util.AppConstants; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -public class ManageProjects { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private Logger logger; - - @Inject - private ProjectManager projectManager; - - @Inject - private CourseManager courseManager; - - @Inject - private SystemConfigService systemConfigService; - - @Inject - private MessagingService messagingService; - - @Inject - private GenericService genericService; - - @Inject - private SelectModelFactory selectModelFactory; - - @Inject - private TranslationService translationService; - - @Inject - private PersistentLocale persistentLocale; - - @Inject - private PersonManager personManager; - - @Inject - private Messages messages; - - @Property - private Project project; - - @Persist - @Property - private Project selectedProject; - - @Persist - @Property - private String selectedStatus; - - @Property - private Responsibility responsibility; - - @Property - private TeamMember teamMember; - - @Property - private Database database; - - @Property - private Repository repository; - - @Persist - @Property - private TeamMember newTm; - - @Persist - @Property - private Project newProject; - - @Persist - @Property - private Team newTeam; - - @Persist - @Property - private Responsibility newResponsibility; - - @Persist - @Property - private Responsibility linkResponsibility; - - @Persist - @Property - private Database newDb; - - @Persist - @Property - private Repository newRp; - - @Persist - @Property - private List inCourses; - - @Persist - @Property - private Project copyActivitiesFromProject; - - @Persist - @Property - private Course selectedCourse; - - @Property - private String personSearch; - - void onActivate() { - } - - public List getAllProjects() { - List list = (List) projectManager.getAllProjects(); - if (selectedCourse == null) { - return new ArrayList(); - } else { - if (selectedStatus == null) { - return list.stream() - .filter(p -> (p.getCourseProjects().stream() - .anyMatch(cp -> cp.getCourse().getCourseId() == selectedCourse.getCourseId()))) - .collect(Collectors.toList()); - } else { - return list.stream() - .filter(p -> (p.getCourseProjects().stream() - .anyMatch(cp -> cp.getCourse().getCourseId() == selectedCourse.getCourseId() - && selectedStatus.equals(cp.getProject().getStatus())))) - .collect(Collectors.toList()); - } - } - } - - public List getProjects() { - if (selectedProject != null) { - List ls = new ArrayList(); - ls.add(genericService.getByPK(Project.class, selectedProject.getProjectId())); - return ls; - } else { - return getAllProjects(); - } - } - - public void onActionFromAddTeamMember(Team t) { - newTm = new TeamMember(); - newTm.setTeam(t); - } - - public void onActionFromNewProject() { - newProject = new Project(); - inCourses = new ArrayList(); - } - - public void onActionFromEditProject(Project p) { - newProject = p; - inCourses = projectManager.getProjectCourses(newProject).stream().map(cp -> cp.getCourse()) - .collect(Collectors.toList()); - } - - public void onActionFromNewTeam(Project p) { - newTeam = new Team(); - newResponsibility = new Responsibility(); - newResponsibility.setProject(p); - newResponsibility.setTeam(newTeam); - } - - public void onActionFromLinkTeam(Project p) { - linkResponsibility = new Responsibility(); - linkResponsibility.setProject(p); - } - - public void onActionFromNewDatabase(Project p) { - newDb = new Database(); - newDb.setProject(p); - String dbPrefix = systemConfigService.getString(AppConstants.SystemParameterDBCreationPrefix); - String tunnelPrefix = systemConfigService.getString(AppConstants.SystemParameterDBTunnelPrefix); - String ownerSuffix = systemConfigService.getString(AppConstants.SystemParameterDBCreationOwnerSuffix); - String prjcode = p.getCode().toLowerCase().replace("-", "_").replace(" ", "_"); - newDb.setType(systemConfigService.getString(AppConstants.SystemParameterDBServerType)); - newDb.setServer(systemConfigService.getString(AppConstants.SystemParameterDBServerName)); - newDb.setPort(systemConfigService.getString(AppConstants.SystemParameterDBServerPort)); - String dbName = (dbPrefix + prjcode).toLowerCase().replace("-", "_").replace(" ", "_"); - newDb.setName(dbName); - newDb.setOwner(dbName + ownerSuffix); - newDb.setPassword(generateRandomHexToken(6)); - newDb.setTunnelServer(systemConfigService.getString(AppConstants.SystemParameterDBTunnelServerName)); - newDb.setTunnelUser(tunnelPrefix + prjcode); - newDb.setTunnelPassword(generateRandomHexToken(4)); - } - - public static String generateRandomHexToken(int byteLength) { - SecureRandom secureRandom = new SecureRandom(); - byte[] token = new byte[byteLength]; - secureRandom.nextBytes(token); - return new BigInteger(1, token).toString(16); - } - - public void onActionFromNewRepository(Project p) { - newRp = new Repository(); - newRp.setProject(p); - } - - public List getAllCourses() { - return courseManager.getAllCoursesByPerson(userInfo.getPersonId()); - } - - public List getAllTeams() { - return (List) genericService.getAll(Team.class); - } - - public SelectModel getCoursesModel() { - return selectModelFactory.create(getAllCourses(), "title"); - } - - public SelectModel getAllTeamsModel() { - return selectModelFactory.create(getAllTeams(), "name"); - } - - public SelectModel getSelectedCoursesModel() { - return selectModelFactory.create(inCourses, "title"); - } - - public ValueEncoder getCourseEncoder() { - return new ValueEncoder() { - @Override - public String toClient(Course value) { - return String.valueOf(value.getCourseId()); - } - - @Override - public Course toValue(String id) { - return genericService.getByPK(Course.class, Long.parseLong(id)); - } - }; - } - - private Boolean cancelTeamMemberForm=false; - - public void onCanceledFromTeamMemberForm() { - cancelTeamMemberForm=true; - } - - @CommitAfter - public void onSuccessFromTeamMemberForm() { - if (!cancelTeamMemberForm) { - if (personSearch != null && personSearch.length() > 0) { - Pattern pattern = Pattern.compile("\\[(.*?)\\]"); - Matcher matcher = pattern.matcher(personSearch); - if (matcher.find()) { - newTm.setPerson(personManager.getPersonByUsername(matcher.group(1))); - } - } - genericService.save(newTm); - } - newTm = null; - } - - @CommitAfter - public void onSuccessFromNewProjectForm() { - genericService.saveOrUpdate(newProject); - projectManager.addCoursesToProject(inCourses, newProject); - selectedProject = newProject; - newProject = null; - } - - public void onCancelNewProject() { - newProject = null; - } - - @CommitAfter - public void onSuccessFromNewTeamForm() { - genericService.saveOrUpdate(newTeam); - if (newResponsibility != null) { - genericService.saveOrUpdate(newResponsibility.getTeam()); - genericService.saveOrUpdate(newResponsibility); - } - newTeam = null; - newResponsibility = null; - } - - @CommitAfter - public void onSuccessFromLinkTeamForm() { - if (linkResponsibility != null) { - genericService.saveOrUpdate(linkResponsibility); - } - linkResponsibility = null; - } - - @CommitAfter - public void onSuccessFromNewDatabaseForm() { - genericService.save(newDb); - try { - messagingService.setupMQHost(AppConfig.getString("MQHost")); - messagingService.sendDatabaseNotification(newDb); - } catch (Exception e) { - logger.error("DB creation message not sent"); - } - newDb = null; - } - - @CommitAfter - public void onSuccessFromNewRepositoryForm() { - genericService.save(newRp); - try { - messagingService.setupMQHost(AppConfig.getString("MQHost")); - messagingService.sendRepositoryNotification(newRp); - } catch (Exception e) { - logger.error("REPO creation message not sent"); - } - newRp = null; - } - - @Property - private Person person; - - public List getPersons() { - return ((List) genericService.getAll(Person.class)).stream() - .sorted((o1, o2) -> o1.getUserName().compareTo(o2.getUserName())).toList(); - } - - public SelectModel getPersonModel() { - return (SelectModel) selectModelFactory.create(getPersons(), "userName"); - } - - public SelectModel getProjectModel() { - return (SelectModel) selectModelFactory.create(getAllProjects(), "title"); - } - - @Property - private Course course; - - public List getProjectCourses() { - return projectManager.getProjectCourses(project).stream().map(cp -> cp.getCourse()) - .collect(Collectors.toList()); - } - - public void onActionFromCopyActivities(Project p) { - copyActivitiesFromProject = p; - } - - public void onActionFromResetClipboard() { - copyActivitiesFromProject = null; - } - - @CommitAfter - public void onActionFromPasteActivities(Project pasteActivitiesToProject) { - List activities = genericService.getByPK(Project.class, copyActivitiesFromProject.getProjectId()) - .getActivities(); - Collections.sort(activities, new ActivityComparatorViaType()); - for (Activity original : activities) { - Activity copy = new Activity(); - copy.setDescription(original.getDescription()); - copy.setTitle(original.getTitle()); - copy.setProject(pasteActivitiesToProject); - copy.setActivityType(original.getActivityType()); - genericService.save(copy); - } - genericService.save(pasteActivitiesToProject); - copyActivitiesFromProject = null; - } - - public String getCourseTitle() { - String trans = translationService.getTranslation(Course.class.getSimpleName(), "title", course.getCourseId(), - persistentLocale.get().getLanguage()); - if (trans == null) { - return course.getTitle(); - } else { - return trans; - } - } - - @CommitAfter - void onActionFromDeleteResponsibilityAndTeam(Responsibility r) { - Team t = r.getTeam(); - genericService.delete(r); - if (t.getResponsibilities().size() == 0) { - genericService.delete(t); - } - } - - @CommitAfter - void onActionFromDeleteResponsibility(Responsibility r) { - genericService.delete(r); - } - - void onActionFromEditTeam(Team t) { - newTeam = t; - } - - void onCancelNewTeam() { - newTeam = null; - } - - void onCancelLinkTeam() { - linkResponsibility = null; - } - - @CommitAfter - void onActionFromChangeStatus(Project p) { - projectManager.cycleStatus(p); - } - - public String[] getModelProjectStatuses() { - return ModelConstants.AllProjectStatuses; - } - - @CommitAfter - public void onActionFromDeleteProject(Project p) { - try { - for (CourseProject cp : p.getCourseProjects()) { - genericService.delete(cp); - } - genericService.delete(p); - } catch (Exception e) { - - } - } - - public List onProvideCompletionsFromSelectPerson(String input) { - List list = new ArrayList(); - if (input != null && input.length() > 0) { - getPersons().stream() - .filter(p -> (p.getFirstName() + p.getLastName() + p.getEmail() + p.getUserName()).contains(input)) - .forEach(p -> list.add(p.getFirstName() + " " + p.getLastName() + " [" + p.getUserName() + "]")); - } - return list; - } - -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageRepositories.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageRepositories.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageRepositories.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -1,5 +1,4 @@ package info.ajanovski.eprms.tap.pages.admin; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -7,13 +6,10 @@ import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; import org.apache.tapestry5.ioc.annotations.Inject; -import info.ajanovski.eprms.model.entities.Repository; import info.ajanovski.eprms.tap.annotations.AdministratorPage; import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.entities.Repository; import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.AppConstants; @AdministratorPage @@ -24,17 +20,7 @@ private GenericService genericService; - @Inject - private SystemConfigService systemConfigService; - @Property @Persist private Boolean isOnlyShowNotCreated; - - @Property - private Repository repository; - - @Persist - @Property - private Repository editRepository; public void onActivate() { @@ -44,30 +30,9 @@ } + @Property + private Repository repository; + public void onActionFromToggle() { isOnlyShowNotCreated = !isOnlyShowNotCreated; - } - - public void onActionFromEdit(Repository r) { - editRepository = r; - } - - @CommitAfter - public void onActionFromDelete(Repository r) { - if (r.getDateCreated() == null) { - genericService.delete(r); - } - } - - @CommitAfter - public void onActionFromActivateRepositories() { - for (Repository r : getRepositories()) { - r.setDateCreated(new Date()); - } - } - - @CommitAfter - public void onSuccessFromEditForm() { - genericService.saveOrUpdate(editRepository); - editRepository = null; } @@ -80,8 +45,3 @@ } } - - public String getRepoCreationCommand() { - return systemConfigService.getString(AppConstants.SystemParameterRepoCreationCommand); - } - } Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageTeams.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageTeams.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,113 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.admin; - -import java.util.Date; -import java.util.List; - -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.Responsibility; -import info.ajanovski.eprms.model.entities.Team; -import info.ajanovski.eprms.model.entities.TeamMember; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -public class ManageTeams { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - @Property - private Team team; - - @Property - private TeamMember teamMember; - - @Persist - @Property - private Boolean approvalOnly; - - @Property - private Responsibility responsibility; - - public void onActivate() { - if (approvalOnly == null) { - approvalOnly = true; - } - } - - public List getTeams() { - List lista = (List) genericService.getAll(Team.class); - if (approvalOnly != null && approvalOnly) { - return lista.stream() - .filter(p -> p.getStatus() != null && p.getStatus().equals(ModelConstants.TeamStatusProposed)) - .toList(); - } else { - return lista; - } - } - - void onActionFromToggleApprovalOnly() { - if (approvalOnly == null) { - approvalOnly = false; - } else { - approvalOnly = !approvalOnly; - } - } - - @CommitAfter - void onActionFromApproveTeam(Team t) { - t.setStatus(ModelConstants.TeamStatusAccepted); - t.setOpenForNewMembers(false); - t.setStatusDate(new Date()); - for (TeamMember tm : t.getTeamMembers()) { - tm.setStatus(ModelConstants.TeamMemberStatusAccepted); - genericService.saveOrUpdate(tm); - } - genericService.saveOrUpdate(t); - } - - @CommitAfter - void onActionFromRemoveTeam(Team t) { - for (TeamMember tm : t.getTeamMembers()) { - genericService.delete(tm); - } - genericService.delete(t); - } - - public List getTeamResponsibilities() { - return team.getResponsibilities(); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,354 +1,0 @@ -package info.ajanovski.eprms.tap.pages.admin; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.http.services.Request; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.SelectModelFactory; -import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; -import org.slf4j.Logger; - -import info.ajanovski.eprms.model.entities.Activity; -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.entities.CourseActivityType; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.WorkEvaluation; -import info.ajanovski.eprms.model.entities.WorkReport; -import info.ajanovski.eprms.model.util.CourseActivityTypeHierarchicalComparator; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.model.util.ProjectCodeComparator; -import info.ajanovski.eprms.mq.MessagingService; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.components.ModalBox; -import info.ajanovski.eprms.tap.services.CourseManager; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.ProjectManager; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.AppConfig; -import info.ajanovski.eprms.tap.util.AppConstants; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -@Import(module = { "bootstrap/modal", "bootstrap/collapse", - "zoneUpdateEffect" }, stylesheet = "OverallCourseReport.css") -public class OverallCourseReport { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private Logger logger; - - @Inject - private SystemConfigService systemConfigService; - - @Inject - private ProjectManager projectManager; - - @Inject - private CourseManager courseManager; - - @Inject - private MessagingService messagingService; - - @Inject - private GenericService genericService; - - @Inject - private Request request; - - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - - @Inject - private SelectModelFactory selectModelFactory; - - @Persist - @Property - private Course selectedCourse; - - @Property - private CourseActivityType courseActivityType; - - @Property - private WorkReport workReport; - - @Property - private WorkEvaluation workEvaluation; - - @Persist - @Property - private WorkReport newWorkReport; - - @Persist - @Property - private WorkEvaluation newWorkEvaluation; - - @InjectComponent - private Zone zWorkReport; - - @InjectComponent - private Zone zTable; - - @InjectComponent - private Zone zWorkEvaluation; - - @InjectComponent - private Zone zAll; - - @InjectComponent - private ModalBox newWorkEvaluationModal; - - @InjectComponent - private ModalBox newWorkReportModal; - - @Persist - @Property - private List projectsToHide; - - @Property - private Project hiddenProject; - - @Persist - @Property - private List activitiesToHide; - - @Property - private CourseActivityType hiddenActivity; - - @Property - private Project project; - - public List getListOfAllActiveProjects() { - List list = new ArrayList(); - if (selectedCourse == null) { - list = ((List) projectManager.getAllProjects()).stream() - .filter(p -> (p.getStatus() != null && p.getStatus().equals(ModelConstants.ProjectStatusActive))) - .collect(Collectors.toList()); - } else { - list = ((List) projectManager.getAllProjectsInCourse(selectedCourse)).stream() - .filter(p -> (p.getStatus() != null && p.getStatus().equals(ModelConstants.ProjectStatusActive))) - .collect(Collectors.toList()); - } - if (projectsToHide != null && projectsToHide.size() > 0) { - list.removeIf(l -> projectsToHide.stream().anyMatch(ph -> ph.getProjectId() == l.getProjectId())); - } - list = list.stream().sorted(new ProjectCodeComparator()).toList(); - return list; - } - - public List getSelectedCourseCourseActivityTypes() { - List list = selectedCourse.getCourseActivityTypes(); - - CourseActivityTypeHierarchicalComparator comparator = new CourseActivityTypeHierarchicalComparator(); - list.sort(comparator); - - if (activitiesToHide != null && activitiesToHide.size() > 0) { - list.removeIf(l -> activitiesToHide.stream() - .anyMatch(ah -> ah.getCourseActivityTypeId() == l.getCourseActivityTypeId())); - } - return list; - } - - public Activity getActivity() { - return project.getActivities().stream().filter(a -> a.getActivityType() - .getActivityTypeId() == courseActivityType.getActivityType().getActivityTypeId()).findFirst() - .orElse(null); - } - - public List getWorkReportsForActivity() { - return projectManager.getWorkReportsForActivity(getActivity()); - } - - public List getWorkEvaluationsForWorkReport() { - return projectManager.getWorkEvaluationForWorkReport(workReport); - } - - public void onActionFromAddWorkReport(Activity a) { - newWorkEvaluation = null; - newWorkReport = new WorkReport(); - newWorkReport.setActivity(a); - newWorkReport.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId())); - newWorkReport.setTitle(systemConfigService.getString(AppConstants.SystemParameterTplNewWorkReportByAdmin)); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zWorkReport); - } - } - - @CommitAfter - void onSuccessFromFrmAddWorkReport() { - genericService.saveOrUpdate(newWorkReport); - newWorkReport = null; - newWorkEvaluation = null; - newWorkReportModal.hide(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender("zWorkReport", zWorkReport).addRender("zTable", zTable); - } - } - - void onAddWorkEvaluation(WorkReport wr) { - WorkReport wr1 = genericService.getByPK(WorkReport.class, wr.getWorkReportId()); - newWorkReport = null; - newWorkEvaluation = new WorkEvaluation(); - newWorkEvaluation.setTitle(systemConfigService.getString(AppConstants.SystemParameterTplNewWorkEvaluation)); - newWorkEvaluation.setEvaluationDate(new Date()); - newWorkEvaluation.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId())); - newWorkEvaluation.setStatus(ModelConstants.EvaluationStatusCreated); - newWorkEvaluation.setWorkReport(wr1); - } - - void onEditWorkEvaluation(WorkEvaluation wa) { - newWorkReport = null; - newWorkEvaluation = wa; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zWorkEvaluation); - } - } - - @CommitAfter - void onToggleWorkEvaluationStatus(WorkEvaluation wa) { - if (wa.getStatus().equals(ModelConstants.EvaluationStatusCreated)) { - wa.setStatus(ModelConstants.EvaluationStatusPublished); - } else { - wa.setStatus(ModelConstants.EvaluationStatusCreated); - } - genericService.saveOrUpdate(wa); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zTable); - } - } - - public String getZWorkEvaluationId() { - return "zWorkEvaluation_" + workEvaluation.getWorkEvaluationId(); - } - - public String getZWorkEvaluationIdNew() { - return "zWorkEvaluation_" + newWorkEvaluation.getWorkEvaluationId(); - } - - @CommitAfter - public void onSuccessFromFrmAddWorkEvaluation() { - genericService.saveOrUpdate(newWorkEvaluation); - // messagingService.sendWorkEvaluationNotification(newWorkEvaluation); - String ident = getZWorkEvaluationIdNew(); - logger.info("zone id = {}", ident); - newWorkReport = null; - newWorkEvaluation = null; - newWorkEvaluationModal.hide(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zTable); - } - } - - public List getListHiddenProjects() { - return projectManager.orderProjectList(projectsToHide); - } - - public void onActionFromResetListOfAllProjects() { - projectsToHide.clear(); - } - - public void onActionFromResetListOfAllActivities() { - activitiesToHide.clear(); - } - - public Float getProjectTotal() { - return projectManager.sumPoints(project); - } - - public SelectModel getCoursesModel() { - return selectModelFactory.create(getAllCourses(), "title"); - } - - public List getAllCourses() { - return courseManager.getAllCoursesByPerson(userInfo.getPersonId()); - } - - public void onActivate() { - if (projectsToHide == null) { - projectsToHide = new ArrayList(); - } - if (activitiesToHide == null) { - activitiesToHide = new ArrayList(); - } - if (selectedCourse != null) { - selectedCourse = genericService.getByPK(Course.class, selectedCourse.getCourseId()); - } - if (newWorkEvaluation != null && newWorkEvaluation.getWorkReport() != null) { - newWorkEvaluation.setWorkReport( - genericService.getByPK(WorkReport.class, newWorkEvaluation.getWorkReport().getWorkReportId())); - } - messagingService.setupMQHost(AppConfig.getString("MQHost")); - } - - void onActionFromRemoveProjectFromListOfAllProjects(Project p) { - projectsToHide.add(p); - } - - void onActionFromRemoveActivityFromListOfAllActivities(CourseActivityType cat) { - activitiesToHide.add(cat); - } - - void onActionFromShowProject(Project p) { - projectsToHide.removeIf(ph -> ph.getProjectId() == p.getProjectId()); - } - - void onActionFromShowActivity(CourseActivityType cat) { - activitiesToHide.removeIf(ph -> ph.getCourseActivityTypeId() == cat.getCourseActivityTypeId()); - } - - void onActionFromHideAllProjects() { - List lista = getListOfAllActiveProjects(); - projectsToHide.addAll(lista); - } - - void onActionFromHideAllActivities() { - List lista = getSelectedCourseCourseActivityTypes(); - activitiesToHide.addAll(lista); - } - - public void onActionFromCancelNewWorkReport() { - newWorkReport = null; - newWorkEvaluation = null; - newWorkReportModal.hide(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAll); - } - } - - public void onActionFromCancelNewWorkEvaluation() { - newWorkReport = null; - newWorkEvaluation = null; - newWorkEvaluationModal.hide(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAll).addRender(zWorkEvaluation); - } - } - - public String[] getEvalStatusModel() { - return ModelConstants.AllEvaluationStatuses; - } - - public String getPMProjectURLPrefix() { - return systemConfigService.getString(AppConstants.SystemParameterPMProjectURLPrefix); - } - - public String gethiddenActivityActivityTypeCode() { - return genericService.getByPK(hiddenActivity.getClass(), hiddenActivity.getCourseActivityTypeId()) - .getActivityType().getCode(); - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ProjectAutomation.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ProjectAutomation.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,71 +1,0 @@ -package info.ajanovski.eprms.tap.pages.admin; - -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.CourseProject; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.Responsibility; -import info.ajanovski.eprms.model.entities.TeamMember; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.AppConstants; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -public class ProjectAutomation { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - @Inject - private SystemConfigService systemConfigService; - - @Property - private Project project; - - @Property - private Responsibility responsibility; - - @Property - private TeamMember member; - - public List getProjects() { - return ((List) genericService.getAll(Project.class)).stream() - .filter(p -> p.getStatus() != null && p.getStatus().equals(ModelConstants.ProjectStatusCreation)) - .collect(Collectors.toList()); - } - - @CommitAfter - public void onActionFromActivateAllListed() { - for (Project p : getProjects()) { - p.setStatus(ModelConstants.ProjectStatusActive); - } - } - - public String getCourseCode() { - List list = responsibility.getProject().getCourseProjects(); - if (list != null && list.size() > 0) { - return (list.get(0).getCourse().getCode()); - } else { - return ModelConstants.CourseUnknown; - } - } - - public String getPMCreationScript() { - return systemConfigService.getString(AppConstants.SystemParameterPMCreationScript); - } - -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Projects.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Projects.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Projects.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,190 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + ******************************************************************************/ + +package info.ajanovski.eprms.tap.pages.admin; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.tapestry5.SelectModel; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.hibernate.annotations.CommitAfter; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.SelectModelFactory; + +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.entities.Database; +import info.ajanovski.eprms.tap.entities.Person; +import info.ajanovski.eprms.tap.entities.Project; +import info.ajanovski.eprms.tap.entities.Repository; +import info.ajanovski.eprms.tap.entities.Responsibility; +import info.ajanovski.eprms.tap.entities.Team; +import info.ajanovski.eprms.tap.entities.TeamMember; +import info.ajanovski.eprms.tap.services.GenericService; +import info.ajanovski.eprms.tap.util.UserInfo; + +@InstructorPage +@AdministratorPage +public class Projects { + @SessionState + @Property + private UserInfo userInfo; + + @Inject + private GenericService genericService; + + public List getAllProjects() { + return (List) genericService.getAll(Project.class); + } + + public List getProjects() { + if (selectedProject != null) { + List ls = new ArrayList(); + ls.add(genericService.getByPK(Project.class, selectedProject.getProjectId())); + return ls; + } else { + return getAllProjects(); + } + } + + @Property + private Project project; + + @Persist + @Property + private Project selectedProject; + + @Property + private Responsibility responsibility; + + @Property + private TeamMember teamMember; + + @Property + private Database database; + + @Property + private Repository repository; + + @Persist + @Property + private TeamMember newTm; + + @Persist + @Property + private Project newProject; + + @Persist + @Property + private Team newTeam; + + @Persist + @Property + private Responsibility newResponsibility; + + @Persist + @Property + private Database newDb; + + @Persist + @Property + private Repository newRp; + + public void onActionFromAddTeamMember(Team t) { + newTm = new TeamMember(); + newTm.setTeam(t); + } + + public void onActionFromNewProject() { + newProject = new Project(); + } + + public void onActionFromNewTeam(Project p) { + newTeam = new Team(); + newResponsibility = new Responsibility(); + newResponsibility.setProject(p); + newResponsibility.setTeam(newTeam); + } + + public void onActionFromNewDatabase(Project p) { + newDb = new Database(); + newDb.setProject(p); + } + + public void onActionFromNewRepository(Project p) { + newRp = new Repository(); + newRp.setProject(p); + } + + @CommitAfter + public void onSuccessFromTeamMemberForm() { + genericService.save(newTm); + newTm = null; + } + + @CommitAfter + public void onSuccessFromNewProjectForm() { + genericService.save(newProject); + selectedProject = newProject; + newProject = null; + } + + @CommitAfter + public void onSuccessFromNewTeamForm() { + genericService.save(newTeam); + genericService.save(newResponsibility); + newTeam = null; + newResponsibility = null; + } + + @CommitAfter + public void onSuccessFromNewDatabaseForm() { + genericService.save(newDb); + newDb = null; + } + + @CommitAfter + public void onSuccessFromNewRepositoryForm() { + genericService.save(newRp); + newRp = null; + } + + @Property + private Person person; + + public List getPersons() { + return (List) genericService.getAll(Person.class); + } + + @Inject + private SelectModelFactory selectModelFactory; + + public SelectModel getPersonModel() { + return (SelectModel) selectModelFactory.create(getPersons(), "userName"); + } + + public SelectModel getProjectModel() { + return (SelectModel) selectModelFactory.create(getAllProjects(), "title"); + } + +} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/SystemParameters.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/SystemParameters.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,76 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.admin; - -import java.util.List; - -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.SystemParameter; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -public class SystemParameters { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - @Property - private SystemParameter systemParameter; - - @Persist - @Property - private SystemParameter editSystemParameter; - - public List getSystemParameters() { - return (List) genericService.getAll(SystemParameter.class); - } - - void onActionFromNewSystemParameter() { - editSystemParameter = new SystemParameter(); - } - - void onActionFromEditParameter(SystemParameter sp) { - editSystemParameter = sp; - } - - @CommitAfter - void onActionFromDeleteParameter(SystemParameter sp) { - genericService.delete(sp); - } - - @CommitAfter - void onSuccessFromEditSystemParameter() { - genericService.saveOrUpdate(editSystemParameter); - editSystemParameter = null; - } -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Teams.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Teams.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Teams.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + ******************************************************************************/ + +package info.ajanovski.eprms.tap.pages.admin; + +import java.util.List; + +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.ioc.annotations.Inject; + +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.entities.Team; +import info.ajanovski.eprms.tap.services.GenericService; +import info.ajanovski.eprms.tap.util.UserInfo; + +@InstructorPage +@AdministratorPage +public class Teams { + @SessionState + @Property + private UserInfo userInfo; + + @Inject + private GenericService genericService; + + public List getTeams() { + return (List) genericService.getAll(Team.class); + } +} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Translations.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/Translations.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,48 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.admin; - -import java.util.List; - -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.Translation; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -public class Translations { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - public List getTranslations() { - return (List) genericService.getAll(Translation.class); - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/projectmanager/ProjectOverviewTickets.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/projectmanager/ProjectOverviewTickets.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,81 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.projectmanager; - -import java.net.URI; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; -import java.net.http.HttpResponse.BodyHandlers; -import java.time.Duration; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.temporal.ChronoUnit; -import java.util.Date; - -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.AppConstants; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -public class ProjectOverviewTickets { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private SystemConfigService systemConfigService; - - @Property - @Persist - private String tickets; - - @Property - @Persist - private Date lastUpdate; - - public void onActivate() { - LocalDateTime now = LocalDateTime.now().minus(Duration.of(1, ChronoUnit.MINUTES)); - Date nowMinus5 = Date.from(now.atZone(ZoneId.systemDefault()).toInstant()); - - if ((tickets == null && lastUpdate == null) || (lastUpdate != null && lastUpdate.compareTo(nowMinus5) < 0)) { - try { - String url = systemConfigService.getString(AppConstants.SystemParameterPMOverviewTicketsURL); - HttpRequest request = HttpRequest.newBuilder(URI.create(url)).build(); - HttpClient client = HttpClient.newBuilder().build(); - HttpResponse response = client.send(request, BodyHandlers.ofString()); - tickets = response.body(); - lastUpdate = new Date(); - } catch (Exception e) { - tickets = null; - lastUpdate = null; - } - } - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/projectmanager/ProjectOverviewTimeline.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/projectmanager/ProjectOverviewTimeline.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,47 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.projectmanager; - -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.AppConstants; -import info.ajanovski.eprms.tap.util.UserInfo; - -@InstructorPage -@AdministratorPage -public class ProjectOverviewTimeline { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private SystemConfigService systemConfigService; - - public String getRSS() { - String url = systemConfigService.getString(AppConstants.SystemParameterPMOverviewTimelineURL); - return url; - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/DiscussProject.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/DiscussProject.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,322 +1,0 @@ -package info.ajanovski.eprms.tap.pages.user; - -import java.util.Collections; -import java.util.Date; -import java.util.List; - -import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.http.services.Request; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.SelectModelFactory; -import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; - -import info.ajanovski.eprms.model.entities.DiscussionOnCourseProject; -import info.ajanovski.eprms.model.entities.DiscussionPost; -import info.ajanovski.eprms.model.entities.DiscussionPostEvaluation; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.util.ComparatorDiscussionPostByReplyTo; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.services.DiscussionManager; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.PersonManager; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.AppConstants; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@Import(stylesheet = { "DiscussProject.css" }) -public class DiscussProject { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - @Inject - private SystemConfigService systemConfigService; - - @Inject - private PersonManager personManager; - - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - - @Inject - private Request request; - - @Inject - private SelectModelFactory selectModelFactory; - - @Property - DiscussionOnCourseProject discussionOnCourseProject; - - @Property - DiscussionPost discussionPost; - - @Property - DiscussionPostEvaluation discussionPostEvaluation; - - @Persist - @Property - DiscussionPost editDiscussionPost; - - @InjectComponent - private Zone zAllPosts; - - void onActivate(DiscussionOnCourseProject docp) { - discussionOnCourseProject = genericService.getByPK(DiscussionOnCourseProject.class, - docp.getDiscussionOnCourseProjectId()); - } - - public DiscussionOnCourseProject onPassivate() { - return discussionOnCourseProject; - } - - public String[] getPostTypes() { - return ModelConstants.AllDiscussionPostTypes; - } - - public List getAllDiscussionPosts() { - List lista = discussionOnCourseProject.getDiscussionPosts(); - ComparatorDiscussionPostByReplyTo c = new ComparatorDiscussionPostByReplyTo(); - Collections.sort(lista, c); - return lista; - } - - void onActionFromAddPost() { - editDiscussionPost = new DiscussionPost(); - editDiscussionPost.setDiscussionOnCourseProject(discussionOnCourseProject); - editDiscussionPost.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId())); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - void onActionFromReplyToPost(DiscussionPost originalPost) { - editDiscussionPost = new DiscussionPost(); - editDiscussionPost.setReplyTo(originalPost); - editDiscussionPost.setType(originalPost.getType()); - editDiscussionPost.setDiscussionOnCourseProject(discussionOnCourseProject); - editDiscussionPost.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId())); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onSuccessFromFrmEditPost() { - editDiscussionPost.setPostedOn(new Date()); - genericService.saveOrUpdate(editDiscussionPost); - editDiscussionPost = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - public String getCoding(DiscussionPost i) { - if (i.getReplyTo() == null) { - return Long.toString(i.getPostedOn().getTime()) + "-"; - } else { - return getCoding(i.getReplyTo()) + Long.toString(i.getPostedOn().getTime()) + "-"; - } - } - - public String getIndentation() { - int a = getCoding(discussionPost).split("-").length; - return "indentation" + a; - } - - public boolean isPostAuthorProjectTeamMember() { - return discussionPost.getDiscussionOnCourseProject().getCourseProject().getProject().getResponsibilities() - .stream().anyMatch(r -> r.getTeam().getTeamMembers().stream() - .anyMatch(tm -> tm.getPerson().getPersonId() == discussionPost.getPerson().getPersonId())); - } - - public String getPostAuthor() { - String fullName = personManager.getPersonFullNameWithId(discussionPost.getPerson()); - if (personManager.isInstructor(discussionPost.getPerson().getPersonId())) { - return fullName; - } else if (isPostAuthorProjectTeamMember()) { - return fullName; - } else if (discussionPost.getPublicPosting()) { - return fullName; - } else { - if (userInfo.isInstructor()) { - return "Anon" + " - " + fullName; - } else { - return "Anon"; - } - } - } - - public String getClassOfPostAuthor() { - if (personManager.isInstructor(discussionPost.getPerson().getPersonId())) { - return "border-primary personAdmin"; - } else if (personManager.isAdministrator(discussionPost.getPerson().getPersonId())) { - return "border-primary personAdmin"; - } else if (isPostAuthorProjectTeamMember()) { - return "border-dark personProjectTeamMember"; - } else { - return "border-light"; - } - } - - public String getRoleOfPostAuthor() { - if (personManager.isInstructor(discussionPost.getPerson().getPersonId())) { - return ModelConstants.RoleInstructor; - } else if (personManager.isAdministrator(discussionPost.getPerson().getPersonId())) { - return ModelConstants.RoleAdministrator; - } else if (isPostAuthorProjectTeamMember()) { - return ModelConstants.TeamMemberRoleMember; - } else { - return ""; - } - } - - public String getIconOfPostAuthor() { - if (personManager.isInstructor(discussionPost.getPerson().getPersonId())) { - return "award"; - } else if (personManager.isAdministrator(discussionPost.getPerson().getPersonId())) { - return "cpu"; - } else if (isPostAuthorProjectTeamMember()) { - return "users"; - } else { - return ""; - } - } - - void onActionFromCancelFrmEditPost() { - editDiscussionPost = null; - } - - @Inject - private DiscussionManager discussionManager; - - public List getDiscussionPostEvaluations() { - return discussionManager.getDiscussionPostEvaluations(discussionPost.getDiscussionPostId()); - } - - public void createDiscussionPostEvaluation(String type, DiscussionPost dp) { - discussionManager.createDiscussionPostEvaluation(type, - genericService.getByPK(Person.class, userInfo.getPersonId()), dp); - } - - @CommitAfter - public void onActionFromEvaluatePostFunctionality(DiscussionPost discussionPost) { - createDiscussionPostEvaluation(ModelConstants.DiscussionPostEvaluationTypeFunctionality, discussionPost); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromEvaluatePostBug(DiscussionPost discussionPost) { - createDiscussionPostEvaluation(ModelConstants.DiscussionPostEvaluationTypeBug, discussionPost); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromEvaluatePostModel(DiscussionPost discussionPost) { - createDiscussionPostEvaluation(ModelConstants.DiscussionPostEvaluationTypeModel, discussionPost); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromEvaluatePostIdea(DiscussionPost discussionPost) { - createDiscussionPostEvaluation(ModelConstants.DiscussionPostEvaluationTypeIdea, discussionPost); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromEvaluatePostOther(DiscussionPost discussionPost) { - createDiscussionPostEvaluation(ModelConstants.DiscussionPostEvaluationTypeOther, discussionPost); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromDeleteDiscussionPostEvaluation(DiscussionPostEvaluation discussionPostEvaluation) { - genericService.delete(discussionPostEvaluation); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromAcceptDiscussionPostEvaluation(DiscussionPostEvaluation discussionPostEvaluation) { - discussionPostEvaluation.setAccepted(true); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromRejectDiscussionPostEvaluation(DiscussionPostEvaluation discussionPostEvaluation) { - discussionPostEvaluation.setAccepted(false); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromSetEvaluatedPostingAsATeamDiscussionPostEvaluation( - DiscussionPostEvaluation discussionPostEvaluation) { - if (discussionPostEvaluation.getEvaluatePostingAsATeam() != null) { - discussionPostEvaluation.setEvaluatePostingAsATeam(!discussionPostEvaluation.getEvaluatePostingAsATeam()); - } else { - discussionPostEvaluation.setEvaluatePostingAsATeam(true); - } - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromSetEvaluatedPostingAddPoints(DiscussionPostEvaluation discussionPostEvaluation) { - if (discussionPostEvaluation.getPoints() == null) { - discussionPostEvaluation.setPoints(1); - } else { - discussionPostEvaluation.setPoints(discussionPostEvaluation.getPoints() + 1); - } - genericService.saveOrUpdate(discussionPostEvaluation); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - @CommitAfter - public void onActionFromSetEvaluatedPostingSubtractPoints(DiscussionPostEvaluation discussionPostEvaluation) { - if (discussionPostEvaluation.getPoints() != null) { - if (discussionPostEvaluation.getPoints() > 0) { - discussionPostEvaluation.setPoints(discussionPostEvaluation.getPoints() - 1); - } else { - discussionPostEvaluation.setPoints(null); - } - } - genericService.saveOrUpdate(discussionPostEvaluation); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zAllPosts); - } - } - - public String getPMProjectURLPrefix() { - return systemConfigService.getString(AppConstants.SystemParameterPMProjectURLPrefix); - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/Discussions.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/Discussions.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,106 +1,0 @@ -package info.ajanovski.eprms.tap.pages.user; - -import java.util.List; - -import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.SelectModelFactory; - -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.entities.DiscussionOnCourseProject; -import info.ajanovski.eprms.model.entities.DiscussionPost; -import info.ajanovski.eprms.model.entities.DiscussionSession; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.Responsibility; -import info.ajanovski.eprms.model.entities.TeamMember; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.services.CourseManager; -import info.ajanovski.eprms.tap.services.DiscussionManager; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@AdministratorPage -public class Discussions { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - @Inject - private CourseManager courseManager; - - @Inject - private DiscussionManager discussionManager; - - @Inject - private SelectModelFactory selectModelFactory; - - @Persist - @Property - private Course selectedCourse; - - @Persist - @Property - private DiscussionSession selectedDiscussionSession; - - @Property - private DiscussionOnCourseProject discussionOnCourseProject; - - @Property - private DiscussionPost discussionPost; - - @Property - private Responsibility responsibility; - - @Property - private TeamMember teamMember; - - @Property - private Person activePerson; - - @Property - private DiscussionPost personPost; - - void onActivate() { - if (selectedDiscussionSession != null) { - selectedDiscussionSession = genericService.getByPK(DiscussionSession.class, - selectedDiscussionSession.getDiscussionSessionId()); - } - } - - public SelectModel getCourseModel() { - return selectModelFactory.create(courseManager.getAllCoursesByPerson(userInfo.getPersonId()), "title"); - } - - public SelectModel getDiscussionSessionModel() { - return selectModelFactory.create(((List) genericService.getAll(DiscussionSession.class)) - .stream().filter(p -> p.getCourse().getCourseId() == selectedCourse.getCourseId()).toList(), "title"); - } - - public SelectModel getCourseProjectModel() { - return selectModelFactory.create(selectedDiscussionSession.getDiscussionsOnCourseProjects(), - "discussionOnCourseProjectId"); - } - - void onSuccessFromSelectCourseForm() { - selectedDiscussionSession = null; - } - - public List getActivePersons() { - return discussionManager.getPersonsActiveInDiscussionSession(selectedDiscussionSession); - } - - public List getPersonPosts() { - return discussionManager.getPersonsDiscussionPostsInDiscussionSession(selectedDiscussionSession, activePerson); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/Login.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/Login.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,20 +1,0 @@ -package info.ajanovski.eprms.tap.pages.user; - -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; - -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@AdministratorPage -public class Login { - - @SessionState - @Property - private UserInfo userInfo; - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/Logout.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/Logout.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,82 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.user; - -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.commons.Messages; -import org.apache.tapestry5.http.services.Request; -import org.apache.tapestry5.http.services.RequestGlobals; -import org.apache.tapestry5.http.services.Session; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Cookies; -import org.slf4j.Logger; - -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.util.AppConfig; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@AdministratorPage -public class Logout { - @Inject - private Logger logger; - - @Inject - private Request request; - - @Inject - private RequestGlobals requestGlobals; - - @Inject - private Cookies cookies; - - @Persist - @Property - private UserInfo userInfo; - - @Property - private String casLogoutLink; - - @Inject - private Messages messages; - - void onActivate() { - casLogoutLink = AppConfig.getString("cas.server") + "/cas/logout?service=" + AppConfig.getString("app.server"); - - // Clear session - Session session = request.getSession(false); - if (session != null) { - session.invalidate(); - userInfo = null; - logger.debug("Session successfully invalidated!"); - } - - clearCookie(); - } - - private void clearCookie() { - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyDatabases.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyDatabases.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,66 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.user; - -import java.util.List; - -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.ResourceManager; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@AdministratorPage -public class MyDatabases { - @Property - @SessionState - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - @Inject - private ResourceManager resourceManager; - - @Inject - private SystemConfigService systemConfigService; - - @Property - private Database database; - - public List getProjectDatabases() { - return resourceManager.getActiveDatabasesByProject(userInfo.getPersonId()); - } - - public String getURLDBSoftware() { - return systemConfigService.getString("URL-DB-Software"); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProfile.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProfile.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,66 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.user; - -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@AdministratorPage -public class MyProfile { - - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - public Person getPerson() { - return genericService.getByPK(Person.class, userInfo.getPersonId()); - } - - @Persist - @Property - private Person editPerson; - - public void onActionFromEditProfile() { - editPerson = getPerson(); - } - - @CommitAfter - public void onSuccessFromFrmEditPerson() { - genericService.saveOrUpdate(editPerson); - editPerson=null; - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjectReports.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjectReports.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,143 +1,0 @@ -package info.ajanovski.eprms.tap.pages.user; - -import java.util.Date; -import java.util.List; - -import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.http.services.Request; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; -import org.slf4j.Logger; - -import info.ajanovski.eprms.model.entities.Activity; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.WorkEvaluation; -import info.ajanovski.eprms.model.entities.WorkReport; -import info.ajanovski.eprms.model.util.ActivityComparatorViaType; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.ProjectManager; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@AdministratorPage -@Import(module = { "bootstrap/modal", "bootstrap/collapse", "zoneUpdateEffect" }) -public class MyProjectReports { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private Logger logger; - - @Inject - private Request request; - - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - - @InjectComponent - private Zone zModal; - - @Inject - private ProjectManager projectManager; - - @Inject - private GenericService genericService; - - public List getMyProjects() { - return projectManager.getProjectByPerson(userInfo.getPersonId()); - } - - @Property - private Project project; - - @Property - private Activity activity; - - @Property - private WorkReport workReport; - - @Property - private WorkEvaluation workEvaluation; - - @Persist - @Property - private WorkReport newWorkReport; - - public void onAddReport(Activity a) { - newWorkReport = new WorkReport(); - newWorkReport.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId())); - newWorkReport.setActivity(a); - newWorkReport.setSubmissionDate(new Date()); - } - - public void onEditWorkReport(WorkReport wr) { - newWorkReport = wr; - } - - @CommitAfter - private void saveChangesToReport() { - genericService.saveOrUpdate(newWorkReport); - } - - private Boolean cancelForm = false; - - public void onCanceledFromFrmNewWorkReport() { - cancelForm = true; - } - - public void onValidateFromFrmNewWorkReport() { - if (!cancelForm) { - saveChangesToReport(); - } - } - - public void onSuccessFromFrmNewWorkReport() { - newWorkReport = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zModal); - } - } - - @CommitAfter - public void onDeleteWorkReport(WorkReport wr) { - genericService.delete(wr); - newWorkReport = null; - } - - public List getProjectActivities() { - ActivityComparatorViaType acr = new ActivityComparatorViaType(); - List lista = project.getActivities(); - lista.sort(acr); - return lista; - } - - public boolean isEvaluationPublished() { - return workEvaluation.getStatus().equals(ModelConstants.EvaluationStatusPublished); - } - - public List getWorkReportsForActivity() { - return projectManager.getWorkReportsForActivity(activity); - } - - public List getWorkEvaluationsForWorkReport() { - return projectManager.getWorkEvaluationForWorkReport(workReport); - } - - public String getProjectURL() { - return projectManager.getProjectURL(project); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjects.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjects.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,508 +1,0 @@ -package info.ajanovski.eprms.tap.pages.user; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.http.services.Request; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.SelectModelFactory; -import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; -import org.slf4j.Logger; - -import info.ajanovski.eprms.model.entities.Activity; -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.entities.CourseProject; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.Responsibility; -import info.ajanovski.eprms.model.entities.Team; -import info.ajanovski.eprms.model.entities.TeamMember; -import info.ajanovski.eprms.model.util.CourseComparator; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.PersonManager; -import info.ajanovski.eprms.tap.services.ProjectManager; -import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@AdministratorPage -@Import(module = { "bootstrap/modal", "bootstrap/collapse", "zoneUpdateEffect" }) -public class MyProjects { - @SessionState - @Property - private UserInfo userInfo; - - @Inject - private Logger logger; - - @Inject - private Request request; - - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - - @Inject - private SelectModelFactory selectModelFactory; - - @Inject - private SystemConfigService systemConfigService; - - @InjectComponent - private Zone zNPModal; - - @InjectComponent - private Zone zNTModal; - - @InjectComponent - private Zone zJNTModal; - - @InjectComponent - private Zone zJTModal; - - @Inject - private ProjectManager projectManager; - - @Inject - private GenericService genericService; - - @Property - private Project project; - - @Property - private Activity activity; - - @Property - @Persist - private Course selectedCourse; - - private Boolean cancelForm = false; - - @Property - @Persist - private Project newProject; - - @Property - @Persist - private Team teamToEdit; - - @Property - @Persist - private Boolean teamNew; - - @Property - private TeamMember myTeamMember; - - @Property - private TeamMember teamMember; - - @Property - @Persist - private Boolean chooseATeam; - - @Persist - @Property - private Team selectedTeam; - - @Property - @Persist - private Team addToTeam; - - @Property - @Persist - private String newMember; - - @Property - private Team joinableTeam; - - public void setupRender() { - if (teamNew == null) { - if (teamToEdit != null) { - teamToEdit = genericService.getByPK(Team.class, teamToEdit.getTeamId()); - } - } - } - - public List getMyProjects() { - return projectManager.getProjectByPerson(userInfo.getPersonId()); - } - - public SelectModel getAllCourses() { - CourseComparator cc = new CourseComparator(); - List lista = (List) genericService.getAll(Course.class); - Collections.sort(lista, cc); - return selectModelFactory.create(lista, "title"); - } - - public List getMyMemberTeams() { - return projectManager.getTeamMembershipOfPerson(userInfo.getPersonId()); - } - - public List getMyTeams() { - return projectManager.getTeamMembershipOfPerson(userInfo.getPersonId()).stream().map(TeamMember::getTeam) - .toList(); - } - - public SelectModel getMyTeamsModel() { - List lista = getMyTeams(); - return selectModelFactory.create(lista, "name"); - } - - public Person getMyself() { - return genericService.getByPK(Person.class, userInfo.getPersonId()); - } - - public void onActionFromProposeProject() { - newProject = new Project(); - newProject.setStatus(ModelConstants.ProjectStatusProposed); - newProject.setStartDate(new Date()); - } - - public void onActionFromEditProject(Project p) { - if (p.getResponsibilities() != null && p.getResponsibilities().size() > 0) { - selectedTeam = p.getResponsibilities().get(0).getTeam(); - } - if (p.getCourseProjects() != null && p.getCourseProjects().size() > 0) { - selectedCourse = p.getCourseProjects().get(0).getCourse(); - } - newProject = p; - } - - void onCancelNewProject() { - newProject = null; - selectedTeam = null; - selectedCourse = null; - } - - public void onSuccessFromFrmProposeProject() { - newProject = null; - selectedTeam = null; - selectedCourse = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zNPModal); - } - } - - @CommitAfter - public void onValidateFromFrmProposeProject() { - if (newProject.getCode() != null) { - genericService.saveOrUpdate(newProject); - if (selectedTeam != null) { - if (!(newProject.getResponsibilities().stream() - .anyMatch(p -> p.getTeam().getTeamId() == selectedTeam.getTeamId()))) { - Responsibility r = new Responsibility(); - r.setProject(newProject); - r.setTeam(selectedTeam); - List listr = new ArrayList(); - listr.add(r); - newProject.setResponsibilities(listr); - genericService.saveOrUpdate(r); - } - } - if (selectedCourse != null) { - if (!(newProject.getCourseProjects().stream() - .anyMatch(p -> p.getCourse().getCourseId() == selectedCourse.getCourseId()))) { - CourseProject cp = new CourseProject(); - cp.setProject(newProject); - cp.setCourse(selectedCourse); - List listcp = new ArrayList(); - listcp.add(cp); - newProject.setCourseProjects(listcp); - genericService.saveOrUpdate(cp); - } - } - genericService.saveOrUpdate(newProject); - } - } - - public void onActionFromProposeTeam() { - teamNew = true; - teamToEdit = new Team(); - teamToEdit.setCreatedDate(new Date()); - teamToEdit.setStatusDate(new Date()); - teamToEdit.setStatus(ModelConstants.TeamStatusProposed); - } - - void onCancelNewTeam() { - teamToEdit = null; - } - - public void onSuccessFromFrmProposeTeam() { - teamToEdit = null; - teamNew = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zNTModal); - } - } - - @CommitAfter - public void onValidateFromFrmProposeTeam() { - genericService.saveOrUpdate(teamToEdit); - if (!(teamToEdit.getTeamMembers().stream() - .anyMatch(p -> p.getPerson().getPersonId() == getMyself().getPersonId()))) { - TeamMember tm = new TeamMember(); - tm.setPerson(getMyself()); - tm.setPositionNumber(1); - tm.setRole(ModelConstants.TeamMemberRoleCoordinator); - tm.setTeam(teamToEdit); - tm.setStatus(ModelConstants.TeamMemberStatusAccepted); - tm.setCreatedDate(new Date()); - tm.setStatusDate(new Date()); - genericService.saveOrUpdate(tm); - } - } - - @CommitAfter - void onActionFromLeaveTeam(TeamMember tm) { - Team t = tm.getTeam(); - t.getTeamMembers().remove(tm); - genericService.delete(tm); - if (t.getTeamMembers().size() == 0) { - for (Responsibility r : t.getResponsibilities()) { - Project p = r.getProject(); - p.getResponsibilities().remove(r); - genericService.delete(r); - if (p.getResponsibilities().size() == 0) { - for (CourseProject cp : p.getCourseProjects()) { - genericService.delete(cp); - } - genericService.delete(p); - } - } - genericService.deleteByPK(Team.class, t.getTeamId()); - } - } - - void onActionFromChooseTeamToJoin() { - chooseATeam = true; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zJTModal); - } - } - - public List getListOfJoinableTeams() { - List lista = (List) genericService.getAll(Team.class); - return lista.stream() - .filter(p -> p.getOpenForNewMembers() != null && p.getOpenForNewMembers() == true - && !(getMyMemberTeams().stream().anyMatch(q -> q.getTeam().getTeamId() == p.getTeamId()))) - .collect(Collectors.toList()); - } - - public SelectModel getJoinableTeams() { - return selectModelFactory.create(getListOfJoinableTeams(), "name"); - } - - @CommitAfter - public void onActionFromJoinTeam(Team t) { - TeamMember tm = new TeamMember(); - tm.setPerson(getMyself()); - tm.setRole(ModelConstants.TeamMemberRoleMember); - tm.setTeam(t); - tm.setStatus(ModelConstants.TeamMemberStatusProposed); - tm.setCreatedDate(new Date()); - tm.setStatusDate(new Date()); - genericService.saveOrUpdate(tm); - selectedTeam = null; - chooseATeam = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zJTModal); - } - } - - public void onCancelJoinTeam() { - selectedTeam = null; - chooseATeam = null; - } - - public void onActionFromEditTeam(TeamMember tm) { - teamToEdit = tm.getTeam(); - } - - public boolean isCanApprove() { - if (myTeamMember.getTeam().getTeamMembers().stream() - .anyMatch(p -> p.getPerson().getPersonId() == getMyself().getPersonId() && p.getRole() != null - && p.getRole().equals(ModelConstants.TeamMemberRoleCoordinator))) { - if (teamMember != null && !(teamMember.getStatus() != null - && teamMember.getStatus().equals(ModelConstants.TeamMemberStatusAccepted))) { - return true; - } else { - if (teamMember == null) { - return true; - } else { - return false; - } - } - } else { - return false; - } - } - - public boolean isCanLeave() { - if (myTeamMember.getTeam().getTeamMembers().stream() - .anyMatch(p -> p.getPerson().getPersonId() == getMyself().getPersonId() && p.getRole() != null - && !p.getRole().equals(ModelConstants.TeamMemberRoleCoordinator))) { - if (teamMember != null && !(teamMember.getStatus() != null - && teamMember.getStatus().equals(ModelConstants.TeamMemberStatusAccepted))) { - return true; - } else { - if (teamMember == null) { - return true; - } else { - return false; - } - } - } else { - return false; - } - } - - public boolean isCanRemoveTeam() { - if (myTeamMember.getTeam().getTeamMembers().stream() - .anyMatch(p -> p.getPerson().getPersonId() == getMyself().getPersonId() && p.getRole() != null - && p.getRole().equals(ModelConstants.TeamMemberRoleCoordinator))) { - if (myTeamMember.getTeam().getTeamMembers().size() == 1 - && myTeamMember.getTeam().getStatus()!=null - && myTeamMember.getTeam().getStatus().equals(ModelConstants.TeamStatusProposed)) { - return true; - } else { - return false; - } - } else { - return false; - } - } - - public boolean isCanRemoveMember() { - // Only coordinators can remove members - if (myTeamMember.getTeam().getTeamMembers().stream() - .anyMatch(tm -> tm.getPerson().getPersonId() == getMyself().getPersonId() && tm.getRole() != null - && tm.getRole().equals(ModelConstants.TeamMemberRoleCoordinator))) { - if (teamMember != null - && !(teamMember.getStatus() != null - && teamMember.getStatus().equals(ModelConstants.TeamMemberStatusAccepted)) - && teamMember.getPerson().getPersonId() != getMyself().getPersonId()) { - return true; - } else { - if (teamMember == null) { - return true; - } else { - return false; - } - } - } else { - return false; - } - } - - public void onActionFromAddMembers(TeamMember tm) { - newMember = new String("brindeks"); - addToTeam = tm.getTeam(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zJNTModal); - } - } - - @CommitAfter - public void onActionFromRemoveTeamMember(TeamMember tm) { - genericService.delete(tm); - } - - @CommitAfter - public void onActionFromRemoveTeam(TeamMember tm) { - Team t = tm.getTeam(); - genericService.delete(tm); - genericService.delete(t); - } - - public void onCancelAddMembers() { - newMember = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zJNTModal); - } - } - - @Inject - private PersonManager personManager; - - @CommitAfter - public void onValidateFromFrmAddMembers() { - if (newMember != null) { - Person p = personManager.getPersonByUsername(newMember); - if (p != null) { - TeamMember tm = new TeamMember(); - tm.setPerson(p); - tm.setRole(ModelConstants.TeamMemberRoleMember); - tm.setTeam(addToTeam); - tm.setStatus(ModelConstants.TeamMemberStatusProposed); - tm.setCreatedDate(new Date()); - tm.setStatusDate(new Date()); - genericService.saveOrUpdate(tm); - } - } - } - - public void onSuccessFromFrmAddMembers() { - newMember = null; - addToTeam = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zJNTModal); - } - } - - @CommitAfter - public void onActionFromApproveTeamMember(TeamMember tm) { - tm.setStatus(ModelConstants.TeamMemberStatusAccepted); - } - - public boolean isProjectEditable() { - if (project != null) { - if (project.getStatus() == null) { - return true; - } else if (project.getStatus().equals(ModelConstants.ProjectStatusProposed)) { - return true; - } else { - return false; - } - } else { - return false; - } - } - - public boolean isCanRemoveProject() { - if (project != null) { - if ((project.getStatus() == null || project.getStatus().equals(ModelConstants.ProjectStatusProposed))) { - return true; - } else { - return false; - } - } else { - return false; - } - } - - @CommitAfter - void onActionFromRemoveProject(Project p) { - p.getCourseProjects().forEach(cp -> genericService.delete(cp)); - p.getResponsibilities().forEach(r -> genericService.delete(r)); - genericService.delete(p); - } - - public String getProjectURL() { - return projectManager.getProjectURL(project); - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyRepositories.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyRepositories.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,64 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.user; - -import java.util.List; - -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.services.ResourceManager; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@AdministratorPage -public class MyRepositories { - - @Property - @SessionState - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - @Inject - private ResourceManager resourceManager; - - public List getPersonalRepositories() { - return resourceManager.getActiveRepositoriesByPerson(userInfo.getPersonId()); - } - - public List getTeamRepositories() { - return resourceManager.getActiveRepositoriesByTeam(userInfo.getPersonId()); - } - - public List getProjectRepositories() { - return resourceManager.getActiveRepositoriesByProject(userInfo.getPersonId()); - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyRepositoryAuth.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyRepositoryAuth.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,95 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.pages.user; - -import java.security.MessageDigest; -import java.util.Base64; - -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.corelib.components.Form; -import org.apache.tapestry5.corelib.components.PasswordField; -import org.apache.tapestry5.hibernate.annotations.CommitAfter; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.slf4j.Logger; - -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.services.GenericService; -import info.ajanovski.eprms.tap.util.UserInfo; - -@StudentPage -@InstructorPage -@AdministratorPage -public class MyRepositoryAuth { - - @Property - @SessionState - private UserInfo userInfo; - - @Inject - private GenericService genericService; - - @Inject - private Logger logger; - - @Property - private String password; - - @Property - private String confirmPassword; - - @InjectComponent("AuthForm") - private Form authForm; - - @InjectComponent("password") - private PasswordField pfPassword; - @InjectComponent("confirmPassword") - private PasswordField pfConfirmPassword; - - public void onValidateFromAuthForm() { - if (password != null && confirmPassword != null && !password.equals(confirmPassword)) { - authForm.recordError(pfPassword, "Enter two identical and non-empty passwords."); - authForm.recordError(pfConfirmPassword, "Enter two identical and non-empty passwords."); - } - } - - @CommitAfter - public void onSuccessFromAuthForm() { - if (password != null && confirmPassword != null && password.equals(confirmPassword)) { - Person myself = genericService.getByPK(Person.class, userInfo.getPersonId()); - try { - MessageDigest md = MessageDigest.getInstance("SHA-1"); - md.reset(); - md.update(password.getBytes("UTF-8")); - myself.setAuthString("{SHA}" + Base64.getEncoder().encodeToString(md.digest())); - genericService.save(myself); - authForm.clearErrors(); - } catch (Exception e) { - logger.error("Password setup failed {}", e); - } - } - } - -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AccessController.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AccessController.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AccessController.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,139 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + ******************************************************************************/ + +package info.ajanovski.eprms.tap.services; + +import java.io.IOException; + +import org.apache.tapestry5.http.services.Response; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.runtime.Component; +import org.apache.tapestry5.services.ApplicationStateManager; +import org.apache.tapestry5.services.ComponentEventRequestParameters; +import org.apache.tapestry5.services.ComponentRequestFilter; +import org.apache.tapestry5.services.ComponentRequestHandler; +import org.apache.tapestry5.services.ComponentSource; +import org.apache.tapestry5.services.PageRenderLinkSource; +import org.apache.tapestry5.services.PageRenderRequestParameters; +import org.slf4j.Logger; + +import info.ajanovski.eprms.tap.annotations.AdministratorPage; +import info.ajanovski.eprms.tap.annotations.InstructorPage; +import info.ajanovski.eprms.tap.annotations.PublicPage; +import info.ajanovski.eprms.tap.annotations.StudentPage; +import info.ajanovski.eprms.tap.pages.Index; +import info.ajanovski.eprms.tap.util.ModelConstants; +import info.ajanovski.eprms.tap.util.UserInfo; + +public class AccessController implements ComponentRequestFilter { + + private ApplicationStateManager applicationStateManager; + private final ComponentSource componentSource; + + @Inject + private Logger logger; + + @Inject + private Response response; + + @Inject + private PageRenderLinkSource linkSource; + + public AccessController(ApplicationStateManager asm, ComponentSource componentSource) { + this.applicationStateManager = asm; + this.componentSource = componentSource; + } + + public boolean checkAccess(String pageName) throws IOException { + boolean hasAccessAnnotation = false; + logger.debug("check access for {}", pageName); + if (pageName.equals("") || pageName.equals("/")) { + pageName = ModelConstants.PageIndex; + } + + Component page = null; + page = componentSource.getPage(pageName); + + boolean publicPage = page.getClass().getAnnotation(PublicPage.class) != null; + boolean studentPage = page.getClass().getAnnotation(StudentPage.class) != null; + boolean instructorPage = page.getClass().getAnnotation(InstructorPage.class) != null; + boolean adminPage = page.getClass().getAnnotation(AdministratorPage.class) != null; + + hasAccessAnnotation = publicPage | studentPage | instructorPage | adminPage; + UserInfo userInfo = applicationStateManager.getIfExists(UserInfo.class); + + boolean canAccess = false; + if (publicPage) { + logger.debug("Accessing a public page."); + canAccess = true; + } else { + if (userInfo == null) { + logger.debug("UserInfo is null"); + } else { + logger.debug("userInfo is not null"); + if (studentPage) { + logger.debug("studentPage"); + canAccess = canAccess || userInfo.isStudent(); + } + if (adminPage) { + logger.debug("adminPage"); + canAccess = canAccess || userInfo.isAdministrator(); + } + } + } + + if (canAccess && hasAccessAnnotation) { + logger.debug("checkAccess: ACCESS GRANTED to page:{} canaccess:{} hasaccessannotation:{} ", pageName, + canAccess, hasAccessAnnotation); + return true; + } else { + logger.debug("checkAccess: ACCESS DENIED to page:{} canaccess:{} hasaccessannotation:{} ", pageName, + canAccess, hasAccessAnnotation); + return false; + } + } + + @Override + public void handleComponentEvent(ComponentEventRequestParameters parameters, ComponentRequestHandler handler) + throws IOException { + boolean accessOK = checkAccess(parameters.getContainingPageName()); + if (accessOK) { + handler.handleComponentEvent(parameters); + } else { + logger.error("handleComponentEvent: ACCESS DENIED TO {} {} {}", parameters.getEventType(), + parameters.getNestedComponentId(), parameters.getContainingPageName()); + + response.sendRedirect(linkSource.createPageRenderLink(Index.class)); + } + } + + @Override + public void handlePageRender(PageRenderRequestParameters parameters, ComponentRequestHandler handler) + throws IOException { + boolean accessOK = checkAccess(parameters.getLogicalPageName()); + if (accessOK) { + handler.handlePageRender(parameters); + } else { + logger.error("handlePageRender: ACCESS DENIED TO {}", parameters.getLogicalPageName()); + + response.sendRedirect(linkSource.createPageRenderLink(Index.class)); + } + } +} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/services/AccessControllerRequestFilter.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AccessControllerRequestFilter.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,147 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.services; - -import java.io.IOException; - -import org.apache.tapestry5.http.services.Response; -import org.apache.tapestry5.runtime.Component; -import org.apache.tapestry5.services.ApplicationStateManager; -import org.apache.tapestry5.services.ComponentEventRequestParameters; -import org.apache.tapestry5.services.ComponentRequestFilter; -import org.apache.tapestry5.services.ComponentRequestHandler; -import org.apache.tapestry5.services.ComponentSource; -import org.apache.tapestry5.services.PageRenderLinkSource; -import org.apache.tapestry5.services.PageRenderRequestParameters; -import org.slf4j.Logger; - -import info.ajanovski.eprms.tap.annotations.AdministratorPage; -import info.ajanovski.eprms.tap.annotations.InstructorPage; -import info.ajanovski.eprms.tap.annotations.PublicPage; -import info.ajanovski.eprms.tap.annotations.StudentPage; -import info.ajanovski.eprms.tap.pages.Index; -import info.ajanovski.eprms.tap.util.AppConstants; -import info.ajanovski.eprms.tap.util.UserInfo; - -public class AccessControllerRequestFilter implements ComponentRequestFilter { - - private final ApplicationStateManager applicationStateManager; - private final ComponentSource componentSource; - private final Logger logger; - - private Response response; - private PageRenderLinkSource linkSource; - - public AccessControllerRequestFilter(final ApplicationStateManager asm, final ComponentSource componentSource, - final Logger logger, Response response, PageRenderLinkSource linkSource) { - logger.info("AccessController ComponentRequestFilter constructor"); - this.componentSource = componentSource; - this.response = response; - this.applicationStateManager = asm; - this.logger = logger; - this.linkSource = linkSource; - } - - @Override - public void handleComponentEvent(ComponentEventRequestParameters parameters, ComponentRequestHandler handler) - throws IOException { - logger.debug("handleComponentEvent entered"); - boolean accessOK = checkAccess(parameters.getActivePageName()); - if (accessOK) { - logger.debug("handleComponentEvent access granted"); - handler.handleComponentEvent(parameters); - } else { - logger.error("handleComponentEvent: ACCESS DENIED TO {} {} {}", parameters.getEventType(), - parameters.getNestedComponentId(), parameters.getContainingPageName()); - response.sendRedirect(linkSource.createPageRenderLink(Index.class)); - } - } - - @Override - public void handlePageRender(PageRenderRequestParameters parameters, ComponentRequestHandler handler) - throws IOException { - logger.debug("handlePageRender entered"); - boolean accessOK = checkAccess(parameters.getLogicalPageName()); - if (accessOK) { - logger.debug("handlePageRender access denied"); - handler.handlePageRender(parameters); - } else { - logger.error("handlePageRender: ACCESS DENIED TO {}", parameters.getLogicalPageName()); - response.sendRedirect(linkSource.createPageRenderLink(Index.class)); - } - } - - public boolean checkAccess(String pageName) throws IOException { - boolean hasAccessAnnotation = false; - logger.debug("checkAccess: page {}", pageName); - if (pageName.equals("") || pageName.equals("/")) { - pageName = AppConstants.PageIndex; - } - - Component page = null; - page = componentSource.getPage(pageName); - - boolean publicPage = page.getClass().isAnnotationPresent(PublicPage.class); - boolean studentPage = page.getClass().isAnnotationPresent(StudentPage.class); - boolean instructorPage = page.getClass().isAnnotationPresent(InstructorPage.class); - boolean adminPage = page.getClass().isAnnotationPresent(AdministratorPage.class); - - hasAccessAnnotation = publicPage | studentPage | instructorPage | adminPage; - logger.debug("checkAccess: page has access annotation: {}", hasAccessAnnotation); - - boolean canAccess = false; - if (publicPage) { - logger.debug("checkAccess: Accessing a public page."); - canAccess = true; - } else { - logger.debug("checkAccess: Accessing a not for public page."); - UserInfo userInfo = applicationStateManager.getIfExists(UserInfo.class); - if (userInfo == null) { - logger.debug("checkAccess: UserInfo is null"); - } else { - logger.debug("checkAccess: userInfo is not null"); - if (studentPage) { - logger.debug("checkAccess: studentPage"); - canAccess = canAccess || userInfo.isStudent(); - } - if (instructorPage) { - logger.debug("checkAccess: instructorPage"); - canAccess = canAccess || userInfo.isInstructor(); - } - if (adminPage) { - logger.debug("checkAccess: adminPage"); - canAccess = canAccess || userInfo.isAdministrator(); - } - } - } - - if (canAccess && hasAccessAnnotation) { - logger.debug("checkAccess: ACCESS GRANTED to page:{} canaccess:{} hasaccessannotation:{} ", pageName, - canAccess, hasAccessAnnotation); - return true; - } else { - logger.info("checkAccess: ACCESS DENIED to page:{} canaccess:{} hasaccessannotation:{} ", pageName, - canAccess, hasAccessAnnotation); - return false; - } - } - -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -21,209 +21,89 @@ package info.ajanovski.eprms.tap.services; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; +import java.io.IOException; import java.util.UUID; import org.apache.tapestry5.SymbolConstants; -import org.apache.tapestry5.beanvalidator.BeanValidatorConfigurer; -import org.apache.tapestry5.beanvalidator.BeanValidatorSource; -import org.apache.tapestry5.commons.Configuration; import org.apache.tapestry5.commons.MappedConfiguration; import org.apache.tapestry5.commons.OrderedConfiguration; -import org.apache.tapestry5.hibernate.HibernateEntityPackageManager; -import org.apache.tapestry5.hibernate.HibernateSymbols; -import org.apache.tapestry5.hibernate.HibernateTransactionAdvisor; -import org.apache.tapestry5.http.services.RequestGlobals; -import org.apache.tapestry5.ioc.MethodAdviceReceiver; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestFilter; +import org.apache.tapestry5.http.services.RequestHandler; +import org.apache.tapestry5.http.services.Response; import org.apache.tapestry5.ioc.ServiceBinder; import org.apache.tapestry5.ioc.annotations.Contribute; -import org.apache.tapestry5.ioc.annotations.Decorate; import org.apache.tapestry5.ioc.annotations.ImportModule; -import org.apache.tapestry5.ioc.annotations.Match; -import org.apache.tapestry5.ioc.services.ThreadLocale; +import org.apache.tapestry5.ioc.annotations.Local; +import org.apache.tapestry5.ioc.services.ApplicationDefaults; +import org.apache.tapestry5.ioc.services.SymbolProvider; import org.apache.tapestry5.modules.Bootstrap4Module; -import org.apache.tapestry5.services.ApplicationStateContribution; -import org.apache.tapestry5.services.ApplicationStateCreator; import org.apache.tapestry5.services.ApplicationStateManager; import org.apache.tapestry5.services.ComponentRequestFilter; import org.apache.tapestry5.services.ComponentSource; -import org.apache.tapestry5.services.ExceptionReporter; -import org.apache.tapestry5.services.PersistentLocale; -import org.hibernate.Session; import org.slf4j.Logger; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.mq.MessagingService; -import info.ajanovski.eprms.tap.data.DiscussionDao; -import info.ajanovski.eprms.tap.data.GenericDao; -import info.ajanovski.eprms.tap.data.PersonDao; -import info.ajanovski.eprms.tap.data.ProjectDao; -import info.ajanovski.eprms.tap.data.ResourceDao; -import info.ajanovski.eprms.tap.data.TranslationDao; +import info.ajanovski.eprms.tap.services.data.GenericDao; +import info.ajanovski.eprms.tap.services.data.PersonDao; +import info.ajanovski.eprms.tap.services.data.ResourceDao; import info.ajanovski.eprms.tap.util.AppConfig; -import info.ajanovski.eprms.tap.util.UserInfo; -import info.ajanovski.eprms.tap.util.UserInfo.UserRole; @ImportModule(Bootstrap4Module.class) public class AppModule { - public static void bind(ServiceBinder binder) { - binder.bind(AccessControllerRequestFilter.class); - binder.bind(CourseManager.class); + binder.bind(AccessController.class).withId("AccessController"); binder.bind(GenericDao.class); binder.bind(GenericService.class); binder.bind(PersonDao.class); binder.bind(PersonManager.class); - binder.bind(ProjectDao.class); - binder.bind(ProjectManager.class); binder.bind(ResourceManager.class); binder.bind(ResourceDao.class); - binder.bind(MessagingService.class); - binder.bind(TranslationDao.class); - binder.bind(TranslationService.class); - binder.bind(SystemConfigService.class); - binder.bind(DiscussionManager.class); - binder.bind(DiscussionDao.class); } public static void contributeFactoryDefaults(MappedConfiguration configuration) { - configuration.override(SymbolConstants.APPLICATION_VERSION, "0.0.4-SNAPSHOT"); + configuration.override(SymbolConstants.APPLICATION_VERSION, "0.0.1-SNAPSHOT"); configuration.override(SymbolConstants.PRODUCTION_MODE, false); } public static void contributeApplicationDefaults(MappedConfiguration configuration) { - configuration.add(SymbolConstants.SUPPORTED_LOCALES, "mk,en"); + configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en,mk"); configuration.add(SymbolConstants.HMAC_PASSPHRASE, AppConfig.getString("tapestry.hmac-passphrase") + UUID.randomUUID()); - configuration.add(SymbolConstants.ENABLE_HTML5_SUPPORT, true); - configuration.add(SymbolConstants.COMPRESS_WHITESPACE, false); - configuration.add(SymbolConstants.CHARSET, "UTF-8"); + } - configuration.add(HibernateSymbols.EARLY_START_UP, true); - + @Contribute(SymbolProvider.class) + @ApplicationDefaults + public static void setupEnvironment(MappedConfiguration configuration) { configuration.add(SymbolConstants.JAVASCRIPT_INFRASTRUCTURE_PROVIDER, "jquery"); } - @Contribute(HibernateEntityPackageManager.class) - public static void addHibernateEntityPackageManager(Configuration configuration) { - configuration.add("info.ajanovski.eprms.model.entities"); + public RequestFilter buildTimingFilter(final Logger log) { + return new RequestFilter() { + public boolean service(Request request, Response response, RequestHandler handler) throws IOException { + long startTime = System.currentTimeMillis(); + try { + return handler.service(request, response); + } finally { + long elapsed = System.currentTimeMillis() - startTime; + log.info("Request time: {} ms", elapsed); + } + } + }; } - @Match({ "*Service", "*Dao", "*Manager" }) - public static void adviseEnableTransactions(HibernateTransactionAdvisor advisor, MethodAdviceReceiver receiver) { - advisor.addTransactionCommitAdvice(receiver); + public static void contributeClasspathAssetAliasManager(MappedConfiguration configuration) { + configuration.add("fontsource-fira-sans", "META-INF/resources/webjars/fontsource-fira-sans/3.0.5"); + configuration.add("tango-icon-theme", "org/freedesktop/tango"); } - @Decorate(serviceInterface = ThreadLocale.class) - public ThreadLocale decorateThreadLocale(final ThreadLocale threadLocale, final PersistentLocale persistentLocale) { - return new ThreadLocale() { - @Override - public void setLocale(Locale locale) { - threadLocale.setLocale(locale); - } - - @Override - public Locale getLocale() { - if (!persistentLocale.isSet()) { - setLocale(new Locale("en")); - persistentLocale.set(new Locale("en")); - } - return threadLocale.getLocale(); - } - - }; + @Contribute(RequestHandler.class) + public void addTimingFilter(OrderedConfiguration configuration, @Local RequestFilter filter) { + configuration.add("Timing", filter); } public static final void contributeComponentRequestHandler( OrderedConfiguration configuration, - ComponentRequestFilter accessControllerRequestFilter, ApplicationStateManager asm, + ComponentRequestFilter accessController, ApplicationStateManager asm, ComponentSource componentSource) { - configuration.add("AccessControllerRequestFilter", accessControllerRequestFilter, "before:*"); - } - - public void contributeApplicationStateManager( - MappedConfiguration configuration, Session session, - PersonManager personManager, RequestGlobals requestGlobals, Logger logger) { - ApplicationStateCreator userInfoCreator = new ApplicationStateCreator() { - public UserInfo create() { - logger.debug("userInfoCreator.create entered"); - - UserInfo userInfo = new UserInfo(); - userInfo.setUserRoles(null); - userInfo.setPersonId(null); - userInfo.setUserName(null); - - try { - String userName = requestGlobals.getHTTPServletRequest().getRemoteUser(); - userInfo.setUserName(userName); - logger.info("Login by user: " + userName); - - Person loggedInPerson = (Person) session.getSession() - .createQuery("from Person p where active=true and userName=:userName") - .setParameter("userName", userName).getSingleResult(); - - if (loggedInPerson == null) { - userInfo.setUserRoles(null); - userInfo.setPersonId(null); - } else { - logger.debug("Login personId: {}", loggedInPerson.getPersonId()); - - List userRoles = new ArrayList(); - - for (PersonRole pr : personManager.getPersonRolesForPerson(loggedInPerson.getPersonId())) { - if (pr.getRole().getName().equals(ModelConstants.RoleAdministrator)) { - userRoles.add(UserRole.ADMINISTRATOR); - } else if (pr.getRole().getName().equals(ModelConstants.RoleInstructor)) { - userRoles.add(UserRole.INSTRUCTOR); - } else if (pr.getRole().getName().equals(ModelConstants.RoleStudent)) { - userRoles.add(UserRole.STUDENT); - } - } - - if (userRoles.size() == 0) { - logger.debug("Login user role is set to NONE"); - userRoles.add(UserRole.NONE); - } - - logger.debug("Login user has {} roles", userRoles.size()); - - userInfo.setUserName(userName); - userInfo.setPersonId(loggedInPerson.getPersonId()); - userInfo.setUserRoles(userRoles); - logger.debug("userInfo is now initialized"); - } - - return userInfo; - - } catch (Exception e) { - if (userInfo.getUserName() != null) { - logger.error("userName {} is not found {}", userInfo.getUserName(), e); - } else { - logger.error("userName is empty"); - } - // throw new NoSuchUserException(); - return userInfo; - } - } - }; - configuration.add(UserInfo.class, new ApplicationStateContribution("session", userInfoCreator)); - } - - public static void contributeClasspathAssetAliasManager(MappedConfiguration configuration) { - configuration.add("fontsource-fira-sans", "META-INF/resources/webjars/fontsource-fira-sans/3.0.5"); - configuration.add("ck", "META-INF/modules/vendor"); - // configuration.add("tango-icon-theme", "org/freedesktop/tango"); - } - - @Contribute(BeanValidatorSource.class) - public static void provideBeanValidatorConfigurer(OrderedConfiguration configuration) { - configuration.add("noXMLBeanValidatorConfigurer", new BeanValidatorConfigurer() { - public void configure(jakarta.validation.Configuration configuration) { - configuration.ignoreXmlConfiguration(); - } - }); + configuration.add("AccessController", accessController, "before:*"); } @@ -232,17 +112,3 @@ } - /** - * By default, Tapestry's ExceptionReporter implementation writes verbose text - * files to the "build/exceptions" directory. This replaces that implementation - * with one that does nothing. (The exceptions still get logged elsewhere.) - */ - @Decorate(serviceInterface = ExceptionReporter.class) - public static ExceptionReporter preventExceptionFileWriting(final ExceptionReporter exceptionReporter) { - return new ExceptionReporter() { - @Override - public void reportException(Throwable exception) { - } - }; - } - } Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/services/CourseManager.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/CourseManager.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,9 +1,0 @@ -package info.ajanovski.eprms.tap.services; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.Course; - -public interface CourseManager { - public List getAllCoursesByPerson(long personId); -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/services/CourseManagerImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/CourseManagerImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,33 +1,0 @@ -package info.ajanovski.eprms.tap.services; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.util.CourseComparator; - -public class CourseManagerImpl implements CourseManager { - - @Inject - private PersonManager personManager; - - @Inject - private GenericService genericService; - - @Override - public List getAllCoursesByPerson(long personId) { - List lista = (List) genericService.getAll(Course.class); - if (personManager.isInstructor(personId) && !personManager.isAdministrator(personId)) { - lista = lista.stream() - .filter(p -> p.getCourseTeachers().stream().anyMatch(q -> q.getTeacher().getPersonId() == personId)) - .collect(Collectors.toList()); - } - CourseComparator cc = new CourseComparator(); - Collections.sort(lista, cc); - return lista; - } - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/services/DiscussionManager.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/DiscussionManager.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,21 +1,0 @@ -package info.ajanovski.eprms.tap.services; - -import java.util.List; - -import info.ajanovski.eprms.model.entities.DiscussionPost; -import info.ajanovski.eprms.model.entities.DiscussionPostEvaluation; -import info.ajanovski.eprms.model.entities.DiscussionSession; -import info.ajanovski.eprms.model.entities.Person; - -public interface DiscussionManager { - - public List getPersonsActiveInDiscussionSession(DiscussionSession discussionSession); - - public List getPersonsDiscussionPostsInDiscussionSession(DiscussionSession discussionSession, - Person person); - - public List getDiscussionPostEvaluations(long discussionPostId); - - public void createDiscussionPostEvaluation(String type, Person person, DiscussionPost dp); - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/services/DiscussionManagerImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/DiscussionManagerImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,50 +1,0 @@ -package info.ajanovski.eprms.tap.services; - -import java.util.Date; -import java.util.List; - -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.DiscussionPost; -import info.ajanovski.eprms.model.entities.DiscussionPostEvaluation; -import info.ajanovski.eprms.model.entities.DiscussionSession; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.tap.data.DiscussionDao; - -public class DiscussionManagerImpl implements DiscussionManager { - - @Inject - private DiscussionDao discussionDao; - - @Inject - private GenericService genericService; - - @Override - public List getPersonsActiveInDiscussionSession(DiscussionSession discussionSession) { - return discussionDao.getPersonsActiveInDiscussionSession(discussionSession); - } - - @Override - public List getPersonsDiscussionPostsInDiscussionSession(DiscussionSession discussionSession, - Person person) { - return discussionDao.getPersonsDiscussionPostsInDiscussionSession(discussionSession, person); - } - - @Override - public List getDiscussionPostEvaluations(long discussionPostId) { - return discussionDao.getDiscussionPostEvaluations(discussionPostId); - } - - @Override - public void createDiscussionPostEvaluation(String type, Person person, DiscussionPost dp) { - DiscussionPostEvaluation dpe = new DiscussionPostEvaluation(); - dpe.setDiscussionPost(genericService.getByPK(DiscussionPost.class, dp.getDiscussionPostId())); - dpe.setEvaluatedOn(new Date()); - dpe.setPerson(genericService.getByPK(Person.class, person.getPersonId())); - dpe.setMessage(""); - dpe.setPoints(null); - dpe.setType(type); - genericService.save(dpe); - } - -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/GenericServiceImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/GenericServiceImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/GenericServiceImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -25,5 +25,5 @@ import org.apache.tapestry5.ioc.annotations.Inject; -import info.ajanovski.eprms.tap.data.GenericDao; +import info.ajanovski.eprms.tap.services.data.GenericDao; public class GenericServiceImpl implements GenericService { Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/PersonManager.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/PersonManager.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/PersonManager.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -23,12 +23,11 @@ import java.util.List; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.entities.Role; +import info.ajanovski.eprms.tap.entities.Person; +import info.ajanovski.eprms.tap.entities.PersonRole; public interface PersonManager { public List getAllPersons(); - + public Person getPersonByUsername(String username); @@ -41,13 +40,3 @@ public List getPersonRolesForPerson(long personId); - public List getRolesForPerson(long personId); - - public List getAllPersonsFromRole(String roleName); - - public boolean isInstructor(long personId); - - public boolean isStudent(long personId); - - public boolean isAdministrator(long personId); - } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/PersonManagerImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/PersonManagerImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/PersonManagerImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -25,78 +25,48 @@ import org.apache.tapestry5.ioc.annotations.Inject; -import info.ajanovski.eprms.model.entities.Person; -import info.ajanovski.eprms.model.entities.PersonRole; -import info.ajanovski.eprms.model.entities.Role; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.tap.data.PersonDao; +import info.ajanovski.eprms.tap.entities.Person; +import info.ajanovski.eprms.tap.entities.PersonRole; +import info.ajanovski.eprms.tap.services.data.PersonDao; public class PersonManagerImpl implements PersonManager { - @Inject - private GenericService genericService; + @Inject + private GenericService genericService; - @Inject - private PersonDao personDao; + @Inject + private PersonDao personDao; - @Override - public List getAllPersons() { - return this.personDao.getAllPersons(); - } + @Override + public List getAllPersons() { + return this.personDao.getAllPersons(); + } - @Override - public Person getPersonByUsername(String username) { - return this.personDao.getPersonByUsername(username); - } + @Override + public Person getPersonByUsername(String username) { + return this.personDao.getPersonByUsername(username); + } - public Person getPersonById(long personId) { - return genericService.getByPK(Person.class, personId); - } + public Person getPersonById(long personId) { + return genericService.getByPK(Person.class, personId); + } - @Override - public List getPersonByFilter(String filter) { - return personDao.getPersonByFilter(filter); - } + @Override + public List getPersonByFilter(String filter) { + return personDao.getPersonByFilter(filter); + } - public List getPersonRolesForPerson(long personId) { - return personDao.getPersonRolesForPerson(personId); - } + public List getPersonRolesForPerson(long personId) { + return personDao.getPersonRolesForPerson(personId); + } - @Override - public String getPersonFullName(Person person) { - return personDao.getPersonFullName(person); - } + @Override + public String getPersonFullName(Person person) { + return personDao.getPersonFullName(person); + } - @Override - public String getPersonFullNameWithId(Person person) { - return personDao.getPersonFullNameWithId(person); - } - - @Override - public List getRolesForPerson(long personId) { - return personDao.getRolesForPerson(personId); - } - - @Override - public List getAllPersonsFromRole(String roleName) { - return personDao.getAllPersonsFromRole(roleName); - } - - @Override - public boolean isInstructor(long personId) { - List userRoles = getRolesForPerson(personId); - return userRoles.stream().anyMatch(p -> p.getName().equals(ModelConstants.RoleInstructor)); - } - - @Override - public boolean isStudent(long personId) { - List userRoles = getRolesForPerson(personId); - return userRoles.stream().anyMatch(p -> p.getName().equals(ModelConstants.RoleStudent)); - } - - @Override - public boolean isAdministrator(long personId) { - List userRoles = getRolesForPerson(personId); - return userRoles.stream().anyMatch(p -> p.getName().equals(ModelConstants.RoleAdministrator)); - } + @Override + public String getPersonFullNameWithId(Person person) { + return personDao.getPersonFullNameWithId(person); + } } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManager.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManager.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManager.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -21,39 +21,5 @@ package info.ajanovski.eprms.tap.services; -import java.util.List; - -import info.ajanovski.eprms.model.entities.Activity; -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.entities.CourseProject; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.TeamMember; -import info.ajanovski.eprms.model.entities.WorkEvaluation; -import info.ajanovski.eprms.model.entities.WorkReport; - public interface ProjectManager { - - public List getAllProjects(); - public List orderProjectList(List list); - - public List getProjectCourses(Project p); - - public void addCoursesToProject(List inCourses, Project p); - - public Float sumPoints(Project p); - - public List getAllProjectsInCourse(Course selectedCourse); - - public List getProjectByPerson(Long personId); - - public void cycleStatus(Project p); - - public List getWorkEvaluationForWorkReport(WorkReport workReport); - - public List getWorkReportsForActivity(Activity activity); - - public List getTeamMembershipOfPerson(Long personId); - - public String getProjectURL(Project project); - } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -21,142 +21,5 @@ package info.ajanovski.eprms.tap.services; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.Activity; -import info.ajanovski.eprms.model.entities.Course; -import info.ajanovski.eprms.model.entities.CourseProject; -import info.ajanovski.eprms.model.entities.Project; -import info.ajanovski.eprms.model.entities.TeamMember; -import info.ajanovski.eprms.model.entities.WorkEvaluation; -import info.ajanovski.eprms.model.entities.WorkReport; -import info.ajanovski.eprms.model.util.ModelConstants; -import info.ajanovski.eprms.model.util.ProjectCodeComparator; -import info.ajanovski.eprms.model.util.WorkEvaluationComparator; -import info.ajanovski.eprms.model.util.WorkReportComparator; -import info.ajanovski.eprms.tap.data.ProjectDao; -import info.ajanovski.eprms.tap.util.AppConstants; - public class ProjectManagerImpl implements ProjectManager { - @Inject - private ProjectDao projectDao; - - @Inject - private GenericService genericService; - - @Inject - private SystemConfigService systemConfigService; - - @Override - public List getAllProjects() { - return projectDao.getAllProjects(); - } - - @Override - public List getProjectCourses(Project p) { - return projectDao.getProjectCourses(p); - } - - @Override - public void addCoursesToProject(List inCourses, Project p) { - List projectCourses = projectDao.getProjectCourses(p); - List coursesFromProjectCourses = projectCourses.stream().map(cp -> cp.getCourse()) - .collect(Collectors.toList()); - for (Course c : inCourses) { - if (!coursesFromProjectCourses.contains(c)) { - CourseProject cp = new CourseProject(); - cp.setCourse(c); - cp.setProject(p); - genericService.save(cp); - } - } - for (CourseProject cp : projectCourses) { - if (!inCourses.contains(cp.getCourse())) { - genericService.delete(cp); - } - } - } - - @Override - public Float sumPoints(Project p) { - return projectDao.sumPoints(p); - } - - @Override - public List getAllProjectsInCourse(Course selectedCourse) { - return projectDao.getAllProjectsInCourse(selectedCourse); - } - - @Override - public List getProjectByPerson(Long personId) { - return projectDao.getProjectByPerson(personId); - } - - @Override - public void cycleStatus(Project p) { - if (p.getStatus() != null) { - String s = p.getStatus(); - int index = Arrays.asList(ModelConstants.AllProjectStatuses).indexOf(s); - index++; - if (index < 0) { - index = 0; - } else if (index >= ModelConstants.AllProjectStatuses.length) { - index = 0; - } else { - } - p.setStatus(Arrays.asList(ModelConstants.AllProjectStatuses).get(index)); - } else { - p.setStatus(ModelConstants.AllProjectStatuses[0]); - } - } - - @Override - public List getWorkEvaluationForWorkReport(WorkReport workReport) { - List list = workReport.getWorkEvaluations(); - WorkEvaluationComparator comparator = new WorkEvaluationComparator(); - Collections.sort(list, comparator); - return list; - } - - @Override - public List getWorkReportsForActivity(Activity activity) { - List list; - if (activity != null) { - list = activity.getWorkReports(); - } else { - list = new ArrayList(); - } - WorkReportComparator comparator = new WorkReportComparator(); - Collections.sort(list, comparator); - return list; - } - - @Override - public List getTeamMembershipOfPerson(Long personId) { - return projectDao.getTeamMembershipOfPerson(personId); - } - - @Override - public String getProjectURL(Project project) { - String baseUrl = systemConfigService.getString(AppConstants.SystemParameterPMProjectURLPrefix); - if (project.getCode() != null) { - return (baseUrl == null ? "" : baseUrl) + project.getCode(); - } else { - return ""; - } - } - - @Override - public List orderProjectList(List list) { - ProjectCodeComparator pcc = new ProjectCodeComparator(); - Collections.sort(list, pcc); - return list; - } - } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ResourceManager.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ResourceManager.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ResourceManager.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -23,6 +23,6 @@ import java.util.List; -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; +import info.ajanovski.eprms.tap.entities.Database; +import info.ajanovski.eprms.tap.entities.Repository; public interface ResourceManager { Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ResourceManagerImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ResourceManagerImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ResourceManagerImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -26,7 +26,7 @@ import org.apache.tapestry5.ioc.annotations.Inject; -import info.ajanovski.eprms.model.entities.Database; -import info.ajanovski.eprms.model.entities.Repository; -import info.ajanovski.eprms.tap.data.ResourceDao; +import info.ajanovski.eprms.tap.entities.Database; +import info.ajanovski.eprms.tap.entities.Repository; +import info.ajanovski.eprms.tap.services.data.ResourceDao; public class ResourceManagerImpl implements ResourceManager { Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/services/SystemConfigService.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/SystemConfigService.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,5 +1,0 @@ -package info.ajanovski.eprms.tap.services; - -public interface SystemConfigService { - public String getString(String key); -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/services/SystemConfigServiceImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/SystemConfigServiceImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,21 +1,0 @@ -package info.ajanovski.eprms.tap.services; - -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.model.entities.SystemParameter; - -public class SystemConfigServiceImpl implements SystemConfigService { - - @Inject - private GenericService genericService; - - @Override - public String getString(String key) { - SystemParameter sp = genericService.getByCode(SystemParameter.class, key); - if (sp != null) { - return sp.getValue(); - } else { - return null; - } - } -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/services/TranslationService.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/TranslationService.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,7 +1,0 @@ -package info.ajanovski.eprms.tap.services; - -public interface TranslationService { - - public String getTranslation(String className, String AttributeCode, long originalObjectId, String locale); - -} Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/services/TranslationServiceImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/TranslationServiceImpl.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,17 +1,0 @@ -package info.ajanovski.eprms.tap.services; - -import org.apache.tapestry5.ioc.annotations.Inject; - -import info.ajanovski.eprms.tap.data.TranslationDao; - -public class TranslationServiceImpl implements TranslationService { - - @Inject - private TranslationDao translationDao; - - @Override - public String getTranslation(String className, String attributeCode, long originalObjectId, String locale) { - return translationDao.getTranslation(className, attributeCode, originalObjectId, locale); - } - -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/GenericDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/GenericDao.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/GenericDao.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource Management + * System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.services.data; + +import java.util.List; + +public interface GenericDao { + public Object getByPK(Class classToLoad, long id); + + public void deleteByPK(Class classToLoad, long id); + + public void delete(Object object); + + public List getQueryResult(String guery); + + public void saveOrUpdate(Object object); + + public Object save(Object object); + + public List getAll(Class classToLoad); + + public Object getByCode(Class classToLoad, String code); + + public List getByTitleSubstring(Class classToSearch, String searchSubString); +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/GenericDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/GenericDaoImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/GenericDaoImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,118 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.services.data; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.apache.tapestry5.ioc.annotations.Inject; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.criterion.MatchMode; +import org.hibernate.criterion.Restrictions; +import org.hibernate.exception.DataException; +import org.slf4j.Logger; + +public class GenericDaoImpl implements GenericDao { + + @Inject + private Session session; + + @Inject + private Logger logger; + + @Override + public Object getByPK(Class classToLoad, long id) { + return session.get(classToLoad, id); + } + + @Override + public void deleteByPK(Class classToLoad, long id) { + session.delete(getByPK(classToLoad, id)); + } + + @Override + public void delete(Object object) { + session.delete(object); + } + + @Override + public List getQueryResult(String guery) { + try { + Query q = session.createQuery(guery); + List l = new ArrayList(); + + for (Iterator it = q.iterate(); it.hasNext();) { + Object[] row = (Object[]) it.next(); + for (int i = 0; i < row.length; i++) { + l.add(row[i]); + } + l.add(" | "); + } + + return l; + + } catch (DataException e) { + // Critical errors : database unreachable, etc. + logger.error( + "Exception - DataAccessException occurs : " + e.getMessage() + " on complete getQueryResult()."); + return null; + } + } + + @Override + public void saveOrUpdate(Object object) { + session.saveOrUpdate(object); + } + + @Override + public Object save(Object object) { + // Object a = session.merge(object); + return session.save(object); + } + + @Override + public List getAll(Class classToLoad) { + return session.createCriteria(classToLoad).list(); + } + + @Override + public Object getByCode(Class classToLoad, String code) { + List l = session.createCriteria(classToLoad).add(Restrictions.eq("code", code)).list(); + if (l.size() > 0) { + return l.get(0); + } else { + return null; + } + } + + @Override + public List getByTitleSubstring(Class classToSearch, String searchSubString) { + if (searchSubString != null) { + return (List) session.createCriteria(classToSearch) + .add(Restrictions.ilike("title", searchSubString, MatchMode.ANYWHERE)).list(); + } else { + return null; + } + } +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/PersonDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/PersonDao.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/PersonDao.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.services.data; + +import java.util.List; + +import info.ajanovski.eprms.tap.entities.Person; +import info.ajanovski.eprms.tap.entities.PersonRole; + +public interface PersonDao { + public List getAllPersons(); + + public Person getPersonByUsername(String username); + + public String getPersonFullName(Person person); + + public String getPersonFullNameWithId(Person person); + + public List getPersonByFilter(String filter); + + public List getPersonRolesForPerson(long personId); + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/PersonDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/PersonDaoImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/PersonDaoImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,87 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.services.data; + +import java.util.List; + +import org.apache.tapestry5.ioc.annotations.Inject; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.hibernate.exception.DataException; +import org.slf4j.Logger; + +import info.ajanovski.eprms.tap.entities.Person; +import info.ajanovski.eprms.tap.entities.PersonRole; +import info.ajanovski.eprms.tap.util.UsefulMethods; + +public class PersonDaoImpl implements PersonDao { + @Inject + private Logger logger; + + @Inject + private Session session; + + @Override + public List getAllPersons() { + try { + return UsefulMethods.castList(Person.class, + session.createCriteria(Person.class).addOrder(Order.asc("lastName")).list()); + } catch (DataException e) { + logger.error("Exception - DataAccessException occurs : {} on complete getAllPersons().", e.getMessage()); + return null; + } + } + + @Override + public Person getPersonByUsername(String username) { + return (Person) session.createCriteria(Person.class).add(Restrictions.eq("userName", username)) + .setReadOnly(true).setCacheable(true).uniqueResult(); + } + + @Override + public List getPersonByFilter(String filter) { + String f = "%" + filter.toLowerCase() + "%"; + Query q = session + .createQuery("select p from Person p where (lower(concat(userName,firstName,lastName)) like :filter)"); + q.setParameter("filter", f); + return UsefulMethods.castList(Person.class, q.list()); + } + + @Override + public List getPersonRolesForPerson(long personId) { + return (List) session.createCriteria(PersonRole.class, "pr") + .add(Restrictions.eq("pr.person.personId", personId)).list(); + } + + @Override + public String getPersonFullName(Person person) { + return person.getLastName() + " " + person.getFirstName(); + } + + @Override + public String getPersonFullNameWithId(Person person) { + return person.getLastName() + " " + person.getFirstName() + " [" + person.getUserName() + "]"; + } + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ProjectDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ProjectDao.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ProjectDao.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.services.data; + +public interface ProjectDao { + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ProjectDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ProjectDaoImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ProjectDaoImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.services.data; + +public class ProjectDaoImpl implements ProjectDao { + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ResourceDao.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ResourceDao.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ResourceDao.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.services.data; + +import java.util.List; + +import info.ajanovski.eprms.tap.entities.Database; +import info.ajanovski.eprms.tap.entities.Repository; + +public interface ResourceDao { + + public List getRepositoriesByPerson(long personId); + + public List getRepositoriesByTeam(long personId); + + public List getRepositoriesByProject(long personId); + + public List getDatabasesByProject(long personId); + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ResourceDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ResourceDaoImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/data/ResourceDaoImpl.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,88 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + * + ******************************************************************************/ + +package info.ajanovski.eprms.tap.services.data; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.tapestry5.ioc.annotations.Inject; +import org.hibernate.Session; + +import info.ajanovski.eprms.tap.entities.Database; +import info.ajanovski.eprms.tap.entities.Repository; + +public class ResourceDaoImpl implements ResourceDao { + + @Inject + private Session session; + + @Override + public List getRepositoriesByPerson(long personId) { + try { + return session.createQuery("from Repository r where r.person.personId=:personId") + .setLong("personId", personId).list(); + } catch (Exception e) { + return new ArrayList(); + } + } + + @Override + public List getRepositoriesByTeam(long personId) { + try { + return session.createQuery(""" + select r from Repository r join r.team t, TeamMember tm join tm.person p + where tm.team.teamId=t.teamId and r.person.personId=:personId + """).setLong("personId", personId).list(); + } catch (Exception e) { + return new ArrayList(); + } + } + + @Override + public List getRepositoriesByProject(long personId) { + try { + return session.createQuery(""" + select r from Repository r join r.project pr, + Responsibility res join res.team t, TeamMember tm join tm.person p + where pr.projectId=res.project.projectId and tm.team.teamId=t.teamId and + tm.person.personId=:personId + """).setLong("personId", personId).list(); + } catch (Exception e) { + return new ArrayList(); + } + } + + @Override + public List getDatabasesByProject(long personId) { + try { + return session.createQuery(""" + select d from Database d join d.project pr, + Responsibility res join res.team t, TeamMember tm join tm.person p + where pr.projectId=res.project.projectId and tm.team.teamId=t.teamId and + tm.person.personId=:personId + """).setLong("personId", personId).list(); + } catch (Exception e) { + return new ArrayList(); + } + + } +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/AppConfig.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/AppConfig.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/AppConfig.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -1,2 +1,22 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + ******************************************************************************/ + package info.ajanovski.eprms.tap.util; @@ -15,4 +35,7 @@ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); + + private AppConfig() { + } public static String getString(String key) { @@ -38,4 +61,3 @@ return Integer.parseInt(getString(key)); } - } Index: rms-tap/src/main/java/info/ajanovski/eprms/tap/util/AppConstants.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/AppConstants.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,57 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the EPRMS - Educational Project and Resource - * Management System (hereinafter: EPRMS). - * - * EPRMS 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. - * - * EPRMS 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 EPRMS. If not, see . - ******************************************************************************/ - -package info.ajanovski.eprms.tap.util; - -public class AppConstants { - - /** - * Pages - */ - public static final String PageIndex = "Index"; - - public static final String SystemParameterDBCreationCommand = "DB-Creation-Command"; - public static final String SystemParameterDBServerType = "DBServerType"; - public static final String SystemParameterDBServerName = "DBServerName"; - public static final String SystemParameterDBServerPort = "DBServerPort"; - public static final String SystemParameterDBCreationPrefix = "DBCreationPrefix"; - public static final String SystemParameterDBCreationOwnerSuffix = "DBCreationOwnerSuffix"; - public static final String SystemParameterDBSSHTunnelUserCreationCommand = "DB-SSH-Tunnel-User-Creation-Command"; - public static final String SystemParameterDBTunnelServerName = "DBTunnelServer"; - public static final String SystemParameterDBTunnelPrefix = "DBTunnelPrefix"; - - public static final String SystemParameterPMOverviewTicketsURL = "PM-Overview-Tickets-URL"; - public static final String SystemParameterPMOverviewTimelineURL = "PM-Overview-Timeline-URL"; - public static final String SystemParameterPMCreationScript = "PM-CreationScript"; - - public static final String SystemParameterPMProjectURLPrefix = "PM-Project-URL-Prefix"; - - public static final String SystemParameterRepoCreationCommand = "Repo-Creation-Command"; - - public static final String[] AllSystemParameters = { SystemParameterDBCreationCommand, SystemParameterDBServerType, - SystemParameterDBServerName, SystemParameterDBServerPort, SystemParameterDBCreationPrefix, - SystemParameterDBCreationOwnerSuffix, SystemParameterDBSSHTunnelUserCreationCommand, - SystemParameterDBTunnelServerName, SystemParameterDBTunnelPrefix, SystemParameterPMOverviewTicketsURL, - SystemParameterPMOverviewTimelineURL, SystemParameterPMCreationScript, SystemParameterPMProjectURLPrefix, - SystemParameterRepoCreationCommand }; - - public static final String SystemParameterTplNewWorkReportByAdmin = "TPL-Work-Report-Title-By-Admin"; - public static final String SystemParameterTplNewWorkEvaluation = "TPL-Work-Evaluation-Title"; -} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/ModelConstants.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/ModelConstants.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/ModelConstants.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (C) 2021 Vangel V. Ajanovski + * + * This file is part of the EPRMS - Educational Project and Resource + * Management System (hereinafter: EPRMS). + * + * EPRMS 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. + * + * EPRMS 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 EPRMS. If not, see . + ******************************************************************************/ + +package info.ajanovski.eprms.tap.util; + +public class ModelConstants { + + /** + * Pages + */ + public final static String PageIndex = "Index"; + + public static final String BooleanTRUEasCHAR = "T"; + public static final String BooleanFALSEasCHAR = "F"; + + public static final String EmailUnknown = "EMAIL@UNKNOWN"; + + public static final String RoleAdministrator = "ADMINISTRATOR"; + public static final String RoleInstructor = "INSTRUCTOR"; + public static final String RoleStudent = "STUDENT"; + +} Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/UTF8Filter.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/UTF8Filter.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/UTF8Filter.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -23,10 +23,10 @@ import java.io.IOException; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; public class UTF8Filter implements Filter { Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/UserInfo.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/UserInfo.java (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/UserInfo.java (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -21,8 +21,17 @@ package info.ajanovski.eprms.tap.util; +import java.util.ArrayList; import java.util.List; +import org.apache.tapestry5.http.services.RequestGlobals; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.slf4j.Logger; + +import info.ajanovski.eprms.tap.entities.Person; +import info.ajanovski.eprms.tap.entities.PersonRole; +import info.ajanovski.eprms.tap.services.PersonManager; + public class UserInfo { - public enum UserRole { + enum UserRole { NONE, STUDENT, INSTRUCTOR, ADMINISTRATOR }; @@ -32,10 +41,56 @@ private List userRoles; + private PersonManager pm; + private Logger logger; + + public UserInfo(@Inject RequestGlobals requestGlobals, @Inject Logger logger, @Inject PersonManager pm) + throws Exception { + this.pm = pm; + this.logger = logger; + + if (requestGlobals != null) { + if (requestGlobals.getHTTPServletRequest().getRemoteUser() != null) { + this.userName = requestGlobals.getHTTPServletRequest().getRemoteUser(); + this.setupUser(); + } else { + this.userName = null; + } + } else { + this.userName = null; + } + } + + private void setupUser() throws Exception { + if (userName != null) { + logger.info("Logged in user: " + userName); + userRoles = new ArrayList(); + Person p = pm.getPersonByUsername(userName); + if (p == null) { + personId = null; + userRoles.clear(); + // throw new NoSuchUserException(); + } else { + this.personId = Long.valueOf(p.getPersonId()); + if (personId != null) { + for (PersonRole pr : pm.getPersonRolesForPerson(personId)) { + if (pr.getRole().getName().equals(ModelConstants.RoleAdministrator)) { + userRoles.add(UserRole.ADMINISTRATOR); + } else if (pr.getRole().getName().equals(ModelConstants.RoleInstructor)) { + userRoles.add(UserRole.INSTRUCTOR); + } else if (pr.getRole().getName().equals(ModelConstants.RoleStudent)) { + userRoles.add(UserRole.STUDENT); + } + } + if (userRoles.size() == 0) { + userRoles.add(UserRole.NONE); + } + } + } + } + + } + public String getUserName() { return userName; - } - - public void setUserName(String userName) { - this.userName = userName; } @@ -44,51 +99,19 @@ } - public void setPersonId(Long personId) { - this.personId = personId; - } - - public List getUserRoles() { - return userRoles; - } - - public void setUserRoles(List userRoles) { - this.userRoles = userRoles; - } - public boolean isNone() { - if (userRoles != null) { - return userRoles.contains(UserRole.NONE); - } else { - return false; - } + return userRoles.contains(UserRole.NONE); } public boolean isStudent() { - if (userRoles != null) { - return userRoles.contains(UserRole.STUDENT); - } else { - return false; - } - } - - public boolean isInstructor() { - if (userRoles != null) { - return userRoles.contains(UserRole.INSTRUCTOR); - } else { - return false; - } + return userRoles.contains(UserRole.STUDENT); } public boolean isAdministrator() { - if (userRoles != null) { - return userRoles.contains(UserRole.ADMINISTRATOR); - } else { - return false; - } + return userRoles.contains(UserRole.ADMINISTRATOR); } public void impersonate(String inUsername) throws Exception { this.userName = inUsername; -// this.setupUser(); + this.setupUser(); } Index: eprms-tap/src/main/resources/AppConfig.properties =================================================================== --- eprms-tap/src/main/resources/AppConfig.properties (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/resources/AppConfig.properties (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -31,4 +31,2 @@ tapestry.hmac-passphrase=@tapestry.hmac-passphrase@ - -MQHost=@MQHost@ Index: rms-tap/src/main/resources/META-INF/assets/DiscussProject.css =================================================================== --- eprms-tap/src/main/resources/META-INF/assets/DiscussProject.css (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,51 +1,0 @@ -.indentation0 { - margin: 0rem; - margin-top: 1rem; -} - -.indentation1 { - margin-left: 0rem; - margin-top: 5rem; -} - -.indentation2 { - margin-left: 2rem; -} - -.indentation3 { - margin-left: 4rem; -} - -.indentation4 { - margin-left: 6rem; -} - -.indentation5 { - margin-left: 8rem; -} - -.indentation6 { - margin-left: 10rem; -} - -.reshenieto img { - width: 100%; -} - -.discussion { - font-size: 90%; -} - -.discussion img { - width: 100%; -} - -.feedback img { - width: 100%; -} - -.card-body .box { - background: var(--light); - color: var(--dark); - padding: 0.5em; -} Index: rms-tap/src/main/resources/META-INF/assets/OverallCourseReport.css =================================================================== --- eprms-tap/src/main/resources/META-INF/assets/OverallCourseReport.css (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,58 +1,0 @@ -.CREATED { - background-color: #ffc0c0ff !important; - color: #000000ff !important; -} - -.report { - min-height: 5rem; - max-height: 10rem; - overflow: auto; - font-size: 75%; -} - -.evaluation { - font-size: 85%; - max-height: 12.5rem; - overflow: auto; -} - -table { - margin: 0; - table-layout: fixed; -} - -table thead th { - position: sticky; - top: 3.5em; - z-index: 1; - width: 18vw; - background: white; -} - -table thead th:first-child { - position: sticky; - left: 0; - z-index: 2; - width: 8vw; -} - -table td { -/* background: #fff;*/ -} - -table tbody th { - position: relative; -} - -table tbody th { - position: sticky; - left: 0; -/* background: #eee;*/ - z-index: 1; -} - -[role="region"][aria-labelledby][tabindex] { - width: 100%; - max-height: 98vh; - overflow: auto; -} Index: eprms-tap/src/main/resources/META-INF/assets/site-overrides.css =================================================================== --- eprms-tap/src/main/resources/META-INF/assets/site-overrides.css (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/resources/META-INF/assets/site-overrides.css (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -2,52 +2,33 @@ --ck-z-default: 100; --ck-z-modal: calc( var(--ck-z-default) + 999 ); - --color-incorrect-wrong: #600f16ff; - --color-incorrect: #e1553eff; /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ - --color-correct: #74b979ff; /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ - --color-correct-better: #484837ff; /* https://www.w3schools.com/colors/colors_british.asp - Olive gree */ + + /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ + --color-incorrect: #c71c2c; + + /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ + --color-correct: #74b979; + --color-noevaluation: #white; --color-exception: #404040; - --main-bg-color-accent: #eceef3ff; - --main-bg-color-accent2: #00000080; - --inlinecomment-bg-color: #cfef60; } -@media (prefers-color-scheme: dark) { - :root { - --main-bg-color: #260661ff; - --main-bg-color2: #260661ff; - --main-bg-color3: #42119cff; - --main-bg-color-box: #42119cff; - --main-bg-color-accent: #330B7Dff; - --main-bg-color-accent2: #00000080; - --main-font-color: white; - --main-font-color-hover: #E9FA5A; - --main-link-color: #A074F0; - --yt-font-color: #8E6600; - --sidebar-bg-color: #260661ff; - --main-border-color: rgb(0,0,0,0.15); - --main-underline-color: rgba(255,255,255,128); - --light: #080704; - --dark: #d4dac0; - --bs-body-bg: rgb(16,16,16); - --bs-body-color: white; - --bs-light-rgb: rgba(42,42,42,0.5); - --bs-bg-opacity: rgba(42,42,42,0.5); - --color-incorrect: #7b000c; /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ - --color-correct: #277c2c; /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ - --inlinecomment-bg-color: #8faf10; - } -} - -body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { +body, +h1, +h2, +h3, +h4, +h5, +h6, +.h1, +.h2, +.h3, +.h4, +.h5, +.h6 { font-family: 'Fira Sans', Helvetica, Arial, sans-serif !important; } -body { - padding-top: 4.5em; -} - code { - font-family: 'Fira Code', 'Fira Mono', monospace, mono !important; + font-family: 'Fira Mono', monospace, mono !important; } @@ -78,4 +59,7 @@ } + + + @keyframes slidein { from { background: white; } @@ -87,104 +71,2 @@ margin-left:0.5em; } - -svg { - fill: transparent; - stroke: currentColor; - stroke-width: 0.1em; - stroke-linecap: round; - stroke-linejoin: round; -} - -nav.navbar { - background-color: #050D58 !important; -} - -.help-block { - background-color: #fff8f0; - padding: 0.1em 0.25em; - color: red; -} - -.glyphicon-calendar { - background-color: var(--light); - color: var(--dark); -} - -.glyphicon-calendar::before { - content: "📅"; -} - -.datefield-popup { - position:relative !important; -} - -.report .box { - background-color: var(--light); - color: var(--dark); - border-left: 1px solid; - padding: 0.5em; -} - -div.palette select { - width: 30em !important; -} - - - - - -@media ( prefers-color-scheme : dark) { - a { - color: #E2F72F; - } - a:hover { - color: #A1B400; - } - body { - background-color: var(--main-bg-color2); - color: var(--main-font-color); - } - .card { - background-color: var(--main-bg-color) !important; - border-color: var(--main-bg-color3) !important; - } - .card-header { - background-color: var(--main-bg-color-accent) !important; - } - .testType .card-header.bg-success { - background-color: var(--color-correct) !important; - } - .card-header h3 { - color: var(--main-font-color) !important; - } - .bg-light { - background-color: var(--main-bg-color3) !important; - } - .table { - color: var(--main-font-color); - background-color: var(--main-bg-color) !important; - } - .table-hover tbody tr:hover td, .table-hover tbody tr:hover th { - background-color: var(--main-bg-color-accent); - color: var(--main-font-color-hover); - } - .dropdown-menu { - background-color: var(--main-bg-color2); - } - .dropdown-menu a { - color: var(--main-link-color) !important; - } - pre { - color: var(--main-font-color); - } - .modal-content { - background-color: var(--main-bg-color2); - border-color: var(--main-bg-color2); - } - .cke_wysiwyg_frame { - background-color: #6060ff !important; - } - p.comment { - background: #7C8B00; - } -} Index: rms-tap/src/main/resources/META-INF/assets/webeditor-custom.css =================================================================== --- eprms-tap/src/main/resources/META-INF/assets/webeditor-custom.css (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,23 +1,0 @@ -@charset "UTF-8"; - -p.comment { - background: #ffff80; -} - -.inlinecomment { - background: #ffffa0; - margin-left: 2rem; - border-left: 1px solid black; - padding-left: 0.5rem; -} - -.resultschema { - background: #d0d0ff; - margin-left: 0.5em; - margin-right: 0.5em; -} - -div.box { - padding: 0.5em; - background: #e0e0e0; -} Index: rms-tap/src/main/resources/META-INF/modules/ModalBox.js =================================================================== --- eprms-tap/src/main/resources/META-INF/modules/ModalBox.js (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,22 +1,0 @@ -define(["jquery","bootstrap/modal"], function($) { - - var activate = function(modalId, options) { - $('#' + modalId).modal(options); - } - - var hide = function(modalId) { - var $modal = $('#' + modalId); - if ($modal.length > 0) { - $modal.modal('hide'); - } else { - $('body').removeClass('modal-open'); - $('.modal-backdrop').remove(); - } - } - - return { - activate: activate, - hide: hide - } - -}); Index: rms-tap/src/main/resources/META-INF/modules/webeditor-config-admin.js =================================================================== --- eprms-tap/src/main/resources/META-INF/modules/webeditor-config-admin.js (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,71 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the dbLearnStar system (hereinafter: dbLearn*). - * - * dbLearn* 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. - * - * dbLearn* 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 dbLearn*. If not, see . - * - ******************************************************************************/ - -requirejs.config({ - shim: { - 'ckeditor-jquery': ['jquery', 'ckeditor-core'] - }, - paths: { - 'ckeditor-core': '../webjars/ckeditor/4.19.0/standard/ckeditor', - 'ckeditor-jquery': '../webjars/ckeditor/4.19.0/standard/adapters/jquery' - } -}); - -define(["jquery", "ckeditor-jquery"], function($) { - init = function(spec) { - $('#' + spec.id).ckeditor(function() { - }, - { - specialChars: ['σ', 'θ', 'π', '⨯', '⋈', 'ρ', '÷', '∪', '∩', - '←', '→', '∨', '∧', '¬', '∀', '∃', '∄', '∈', '∉', '⊂', '⊃', - '⊆', '⊇', '≤', '≠', '≥'], - toolbarGroups: [ - { "name": "basicstyles", "groups": ["basicstyles"] }, - { "name": "paragraph", "groups": ["list"] }, - { "name": "insert", "groups": ["insert"] }, - { "name": "styles", "groups": ["styles"] }, - { "name": "document", "groups": ["mode"] } - ], - stylesSet: [ - { - name: 'Box', - element: 'div', - attributes: { 'class': 'box' } - }, { - name: 'Comment', - element: 'p', - attributes: { 'class': 'comment' } - }, { - name: 'InlineComment', - element: 'span', - attributes: { 'class': 'inlinecomment' } - }, { - name: 'ResultsSchema', - element: 'span', - attributes: { 'class': 'resultschema' } - } - ], - removeButtons: 'Anchor,Strike,blockquote', - contentsCss: [spec.csspath], - baseFloatZIndex: 40000 - }); - }; - return init; -}); Index: rms-tap/src/main/resources/META-INF/modules/webeditor-config.js =================================================================== --- eprms-tap/src/main/resources/META-INF/modules/webeditor-config.js (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,59 +1,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the dbLearnStar system (hereinafter: dbLearn*). - * - * dbLearn* 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. - * - * dbLearn* 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 dbLearn*. If not, see . - * - ******************************************************************************/ - -requirejs.config({ - shim: { - 'ckeditor-jquery': ['jquery', 'ckeditor-core'] - }, - paths: { - 'ckeditor-core': '../webjars/ckeditor/4.19.0/standard/ckeditor', - 'ckeditor-jquery': '../webjars/ckeditor/4.19.0/standard/adapters/jquery' - } -}); - -define(["jquery", "ckeditor-jquery"], function($) { - init = function(spec) { - $('#' + spec.id).ckeditor(function() { - }, - { - specialChars: ['σ', 'θ', 'π', '⨯', '⋈', 'ρ', '÷', '∪', '∩', - '←', '→', '∨', '∧', '¬', '∀', '∃', '∄', '∈', '∉', '⊂', '⊃', - '⊆', '⊇', '≤', '≠', '≥'], - toolbarGroups: [ - { "name": "basicstyles", "groups": ["basicstyles"] }, - { "name": "paragraph", "groups": ["list"] }, - { "name": "insert", "groups": ["insert"] }, - { "name": "styles", "groups": ["styles"] }, - { "name": "document", "groups": ["mode"] } - ], - stylesSet: [ - { - name: 'Box', - element: 'div', - attributes: { 'class': 'box' } - } - ], - removeButtons: 'Anchor,Strike,blockquote', - contentsCss: [spec.csspath], - baseFloatZIndex: 40000 - }); - }; - return init; -}); Index: rms-tap/src/main/resources/META-INF/modules/zoneUpdateEffect.js =================================================================== --- eprms-tap/src/main/resources/META-INF/modules/zoneUpdateEffect.js (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,14 +1,0 @@ -define([ "jquery", "t5/core/dom", "t5/core/events" ], function($, dom, events) { - - $('*[data-container-type="zone"]').on(events.zone.didUpdate, function() { - $(this).css("animation", "0.3s linear slidein"); - }); - - $('*[data-container-type="zone"]').on("animationend", function() { - $(this).css("animation", "none"); - $(this).offsetHeight; - $(this).css("animation", "null"); - }); - - //return null; -}); Index: eprms-tap/src/main/resources/application.yml =================================================================== --- eprms-tap/src/main/resources/application.yml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/resources/application.yml (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -1,7 +1,3 @@ server: - port: 8082 + port: 8081 -spring: - servlet: - multipart: - enabled: false Index: eprms-tap/src/main/resources/hibernate.cfg.xml =================================================================== --- eprms-tap/src/main/resources/hibernate.cfg.xml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/resources/hibernate.cfg.xml (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -6,23 +6,18 @@ + @jdbc.url@ + @jdbc.default_schema@ + @jdbc.username@ + @jdbc.password@ + @hib.hbm2ddlauto@ - false + @hib.dialect@ + @jdbc.driver@ + false - - org.hibernate.hikaricp.internal.HikariCPConnectionProvider - TapestryHibernatePool - true - 5 - 16 - 30000 - org.postgresql.ds.PGSimpleDataSource - @jdbc.url@ - @jdbc.username@ - @jdbc.password@ - @jdbc.default_schema@ - + @hib.showsql@ Index: rms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Backlink.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Backlink.tml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,9 +1,0 @@ - - -
- ${message:back-label} -
- - Index: rms-tap/src/main/resources/info/ajanovski/eprms/tap/components/IconActionLink.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/IconActionLink.tml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ (revision ) @@ -1,7 +1,0 @@ - - - - - - Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Layout.tml =================================================================== --- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Layout.tml (revision d8e4bebf64362eeac6aa4fbb4b993eb8eb4d4025) +++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/components/Layout.tml (revision bfbd854e3dd125147273745bfe401da3bc5d15a1) @@ -4,7 +4,5 @@ - ${title} - @@ -16,9 +14,8 @@ - - -