Index: ithub/workflows/codeql-analysis.yml =================================================================== --- .github/workflows/codeql-analysis.yml (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,1 +1,0 @@ - Index: PYING =================================================================== --- COPYING (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (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: STALLATION.md =================================================================== --- INSTALLATION.md (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,233 +1,0 @@ -# dbLearn* - Installation - -## Building the web application from source - - - -### 0. Get the source: - -```bash -git clone https://github.com/ajanovski/dbLearnStar.git -``` - - - -### 1. Setup a CAS instance for authentication. - -The web application is configured to use CAS for authentication. If you don't have access to a production/development CAS server to use for testing purposes, you can run your own development CAS instance in a container by following these instructions. - -First, go into the directory for a CAS container example. - -```bash -cd dbLearnStar-other/container_cas_example/ -``` - -Then, edit cas.properties and configure a list of experimental users that you will use to test authentication in the web application. - -```bash -$EDITOR config/cas.properties -``` - -Next, setup the podman/docker command for starting the container - modify the container name, modify the port and the local directories that are mapped to the container. - -```bash -$EDITOR webstart.sh -``` - -Finally, run the CAS container. Tested with podman, but the command should be 100% compatibile with docker too. - -```bash -./webstart.sh -``` - -Run podman ps or docker ps to view the list of running containers, to check if the startup was successful. - -```bash -podman ps -``` - - - -### 2. Setup a DBMS instance for the main database. - -The web application is built and tested with PostgreSQL for the main database. It should be possible to run against another DBMS, but some source code modifications will be required. If you don't have access to a production/development PostgreSQL server, you can run your own PostgreSQL instance in a container by following these instructions. - -First, go into the directory for the DB container example. - -```bash -cd dbLearnStar-other/container_maindb_example/ -``` - -Next, setup the docker/podman command for starting the container - modify the port and the local directories that are mapped to the container if you need to do so. - -```bash -$EDITOR dbstart.sh -``` - -Next, run the DB container. Tested with podman, but the command should be 100% compatibile with docker too. - -```bash -./dbstart.sh -``` - -Run podman ps or docker ps to view the list of running containers, to check if the startup was successful. - -```bash -podman ps -``` - -Finally, enter console within the container to initialize the MAIN DB. - -```bash -podman exec -u postgres -it dblearnstar_maindb bash -``` - -```sql -psql -CREATE USER dblearnstar_owner ENCRYPTED PASSWORD 'DBLEARNSTAR_OWNER_PASSWORD'; -CREATE DATABASE dblearnstar ENCODING 'UTF-8' OWNER DBLEARNSTAR_OWNER; -\c dblearnstar -CREATE SCHEMA dblearnstar AUTHORIZATION dblearnstar_owner; -``` - - - -### 3. Build and run from source - -First, configure a maven build profile. - -Edit the local maven settings file: - -```bash -$EDITOR ~/.m2/settings.xml -``` - -If you don't have this file, setup an initial file, like documented here: https://maven.apache.org/settings.html - -Under the *profiles* section add a new build profile called development-dbLearnStar, setting up for your local needs. - - -```xml - - - development-dbLearnStar-example - - - env - development-dbLearnStar-example - - - - - - - CAS URL - - APPLICATION_URL_AFTER_LOGIN - APPLICATION_URL_AFTER_LOGOUT - - - - - - - jdbc:postgresql://address:port/MAINDB_NAME - MAINDB_USERNAME - MAINDB_PASSWORD - dbLearnStar - - - create - - CHANGE_IT! - - false - - /tmp - INFO,Console - - - - - /.../.../dbLearnStar_files - - /excel - /fonts - /data - /upload - /submissions - - - - - - - - - org.postgresql.Driver - jdbc:postgresql://address:port - - - tables - - - - - - - - - org.postgresql.Driver - jdbc:postgresql://address:port/EPRMSDB_NAME - EPRMSDB_USERNAME - EPRMSDB_PASS - eprms_main - - - -``` - -The latest version is tested with Java 21 and Maven 3.9.9. - -Build and install the model sub-project first. The jar will be installed in the local maven repo. - -```bash -cd dbLearnStar-model/ -mvn -P development-dbLearnStar-example clean install -cd .. -``` - -After the model is successfully built, one can build and run the web application. - -Setup the port on which the app runs here: - -```bash -cd dbLearnStar-webApp/ -$EDITOR src/main/resources/application.yml -``` - -```bash -mvn -P development-dbLearnStar-example clean spring-boot:run -``` - -If the build is successful, the web application will be running on the configured port under localhost. - -You can test it at: [http://localhost:8081](http://localhost:8081) (change to configured port) - -If all is setup properly the browser will automatically redirect you to the CAS instance at [http://localhost:8080](http://localhost:8080) (or configured address and port). - -Before first run, you need to register the account of the admin user and username in the person table in the MAIN DB. -This process is automated by running the script import.sql which is in dbLearnStar-webapp/src/main/resources. -It should run automatically to seed initial data in the database during runs with the 'create' parameter in maven settings hib.dbm2ddl.auto. -Otherwise run the script manually on the first run, before logging in. - -Then you can authenticate. Enter a user/password configured in your CAS instance in step 1. - -If authentication is successful you will be redirected back to the web aplication at [http://localpost:8081](http://localpost:8081) (or configured address and port). - -The webaplication main screen will welcome you. Index: README.md =================================================================== --- README.md (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ README.md (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -1,47 +1,3 @@ # dbLearn* - Open-Source System for Conducting Iterative Exercises and Exams in a Databases Course -## Features -- Library of tasks and tests for individual practice - * Flexibility in defining as many task types as needed - each task type can be associated with a specific code editors in case such an editor is needed (there is support for SQL code to be used in coding and practical tasks, and there are text editors using specific symbol sets to be used in written and theory-based tasks) - * Flexibility in defining as many collections as needed and their organization in a hierarchy if needed -- Test administration and management for organized group testing or individual testing - * Test templates can be defined using a specific test structure - * Test instances can be created based on test templates and conducted at a specific date - * Test groups who are allowed to take each tests can be defined - * Tests can be graded and reviewed - * Support for transparency in grading - students can be allowed to view -- Support for automatic and semi-automatic evaluation of SQL tasks based on correct solutions test samples implemented as database views -- Support for rapid and semi-automated evaluation of database and schema design DDL tasks - -The system was presented at the following conferences: -- 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 -- Vangel Ajanovski. 2021. DbLearn*: Open-Source System and a Set of Practices for Conducting Iterative Exercises and Exams in a Databases Course. In Proceedings of the 22nd Annual Conference on Information Technology Education (SIGITE '21). Association for Computing Machinery, New York, NY, USA, 61–62. https://doi.org/10.1145/3450329.3478317 - -The system is used in production: -- Database courses taught by the main author since 2019 at the Faculty of Computer Science and Engineering, Ss. Cyril and Methodius University in Skopje. - -## Screenshots - -Library of Test Collections and Tasks - -![Image](https://github.com/ajanovski/dbLearnStar/raw/main/dbLearnStar-presentations/screenShots/LibraryOfTestCollectionsAndTasks.png) - ---- - -Taking a Practical Exam - SQL - -![Image](https://github.com/ajanovski/dbLearnStar/raw/main/dbLearnStar-presentations/screenShots/TakingAPracticalExam-WorkingOnAQueryTask.png) - ---- - -Taking a Theoretical Exam - Models - -![Image](https://github.com/ajanovski/dbLearnStar/raw/main/dbLearnStar-presentations/screenShots/TakingATheoreticalExam-WorkingOnATask.png) - ---- - -System Translation Process - -![Image](https://github.com/ajanovski/dbLearnStar/raw/main/dbLearnStar-presentations/screenShots/TranslationProcess.png) - Index: LearnStar-model/COPYING =================================================================== --- dbLearnStar-model/COPYING (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (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: dbLearnStar-model/pom.xml =================================================================== --- dbLearnStar-model/pom.xml (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/pom.xml (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -1,3 +1,3 @@ - @@ -6,5 +6,5 @@ dblearnstar dblearnstar-model - 0.2.1-SNAPSHOT + 0.0.1-SNAPSHOT dbLearnStar - Model @@ -26,7 +26,7 @@ - 21 - 21 - 21 + 15 + 15 + 15 UTF-8 @@ -40,9 +40,4 @@ 2.2 - - org.hibernate.validator - hibernate-validator - 8.0.2.Final - Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/ActivityInTask.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/ActivityInTask.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/ActivityInTask.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "activity_in_task") +@Table(schema = "sql_learning", name = "activity_in_task") public class ActivityInTask implements java.io.Serializable { private long activityInTaskId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/AssessmentDiscussion.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/AssessmentDiscussion.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/AssessmentDiscussion.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "assessment_discussion") +@Table(schema = "sql_learning", name = "assessment_discussion") public class AssessmentDiscussion implements java.io.Serializable { private long assessmentDiscussionId; @@ -37,5 +37,4 @@ private AssessmentDiscussion replyTo; private Person person; - private List replies; @Id @@ -60,5 +59,5 @@ } - @Column(name = "message", nullable = false, length = 10000000) + @Column(name = "message", nullable = false, length = 10000) public String getMessage() { return this.message; @@ -118,12 +117,3 @@ } - @OneToMany(fetch = FetchType.LAZY, mappedBy = "replyTo") - public List getReplies() { - return replies; - } - - public void setReplies(List replies) { - this.replies = replies; - } - } Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/Group.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/Group.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/Group.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "group") +@Table(schema = "sql_learning", name = "group") public class Group implements java.io.Serializable { private long groupId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/GroupFocusOnTest.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/GroupFocusOnTest.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/GroupFocusOnTest.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "group_focus_on_test") +@Table(schema = "sql_learning", name = "group_focus_on_test") public class GroupFocusOnTest implements java.io.Serializable { private long groupFocusOnTestId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/GroupMember.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/GroupMember.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/GroupMember.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "group_member") +@Table(schema = "sql_learning", name = "group_member") public class GroupMember implements java.io.Serializable { private long groupMemberId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/Model.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/Model.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/Model.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "model") +@Table(schema = "sql_learning", name = "model") public class Model implements java.io.Serializable { private long modelId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/Person.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/Person.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/Person.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "person") +@Table(schema = "sql_learning", name = "person") public class Person implements java.io.Serializable { private long personId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/PersonRole.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/PersonRole.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/PersonRole.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "person_role") +@Table(schema = "sql_learning", name = "person_role") public class PersonRole implements java.io.Serializable { private long personRoleId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/Role.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/Role.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/Role.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "roles") +@Table(schema = "sql_learning", name = "roles") public class Role implements java.io.Serializable { private long roleId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/SolutionAssessment.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/SolutionAssessment.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/SolutionAssessment.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "solution_assessment") +@Table(schema = "sql_learning", name = "solution_assessment") public class SolutionAssessment implements java.io.Serializable { private long solutionAssessmentId; @@ -35,5 +35,4 @@ private String type; private Float grade; - private String feedbackSource; private StudentSubmitSolution studentSubmitSolution; private TestInstanceParameters testInstanceParameters; @@ -98,13 +97,4 @@ } - @Column(name = "feedback_source", length = 1000000, columnDefinition = "TEXT") - public String getFeedbackSource() { - return this.feedbackSource; - } - - public void setFeedbackSource(String feedbackSource) { - this.feedbackSource = feedbackSource; - } - @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "student_submit_solution_id", nullable = false, foreignKey = @ForeignKey(name = "fk_solution_assessment_student_submit_solution")) Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/Student.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/Student.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/Student.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "student") +@Table(schema = "sql_learning", name = "student") public class Student implements java.io.Serializable { private long studentId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/StudentStartedTest.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/StudentStartedTest.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/StudentStartedTest.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "student_started_test") +@Table(schema = "sql_learning", name = "student_started_test") public class StudentStartedTest implements java.io.Serializable { private long studentStartedTestId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/StudentSubmitSolution.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/StudentSubmitSolution.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/StudentSubmitSolution.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "student_submit_solution") +@Table(schema = "sql_learning", name = "student_submit_solution") public class StudentSubmitSolution implements java.io.Serializable { private long studentSubmitSolutionId; Index: LearnStar-model/src/main/java/dblearnstar/model/entities/SystemParameter.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/SystemParameter.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,104 +1,0 @@ -/******************************************************************************* - - * Copyright (C) 2021 Vangel V. Ajanovski - * - * This file is part of the dbLearn* 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 dblearnstar.model.entities; - -import java.util.*; -import javax.persistence.*; - -import jakarta.validation.constraints.NotNull; - -/* -*/ -@Entity -@Table (schema="dblearnstar", name="system_parameter") -public class SystemParameter implements java.io.Serializable { - private long systemParameterId; - private String className; - private long originalObjectId; - private String type; - private String code; - private String value; - - - @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 = "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 = "type", nullable = false) - public String getType() { - return this.type; - } - - public void setType(String type) { - this.type=type; - } - - @NotNull - @Column(name = "code", 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; - } - -} Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/Task.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/Task.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/Task.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "task") +@Table(schema = "sql_learning", name = "task") public class Task implements java.io.Serializable { private long taskId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskInTestInstance.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskInTestInstance.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskInTestInstance.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "task_in_test_instance") +@Table(schema = "sql_learning", name = "task_in_test_instance") public class TaskInTestInstance implements java.io.Serializable { private long taskInTestInstanceId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskIsOfType.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskIsOfType.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskIsOfType.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "task_is_of_type") +@Table(schema = "sql_learning", name = "task_is_of_type") public class TaskIsOfType implements java.io.Serializable { private long taskIsOfTypeId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskType.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskType.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskType.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "task_type") +@Table(schema = "sql_learning", name = "task_type") public class TaskType implements java.io.Serializable { private long taskTypeId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskTypeInTemplate.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskTypeInTemplate.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/TaskTypeInTemplate.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "task_type_in_template") +@Table(schema = "sql_learning", name = "task_type_in_template") public class TaskTypeInTemplate implements java.io.Serializable { private long taskTypeInTemplateId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestCollection.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestCollection.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestCollection.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "test_collection") +@Table(schema = "sql_learning", name = "test_collection") public class TestCollection implements java.io.Serializable { private long testCollectionId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestInstance.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestInstance.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestInstance.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "test_instance") +@Table(schema = "sql_learning", name = "test_instance") public class TestInstance implements java.io.Serializable { private long testInstanceId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestInstanceParameters.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestInstanceParameters.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestInstanceParameters.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "test_instance_parameters") +@Table(schema = "sql_learning", name = "test_instance_parameters") public class TestInstanceParameters implements java.io.Serializable { private long testInstanceParametersId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestTemplate.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestTemplate.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestTemplate.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "test_template") +@Table(schema = "sql_learning", name = "test_template") public class TestTemplate implements java.io.Serializable { private long testTemplateId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestType.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestType.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/TestType.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "test_type") +@Table(schema = "sql_learning", name = "test_type") public class TestType implements java.io.Serializable { private long testTypeId; Index: dbLearnStar-model/src/main/java/dblearnstar/model/entities/Translation.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/entities/Translation.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/entities/Translation.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,5 +27,5 @@ */ @Entity -@Table(schema = "dblearnstar", name = "translations") +@Table(schema = "sql_learning", name = "translations") public class Translation implements java.io.Serializable { private long translationId; Index: LearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTaskInTestInstance.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTaskInTestInstance.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,44 +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 dblearnstar.model.model; - -import java.util.Comparator; - -import dblearnstar.model.entities.TaskInTestInstance; - -public class ComparatorTaskInTestInstance implements Comparator { - - @Override - public int compare(TaskInTestInstance o1, TaskInTestInstance o2) { - if (o1.getTestInstance().getTestInstanceId() == o2.getTestInstance().getTestInstanceId()) { - if (o1.getTask().getTitle() != null && o2.getTask().getTitle() != null - && !o1.getTask().getTitle().equals(o2.getTask().getTitle())) { - return o1.getTask().getTitle().compareTo(o2.getTask().getTitle()); - } else { - return Long.compare(o1.getTaskInTestInstanceId(), o2.getTaskInTestInstanceId()); - } - } else { - ComparatorTestInstance cti = new ComparatorTestInstance(); - return cti.compare(o1.getTestInstance(), o2.getTestInstance()); - } - } - -} Index: dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTestCollection.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTestCollection.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTestCollection.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -21,7 +21,5 @@ package dblearnstar.model.model; -import java.util.ArrayList; import java.util.Comparator; -import java.util.List; import dblearnstar.model.entities.TestCollection; @@ -29,30 +27,21 @@ public class ComparatorTestCollection implements Comparator { - public List getCoding(TestCollection i) { + public String getCoding(TestCollection i) { Integer broj = i.getOrdering(); if (broj == null) { broj = 0; } - List l; if (i.getParentCollection() == null) { - l = new ArrayList(); + return Long.toString(broj) + "-"; } else { - l = getCoding(i.getParentCollection()); + return getCoding(i.getParentCollection()) + Long.toString(broj) + "-"; } - l.add(broj); - return l; } @Override - public int compare(TestCollection tc1, TestCollection tc2) { - List o1 = getCoding(tc1); - List o2 = getCoding(tc2); - for (int i = 0; i < Math.min(o1.size(), o2.size()); i++) { - int c = o1.get(i).compareTo(o2.get(i)); - if (c != 0) { - return c; - } - } - return Integer.compare(o1.size(), o2.size()); + public int compare(TestCollection o1, TestCollection o2) { + String hier1 = getCoding(o1); + String hier2 = getCoding(o2); + return hier1.compareTo(hier2); } Index: dbLearnStar-model/src/main/java/dblearnstar/model/model/ModelConstants.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/model/ModelConstants.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/model/ModelConstants.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -23,42 +23,23 @@ public class ModelConstants { - public static final String TaskCodeSQL = "SQL"; - public static final String TaskCodeDDL = "DDL"; - public static final String TaskCodeTEXT = "TEXT"; - public static final String TaskCodeUPLOAD = "UPLOAD"; + public final static String TaskCodeSQL = "SQL"; + public final static String TaskCodeDDL = "DDL"; + public final static String TaskCodeTEXT = "TEXT"; + public final static String TaskCodeUPLOAD = "UPLOAD"; - public static final String ActivityEval = "TASK_EVAL"; - public static final String ActivityExecAll = "TASK_RUNONLY"; - public static final String ActivityExecSelection = "TASK_RUNONLY_SELECTION"; - public static final String ActivityPlan = "TASK_PLANONLY"; - public static final String ActivityViewTask = "VIEW_TASK"; - public static final String ActivityStillViewing = "TASK_STILL_VIEWING"; - public static final String ActivitySubmitText = "TASK_SUBMIT_TEXT"; - public static final String ActivityTryUpload = "TRIED TASK_UPLOAD"; + public static final String ActivityEval = "TASK_EVAL"; + public static final String ActivityExecAll = "TASK_RUNONLY"; + public static final String ActivityExecSelection = "TASK_RUNONLY_SELECTION"; + public static final String ActivityPlan = "TASK_PLANONLY"; + public static final String ActivityViewTask = "VIEW_TASK"; + public static final String ActivityStillViewing = "TASK_STILL_VIEWING"; + public static final String ActivitySubmitText = "TASK_SUBMIT_TEXT"; + public static final String ActivityTryUpload = "TRIED TASK_UPLOAD"; - public static final String PersonDeactivatedSuffix = "---"; - + /** * Pages */ - public static final String PageIndex = "Index"; - - public static final Object InstructorRole = "INSTRUCTOR"; - public static final Object AdministratorRole = "ADMINISTRATOR"; - - /* - * Object types - */ - public static final String DBRelationalObjectTypesTABLE = "TABLE"; - public static final String DBRelationalObjectTypesPK = "PK"; - public static final String DBRelationalObjectTypesFK = "FK"; - public static final String DBRelationalObjectTypesNN = "NN"; - public static final String DBRelationalObjectTypesCHECK = "CHECK"; - public static final String DBRelationalObjectTypesUK = "UK"; - public static final String DBRelationalObjectTypesDATA = "DATA"; - - public static final String[] AllDBRelationalObjectTypes = { DBRelationalObjectTypesTABLE, DBRelationalObjectTypesPK, - DBRelationalObjectTypesFK, DBRelationalObjectTypesNN, DBRelationalObjectTypesCHECK, - DBRelationalObjectTypesUK, DBRelationalObjectTypesDATA }; + public final static String PageIndex = "Index"; } Index: dbLearnStar-model/src/main/java/dblearnstar/model/model/Triplet.java =================================================================== --- dbLearnStar-model/src/main/java/dblearnstar/model/model/Triplet.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-model/src/main/java/dblearnstar/model/model/Triplet.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -27,8 +27,9 @@ private T3 thirdItem; - public Triplet(T1 firstItem, T2 secondItem, T3 thirdItem) { - super(); - this.firstItem = firstItem; - this.secondItem = secondItem; + public T3 getThirdItem() { + return thirdItem; + } + + public void setThirdItem(T3 thirdItem) { this.thirdItem = thirdItem; } @@ -46,15 +47,14 @@ } + public Triplet(T1 firstItem, T2 secondItem, T3 thirdItem) { + super(); + this.firstItem = firstItem; + this.secondItem = secondItem; + this.thirdItem = thirdItem; + } + public void setSecondItem(T2 secondItem) { this.secondItem = secondItem; } - public T3 getThirdItem() { - return thirdItem; - } - - public void setThirdItem(T3 thirdItem) { - this.thirdItem = thirdItem; - } - } Index: LearnStar-other/container_cas_example/config/cas.properties =================================================================== --- dbLearnStar-other/container_cas_example/config/cas.properties (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,2 +1,0 @@ -cas.authn.accept.users=admin::adminpass,user1::pass1,user2::pass2 -#cas.service-registry.json.location=file:/etc/cas/services Index: LearnStar-other/container_cas_example/docker-compose.yml =================================================================== --- dbLearnStar-other/container_cas_example/docker-compose.yml (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,23 +1,0 @@ -version: '3.8' - -networks: - samples: - driver: bridge - -services: - cas: - image: apereo/cas:6.6.6 - container_name: cas - restart: always - ports: - - "8090:8080" - command: > - --cas.standalone.configuration-directory=/etc/cas/config - --server.ssl.enabled=false - --server.port=8080 - --cas.service-registry.core.init-from-json=true - --cas.service-registry.json.location=file:/etc/cas/services - volumes: - - ./services/http-1.json:/etc/cas/services/http-1.json - networks: - - samples Index: LearnStar-other/container_cas_example/services/http-1.json =================================================================== --- dbLearnStar-other/container_cas_example/services/http-1.json (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,8 +1,0 @@ -{ - "@class": "org.apereo.cas.services.CasRegisteredService", - "serviceId": "^(https?)://.*", - "name": "HTTP/HTTPS", - "id": 1, - "description": "This service definition authorizes all application urls that support HTTP and HTTPS protocols.", - "evaluationOrder": 10000 -} Index: LearnStar-other/container_cas_example/webstart.sh =================================================================== --- dbLearnStar-other/container_cas_example/webstart.sh (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,15 +1,0 @@ -podman run \ - --name docker_cas \ - -v ./services:/etc/cas/services:Z \ - -v ./config:/etc/cas/config:Z \ - --rm \ - -p 8080:8080 \ - -d \ - --name cas \ - apereo/cas:6.6.7 \ - --cas.standalone.configuration-directory=/etc/cas/config \ - --server.ssl.enabled=false \ - --server.port=8080 \ - --management.server.port=10000 \ - --cas.service-registry.core.init-from-json=true \ - --cas.service-registry.json.location=file:/etc/cas/services Index: LearnStar-other/container_maindb_example/DatabaseFolder/README.md =================================================================== --- dbLearnStar-other/container_maindb_example/DatabaseFolder/README.md (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,2 +1,0 @@ -When starting the container as proposed, it's internal database data directory will be mapped to this external directory. As an effect, all the database files created by the container will persist in this directory instead of insinde the container, so removing or deleting the container will not delete the database. - Index: LearnStar-other/container_maindb_example/dbstart.sh =================================================================== --- dbLearnStar-other/container_maindb_example/dbstart.sh (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,10 +1,0 @@ -podman run \ - --cgroup-manager=cgroupfs \ - -d \ - -e POSTGRES_USER=postgres \ - -e POSTGRES_PASSWORD=CHANGEPASS \ - --privileged \ - --mount type=bind,source=./DatabaseFolder,target=/var/lib/postgresql/data \ - -p 5432:5432 \ - --name dblearnstar_maindb \ - postgres:17 Index: LearnStar-other/evaluation_method_view_example/eval_view_template.sql =================================================================== --- dbLearnStar-other/evaluation_method_view_example/eval_view_template.sql (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,17 +1,0 @@ --- drop view -drop view if exists EVALPREFIX_TASKNAME; - --- create view -CREATE OR REPLACE VIEW EVALPREFIX_TASKNAME -AS - - -VIEWTEKST - - -; - --- Permissions -ALTER TABLE EVALPREFIX_TASKNAME OWNER TO MAINDB_OWNER; -GRANT ALL ON TABLE EVALPREFIX_TASKNAME TO MAINDB_OWNER; -GRANT ALL ON TABLE EVALPREFIX_TASKNAME TO MAINDB_EVALUSER; Index: dbLearnStar-webApp/pom.xml =================================================================== --- dbLearnStar-webApp/pom.xml (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/pom.xml (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -1,12 +1,12 @@ + xmlns="http://maven.apache.org/POM/4.0.0"> + 4.0.0 org.springframework.boot spring-boot-starter-parent - 3.1.3 + 2.5.3 @@ -14,5 +14,5 @@ dblearnstar dblearnstar - 0.15.2-SNAPSHOT + 0.8-T5.7.3 dbLearnStar @@ -33,24 +33,27 @@ + 15 + 15 + 15 + + 2.5.3 + 5.7.3 + 1.0.4 + 1.0.1 + + 2.12.4 + 2.3.1 + 2.33.3 + 1.1.4 + 3.141.59 + 3.0.1 + 1.3-groovy-2.5 + 1.0.9 + + 42.2.23 + 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.19.0 - 2.24.0 - 5.8.2 - 2.0.4 - 5.0.0 - - 42.7.7 - 4.0.4 @@ -62,9 +65,10 @@ + dblearnstar dblearnstar-model - 0.2.1-SNAPSHOT + 0.0.1-SNAPSHOT @@ -99,17 +103,19 @@ org.springframework.boot - spring-boot-starter-log4j2 - compile - - - org.springframework.boot spring-boot-starter-tomcat provided + + org.springframework.boot + spring-boot-starter-log4j2 + compile + + org.apache.tapestry - tapestry-core-jakarta + tapestry-hibernate ${tapestry-version} compile @@ -118,70 +124,91 @@ org.apache.tapestry - tapestry-webresources-jakarta + tapestry-webresources ${tapestry-version} compile - - + org.apache.tapestry - tapestry-hibernate-jakarta + tapestry-upload ${tapestry-version} compile + + + + org.apache.tapestry - tapestry-beanvalidator-jakarta + tapestry-test ${tapestry-version} - compile - - - org.hibernate.validator - hibernate-validator - 8.0.2.Final - - - 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} + 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-logging + + + + + org.gebish + geb-spock + ${geb-version} + test + + + org.seleniumhq.selenium + selenium-support + test + + + org.seleniumhq.selenium + htmlunit-driver 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} @@ -191,76 +218,54 @@ + org.glassfish + javax.json + ${json-version} + + com.fasterxml.jackson.core jackson-core - ${jackson-version} com.fasterxml.jackson.core jackson-databind - ${jackson-version} com.fasterxml.jackson.dataformat jackson-dataformat-yaml - ${jackson-version} - - - jakarta.servlet - jakarta.servlet-api - ${servlet-version} + + + com.fasterxml.jackson.core + jackson-annotations + + + javax.servlet + javax.servlet-api + ${servlet-api-version} provided + + org.postgresql postgresql - ${postgresql-version} - - - com.zaxxer - HikariCP - 6.2.1 - - - org.hibernate - hibernate-hikaricp - 5.4.33.Final - - - - org.apereo.cas.client + + + + 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 - - + + commons-fileupload commons-fileupload - 1.5 - - - - commons-codec - commons-codec - - - - org.apache.commons - commons-text - 1.10.0 + 1.4 @@ -269,5 +274,5 @@ org.webjars webjars-locator - 0.52 + 0.42 @@ -279,10 +284,15 @@ org.webjars.npm feather-icons - 4.29.1 + 4.28.0 org.webjars ckeditor - 4.19.0 + 4.16.1 + + + org.webjars + codemirror + 5.62.2 @@ -291,32 +301,6 @@ 1.205.0 - - org.webjars.npm - codemirror - 6.65.7 - - - - com.github.vertical-blank - sql-formatter - 2.0.4 - - - - net.objecthunter - exp4j - 0.4.8 - + - - - - - org.hibernate.orm - hibernate-core - 5.4.33.Final - - - @@ -380,60 +364,10 @@ + - - 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 @@ -441,66 +375,4 @@ 2.6 - - - - 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/ - - - org.webjars.npm - codemirror - jar - META-INF/resources/webjars/**/* - ${project.basedir}/target/classes/META-INF/assets/codemirror/ - - - ^\QMETA-INF/resources/webjars/codemirror/6.65.7/\E - ./ - - - - - - - - - - Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/App.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/App.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/App.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -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: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/AppConfiguration.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/AppConfiguration.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/AppConfiguration.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -23,10 +23,15 @@ 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; @@ -40,8 +45,4 @@ import dblearnstar.webapp.services.UTF8Filter; import dblearnstar.webapp.util.AppConfig; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.SessionTrackingMode; @Configuration @@ -53,40 +54,47 @@ return new ServletContextInitializer() { @Override - public void onStartup(ServletContext ctx) throws ServletException { - // Tapestry init parameters - ctx.setInitParameter("tapestry.app-package", "dblearnstar.webapp"); - ctx.setInitParameter("tapestry.development-modules", "dblearnstar.webapp.services.DevelopmentModule"); - ctx.setInitParameter("tapestry.qa-modules", "dblearnstar.webapp.services.QaModule"); + public void onStartup(ServletContext servletContext) throws ServletException { + servletContext.setInitParameter("tapestry.app-package", "dblearnstar.webapp"); + servletContext.setInitParameter("tapestry.development-modules", + "dblearnstar.webapp.services.DevelopmentModule"); + servletContext.setInitParameter("tapestry.qa-modules", "dblearnstar.webapp.services"); - ctx.setInitParameter("artifactParameterName", "ticket"); + servletContext.setInitParameter("artifactParameterName", "ticket"); - // Apereo CAS init parameters - ctx.setInitParameter("casServerLogoutUrl", AppConfig.getString("cas.server") + "/cas/logout"); - ctx.setInitParameter("casServerLoginUrl", AppConfig.getString("cas.server") + "/cas/login"); - ctx.setInitParameter("casServerUrlPrefix", AppConfig.getString("cas.server") + "/cas"); - ctx.setInitParameter("service", AppConfig.getString("app.server") + ctx.getContextPath()); + servletContext.setInitParameter("casServerLogoutUrl", + AppConfig.getString("cas.server") + "/cas/logout"); - // Filters + servletContext.setInitParameter("casServerLoginUrl", AppConfig.getString("cas.server") + "/cas/login"); - EnumSet esDTs = EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR); + servletContext.setInitParameter("casServerUrlPrefix", AppConfig.getString("cas.server") + "/cas"); - ctx.addFilter("encodingFilter", UTF8Filter.class) - .addMappingForUrlPatterns(esDTs, false, "/*"); + servletContext.setInitParameter("service", + AppConfig.getString("app.server") + servletContext.getContextPath()); - ctx.addFilter("CAS Single Sign Out Filter", SingleSignOutFilter.class) - .addMappingForUrlPatterns(esDTs, false, "/*"); - ctx.addFilter("CAS Authentication Filter", AuthenticationFilter.class) - .addMappingForUrlPatterns(esDTs, false, "/*"); - ctx.addFilter("CAS Validation Filter", Cas20ProxyReceivingTicketValidationFilter.class) - .addMappingForUrlPatterns(esDTs, false, "/*"); - ctx.addFilter("CAS HttpServletRequest Wrapper Filter", HttpServletRequestWrapperFilter.class) - .addMappingForUrlPatterns(esDTs, false, "/*"); + servletContext.addFilter("encodingFilter", UTF8Filter.class).addMappingForUrlPatterns( + EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); - ctx.addFilter("app", TapestryFilter.class) - .addMappingForUrlPatterns(esDTs, false, "/*"); + servletContext.addFilter("CAS Single Sign Out Filter", SingleSignOutFilter.class) + .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, + "/*"); - ctx.addListener(SingleSignOutHttpSessionListener.class); + servletContext.addFilter("CAS Authentication Filter", AuthenticationFilter.class) + .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, + "/*"); - ctx.setSessionTrackingModes(EnumSet.of(SessionTrackingMode.COOKIE)); + 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, + "/*"); + + servletContext.addFilter("app", TapestryFilter.class).addMappingForUrlPatterns( + EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); + + servletContext.addListener(SingleSignOutHttpSessionListener.class); + + servletContext.setSessionTrackingModes(EnumSet.of(SessionTrackingMode.COOKIE)); } }; Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/Code.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/Code.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/Code.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -21,5 +21,4 @@ package dblearnstar.webapp.components; -import org.apache.commons.text.StringEscapeUtils; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.annotations.Parameter; @@ -43,8 +42,4 @@ } - public String getEscapedValue() { - return StringEscapeUtils.escapeHtml4(value); - } - public Boolean getNullValue() { if (value == null) { Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/Layout.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/Layout.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/Layout.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -44,8 +44,8 @@ import dblearnstar.webapp.services.PersonManager; -@Import(stylesheet = { "classpath:META-INF/assets/META-INF/resources/webjars/fontsource-fira-sans/3.0.5/index.css", - "classpath:META-INF/assets/META-INF/resources/webjars/fontsource-fira-sans/3.0.5/500.css", - "classpath:META-INF/assets/META-INF/resources/webjars/fontsource-fira-sans/3.0.5/700.css", - "classpath:META-INF/assets/META-INF/resources/webjars/firacode/1.205.0/distr/fira_code.css", +@Import(stylesheet = { "classpath:META-INF/resources/webjars/fontsource-fira-sans/3.0.5/index.css", + "classpath:META-INF/resources/webjars/fontsource-fira-sans/3.0.5/500.css", + "classpath:META-INF/resources/webjars/fontsource-fira-sans/3.0.5/700.css", + "classpath:META-INF/resources/webjars/firacode/1.205.0/distr/fira_code.css", "site-overrides.css" }, module = { "bootstrap/dropdown", "bootstrap/collapse", "zoneUpdateEffect" }) @PublicPage @@ -92,23 +92,12 @@ public String[] getStudentPageNames() { - return new String[] { "TasksOverview", "ExamsAndTasksOverview", "OpenDiscussions", "PersonalAnalytics" }; - } - - public String[] getInstructorPageNames() { - if (userInfo.isInstructor()) { - return new String[] { "admin/ManageModels", "admin/TestAdmin", - "admin/TestCollectionManagement", "admin/GroupManagement", "admin/StudentGroupProgress", "admin/SubmissionEvaluations", - "admin/Reevaluation", "admin/TranslationPage", "admin/SystemParameters" }; - } else { - return null; - } + return new String[] { "ExamsAndTasksOverview", "SolutionComparator", "OpenDiscussions", "PersonalAnalytics" }; } public String[] getAdminPageNames() { if (userInfo.isAdministrator()) { - return new String[] { "admin/ManagePersons", "admin/GroupManagement", "admin/ManageModels", - "admin/TestAdmin", "admin/TestCollectionManagement", "admin/StudentGroupProgress", - "admin/SubmissionEvaluations", "admin/Reevaluation", "admin/ActiveUsers", "admin/TranslationPage", - "admin/SystemParameters" }; + return new String[] { "admin/ManagePersons", "admin/GroupManagement", "admin/StudentGroupProgress", + "admin/ManageModels", "admin/TestAdmin", "admin/Reevaluation", "admin/SubmissionLogViewer", + "admin/TestCollectionManagement", "admin/ActiveUsers" }; } else { return null; Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/ModalBox.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/ModalBox.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/components/ModalBox.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -21,4 +21,6 @@ package dblearnstar.webapp.components; +import javax.inject.Inject; + import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ClientElement; @@ -27,5 +29,4 @@ import org.apache.tapestry5.annotations.Property; 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; @@ -59,5 +60,5 @@ void setupRender() { JSONObject json = new JSONObject(); - json.put("keyboard", false); + json.put("keyboard", true); json.put("backdrop", "static"); json.put("focus", true); Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/model/ApplicationConstants.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/model/ApplicationConstants.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,27 +1,0 @@ -package dblearnstar.webapp.model; - -public class ApplicationConstants { - - public static String EPRMS_JDBC_DRIVER = "eprms.jdbc.driver"; - public static String EPRMS_JDBC_URL = "eprms.jdbc.url"; - public static String EPRMS_JDBC_SCHEMA = "eprms.jdbc.default_schema"; - public static String EPRMS_JDBC_USERNAME = "eprms.jdbc.username"; - public static String EPRMS_JDBC_PASSWORD = "eprms.jdbc.password"; - - public static String STUDENTDBS_JDBC_DRIVER = "studentdbs.jdbc.driver"; - public static String STUDENTDBS_JDBC_URL = "studentdbs.jdbc.url"; - public static String STUDENTDBS_JDBC_SCHEMA = "studentdbs.jdbc.default_schema"; - public static String STUDENTDBS_JDBC_USERNAME = "studentdbs.jdbc.username"; - public static String STUDENTDBS_JDBC_PASSWORD = "studentdbs.jdbc.password"; - - public static String DATEFORMAT_SUBMISSION = "yyyyMMdd-HHmmss"; - public static String DATEFORMAT_AUDIT = "yyyy-MM-dd'T'HH:mm:ss"; - public static String DATEFORMAT_AUDITDATEONLY = "yyyy-MM-dd"; - public static String DATEFORMAT_GUI_DATE = "dd.MM.yyyy"; - public static String DATEFORMAT_GUI_TIME = "HH:mm"; - public static String DATEFORMAT_GUI_DATETIME = "dd.MM.yyyy HH:mm:ss"; - public static String DATEFORMAT_CONDENSED = "yyyyMMdd"; - - public static String AUTH_AUTO_CREATE_USER="auth.autoCreateUser"; - -} Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/model/StudentSelectModel.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/model/StudentSelectModel.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/model/StudentSelectModel.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -34,5 +34,4 @@ public class StudentSelectModel extends AbstractSelectModel { private List students; - private Boolean hideNames; public StudentSelectModel(List students) { @@ -42,14 +41,4 @@ this.students = students; } - this.hideNames = false; - } - - public StudentSelectModel(List students, Boolean hideNames) { - if (students == null) { - this.students = new ArrayList(); - } else { - this.students = students; - } - this.hideNames = hideNames; } @@ -64,9 +53,5 @@ for (Student student : students) { Person p = student.getPerson(); - String name = " [" + p.getUserName() + "]"; - if (hideNames != null && hideNames) { - } else { - name = p.getLastName() + " " + p.getFirstName() + name; - } + String name = p.getLastName() + " " + p.getFirstName() + " [" + p.getUserName() + "]"; options.add(new OptionModelImpl(name, student)); } Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/model/TaskInTestInstanceSelectModel.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/model/TaskInTestInstanceSelectModel.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,37 +1,0 @@ -package dblearnstar.webapp.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 dblearnstar.model.entities.TaskInTestInstance; - -public class TaskInTestInstanceSelectModel extends AbstractSelectModel { - private List taskInTestInstances; - - public TaskInTestInstanceSelectModel(List taskInTestInstances) { - if (taskInTestInstances == null) { - this.taskInTestInstances = new ArrayList(); - } else { - this.taskInTestInstances = taskInTestInstances; - } - } - - @Override - public List getOptionGroups() { - return null; - } - - @Override - public List getOptions() { - List options = new ArrayList(); - for (TaskInTestInstance taskInTestInstance : taskInTestInstances) { - options.add(new OptionModelImpl(taskInTestInstance.getTask().getTitle(), taskInTestInstance)); - } - return options; - } -} Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/model/TestCollectionSelectModel.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/model/TestCollectionSelectModel.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,79 +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 dblearnstar.webapp.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.services.PersistentLocale; -import org.apache.tapestry5.util.AbstractSelectModel; - -import dblearnstar.model.entities.TestCollection; -import dblearnstar.webapp.services.TranslationService; - -public class TestCollectionSelectModel extends AbstractSelectModel { - private List testCollections; - - private TranslationService translationService; - private PersistentLocale persistentLocale; - - public TestCollectionSelectModel(List testCollections, TranslationService translationService, - PersistentLocale persistentLocale) { - if (testCollections == null) { - this.testCollections = new ArrayList(); - } else { - this.testCollections = testCollections; - } - this.persistentLocale = persistentLocale; - this.translationService = translationService; - } - - @Override - public List getOptionGroups() { - return null; - } - - public String getPrefix(TestCollection i) { - if (i.getParentCollection() == null) { - return ""; - } else { - return getPrefix(i.getParentCollection()) + "  "; // unicode double em-space - } - } - - @Override - public List getOptions() { - List options = new ArrayList(); - for (TestCollection tc : testCollections) { - String title = translationService.getTranslation(TestCollection.class.getSimpleName(), "title", - tc.getTestCollectionId(), persistentLocale.get().getLanguage().toLowerCase()); - if (title == null) { - title = tc.getTitle(); - } - String name = getPrefix(tc) + title; - options.add(new OptionModelImpl(name, tc)); - } - return options; - } -} Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ComplaintsAndDiscussions.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ComplaintsAndDiscussions.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ComplaintsAndDiscussions.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -31,5 +31,4 @@ import org.apache.tapestry5.hibernate.annotations.CommitAfter; import org.apache.tapestry5.ioc.annotations.Inject; -import org.slf4j.Logger; import dblearnstar.model.entities.AssessmentDiscussion; @@ -37,15 +36,12 @@ import dblearnstar.model.entities.SolutionAssessment; import dblearnstar.model.model.ComparatorAssessmentDiscussionByReplyTo; -import dblearnstar.model.model.TaskTypeChecker; import dblearnstar.model.model.UserInfo; import dblearnstar.webapp.annotations.AdministratorPage; import dblearnstar.webapp.annotations.StudentPage; import dblearnstar.webapp.services.GenericService; -import dblearnstar.webapp.services.PersonManager; -import dblearnstar.webapp.services.TestManager; @StudentPage @AdministratorPage -@Import(module = { "bootstrap/collapse" }, stylesheet = { "ComplaintsAndDiscussions.css", "feedback-styles.css" }) +@Import(module = { "bootstrap/collapse" }) public class ComplaintsAndDiscussions { @@ -55,21 +51,14 @@ @Inject private GenericService genericService; - @Inject - private Logger logger; - @Inject - private PersonManager personManager; - @Inject - private TestManager testManager; @Persist @Property SolutionAssessment solutionAssessmentToDiscuss; + @Property + private AssessmentDiscussion runningAssessmentDiscussion; @Persist @Property AssessmentDiscussion newAssessmentDiscussion; - - @Property - private AssessmentDiscussion runningAssessmentDiscussion; public void onActivate() { @@ -78,4 +67,5 @@ solutionAssessmentToDiscuss.getSolutionAssessmentId()); } + } @@ -111,7 +101,4 @@ newAssessmentDiscussion.setPostedOn(new Date()); newAssessmentDiscussion.setReplyTo(replyTo); - if (userInfo.isAdministrator() || userInfo.isInstructor()) { - newAssessmentDiscussion.setMessage("
" + replyTo.getMessage() + "
\n

"); - } newAssessmentDiscussion.setSolutionEvaluation(solutionAssessmentToDiscuss); } @@ -120,8 +107,4 @@ public void onSuccessFromNewAssessmentDiscussionForm() { genericService.save(newAssessmentDiscussion); - newAssessmentDiscussion = null; - } - - void onCancelNewAssessmentDiscussionForm() { newAssessmentDiscussion = null; } @@ -151,8 +134,4 @@ } - public boolean isPostedByInstructor() { - return personManager.isInstructor(runningAssessmentDiscussion.getPerson()); - } - @CommitAfter public void onActionFromDeleteDiscussion(long assessmentDiscussionId) { @@ -160,6 +139,3 @@ } - public boolean isSQL() { - return TaskTypeChecker.isSQL(testManager.getCodeType(solutionAssessmentToDiscuss.getStudentSubmitSolution())); - } } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -21,39 +21,24 @@ package dblearnstar.webapp.pages; -import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.InjectPage; -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.ioc.annotations.Inject; import org.apache.tapestry5.services.PersistentLocale; -import org.apache.tapestry5.services.SelectModelFactory; -import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; import org.apache.tapestry5.services.javascript.JavaScriptSupport; import org.slf4j.Logger; -import dblearnstar.model.entities.Task; import dblearnstar.model.entities.TaskInTestInstance; import dblearnstar.model.entities.TaskIsOfType; -import dblearnstar.model.entities.TestCollection; import dblearnstar.model.entities.TestInstance; import dblearnstar.model.entities.TestType; -import dblearnstar.model.model.ComparatorTestCollection; import dblearnstar.model.model.UserInfo; import dblearnstar.webapp.annotations.AdministratorPage; import dblearnstar.webapp.annotations.StudentPage; -import dblearnstar.webapp.model.TestCollectionSelectModel; -import dblearnstar.webapp.pages.admin.SubmissionEvaluations; -import dblearnstar.webapp.services.DigestService; import dblearnstar.webapp.services.GenericService; import dblearnstar.webapp.services.PersonManager; @@ -69,19 +54,6 @@ @Inject private Logger logger; - @Inject - private JavaScriptSupport javaScriptSupport; - @Inject - private PersistentLocale persistentLocale; - @Inject - private SelectModelFactory selectModelFactory; - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - @Inject - private DigestService digestService; - @SessionState - @Property private UserInfo userInfo; - @Inject private PersonManager pm; @@ -91,10 +63,12 @@ private TestManager testManager; @Inject + private JavaScriptSupport javaScriptSupport; + @Inject + private PersistentLocale persistentLocale; + @Inject private TranslationService translationService; @InjectPage private QueryTest queryTest; - @InjectPage - private SubmissionEvaluations submissionEvaluations; @Property @@ -106,18 +80,8 @@ @Property private TaskIsOfType taskIsOfType; - @Persist - @Property - private TestCollection testCollection; - - @InjectComponent - private Zone collectionZone; - private long studentId; public void onActivate() { studentId = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0).getStudentId(); - if (testCollection == null) { - testCollection = getTestCollections().stream().findFirst().orElse(null); - } } @@ -130,51 +94,12 @@ } - public String getHashedTestInstanceId() { - return digestService.obfuscate(Long.toString(testInstance.getTestInstanceId())); - } - - /* selectTestCollection Form */ - - public List getTestCollections() { - List list = testManager.getTestCollectionsWithTestInstances(); - ComparatorTestCollection c = new ComparatorTestCollection(); - Collections.sort(list, c); - return list; - } - - public SelectModel getTestCollectionModel() { - List list = getTestCollections(); - if (list == null) { + public List getTestInstances() { + if (userInfo.isAdministrator()) { + return testManager.getAllTestInstancesByTestType(testType.getTestTypeId()); + } else if (userInfo.isStudent()) { + return testManager.getTestInstancesForStudentByTestType(studentId, testType.getTestTypeId()); + } else { return null; - } else { - return new TestCollectionSelectModel(list, translationService, persistentLocale); } - } - - public void onValueChanged(TestCollection newTestCollection) { - testCollection = newTestCollection; - ajaxResponseRenderer.addRender(collectionZone); - } - - public List getTestInstances() { - List list; - if (userInfo.isAdministrator()) { - if (testCollection == null) { - list = testManager.getAllTestInstancesByTestType(testType.getTestTypeId()); - } else { - list = testManager.getAllTestInstancesByTestTypeAndCollection(testType.getTestTypeId(), - testCollection.getTestCollectionId()); - } - } else if (userInfo.isStudent()) { - if (testCollection == null) { - list = testManager.getTestInstancesForStudentByTestType(studentId, testType.getTestTypeId()); - } else { - list = testManager.getTestInstancesForStudentByTestTypeAndCollection(studentId, - testType.getTestTypeId(), testCollection.getTestCollectionId()); - } - } else { - list = new ArrayList(); - } - return list; } @@ -192,23 +117,6 @@ } - public String getBtnBooleanClass(Boolean value) { - if (value != null && value) { - return "btn-success"; - } else { - return "btn-warning"; - } - - } - - public String getClassOpenToAllStudents() { - return getBtnBooleanClass(testInstance.getOpenToAllStudents()); - } - - public String getClassOpenForReviewByStudents() { - return getBtnBooleanClass(testInstance.getOpenForReviewByStudents()); - } - public List getTaskInTestInstances() { - return testManager.getTaskInTestInstancesByTestInstance(testInstance.getTestInstanceId()); + return testManager.getTasksInTestInstance(testInstance.getTestInstanceId()); } @@ -222,25 +130,13 @@ public String getTranslateTestInstanceTitle() { - String translated = translationService.getTranslation(TestInstance.class.getSimpleName(), "title", - testInstance.getTestInstanceId(), persistentLocale.get().getLanguage().toLowerCase()); + String translated = translationService.getTranslation("TestInstance", "title", testInstance.getTestInstanceId(), + persistentLocale.get().getLanguage().toLowerCase()); return (translated != null ? translated : testInstance.getTitle()); } - public String getTranslatedTestInstanceDescription() { - String translated = translationService.getTranslation(TestInstance.class.getSimpleName(), "description", - testInstance.getTestInstanceId(), persistentLocale.get().getLanguage().toLowerCase()); - return (translated != null ? translated : testInstance.getDescription()); - } - public String getTranslateTestTypeTitle() { - String translated = translationService.getTranslation(TestType.class.getSimpleName(), "title", - testType.getTestTypeId(), persistentLocale.get().getLanguage().toLowerCase()); + String translated = translationService.getTranslation("TestType", "title", testType.getTestTypeId(), + persistentLocale.get().getLanguage().toLowerCase()); return (translated != null ? translated : testType.getTitle()); - } - - public String getTranslatedTaskInTestInstanceTaskTitle() { - String translated = translationService.getTranslation(Task.class.getSimpleName(), "title", - taskInTestInstance.getTask().getTaskId(), persistentLocale.get().getLanguage().toLowerCase()); - return (translated != null ? translated : taskInTestInstance.getTask().getTitle()); } @@ -273,23 +169,3 @@ } } - - public Object onEvaluate(TestInstance ti) { - submissionEvaluations.onValueChangedFromSelectTestInstance(ti); - return submissionEvaluations; - } - - @CommitAfter - public void onToggleOpenToAll(TestInstance ti) { - if (userInfo != null && userInfo.isInstructor()) { - ti.setOpenToAllStudents(!ti.getOpenToAllStudents()); - } - } - - @CommitAfter - public void onToggleOpenForReviewByStudents(TestInstance ti) { - if (userInfo != null && userInfo.isInstructor()) { - ti.setOpenForReviewByStudents(!ti.getOpenForReviewByStudents()); - } - } - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/Logout.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/Logout.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/Logout.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -37,5 +37,5 @@ @PublicPage -@Import(stylesheet = { "classpath:META-INF/assets/META-INF/resources/webjars/fontsource-fira-sans/3.0.5/index.css", +@Import(stylesheet = { "classpath:META-INF/resources/webjars/fontsource-fira-sans/3.0.5/index.css", "site-overrides.css" }, module = { "bootstrap/dropdown", "bootstrap/collapse" }) public class Logout { Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/OpenDiscussions.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/OpenDiscussions.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/OpenDiscussions.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -43,5 +43,4 @@ import dblearnstar.webapp.annotations.AdministratorPage; import dblearnstar.webapp.annotations.StudentPage; -import dblearnstar.webapp.services.EvaluationService; import dblearnstar.webapp.services.GenericService; import dblearnstar.webapp.services.PersonManager; @@ -66,9 +65,5 @@ private TestManager testManager; @Inject - private PersonManager personManager; - @Inject - private EvaluationService evaluationService; - - + private PersonManager pm; @Inject private AjaxResponseRenderer ajaxResponseRenderer; @@ -82,17 +77,12 @@ SolutionAssessment runningSolutionAssessment; - public void onActivate() { - if (selectedTestInstance != null) { - selectedTestInstance = genericService.getByPK(TestInstance.class, selectedTestInstance.getTestInstanceId()); - } - } - - public void onActivate(TestInstance ti) { - selectedTestInstance = ti; - } - public List getSolutionAssessmentsWithDiscussion() { - return evaluationService - .getSolutionAssessmentsWithDiscussionForTestInstance(selectedTestInstance.getTestInstanceId()); + return ((List) UsefulMethods.castList(SolutionAssessment.class, + genericService.getAll(SolutionAssessment.class))) + .stream() + .filter(p -> p.getAssessmentDiscussions().size() > 0 + && p.getStudentSubmitSolution().getStudentStartedTest().getTestInstance() + .getTestInstanceId() == selectedTestInstance.getTestInstanceId()) + .collect(Collectors.toList()); } @@ -108,5 +98,5 @@ return tilist; } else if (userInfo.isStudent()) { - long studentId = personManager.getStudentsByPersonId(userInfo.getPersonId()).get(0).getStudentId(); + long studentId = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0).getStudentId(); List listAD = UsefulMethods.castList(AssessmentDiscussion.class, genericService.getAll(AssessmentDiscussion.class)); @@ -133,30 +123,3 @@ } - public boolean answered(AssessmentDiscussion ad) { - logger.debug(" ad = {} {}", ad.getAssessmentDiscussionId(), ad.getPerson().getUserName()); - if (ad.getReplies() != null && ad.getReplies().size() > 0) { - logger.debug(" has replies"); - boolean allAnswered = true; - for (AssessmentDiscussion i : ad.getReplies()) { - if (!answered(i)) { - allAnswered = false; - } - } - return allAnswered; - } else { - logger.info(" no replies"); - return personManager.isInstructor(ad.getPerson()); - } - } - - public boolean isAnsweredByInstructor() { - boolean allAnswered = true; - logger.debug("sa = {}", runningSolutionAssessment.getSolutionAssessmentId()); - for (AssessmentDiscussion ad : runningSolutionAssessment.getAssessmentDiscussions().stream() - .filter(p -> p.getReplyTo() == null).toList()) { - allAnswered = allAnswered && answered(ad); - } - return allAnswered; - } - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/QueryTest.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/QueryTest.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/QueryTest.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -28,4 +28,8 @@ import java.io.InputStream; import java.security.MessageDigest; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLWarning; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -33,15 +37,15 @@ import java.util.Enumeration; import java.util.List; -import java.util.concurrent.TimeUnit; +import java.util.Properties; import java.util.stream.Collectors; -import jakarta.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.fileupload.FileUploadException; -import org.apache.tapestry5.EventContext; import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.InjectPage; import org.apache.tapestry5.annotations.OnEvent; import org.apache.tapestry5.annotations.Persist; @@ -59,10 +63,8 @@ import org.apache.tapestry5.services.PersistentLocale; import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; -import org.apache.tapestry5.services.ajax.JavaScriptCallback; import org.apache.tapestry5.services.javascript.JavaScriptSupport; import org.apache.tapestry5.upload.services.UploadedFile; import org.slf4j.Logger; -import dblearnstar.model.entities.Person; import dblearnstar.model.entities.Student; import dblearnstar.model.entities.StudentStartedTest; @@ -76,6 +78,4 @@ import dblearnstar.webapp.annotations.AdministratorPage; import dblearnstar.webapp.annotations.StudentPage; -import dblearnstar.webapp.components.ModalBox; -import dblearnstar.webapp.services.ActivityManager; import dblearnstar.webapp.services.EvaluationService; import dblearnstar.webapp.services.GenericService; @@ -95,7 +95,4 @@ private UserInfo userInfo; - @Property - private Boolean accessAllowed; - @Inject private Logger logger; @@ -122,10 +119,10 @@ private TestManager testManager; @Inject - private ActivityManager activityManager; - @Inject private EvaluationService evaluationService; @Inject private PersonManager pm; + @InjectPage + private ExamsAndTasksOverviewPage examsAndTasksOverviewPage; @InjectComponent private Zone historyZone; @@ -136,29 +133,20 @@ @InjectComponent private Zone evalZone; - @InjectComponent - private Zone currentTimeZone; - - private Student activeStudent; - - @Property -// @Persist + + @Property + @Persist private TaskInTestInstance taskInTestInstance; - @Property @Persist private Boolean filterNotForEvalution; - @Property @Persist private UploadedFile file; - @Property @Persist private String fileComment; - @Property @Persist(PersistenceConstants.FLASH) private String message; - @Property @Persist(PersistenceConstants.FLASH) @@ -166,8 +154,4 @@ @Property - @Persist - private String errorPosition; - - @Property private String codeType; @@ -203,5 +187,5 @@ private String oneHeader; - private Long studentId; + private long studentId; private boolean toUpload; private boolean toSubmitText; @@ -213,8 +197,5 @@ toUpload = false; toSubmitText = false; - recordActivity(activeStudent.getPerson(), ModelConstants.ActivityStillViewing, payload, issuer); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(currentTimeZone); - } + recordActivity(ModelConstants.ActivityStillViewing, payload, issuer); } @@ -225,5 +206,5 @@ toUpload = false; toSubmitText = false; - recordActivity(activeStudent.getPerson(), ModelConstants.ActivityExecSelection, query, issuer); + recordActivity(ModelConstants.ActivityExecSelection, query, issuer); runQueryAndEval(true, query); // field is NotForEvaluation if (request.isXHR()) { @@ -238,5 +219,5 @@ toUpload = false; toSubmitText = false; - recordActivity(activeStudent.getPerson(), ModelConstants.ActivityExecAll, query, issuer); + recordActivity(ModelConstants.ActivityExecAll, query, issuer); runQueryAndEval(true, query); // field is NotForEvaluation if (request.isXHR()) { @@ -249,5 +230,5 @@ public void execEvalAll(@RequestParameter(value = "query") String query, @RequestParameter(value = "issuer") String issuer) { - recordActivity(activeStudent.getPerson(), ModelConstants.ActivityEval, query, issuer); + recordActivity(ModelConstants.ActivityEval, query, issuer); } @@ -258,5 +239,5 @@ toUpload = false; toSubmitText = false; - recordActivity(activeStudent.getPerson(), ModelConstants.ActivityPlan, query, issuer); + recordActivity(ModelConstants.ActivityPlan, query, issuer); runQueryAndEval(true, "explain " + query); // field is // NotForEvaluation @@ -266,72 +247,42 @@ } - @InjectComponent - private ModalBox errorModal; - - public void onActionFromHideModal() { - errorModal.hide(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(errorZone).addCallback(positionToError()); - } - } - - private JavaScriptCallback positionToError() { - return new JavaScriptCallback() { - public void run(JavaScriptSupport javascriptSupport) { - javaScriptSupport.require("codemirror-error").invoke("positionToError").with(errorPosition); - } - }; - } - - public void onActionFromHideEvalModal() { - errorModal.hide(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(evalZone).addCallback(positionToError()); - } - } - - public Object onActivate(EventContext eventContext) { - if (eventContext.getCount() > 1) { - return ExamsAndTasksOverviewPage.class; - } else if (eventContext.getCount() == 1) { - TaskInTestInstance tti = eventContext.get(TaskInTestInstance.class, 0); - if (tti == null) { - logger.error("tti is null, username:{}", userInfo.getUserName()); - return ExamsAndTasksOverviewPage.class; - } else { - taskInTestInstance = genericService.getByPK(TaskInTestInstance.class, tti.getTaskInTestInstanceId()); - activeStudent = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0); - studentId = activeStudent.getStudentId(); - - if (userInfo.isAdministrator() || testManager.accessToTaskInTestInstanceAllowed(activeStudent, tti)) { - studentId = activeStudent.getStudentId(); - codeType = taskInTestInstance.getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype(); - - resultsErrors = null; - resultsSimple = null; - - resultsEvaluation = null; - resultsHeadersSimple = null; - taskInTestInstance = genericService.getByPK(TaskInTestInstance.class, - taskInTestInstance.getTaskInTestInstanceId()); - if (filterNotForEvalution == null) { - filterNotForEvalution = false; - } - recordActivity(activeStudent.getPerson(), ModelConstants.ActivityViewTask, "", "onActivity"); - toUpload = false; - logger.debug("access allowed"); - accessAllowed = true; - return null; - } else { - accessAllowed = false; - logger.error("Task not allowed: ttiId:{} username:{}", tti.getTaskInTestInstanceId(), - userInfo.getUserName()); - return ExamsAndTasksOverviewPage.class; - } - } - } else { - logger.error("Task not selected username:{}", userInfo.getUserName()); - return ExamsAndTasksOverviewPage.class; // no tti selected - } + public Date getCurrentTime() { + return new Date(); + } + + public void onActivate() { + logger.debug("onActivate: empty"); + studentId = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0).getStudentId(); + } + + public void onActivate(TaskInTestInstance tti) { + logger.debug("onActivate: {}", tti.getTaskInTestInstanceId()); + Student student = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0); + if (userInfo.isAdministrator() || testManager + .getTestInstancesForStudentByTestType(student.getStudentId(), + tti.getTestInstance().getTestTemplate().getTestType().getTestTypeId()) + .stream().anyMatch(ti -> ti.getTestInstanceId() == tti.getTestInstance().getTestInstanceId())) { + studentId = student.getStudentId(); + taskInTestInstance = genericService.getByPK(TaskInTestInstance.class, tti.getTaskInTestInstanceId()); + codeType = taskInTestInstance.getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype(); + + resultsErrors = null; + resultsSimple = null; + + resultsEvaluation = null; + resultsHeadersSimple = null; + taskInTestInstance = genericService.getByPK(TaskInTestInstance.class, + taskInTestInstance.getTaskInTestInstanceId()); + if (filterNotForEvalution == null) { + filterNotForEvalution = false; + } + toUpload = false; + } else { + logger.error("Task not allowed: ttiId:{} username:{}", tti.getTaskInTestInstanceId(), + student.getPerson().getUserName()); + throw new RuntimeException(student.getPerson().getUserName() + + " tried to access a task that is not allowed. Access was logged."); + } + recordActivity(ModelConstants.ActivityViewTask, "", "onActivity"); } @@ -344,5 +295,4 @@ if (isSQL()) { javaScriptSupport.require("codemirror-run"); - javaScriptSupport.require("codemirror-error"); } } @@ -350,10 +300,11 @@ @CommitAfter - public void recordActivity(Person p, String type, String payload, String issuer) { + public void recordActivity(String type, String payload, String issuer) { logger.debug("recordActivity RECEIVED: {},{},{}", type, issuer, payload); - activityManager.recordActivityInTask(p, taskInTestInstance, type, payload); - } - - public String getQueryErrorPosition() { + Student student = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0); + testManager.recordActivityInTask(student.getPerson(), taskInTestInstance, type, payload); + } + + public String getErrorPosition() { if (resultsErrors != null && resultsErrors.size() > 0) { try { @@ -362,6 +313,5 @@ if (lines != null && lines.size() > 0) { String s = lines.get(0); - String posit = s.substring(s.indexOf("Position:") + 10).split(" ")[0]; - return posit; + return s.substring(s.indexOf("Position:") + 10).split(" ")[0]; } else { return "0"; @@ -375,4 +325,93 @@ } + public void getResultsFrom(String queryToRun, TestInstanceParameters tip, String schema, String type) { + if (queryToRun != null) { + String qtlc = queryToRun.toLowerCase(); + if (qtlc.contains("delete") || qtlc.contains("update") || qtlc.contains("insert") || qtlc.contains("create") + || qtlc.contains("drop") || qtlc.contains("alter") || qtlc.contains("information_schema")) { + resultsErrors.add(messages.get("sql-db-modifications")); + logger.error("Database modification or catalog or directory query issued by {}", + userInfo.getUserName()); + } else { + resultsSimple = new ArrayList(); + resultsHeadersSimple = new ArrayList(); + + Connection connection = null; + int statusCounter = 0; + try { + Properties props = new Properties(); + props.setProperty("user", tip.getDbUser()); + props.setProperty("password", tip.getDbPass()); + String url = "jdbc:postgresql://" + tip.getHostname() + ":" + tip.getPort() + "/" + tip.getDbName(); + + connection = DriverManager.getConnection(url, props); + statusCounter = 1; + + connection.setClientInfo("ApplicationName", "dbLearn*Evaluator"); + connection.setReadOnly(true); + connection.setAutoCommit(false); + connection.setSavepoint(); + connection.setSchema(schema); + statusCounter = 2; + + ResultSet rs = connection.prepareStatement(queryToRun).executeQuery(); + boolean isNextRow = rs.next(); + int numColumns = rs.getMetaData().getColumnCount(); + for (int i = 1; i <= numColumns; i++) { + resultsHeadersSimple.add(rs.getMetaData().getColumnName(i)); + } + statusCounter = 3; + + int count = 1; + while (isNextRow && count < 500) { + Object[] o = new Object[numColumns]; + for (int i = 1; i <= numColumns; i++) { + o[i - 1] = rs.getObject(i); + } + resultsSimple.add(o); + isNextRow = rs.next(); + count++; + } + statusCounter = 4; + rs.close(); + SQLWarning w = connection.getWarnings(); + if (w != null) { + logger.debug("warning"); + resultsErrors.add(w.getMessage()); + } + if (count >= 500) { + logger.debug("count"); + resultsErrors.add(messages.get("sql-moreThan500Rows")); + } + connection.rollback(); + } catch (Exception e) { + if (statusCounter == 0) { + logger.error("Error when connecting to evaluation database for testinstance: {}", + tip.getTestInstance().getTestInstanceId()); + logger.debug("Exception: {}", e); + resultsErrors.add(messages.get("evalDBNA-label")); + } else { + logger.error( + "Connected to evaluation database for test instance {}, but failed in running query: {} ", + tip.getTestInstance().getTestInstanceId(), queryToRun); + logger.debug("Exception: {}", e); + resultsErrors.add(e.getMessage()); + } + } finally { + if (connection != null) { + try { + connection.close(); + } catch (Exception e) { + logger.error("Connection can't be closed {} {}", userInfo.getUserName(), e.getMessage()); + } + } + } + } + } else { + resultsSimple = new ArrayList(); + resultsHeadersSimple = new ArrayList(); + } + } + private void startTestIfNotStarted() { studentStartedTest = testManager.studentStartTest(studentId, @@ -380,8 +419,8 @@ } - private StudentSubmitSolution recordQueryAsStudentSubmitSolution(Boolean notForEvaluation, String query) { + private StudentSubmitSolution recordQueryInLog(Boolean notForEvaluation, String query) { if (query != null) { StudentSubmitSolution solution = new StudentSubmitSolution(); - solution.setSubmittedOn(getCurrentTime()); + solution.setSubmittedOn(new Date()); solution.setStudentStartedTest(studentStartedTest); solution.setSubmission(query); @@ -434,12 +473,5 @@ // For printing purposes - Triplet, List, List> rezultatiteZaListanje = evaluationService - .getResultsForPrintingPurposes(userInfo.getUserName(), queryToRun, testInstanceParameters, - testInstanceParameters.getSchemaSimple(), "simple"); - resultsSimple = rezultatiteZaListanje.getFirstItem(); - resultsHeadersSimple = rezultatiteZaListanje.getSecondItem(); - resultsErrors = rezultatiteZaListanje.getThirdItem(); - - errorPosition = getQueryErrorPosition(); + getResultsFrom(queryToRun, testInstanceParameters, testInstanceParameters.getSchemaSimple(), "simple"); // For evaluation @@ -461,5 +493,5 @@ } startTestIfNotStarted(); - recordQueryAsStudentSubmitSolution(notForEvaluation, queryToRun); + recordQueryInLog(notForEvaluation, queryToRun); } @@ -467,5 +499,5 @@ toUpload = false; toSubmitText = false; - recordActivity(activeStudent.getPerson(), ModelConstants.ActivityEval, queryString, "onSelectedFromEvaluate"); + recordActivity(ModelConstants.ActivityEval, queryString, "onSelectedFromEvaluate"); runQueryAndEval(false, queryString); // field is NotForEvaluation } @@ -475,5 +507,5 @@ toUpload = true; toSubmitText = false; - recordActivity(activeStudent.getPerson(), ModelConstants.ActivityTryUpload, "", "onSelectedFromUpload"); + recordActivity(ModelConstants.ActivityTryUpload, "", "onSelectedFromUpload"); // doTheUpload(); } @@ -483,6 +515,5 @@ toUpload = false; toSubmitText = true; - recordActivity(activeStudent.getPerson(), ModelConstants.ActivitySubmitText, "", - "onSelectedFromSubmitTextSolution"); + recordActivity(ModelConstants.ActivitySubmitText, "", "onSelectedFromSubmitTextSolution"); } @@ -520,5 +551,5 @@ } - public StreamResponse onActionFromDownloadFile(StudentSubmitSolution sss) { + private StreamResponse onActionFromDownloadFile(StudentSubmitSolution sss) { logger.info("Start Download of {}", sss.getStudentSubmitSolutionId()); if (sss.getStudentStartedTest().getStudent().getPerson().getPersonId() == userInfo.getPersonId()) { @@ -573,5 +604,5 @@ Object onActionFromBackToExamsOverview() { - return ExamsAndTasksOverviewPage.class; + return examsAndTasksOverviewPage; } @@ -648,5 +679,5 @@ @CommitAfter public void onSuccess() { - logger.debug("onSuccess"); + logger.info("onSuccess"); if (toUpload) { logger.info("Processing upload"); @@ -656,10 +687,9 @@ evalResultsExam = false; queryString = "FILE:" + file.getFileName(); - StudentSubmitSolution solution = recordQueryAsStudentSubmitSolution(false, queryString); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat( - AppConfig.getString("date.upload.submission.format")); + StudentSubmitSolution solution = recordQueryInLog(false, queryString); + SimpleDateFormat sdf = new SimpleDateFormat(AppConfig.getString("date.upload.submission.format")); String emde5 = ""; try { - MessageDigest md = MessageDigest.getInstance("SHA-1"); + MessageDigest md = MessageDigest.getInstance("MD5"); md.update(file.getStream().readAllBytes()); byte[] hashBytes = md.digest(); @@ -677,5 +707,5 @@ + "/STUDENT_" + solution.getStudentStartedTest().getStudent().getPerson().getUserName() + "_SUBMISSION_" + solution.getStudentSubmitSolutionId() + "_" - + simpleDateFormat.format(solution.getSubmittedOn()) + "_MD5_" + emde5); + + sdf.format(solution.getSubmittedOn()) + "_MD5_" + emde5); file.write(copied); @@ -685,6 +715,5 @@ genericService.saveOrUpdate(solution); } catch (Exception e) { - logger.error("Error uploading: {} {} {}", userInfo.getUserName(), file.getFileName(), e); - e.printStackTrace(); + logger.error("Error uploading: {} {} {}", userInfo.getUserName(), file.getFileName(), e.getMessage()); } toUpload = false; @@ -695,5 +724,5 @@ evalResultsComplex = false; evalResultsExam = false; - recordQueryAsStudentSubmitSolution(false, queryString); + recordQueryInLog(false, queryString); } if (request.isXHR()) { @@ -749,5 +778,5 @@ public boolean isTEXT() { - return TaskTypeChecker.isTEXT(codeType) || TaskTypeChecker.isDDL(codeType); + return TaskTypeChecker.isTEXT(codeType); } @@ -770,79 +799,3 @@ } - public Date getCurrentTime() { - return new Date(); - } - - public String getDisplayCurrentTime() { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(AppConfig.getString("datetime.gui.format")); - return simpleDateFormat.format(getCurrentTime()); - } - - public String getDisplayEndTime() { - Date dateFrom = taskInTestInstance.getTestInstance().getScheduledFor(); - Date dateUntil = taskInTestInstance.getTestInstance().getScheduledUntil(); - if (dateFrom != null && dateUntil != null) { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(AppConfig.getString("datetime.gui.format")); - if (dateFrom.before(getCurrentTime()) && dateUntil.after(getCurrentTime())) { - if ((new Date(System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(5))).after(dateUntil)) { - return simpleDateFormat.format(dateUntil); - } else { - return simpleDateFormat.format(dateUntil); - } - } else { - if ((new Date(System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(5))).before(dateUntil)) { - return simpleDateFormat.format(dateUntil); - } else { - return null; - } - } - } else { - return null; - } - } - - public String getClassTestIsNow() { - Date dateFrom = taskInTestInstance.getTestInstance().getScheduledFor(); - Date dateUntil = taskInTestInstance.getTestInstance().getScheduledUntil(); - if (dateFrom != null && dateUntil != null) { - if (dateFrom.before(getCurrentTime()) && dateUntil.after(getCurrentTime())) { - if ((new Date(System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(5))).after(dateUntil)) { - return "alert alert-danger"; - } else { - return "alert alert-success"; - } - } else { - if ((new Date(System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(5))).before(dateUntil)) { - return "alert alert-dark"; - } else { - return ""; - } - } - } else { - return ""; - } - } - - public String getTestIsNow() { - Date dateFrom = taskInTestInstance.getTestInstance().getScheduledFor(); - Date dateUntil = taskInTestInstance.getTestInstance().getScheduledUntil(); - if (dateFrom != null && dateUntil != null) { - if (dateFrom.before(getCurrentTime()) && dateUntil.after(getCurrentTime())) { - if ((new Date(System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(5))).after(dateUntil)) { - return messages.get("timeIsRunningOut-label"); - } else { - return messages.get("timeTestIsActive-label"); - } - } else { - if ((new Date(System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(5))).before(dateUntil)) { - return messages.get("timehasRunOut-label"); - } else { - return null; - } - } - } else { - return null; - } - } - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/SolutionComparatorPage.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/SolutionComparatorPage.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/SolutionComparatorPage.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -28,4 +28,5 @@ import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -33,9 +34,12 @@ import java.util.stream.Collectors; +import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.StreamResponse; 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.ioc.annotations.Inject; import org.apache.tapestry5.services.SelectModelFactory; @@ -46,5 +50,4 @@ import dblearnstar.model.entities.StudentSubmitSolution; import dblearnstar.model.entities.TaskInTestInstance; -import dblearnstar.model.entities.TestCollection; import dblearnstar.model.entities.TestInstance; import dblearnstar.model.model.ModelConstants; @@ -78,14 +81,11 @@ private GenericService genericService; + @InjectComponent + private Zone zTestInstance; + @Persist @Property private TestInstance selectedTestInstance; - @Persist - @Property - private TestCollection testCollection; - - @Property - private SolutionAssessment oneOfTheEvaluatedSolutions; @Property private StudentSubmitSolution otherStudentSubmitSolution; @@ -95,9 +95,38 @@ private TaskInTestInstance taskInTestInstance; @Property - private Float totalPoints; - @Property - Map> mapTTItoSA; + private float totalPoints; + @Property + Map mapTTItoSA; private long studentId; + + public void prepareMapOfEvaluationsAndTotal() { + totalPoints = 0; + mapTTItoSA = new HashMap(); + for (TaskInTestInstance tti : taskInTestInstances) { + List lista = testManager.getEvaluatedSolutionsForTaskInTestInstance(studentId, + tti.getTaskInTestInstanceId()); + if (lista != null && lista.size() > 0) { + SolutionAssessment sa; + List podlista = lista.stream().filter(p -> p.getEvaluations().size() > 0) + .collect(Collectors.toList()); + if (podlista != null && podlista.size() > 0) { + sa = podlista.get(0).getEvaluations().get(0); + } else { + if (lista.get(0).getEvaluations() != null && lista.get(0).getEvaluations().size() > 0) { + sa = lista.get(0).getEvaluations().get(0); + } else { + sa = null; + } + } + mapTTItoSA.put(tti, sa); + if (sa != null && sa.getGrade() != null) { + totalPoints += sa.getGrade(); + } + } else { + mapTTItoSA.put(tti, null); + } + } + } public void onActivate() { @@ -105,43 +134,36 @@ if (selectedTestInstance != null) { selectedTestInstance = genericService.getByPK(TestInstance.class, selectedTestInstance.getTestInstanceId()); - taskInTestInstances = testManager.getTaskInTestInstancesByTestInstance(selectedTestInstance.getTestInstanceId()); + taskInTestInstances = testManager.getTasksInTestInstance(selectedTestInstance.getTestInstanceId()); prepareMapOfEvaluationsAndTotal(); } } - public void onActivate(TestInstance ti) { - selectedTestInstance = ti; - } - - public void prepareMapOfEvaluationsAndTotal() { - totalPoints = testManager.getTotalPoints(studentId, selectedTestInstance.getTestInstanceId()); - mapTTItoSA = new HashMap>(); - for (TaskInTestInstance tti : taskInTestInstances) { - List lista = testManager.getAllEvaluationsOfSolutionsForTaskInTestInstance(studentId, - tti.getTaskInTestInstanceId()); - if (lista != null && lista.size() > 0) { - mapTTItoSA.put(tti, lista); - } else { - mapTTItoSA.put(tti, null); - } - } - } - - public Boolean getHasManySolutions() { - List list = mapTTItoSA.get(taskInTestInstance); - if (list != null && list.size() > 1) { - return true; - } else { - return false; - } - } - - public List getListEvaluatedSolutionsForTaskInTestInstance() { - List sa = mapTTItoSA.get(taskInTestInstance); - return sa; + public StudentSubmitSolution getLastSolutionForTaskInTestInstance() { + // if there are correct solutions, return the last correct, and if there + // are not return the last evaluated solution + List sss = testManager.getCorrectSolutionsByStudentAndTaskInTestInstance(studentId, + taskInTestInstance.getTaskInTestInstanceId()); + if (sss == null || sss.isEmpty()) { + sss = testManager.getIncorrectSolutionsByStudentAndTaskInTestInstance(studentId, + taskInTestInstance.getTaskInTestInstanceId()); + } + if (sss.isEmpty()) { + return null; + } else { + return sss.get(0); + } + } + + public StudentSubmitSolution getLastEvaluatedSolutionForTaskInTestInstance() { + SolutionAssessment sa = mapTTItoSA.get(taskInTestInstance); + if (sa != null) { + return sa.getStudentSubmitSolution(); + } else { + return null; + } } public boolean isLastSolutionCorrect() { - StudentSubmitSolution sss = oneOfTheEvaluatedSolutions.getStudentSubmitSolution(); + StudentSubmitSolution sss = getLastEvaluatedSolutionForTaskInTestInstance(); if (sss.getTaskInTestInstance().getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype() .equals(ModelConstants.TaskCodeSQL)) { @@ -153,5 +175,5 @@ public String getClassLastSolutionForTaskInTestInstance() { - StudentSubmitSolution sss = oneOfTheEvaluatedSolutions.getStudentSubmitSolution(); + StudentSubmitSolution sss = getLastEvaluatedSolutionForTaskInTestInstance(); if (sss != null) { if (isLastSolutionCorrect()) { @@ -166,5 +188,5 @@ public List getOtherSolutions() { - StudentSubmitSolution sss = oneOfTheEvaluatedSolutions.getStudentSubmitSolution(); + StudentSubmitSolution sss = getLastEvaluatedSolutionForTaskInTestInstance(); if (sss.getTaskInTestInstance().getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype() .equals(ModelConstants.TaskCodeSQL)) { @@ -178,8 +200,34 @@ return sss.getTaskInTestInstance().getStudentSubmitSolutions().stream() .filter(p -> (p.getEvaluations() != null && p.getEvaluations().size() > 0 - && p.getEvaluations().get(0).getPassed() != null && p.getEvaluations().get(0).getPassed() + && p.getEvaluations().get(0).getPassed() && p.getStudentSubmitSolutionId() != sss.getStudentSubmitSolutionId())) .collect(Collectors.toList()); } + } + + public List getTestInstances() { + if (userInfo.isAdministrator()) { + return testManager.getAllTestInstances(); + } else if (userInfo.isStudent()) { + long studentId = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0).getStudentId(); + return testManager.getTestInstancesForStudent(studentId); + } else { + return null; + } + } + + public SelectModel getTestInstanceSelectModel() { + return selectModelFactory.create(getTestInstances(), "title"); + } + + public void onValueChanged(TestInstance newTestInstance) { + selectedTestInstance = newTestInstance; + if (selectedTestInstance != null) { + taskInTestInstances = testManager.getTasksInTestInstance(selectedTestInstance.getTestInstanceId()); + } else { + taskInTestInstances = new ArrayList<>(); + } + prepareMapOfEvaluationsAndTotal(); + ajaxResponseRenderer.addRender(zTestInstance); } @@ -246,5 +294,5 @@ public String getFileFromSubmission() { - return processFileNameFromSubmission(oneOfTheEvaluatedSolutions.getStudentSubmitSolution()); + return processFileNameFromSubmission(getLastEvaluatedSolutionForTaskInTestInstance()); } @@ -274,7 +322,7 @@ public SolutionAssessment getSubmissionsFirstEvaluation() { - StudentSubmitSolution sss = oneOfTheEvaluatedSolutions.getStudentSubmitSolution(); - if (sss != null && sss.getEvaluations() != null && sss.getEvaluations().size() > 0) { - return sss.getEvaluations().get(0); + StudentSubmitSolution ssa = getLastEvaluatedSolutionForTaskInTestInstance(); + if (ssa != null && ssa.getEvaluations() != null && ssa.getEvaluations().size() > 0) { + return ssa.getEvaluations().get(0); } else { return null; @@ -282,14 +330,4 @@ } - - public String getSolutionCorrectnessClass() { - if (oneOfTheEvaluatedSolutions.getPassed()) { - return " solutionCorrect "; - } - if (!oneOfTheEvaluatedSolutions.getPassed()) { - return " solutionInCorrect "; - } - return " "; - } } Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/pages/TasksOverviewPage.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/TasksOverviewPage.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,245 +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 dblearnstar.webapp.pages; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.annotations.Import; -import org.apache.tapestry5.annotations.InjectPage; -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.PersistentLocale; -import org.apache.tapestry5.services.SelectModelFactory; -import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; -import org.apache.tapestry5.services.javascript.JavaScriptSupport; -import org.slf4j.Logger; - -import dblearnstar.model.entities.Model; -import dblearnstar.model.entities.Student; -import dblearnstar.model.entities.TaskInTestInstance; -import dblearnstar.model.entities.TaskType; -import dblearnstar.model.entities.TestInstance; -import dblearnstar.model.model.UserInfo; -import dblearnstar.webapp.annotations.AdministratorPage; -import dblearnstar.webapp.annotations.StudentPage; -import dblearnstar.webapp.pages.admin.SubmissionEvaluations; -import dblearnstar.webapp.services.DigestService; -import dblearnstar.webapp.services.GenericService; -import dblearnstar.webapp.services.PersonManager; -import dblearnstar.webapp.services.TestManager; -import dblearnstar.webapp.services.TranslationService; - -@AdministratorPage -@StudentPage -@Import(stylesheet = "ExamsAndTasksOverviewPage.css", module = "bootstrap/collapse") - -public class TasksOverviewPage { - @Inject - private Logger logger; - @Inject - private JavaScriptSupport javaScriptSupport; - @Inject - private PersistentLocale persistentLocale; - @Inject - private SelectModelFactory selectModelFactory; - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - @Inject - private DigestService digestService; - - @SessionState - @Property - private UserInfo userInfo; - - @Persist - @Property - private Model chosenModel; - - @Property - private TaskInTestInstance listedTaskInTestInstance; - - @Persist - @Property - private TaskType chosenTaskType; - - @Inject - private PersonManager pm; - @Inject - private GenericService genericService; - @Inject - private TestManager testManager; - @Inject - private TranslationService translationService; - - @InjectPage - private SubmissionEvaluations submissionEvaluations; - - @Property - private Model listedModel; - @Property - private TaskType listedTaskType; - - private Student student; - - public void onActivate() { - // @TODO better implementation is needed for many students per user - student = pm.getStudentsByPersonId(userInfo.getPersonId()).get(0); - prevTestInstance = null; - } - - public List getAllModels() { - List list = testManager.getAllModels(); - return list.stream().sorted((o1, o2) -> { - return o1.getTitle().compareTo(o2.getTitle()); - }).toList(); - } - - public List getAllTaskTypes() { - List list = new ArrayList(); - if (chosenModel != null) { - list = testManager.getAllTaskTypesDefinedOverModel(chosenModel); - } else { - list = testManager.getAllTaskTypes(); - } - return list.stream().sorted((o1, o2) -> { - return o1.getTitle().compareTo(o2.getTitle()); - }).toList(); - } - - public String getClassSelectedModel() { - if (chosenModel != null) { - if (listedModel.getModelId() == chosenModel.getModelId()) { - return " btn-primary text-light "; - } else { - return ""; - } - } else { - return ""; - } - } - - public String getClassSelectedTaskType() { - if (chosenTaskType != null) { - if (listedTaskType.getTaskTypeId() == chosenTaskType.getTaskTypeId()) { - return " btn-primary text-light "; - } else { - return ""; - } - } else { - return ""; - } - } - - public void onChooseModel(Model m) { - chosenModel = m; - } - - public void onUnchooseModel() { - chosenModel = null; - } - - public void onChooseTaskType(TaskType tt) { - chosenTaskType = tt; - } - - public void onUnchooseTaskType() { - chosenTaskType = null; - } - - private TestInstance prevTestInstance; - - public Boolean getPrevTestInstance() { - if (prevTestInstance == null) { - prevTestInstance = listedTaskInTestInstance.getTestInstance(); - return true; - } else { - if (prevTestInstance.getTestInstanceId() == listedTaskInTestInstance.getTestInstance() - .getTestInstanceId()) { - return false; - } else { - prevTestInstance = listedTaskInTestInstance.getTestInstance(); - return true; - } - } - } - - public List getAllTasks() { - if (chosenModel != null) { - List list = testManager.getTaskInTestInstancesByModel(chosenModel.getModelId()); - if (chosenTaskType != null) { - list = list.stream() - .filter(p -> p.getTask().getTaskIsOfTypes().stream() - .anyMatch(q -> q.getTaskType().getTaskTypeId() == chosenTaskType.getTaskTypeId())) - .collect(Collectors.toList()); - if (student != null) { - list = list.stream().filter(p -> testManager.accessToTaskInTestInstanceAllowed(student, p)) - .toList(); - } - } - return list; - } else { - if (chosenTaskType != null) { - List list = new ArrayList(); - list = testManager.getTaskInTestInstancesByTaskType(chosenTaskType); - if (student != null) { - list = list.stream().filter(p -> testManager.accessToTaskInTestInstanceAllowed(student, p)) - .toList(); - } - return list; - } else { - return null; - } - } - } - - public Long getNumPersonsSuccessful() { - return testManager - .getNumPersonsSuccessfulForTaskInTestInstance(listedTaskInTestInstance.getTaskInTestInstanceId()); - } - - public long getNumPersonsTriedToSolve() { - return testManager - .getNumPersonsTriedToSolveTaskInTestInstance(listedTaskInTestInstance.getTaskInTestInstanceId()); - } - - public String getClassForSolved() { - Boolean solved = isTaskInTestInstanceSolved(); - if (solved != null && solved) { - return "text-white bg-success"; - } else { - return ""; - } - } - - public Boolean isTaskInTestInstanceSolved() { - if (student != null) { - return testManager.isTaskInTestInstanceSolvedByStudent(listedTaskInTestInstance.getTaskInTestInstanceId(), - student.getStudentId()); - } else { - return false; - } - } - -} Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/GroupManagement.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/GroupManagement.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/GroupManagement.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -21,5 +21,4 @@ package dblearnstar.webapp.pages.admin; -import java.util.ArrayList; import java.util.List; @@ -29,5 +28,4 @@ import org.apache.tapestry5.beanmodel.BeanModel; import org.apache.tapestry5.beanmodel.services.BeanModelSource; -import org.apache.tapestry5.beanmodel.services.PropertyConduitSource; import org.apache.tapestry5.commons.Messages; import org.apache.tapestry5.hibernate.annotations.CommitAfter; @@ -40,5 +38,4 @@ import dblearnstar.model.entities.GroupMember; import dblearnstar.model.entities.Person; -import dblearnstar.model.entities.Student; import dblearnstar.webapp.annotations.AdministratorPage; import dblearnstar.webapp.model.StudentSelectModel; @@ -65,17 +62,10 @@ private SelectModelFactory selectModelFactory; - @Inject - private BeanModelSource beanModelSource; - @Inject - private Messages messages; - @Inject - private PropertyConduitSource pcs; - - @Persist - @Property - private String errors; + @Property + private Group group; @Property @Persist private Group selectedGroup; + @Property @Persist @@ -87,7 +77,4 @@ @Persist private GroupFocusOnTest editGroupFocusOnTest; - - @Property - private Group group; @Property private GroupMember groupMember; @@ -96,6 +83,4 @@ @Property private Person personToAdd; - @Property - private String studentsToImport; public void onActivate() { @@ -106,7 +91,4 @@ } } - if (groupCopyFrom != null) { - groupCopyFrom = genericService.getByPK(Group.class, groupCopyFrom.getGroupId()); - } } @@ -131,37 +113,10 @@ public void onSuccessFromNewGroupForm() { logger.info("Submitting new group"); - errors = ""; - genericService.saveOrUpdate(editGroup); if (editGroupMember != null) { genericService.saveOrUpdate(editGroupMember); } - if (studentsToImport != null) { - for (String line : studentsToImport.split("\\r?\\n")) { - logger.info(">>> Importing {} <<<", line); - for (String lineField : line.split("[,\t]")) { - try { - Student s = personManager - .getStudentsByPersonId(personManager.getPersonByUsername(lineField).getPersonId()) - .get(0); - if (editGroup.getGroupMembers().stream() - .noneMatch(p -> p.getStudent().getStudentId() == s.getStudentId())) { - GroupMember gm = new GroupMember(); - gm.setGroup(editGroup); - gm.setStudent(s); - genericService.save(gm); - } - } catch (Exception e) { - errors += ">>> Student " + line + " can not be imported due to: " + e.getLocalizedMessage(); - } - } - } - if (!(errors.length() > 0)) { - errors = ""; - studentsToImport = null; - editGroupMember = null; - } - } else { - editGroup = null; - } + genericService.saveOrUpdate(editGroup); + editGroupMember = null; + editGroup = null; } @@ -199,4 +154,10 @@ } + @Inject + private BeanModelSource beanModelSource; + + @Inject + private Messages messages; + @Property @Persist @@ -214,14 +175,4 @@ modelGroupFocusOnTest.add("testInstance"); modelGroupFocusOnTest.exclude("groupFocusOnTestId"); - } - - public BeanModel getGroupMemberGridModel() { - BeanModel model = beanModelSource.createDisplayModel(GroupMember.class, messages); - model.exclude("groupMemberId"); - model.add("userName", pcs.create(GroupMember.class, "student.person.userName")); - model.add("firstName", pcs.create(GroupMember.class, "student.person.firstName")); - model.add("lastName", pcs.create(GroupMember.class, "student.person.lastName")); - model.addEmpty("actions"); - return model; } @@ -247,41 +198,3 @@ } } - - void onCancelEditGroup() { - editGroup = null; - } - - void onCancelNewMemberForm() { - editGroupMember = null; - } - - void onCancelNewFocusOnTestForm() { - editGroupFocusOnTest = null; - } - - @Persist - @Property - private Group groupCopyFrom; - - void onCopyMembers(Group g) { - groupCopyFrom = g; - } - - void onForgetCopy() { - groupCopyFrom = null; - } - - @CommitAfter - void onPasteMembers(Group g) { - g.getGroupMembers().forEach(p -> genericService.delete(p)); - if (groupCopyFrom.getGroupMembers() != null && groupCopyFrom.getGroupMembers().size() > 0) { - for (GroupMember gm : groupCopyFrom.getGroupMembers()) { - GroupMember newGm = new GroupMember(); - newGm.setGroup(g); - newGm.setStudent(gm.getStudent()); - genericService.save(newGm); - } - } - groupCopyFrom = null; - } } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManageModels.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManageModels.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManageModels.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -11,5 +11,4 @@ import dblearnstar.webapp.annotations.AdministratorPage; import dblearnstar.webapp.services.GenericService; -import dblearnstar.webapp.services.TestManager; @AdministratorPage @@ -18,7 +17,4 @@ @Inject private GenericService genericService; - - @Inject - private TestManager testManager; @Property @@ -30,5 +26,5 @@ public List getAllModels() { - return testManager.getAllModels(); + return (List) genericService.getAll(Model.class); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManagePersons.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManagePersons.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManagePersons.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -22,5 +22,6 @@ import java.util.List; -import java.util.stream.Collectors; + +import javax.inject.Inject; import org.apache.tapestry5.SelectModel; @@ -31,5 +32,4 @@ 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; @@ -39,5 +39,4 @@ import dblearnstar.model.entities.Role; import dblearnstar.model.entities.Student; -import dblearnstar.model.model.ModelConstants; import dblearnstar.model.model.UserInfo; import dblearnstar.webapp.annotations.AdministratorPage; @@ -53,7 +52,4 @@ @Inject - private SelectModelFactory selectModelFactory; - - @Inject private PersonManager personManager; @@ -64,15 +60,6 @@ private Logger logger; - @InjectComponent - private Form frmImport; - - private Boolean cancelForm = false; - @Property private Person person; - - @Persist - @Property - private Person personToEdit; @Property @@ -80,29 +67,18 @@ private String personListToImport; - @Property - Role selectedRole; + public List getAllPersons() { + return personManager.getAllPersons(); + } - @Property - @Persist - private String searchString; + public void onActionFromImportPersons() { + personListToImport = "firstName,lastName,email,userName"; + } + + @InjectComponent + private Form frmImport; @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.getUserName()).contains(searchString)) - .collect(Collectors.toList()); - } - } - - public void onActionFromImportPersons() { - personListToImport = "firstName\tlastName\tuserName"; - } @CommitAfter @@ -115,17 +91,13 @@ Person p; try { - p = personManager.getPersonByUsername(lineFields[2]); + p = personManager.getPersonByUsername(lineFields[3]); if (p != null) { - errors += ">>> Person " + p.getUserName() + " already exists, skipping creation, activating."; - if (p.getStudents().size() > 0) { - p.setFirstName(lineFields[0]); - p.setLastName(lineFields[1]); - genericService.save(p); - } + errors += ">>> Person " + p.getUserName() + " already exists, skipping."; } else { p = new Person(); p.setFirstName(lineFields[0]); p.setLastName(lineFields[1]); - p.setUserName(lineFields[2]); + // p.setEmail(lineFields[2]); + p.setUserName(lineFields[3]); genericService.save(p); Student pr = new Student(); @@ -134,5 +106,5 @@ } } catch (Exception e) { - errors += ">>> Person " + lineFields[2] + " can not be imported due to: " + e.getLocalizedMessage(); + errors += ">>> Person " + lineFields[3] + " can not be imported due to: " + e.getLocalizedMessage(); } } @@ -160,12 +132,17 @@ } - @CommitAfter - public void onTogglePersonStatus(Person p) { - if (p.getUserName().contains(ModelConstants.PersonDeactivatedSuffix)) { - p.setUserName(p.getUserName().replace(ModelConstants.PersonDeactivatedSuffix, "")); - } else { - p.setUserName(p.getUserName() + ModelConstants.PersonDeactivatedSuffix); - } + @Inject + private SelectModelFactory selectModelFactory; + + @Property + Role selectedRole; + + public SelectModel getSelectRoleModel() { + return selectModelFactory.create(genericService.getAll(Role.class), "name"); } + + @Persist + @Property + private Person personToEdit; public void onActionFromNewPerson() { @@ -188,4 +165,6 @@ } + private Boolean cancelForm = false; + public void onCanceledFromFrmNewPerson() { cancelForm = true; @@ -202,7 +181,3 @@ } - public SelectModel getSelectRoleModel() { - return selectModelFactory.create(genericService.getAll(Role.class), "name"); - } - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/Reevaluation.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/Reevaluation.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/Reevaluation.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -31,5 +31,4 @@ import dblearnstar.model.entities.StudentSubmitSolution; -import dblearnstar.model.entities.TaskInTestInstance; import dblearnstar.model.entities.TestInstance; import dblearnstar.model.model.UserInfo; @@ -68,7 +67,4 @@ private TestInstance testInstance; - @Property - private TaskInTestInstance taskInTestInstance; - @Inject Request request; @@ -80,23 +76,26 @@ @CommitAfter + public void processSolution(StudentSubmitSolution s) { + evaluationService.processSolution(userInfo.getUserName(), s); + } + public void onActionFromReEvalTest(TestInstance selectedTestInstance) { List list = evaluationService .getAllSolutionsForEvalutionFromTestInstance(selectedTestInstance); - evaluationService.reEvalListOfSubmissions(userInfo.getUserName(), list); + for (StudentSubmitSolution s : list) { + try { + processSolution(s); + } catch (Exception e) { + logger.error("Fail evaluation for sssId: {}", s.getStudentSubmitSolutionId()); + } + } logger.info("Finished reEvalTest and processed {} entries", list.size()); } - @CommitAfter - public void onActionFromReEvalTaskInTestInstance(TaskInTestInstance taskInTestInstance) { - List list = evaluationService - .getAllSolutionsForEvalutionFromTaskInTestInstance(taskInTestInstance); - evaluationService.reEvalListOfSubmissions(userInfo.getUserName(), list); - logger.info("Finished reEvalTaskInTestInstance and processed {} entries", list.size()); - } - - @CommitAfter public void onActionFromReEvalAll() { List list = evaluationService.getAllSolutionsForEvaluation(); - evaluationService.reEvalListOfSubmissions(userInfo.getUserName(), list); + for (StudentSubmitSolution s : list) { + processSolution(s); + } logger.info("Finished reEvalAll and processed {} entries", list.size()); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SimilarQueries.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SimilarQueries.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SimilarQueries.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -288,5 +288,5 @@ @CommitAfter public void onActionFromReevaluateSubmission(StudentSubmitSolution s) { - evaluationService.reEvalSolution(userInfo.getUserName(), s); + evaluationService.processSolution(userInfo.getUserName(), s); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/StudentGroupProgress.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/StudentGroupProgress.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/StudentGroupProgress.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -31,4 +31,5 @@ import org.apache.tapestry5.services.PersistentLocale; import org.apache.tapestry5.services.SelectModelFactory; +import org.slf4j.Logger; import dblearnstar.model.entities.Group; @@ -37,5 +38,4 @@ import dblearnstar.model.entities.TaskInTestInstance; import dblearnstar.webapp.annotations.AdministratorPage; -import dblearnstar.webapp.services.EvaluationService; import dblearnstar.webapp.services.GenericService; import dblearnstar.webapp.services.GroupManager; @@ -45,9 +45,11 @@ @AdministratorPage -@Import(module = { "zoneUpdateEffect" }, stylesheet = { "StudentGroupProgress.css" }) +@Import(module = { "zoneUpdateEffect" }) public class StudentGroupProgress { @Inject private SelectModelFactory selectModelFactory; + @Inject + private Logger logger; @Inject @@ -59,6 +61,4 @@ @Inject private PersonManager personManager; - @Inject - private EvaluationService evaluationService; @Property @@ -91,4 +91,10 @@ } + public Boolean getSolvedTaskByStudent() { + Boolean test = testManager.isTaskInTestInstanceSolvedByStudent(taskInTestInstance.getTaskInTestInstanceId(), + groupMember.getStudent().getStudentId()); + return test; + } + public Float getAssessmentsForTaskForStudent() { return testManager.getGradeForTaskInTestInstanceByStudent(taskInTestInstance.getTaskInTestInstanceId(), @@ -100,28 +106,20 @@ } - public Integer getResultGrade() { - return (Integer) result[0]; - } - - public String getResultColorClass() { - Boolean shouldPass = (Boolean) result[1]; - Boolean passed = (Boolean) result[2]; - - String colorClass = " "; - if (passed != null && passed) { - colorClass += " result-passed "; - } else if (passed != null && !passed) { - colorClass += " result-notpassed "; + public String getColorClass() { + Boolean solved = getSolvedTaskByStudent(); + Float grade = getAssessmentsForTaskForStudent(); + if (solved == null) { + if (grade != null) { + return " color-queryError "; + } else { + return " "; + } } else { - + if (solved) { + return " color-queryCorrect "; + } else { + return " color-queryError "; + } } - if (shouldPass != null && shouldPass) { - colorClass += " result-queryCorrect "; - } else if (shouldPass != null && !shouldPass) { - colorClass += " result-queryError "; - } else { - - } - return colorClass; } @@ -135,13 +133,5 @@ public List getTaskInTestInstances() { - return testManager.getTaskInTestInstancesByTestInstance(groupFocusOnTest.getTestInstance().getTestInstanceId()); - } - - @Property - private Object[] result; - - public List getTestInstanceResultsByStudentSortedByTaskName() { - return testManager.getTestInstanceResultsByStudentSortedByTaskName(groupMember.getStudent(), - groupFocusOnTest.getTestInstance()); + return testManager.getTasksInTestInstance(groupFocusOnTest.getTestInstance().getTestInstanceId()); } @@ -171,12 +161,9 @@ public String getTaskInTestInstanceTaskTitleTranslated() { - String translated = translationService.getTranslation("Task", "title", taskInTestInstance.getTask().getTaskId(), + String translated = translationService.getTranslation("Task", "title", + taskInTestInstance.getTask().getTaskId(), persistentLocale.get().getLanguage().toLowerCase()); return (translated != null ? translated : taskInTestInstance.getTask().getTitle()); } - - public List getSelectedGroupMembersSorted() { - return evaluationService.groupMembersSortedByTestTotals(selectedGroup); - } } Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,641 +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 dblearnstar.webapp.pages.admin; - -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Comparator; -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.beaneditor.RelativePosition; -import org.apache.tapestry5.beanmodel.BeanModel; -import org.apache.tapestry5.beanmodel.services.BeanModelSource; -import org.apache.tapestry5.beanmodel.services.PropertyConduitSource; -import org.apache.tapestry5.commons.Messages; -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.PersistentLocale; -import org.apache.tapestry5.services.SelectModelFactory; -import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; -import org.slf4j.Logger; - -import com.github.vertical_blank.sqlformatter.SqlFormatter; -import com.github.vertical_blank.sqlformatter.core.FormatConfig; -import com.github.vertical_blank.sqlformatter.languages.Dialect; - -import dblearnstar.model.entities.Person; -import dblearnstar.model.entities.SolutionAssessment; -import dblearnstar.model.entities.Student; -import dblearnstar.model.entities.StudentSubmitSolution; -import dblearnstar.model.entities.TaskInTestInstance; -import dblearnstar.model.entities.TestInstance; -import dblearnstar.model.entities.TestInstanceParameters; -import dblearnstar.model.model.ModelConstants; -import dblearnstar.model.model.TaskTypeChecker; -import dblearnstar.model.model.Triplet; -import dblearnstar.model.model.UserInfo; -import dblearnstar.webapp.annotations.AdministratorPage; -import dblearnstar.webapp.model.StudentSelectModel; -import dblearnstar.webapp.model.TaskInTestInstanceSelectModel; -import dblearnstar.webapp.services.EvaluationService; -import dblearnstar.webapp.services.GenericService; -import dblearnstar.webapp.services.PersonManager; -import dblearnstar.webapp.services.TestManager; -import dblearnstar.webapp.services.TranslationService; -import dblearnstar.webapp.services.UsefulMethods; - -@AdministratorPage -@Import(stylesheet = { "SubmissionEvaluations.css", "feedback-styles.css" }, module = { "zoneUpdateEffect", - "bootstrap/modal", "bootstrap/collapse" }) -public class SubmissionEvaluations { - - @SessionState - private UserInfo userInfo; - - @Inject - private Logger logger; - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - - @Inject - private BeanModelSource beanModelSource; - @Inject - private Messages messages; - @Inject - private PropertyConduitSource pcs; - - @Inject - private SelectModelFactory selectModelFactory; - @Inject - private Request request; - @Inject - private PersistentLocale persistentLocale; - - @Inject - private EvaluationService evaluationService; - @Inject - private GenericService genericService; - @Inject - private TestManager testManager; - @Inject - private PersonManager personManager; - @Inject - private TranslationService translationService; - - @InjectComponent - private Zone zTask; - @InjectComponent - private Zone zStudent; - @InjectComponent - private Zone zSubmissions; - @InjectComponent - private Zone zModal; - @InjectComponent - private Zone zSQLEval; - @InjectComponent - private Zone zSolution; - - @Persist - @Property - private Student filterStudent; - @Persist - @Property - private TestInstance filterTestInstance; - @Persist - @Property - private TaskInTestInstance filterTaskInTestInstance; - @Persist - @Property - private Boolean onlyEval; - @Persist - @Property - private Boolean onlyLast; - @Persist - @Property - private Boolean onlyCorrect; - @Persist - @Property - private Boolean onlyDateOfExam; - @Persist - @Property - private Boolean onlyAssessed; - @Persist - @Property - private Boolean onlyUnAssessed; - @Persist - @Property - private Boolean hideClientInfo; - @Persist - @Property - private Boolean hideNames; - @Persist - @Property - SolutionAssessment editedAssessment; - @Persist - @Property - private Boolean prettyFormat; - @Property - @Persist - private List resultsHeaders1; - @Property - @Persist - private List resultsHeaders2; - @Property - @Persist - private List resultsEvaluation1; - @Property - @Persist - private List resultsEvaluation2; - @Property - @Persist - private List resultsErrors1; - @Property - @Persist - private List resultsErrors2; - - @Property - private StudentSubmitSolution submission; - @Property - private String resultsError; - @Property - private String oneHeader; - @Property - private Object[] oneRow; - @Property - private Object oneColumn; - - public void onActivate() { - logger.warn("Activated from {} by {} {}", request.getRemoteHost(), userInfo.getUserName(), - request.getHeader("User-Agent")); - if (onlyLast == null) { - onlyLast = true; - } - if (onlyEval == null) { - onlyEval = true; - } - if (hideClientInfo == null) { - hideClientInfo = true; - } - if (hideNames == null) { - hideNames = true; - } - if (filterStudent != null) { - filterStudent = genericService.getByPK(Student.class, filterStudent.getStudentId()); - } - if (filterTestInstance != null) { - filterTestInstance = genericService.getByPK(TestInstance.class, filterTestInstance.getTestInstanceId()); - } - if (filterTaskInTestInstance != null) { - filterTaskInTestInstance = genericService.getByPK(TaskInTestInstance.class, - filterTaskInTestInstance.getTaskInTestInstanceId()); - } - if (prettyFormat == null) { - prettyFormat = false; - } - } - - public void onActivate(SolutionAssessment sa) { - logger.warn("Activated with sa={} from {} by {} {}", sa, request.getRemoteHost(), userInfo.getUserName(), - request.getHeader("User-Agent")); - editedAssessment = genericService.getByPK(SolutionAssessment.class, sa.getSolutionAssessmentId()); - } - - public List getAllSubmissions() { - List lista = null; - if (filterTestInstance != null) { - if (onlyLast != null && onlyLast) { - lista = evaluationService.getOnlyLastSubmissionsByStudentAndTaskInTestInstance(filterStudent, - filterTestInstance, filterTaskInTestInstance, onlyEval, onlyCorrect); - } else { - lista = evaluationService.getSubmissionsByStudentAndTaskInTestInstance(filterStudent, - filterTestInstance, filterTaskInTestInstance, onlyEval, onlyCorrect); - } - } - if (lista != null && onlyDateOfExam != null && onlyDateOfExam) { - lista = lista.stream().filter(sss -> sss.getSubmittedOn() - .after(sss.getTaskInTestInstance().getTestInstance().getScheduledFor()) - && sss.getSubmittedOn().before(sss.getTaskInTestInstance().getTestInstance().getScheduledUntil())) - .collect(Collectors.toList()); - } - if (lista != null && onlyAssessed != null && onlyAssessed) { - lista = lista.stream().filter(sss -> (sss.getEvaluations() != null && sss.getEvaluations().size() > 0)) - .collect(Collectors.toList()); - } - if (lista != null && onlyUnAssessed != null && onlyUnAssessed) { - lista = lista.stream().filter(sss -> (sss.getEvaluations() == null || sss.getEvaluations().size() == 0)) - .collect(Collectors.toList()); - } - - return lista; - } - - public BeanModel getModelSSS() { - BeanModel modelSSS = beanModelSource.createDisplayModel(StudentSubmitSolution.class, - messages); - modelSSS.add(RelativePosition.BEFORE, "submission", "submittedBy", - pcs.create(StudentSubmitSolution.class, "studentStartedTest.student.person.lastName")); - modelSSS.add(RelativePosition.BEFORE, "submission", "task", - pcs.create(StudentSubmitSolution.class, "taskInTestInstance.task.title")); - modelSSS.add(RelativePosition.BEFORE, "submission", "test", - pcs.create(StudentSubmitSolution.class, "taskInTestInstance.testInstance.title")); - modelSSS.addEmpty("assessment"); - modelSSS.reorder("submittedBy", "task", "submission", "submittedOn", "evaluationSimple", "evaluationComplex", - "evaluationExam", "notForEvaluation", "assessment", "ipAddress"); - if (filterStudent != null) { - modelSSS.exclude("submittedBy"); - } - if (filterTestInstance != null) { - modelSSS.exclude("test"); - } - if (onlyCorrect != null && onlyCorrect) { - modelSSS.exclude("evaluationSimple", "evaluationComplex", "evaluationExam"); - } - if (hideClientInfo != null && hideClientInfo) { - modelSSS.exclude("ipAddress", "clientInfo"); - } - if (filterTaskInTestInstance != null && filterTaskInTestInstance.getTask().getTaskIsOfTypes() != null - && filterTaskInTestInstance.getTask().getTaskIsOfTypes().size() > 1) { - if (filterTaskInTestInstance.getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype() - .equals(ModelConstants.TaskCodeTEXT)) { - modelSSS.exclude("evaluationSimple", "evaluationComplex", "evaluationExam", "notForEvaluation", "task"); - } - if (filterTaskInTestInstance.getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype() - .equals(ModelConstants.TaskCodeSQL)) { - modelSSS.exclude("task"); - } - if (filterTaskInTestInstance.getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype() - .equals(ModelConstants.TaskCodeUPLOAD)) { - modelSSS.exclude("evaluationSimple", "evaluationComplex", "evaluationExam", "notForEvaluation", "task"); - } - } - modelSSS.exclude("studentSubmitSolutionId"); - return modelSSS; - } - - public List getAllStudents() { - if (filterTestInstance != null) { - return testManager.getStudentsWhoStartedTestInstance(filterTestInstance); - } else { - return UsefulMethods.castList(Student.class, genericService.getAll(Student.class)); - } - } - - public SelectModel getSelectTestInstanceModel() { - List list = testManager.getAllTestInstances(); - Comparator comparator = (ti1, - ti2) -> (ti1 != null && ti2 != null && ti1.getScheduledFor() != null && ti2.getScheduledFor() != null - ? ti1.getScheduledFor().toInstant().truncatedTo(ChronoUnit.DAYS) - .compareTo(ti2.getScheduledFor().toInstant().truncatedTo(ChronoUnit.DAYS)) - : 0); - Comparator reverser = comparator.reversed(); - list.sort(reverser); - return selectModelFactory.create(list, "title"); - } - - public SelectModel getSelectStudentsModel() { - return new StudentSelectModel(getAllStudents(), hideNames); - } - - public SelectModel getSelectTaskInTestInstanceModel() { - List list = new ArrayList(); - if (filterTestInstance != null) { - list = filterTestInstance.getTaskInTestInstances(); - } - return new TaskInTestInstanceSelectModel(list); - } - - public void onValueChangedFromSelectStudent(Student newStudent) { - filterStudent = newStudent; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zSubmissions); - } - } - - public void onValueChangedFromSelectTestInstance(TestInstance ti) { - filterTestInstance = ti; - filterTaskInTestInstance = null; - filterStudent = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zTask).addRender(zStudent).addRender(zSubmissions); - } - } - - public void onValueChangedFromSelectTaskInTestInstance(TaskInTestInstance tti) { - filterTaskInTestInstance = tti; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zSubmissions); - } - } - - public void onActionFromShowUserActivities(StudentSubmitSolution selectedSubmission) { - filterStudent = selectedSubmission.getStudentStartedTest().getStudent(); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zSubmissions); - } - } - - public String getSubmittedByNameWithId() { - if (hideNames != null && hideNames) { - return "[" + submission.getStudentStartedTest().getStudent().getPerson().getUserName() + "]"; - } else { - return personManager.getPersonFullNameWithId(submission.getStudentStartedTest().getStudent().getPerson()); - } - } - - private void clearResultsAndErrors() { - resultsEvaluation1 = null; - resultsEvaluation2 = null; - resultsErrors1 = null; - resultsErrors2 = null; - } - - @CommitAfter - public void onReevaluateSubmission(StudentSubmitSolution s) { - evaluationService.reEvalSolution(userInfo.getUserName(), s); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zSubmissions); - } - } - - @CommitAfter - public void onReevaluateEditedSubmission(StudentSubmitSolution s) { - clearResultsAndErrors(); - evaluationService.reEvalSolution(userInfo.getUserName(), s); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zSQLEval); - } - } - - public boolean isEditedAssessmentTaskSQL() { - if (editedAssessment != null) { - StudentSubmitSolution sss = genericService.getByPK(StudentSubmitSolution.class, - editedAssessment.getStudentSubmitSolution().getStudentSubmitSolutionId()); - return TaskTypeChecker.isSQL(testManager.getCodeType(sss)); - } else { - return false; - } - } - - public boolean isSQL() { - return TaskTypeChecker.isSQL(testManager.getCodeType(submission)); - } - - public boolean isTEXT() { - return TaskTypeChecker.isTEXT(testManager.getCodeType(submission)); - } - - public boolean isDDL() { - return TaskTypeChecker.isDDL(testManager.getCodeType(submission)); - } - - public boolean isFilterTaskDDL() { - if (filterTaskInTestInstance != null) { - return filterTaskInTestInstance.getTask().getTaskIsOfTypes().stream() - .anyMatch(tti -> tti.getTaskType().getCodetype().equals(ModelConstants.TaskCodeDDL)); - } else { - return false; - } - } - - public boolean isUPLOAD() { - return TaskTypeChecker.isUPLOAD(testManager.getCodeType(submission)); - } - - public SolutionAssessment getSubmissionsFirstEvaluation() { - return submission.getEvaluations().get(0); - } - - void onActionFromAddAssessment(StudentSubmitSolution s) { - clearResultsAndErrors(); - editedAssessment = new SolutionAssessment(); - editedAssessment.setStudentSubmitSolution(s); - prettyFormat = false; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zModal); - } - } - - void onActionFromEditAssessment(SolutionAssessment sa) { - editedAssessment = sa; - prettyFormat = false; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zModal); - } - } - - @CommitAfter - public void onSuccessFromFormEditor() { - if (editedAssessment != null) { - editedAssessment.setEvaluatedOn(Calendar.getInstance().getTime()); - genericService.saveOrUpdate(editedAssessment); - } - editedAssessment = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zModal).addRender(zSubmissions); - } - } - - public void onActionFromCancelFormEditor() { - clearResultsAndErrors(); - editedAssessment = null; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zModal).addRender(zSubmissions); - } - } - - public String getEvaluationClass() { - String output = ""; - try { - if (submission.getEvaluations() != null && submission.getEvaluations().size() > 0) { - if (submission.getEvaluations().get(0).getPassed()) { - output = "correct"; - } else { - output = "incorrect"; - } - } else { - output = "noeval"; - } - } catch (Exception e) { - output = "exception"; - } - return output; - } - - public String getTranslateTaskDescription() { - String trans = translationService.getTranslation("Task", "description", - editedAssessment.getStudentSubmitSolution().getTaskInTestInstance().getTask().getTaskId(), - persistentLocale.get().getLanguage().toLowerCase()); - if (trans == null) { - return editedAssessment.getStudentSubmitSolution().getTaskInTestInstance().getTask().getDescription(); - } else { - return trans; - } - } - - void onViewEvaluationResults(StudentSubmitSolution s) { - if (resultsEvaluation1 != null || resultsEvaluation2 != null) { - clearResultsAndErrors(); - } else { - TaskInTestInstance tti = s.getTaskInTestInstance(); - /* - * TODO: Only supports TestInstances with a single TestInstanceParameter line - */ - TestInstanceParameters tip = tti.getTestInstance().getTestInstanceParameters().get(0); - - Triplet, List, List> rsltsSimple = evaluationService - .getEvalResultsForViewing(userInfo.getUserName(), s.getSubmission(), tti, tip, - tip.getSchemaSimple()); - Triplet, List, List> rsltsComplex = evaluationService - .getEvalResultsForViewing(userInfo.getUserName(), s.getSubmission(), tti, tip, - tip.getSchemaComplex()); - resultsEvaluation1 = rsltsSimple.getFirstItem(); - resultsEvaluation2 = rsltsComplex.getFirstItem(); - resultsHeaders1 = rsltsSimple.getSecondItem(); - resultsHeaders2 = rsltsComplex.getSecondItem(); - resultsErrors1 = rsltsSimple.getThirdItem(); - resultsErrors2 = rsltsComplex.getThirdItem(); - } - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zSQLEval); - } - } - - public String getClassSQLsolution() { - if (isEditedAssessmentTaskSQL()) { - return "sqlSolution"; - } else { - return "nonSqlSolution"; - } - } - - public void onPrettyFormatToggle() { - prettyFormat = !prettyFormat; - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zSolution); - } - } - - public String getClassPrettyFormat() { - if (prettyFormat) { - return "btn-info"; - } else { - return " "; - } - } - - public String getFormattedSolution() { - if (isEditedAssessmentTaskSQL() && prettyFormat) { - return SqlFormatter.of(Dialect.PostgreSql) - .format(editedAssessment.getStudentSubmitSolution().getSubmission(), FormatConfig.builder() - .indent(" ").uppercase(true).linesBetweenQueries(2).maxColumnLength(100).build()); - } else { - return editedAssessment.getStudentSubmitSolution().getSubmission(); - } - } - - @CommitAfter - void onAssessAsCorrectSubmission(StudentSubmitSolution submission) { - SolutionAssessment sa = new SolutionAssessment(); - sa.setStudentSubmitSolution(submission); - sa.setFeedback(messages.get("assessmentComment-correct")); - sa.setEvaluatedOn(new Date()); - sa.setGrade(submission.getTaskInTestInstance().getPoints()); - sa.setPassed(true); - genericService.save(sa); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zSubmissions); - } - } - - @CommitAfter - void onAssessAsIncorrectSubmission(StudentSubmitSolution submission) { - SolutionAssessment sa = new SolutionAssessment(); - sa.setStudentSubmitSolution(submission); - sa.setFeedback(messages.get("assessmentComment-incorrect")); - sa.setEvaluatedOn(new Date()); - sa.setGrade(0.0F); - sa.setPassed(false); - genericService.save(sa); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zSubmissions); - } - } - - @CommitAfter - void onAssessEditedAsCorrectSubmission() { - editedAssessment.setFeedback(messages.get("assessmentComment-correct")); - editedAssessment.setEvaluatedOn(new Date()); - editedAssessment.setGrade(editedAssessment.getStudentSubmitSolution().getTaskInTestInstance().getPoints()); - editedAssessment.setPassed(true); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zModal); - } - } - - @CommitAfter - void onAssessEditedAsIncorrectSubmission() { - editedAssessment.setFeedback(messages.get("assessmentComment-incorrect")); - editedAssessment.setEvaluatedOn(new Date()); - editedAssessment.setGrade(0.0F); - editedAssessment.setPassed(false); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zModal); - } - } - - public boolean isAnyErrors() { - return (resultsErrors1 != null && resultsErrors1.size() > 0) - || (resultsErrors2 != null && resultsErrors2.size() > 0); - } - - public boolean isAnyResults() { - return (resultsEvaluation1 != null) || (resultsEvaluation2 != null); - } - - public boolean isAnyStatus() { - return isAnyErrors() || isAnyResults(); - } - - void onCopySolutionToFeedback() { - editedAssessment.setFeedback(getFormattedSolution()); - } - - public String getEditedAssessmentSubmitterName() { - Person p = editedAssessment.getStudentSubmitSolution().getStudentStartedTest().getStudent().getPerson(); - String name = " [" + p.getUserName() + "]"; - if (hideNames != null && hideNames) { - } else { - name = p.getLastName() + " " + p.getFirstName() + name; - } - return name; - } -} Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionLogViewer.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionLogViewer.java (revision 9496f79ee76bb108366f956111b076bd1b817255) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionLogViewer.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -0,0 +1,439 @@ +/******************************************************************************* + * 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 dblearnstar.webapp.pages.admin; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +import org.apache.tapestry5.OptionGroupModel; +import org.apache.tapestry5.OptionModel; +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.beaneditor.RelativePosition; +import org.apache.tapestry5.beanmodel.BeanModel; +import org.apache.tapestry5.beanmodel.services.BeanModelSource; +import org.apache.tapestry5.beanmodel.services.PropertyConduitSource; +import org.apache.tapestry5.commons.Messages; +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.internal.OptionModelImpl; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.PersistentLocale; +import org.apache.tapestry5.services.SelectModelFactory; +import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; +import org.apache.tapestry5.util.AbstractSelectModel; +import org.slf4j.Logger; + +import dblearnstar.model.entities.SolutionAssessment; +import dblearnstar.model.entities.Student; +import dblearnstar.model.entities.StudentSubmitSolution; +import dblearnstar.model.entities.TaskInTestInstance; +import dblearnstar.model.entities.TaskIsOfType; +import dblearnstar.model.entities.TestInstance; +import dblearnstar.model.model.ModelConstants; +import dblearnstar.model.model.TaskTypeChecker; +import dblearnstar.model.model.UserInfo; +import dblearnstar.webapp.annotations.AdministratorPage; +import dblearnstar.webapp.model.StudentSelectModel; +import dblearnstar.webapp.services.EvaluationService; +import dblearnstar.webapp.services.GenericService; +import dblearnstar.webapp.services.PersonManager; +import dblearnstar.webapp.services.TestManager; +import dblearnstar.webapp.services.TranslationService; +import dblearnstar.webapp.services.UsefulMethods; + +@AdministratorPage +@Import(stylesheet = { "SubmissionLogViewer.css" }, module = { "zoneUpdateEffect", "bootstrap/modal", + "bootstrap/collapse" }) +public class SubmissionLogViewer { + + @SessionState + private UserInfo userInfo; + + @Inject + private Logger logger; + @Inject + private AjaxResponseRenderer ajaxResponseRenderer; + + @Inject + private BeanModelSource beanModelSource; + @Inject + private Messages messages; + + @Inject + private PropertyConduitSource pcs; + @Inject + private SelectModelFactory selectModelFactory; + @Inject + private Request request; + @Inject + private PersistentLocale persistentLocale; + + @Inject + private EvaluationService evaluationService; + @Inject + private GenericService genericService; + @Inject + private TestManager testManager; + @Inject + private PersonManager personManager; + @Inject + private TranslationService translationService; + + @InjectComponent + private Zone zTask; + @InjectComponent + private Zone zStudent; + + @InjectComponent + private Zone zSubmissions; + @InjectComponent + private Zone zModal; + + @Property + private StudentSubmitSolution submission; + + @Persist + @Property + private Student filterStudent; + @Persist + @Property + private TestInstance filterTestInstance; + @Persist + @Property + private TaskInTestInstance filterTaskInTestInstance; + @Persist + @Property + private Boolean onlyEval; + @Persist + @Property + private Boolean onlyLast; + @Persist + @Property + private Boolean onlyCorrect; + @Persist + @Property + private Boolean onlyDateOfExam; + @Persist + @Property + private Boolean onlyAssessed; + @Persist + @Property + private Boolean hideClientInfo; + @Persist + @Property + SolutionAssessment editedAssessment; + + private Boolean toCancel; + + public void onActivate() { + logger.info("Activated from {} by {} {}", request.getRemoteHost(), userInfo.getUserName(), + request.getHeader("User-Agent")); + if (onlyLast == null) { + onlyLast = true; + } + if (onlyEval == null) { + onlyEval = true; + } + if (hideClientInfo == null) { + hideClientInfo = true; + } + if (filterStudent != null) { + filterStudent = genericService.getByPK(Student.class, filterStudent.getStudentId()); + } + if (filterTestInstance != null) { + filterTestInstance = genericService.getByPK(TestInstance.class, filterTestInstance.getTestInstanceId()); + } + if (filterTaskInTestInstance != null) { + filterTaskInTestInstance = genericService.getByPK(TaskInTestInstance.class, + filterTaskInTestInstance.getTaskInTestInstanceId()); + } + } + + public List getAllSubmissions() { + List lista = null; + if (filterTestInstance != null) { + if (onlyLast != null && onlyLast) { + lista = evaluationService.getOnlyLastSubmissionsByStudentAndTaskInTestInstance(filterStudent, + filterTestInstance, filterTaskInTestInstance, onlyEval, onlyCorrect); + } else { + lista = evaluationService.getSubmissionsByStudentAndTaskInTestInstance(filterStudent, + filterTestInstance, filterTaskInTestInstance, onlyEval, onlyCorrect); + } + } + if (lista != null && onlyDateOfExam != null && onlyDateOfExam) { + lista = lista.stream().filter(sss -> sss.getSubmittedOn() + .after(sss.getTaskInTestInstance().getTestInstance().getScheduledFor()) + && sss.getSubmittedOn().before(sss.getTaskInTestInstance().getTestInstance().getScheduledUntil())) + .collect(Collectors.toList()); + } + if (lista != null && onlyAssessed != null && onlyAssessed) { + lista = lista.stream().filter(sss -> (sss.getEvaluations() != null && sss.getEvaluations().size() > 0)) + .collect(Collectors.toList()); + } + return lista; + } + + public BeanModel getModelSSS() { + BeanModel modelSSS = beanModelSource.createDisplayModel(StudentSubmitSolution.class, + messages); + modelSSS.add(RelativePosition.BEFORE, "submission", "submittedBy", + pcs.create(StudentSubmitSolution.class, "studentStartedTest.student.person.lastName")); + modelSSS.add(RelativePosition.BEFORE, "submission", "task", + pcs.create(StudentSubmitSolution.class, "taskInTestInstance.task.title")); + modelSSS.add(RelativePosition.BEFORE, "submission", "test", + pcs.create(StudentSubmitSolution.class, "taskInTestInstance.testInstance.title")); + modelSSS.addEmpty("assessment"); + modelSSS.reorder("submittedBy", "task", "submission", "submittedOn", "evaluationSimple", "evaluationComplex", + "evaluationExam", "notForEvaluation", "assessment", "ipAddress"); + if (filterStudent != null) { + modelSSS.exclude("submittedBy"); + } + if (filterTestInstance != null) { + modelSSS.exclude("test"); + } + if (onlyCorrect != null && onlyCorrect) { + modelSSS.exclude("evaluationSimple", "evaluationComplex", "evaluationExam"); + } + if (hideClientInfo != null && hideClientInfo) { + modelSSS.exclude("ipAddress", "clientInfo"); + } + if (filterTaskInTestInstance != null && filterTaskInTestInstance.getTask().getTaskIsOfTypes() != null + && filterTaskInTestInstance.getTask().getTaskIsOfTypes().size() > 1) { + if (filterTaskInTestInstance.getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype() + .equals(ModelConstants.TaskCodeTEXT)) { + modelSSS.exclude("evaluationSimple", "evaluationComplex", "evaluationExam", "notForEvaluation", "task"); + } + if (filterTaskInTestInstance.getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype() + .equals(ModelConstants.TaskCodeSQL)) { + modelSSS.exclude("task"); + } + if (filterTaskInTestInstance.getTask().getTaskIsOfTypes().get(0).getTaskType().getCodetype() + .equals(ModelConstants.TaskCodeUPLOAD)) { + modelSSS.exclude("evaluationSimple", "evaluationComplex", "evaluationExam", "notForEvaluation", "task"); + } + } + modelSSS.exclude("studentSubmitSolutionId"); + return modelSSS; + } + + public List getAllStudents() { + if (filterTestInstance != null) { + return testManager.getStudentsWhoStartedTestInstance(filterTestInstance); + } else { + return UsefulMethods.castList(Student.class, genericService.getAll(Student.class)); + } + } + + public SelectModel getSelectTestInstanceModel() { + List list = testManager.getAllTestInstances(); + Comparator comparator = (ti1, + ti2) -> (ti1 != null && ti2 != null && ti1.getScheduledFor() != null && ti2.getScheduledFor() != null + ? ti1.getScheduledFor().compareTo(ti2.getScheduledFor()) + : 0); + Comparator reverser = comparator.reversed(); + list.sort(reverser); + return selectModelFactory.create(list, "title"); + } + + public SelectModel getSelectStudentsModel() { + return new StudentSelectModel(getAllStudents()); + } + + public SelectModel getSelectTaskInTestInstanceModel() { + + class TaskInTestInstanceSelectModel extends AbstractSelectModel { + private List taskInTestInstances; + + public TaskInTestInstanceSelectModel(List taskInTestInstances) { + if (taskInTestInstances == null) { + this.taskInTestInstances = new ArrayList(); + } else { + this.taskInTestInstances = taskInTestInstances; + } + } + + @Override + public List getOptionGroups() { + return null; + } + + @Override + public List getOptions() { + List options = new ArrayList(); + for (TaskInTestInstance taskInTestInstance : taskInTestInstances) { + options.add(new OptionModelImpl(taskInTestInstance.getTask().getTitle(), taskInTestInstance)); + } + return options; + } + } + + if (filterTestInstance == null) { + return new TaskInTestInstanceSelectModel(new ArrayList()); + } else { + return new TaskInTestInstanceSelectModel(filterTestInstance.getTaskInTestInstances()); + } + } + + public void onValueChangedFromSelectStudent(Student newStudent) { + filterStudent = newStudent; + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zSubmissions); + } + } + + public void onValueChangedFromSelectTestInstance(TestInstance ti) { + filterTestInstance = ti; + filterTaskInTestInstance = null; + filterStudent = null; + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zTask).addRender(zStudent).addRender(zSubmissions); + } + } + + public void onValueChangedFromSelectTaskInTestInstance(TaskInTestInstance tti) { + filterTaskInTestInstance = tti; + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zSubmissions); + } + } + + public void onActionFromShowUserActivities(StudentSubmitSolution selectedSubmission) { + filterStudent = selectedSubmission.getStudentStartedTest().getStudent(); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zSubmissions); + } + } + + public String getSubmittedByNameWithId() { + return personManager.getPersonFullNameWithId(submission.getStudentStartedTest().getStudent().getPerson()); + } + + @CommitAfter + public void onActionFromReevaluateSubmission(StudentSubmitSolution s) { + evaluationService.processSolution(userInfo.getUserName(), s); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zSubmissions); + } + } + + public String getCodeType() { + List listTypes = submission.getTaskInTestInstance().getTask().getTaskIsOfTypes(); + if (listTypes != null && listTypes.size() > 0) { + return listTypes.get(0).getTaskType().getCodetype(); + } else { + return "/"; + } + } + + public boolean isSQL() { + return TaskTypeChecker.isSQL(getCodeType()); + } + + public boolean isTEXT() { + return TaskTypeChecker.isTEXT(getCodeType()); + } + + public boolean isDDL() { + return TaskTypeChecker.isDDL(getCodeType()); + } + + public boolean isUPLOAD() { + return TaskTypeChecker.isUPLOAD(getCodeType()); + } + + public SolutionAssessment getSubmissionsFirstEvaluation() { + return submission.getEvaluations().get(0); + } + + void onActionFromAddAssessment(StudentSubmitSolution s) { + editedAssessment = new SolutionAssessment(); + editedAssessment.setStudentSubmitSolution(s); + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zModal); + } + } + + void onActionFromEditAssessment(SolutionAssessment sa) { + editedAssessment = sa; + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zModal); + } + } + + public void onCanceledFromFormEditor() { + toCancel = true; + } + + @CommitAfter + public void onSubmitFromFormEditor() { + if (toCancel != null && toCancel) { + toCancel = null; + } else { + if (editedAssessment != null) { + editedAssessment.setEvaluatedOn(Calendar.getInstance().getTime()); + genericService.saveOrUpdate(editedAssessment); + } + } + editedAssessment = null; + if (request.isXHR()) { + ajaxResponseRenderer.addRender(zModal).addRender(zSubmissions); + } + } + + public String getEvaluationClass() { + String output = ""; + try { + if (submission.getEvaluations() != null && submission.getEvaluations().size() > 0) { + if (submission.getEvaluations().get(0).getPassed()) { + output = "correct"; + } else { + output = "incorrect"; + } + } else { + output = "noeval"; + } + } catch (Exception e) { + output = "exception"; + } + return output; + } + + public String getTranslateTaskDescription() { + String trans = translationService.getTranslation("Task", "description", + editedAssessment.getStudentSubmitSolution().getTaskInTestInstance().getTask().getTaskId(), + persistentLocale.get().getLanguage().toLowerCase()); + if (trans == null) { + return editedAssessment.getStudentSubmitSolution().getTaskInTestInstance().getTask().getDescription(); + } else { + return trans; + } + } + +} Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SystemParameters.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SystemParameters.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (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 dblearnstar.webapp.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 dblearnstar.model.entities.SystemParameter; -import dblearnstar.model.model.UserInfo; -import dblearnstar.webapp.annotations.AdministratorPage; -import dblearnstar.webapp.annotations.InstructorPage; -import dblearnstar.webapp.services.GenericService; -import dblearnstar.webapp.services.UsefulMethods; - -@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) UsefulMethods.castList(SystemParameter.class, - 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: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestAdminPage.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestAdminPage.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestAdminPage.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -22,5 +22,4 @@ import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.List; @@ -33,7 +32,4 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.beanmodel.BeanModel; -import org.apache.tapestry5.beanmodel.services.BeanModelSource; -import org.apache.tapestry5.commons.Messages; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.hibernate.annotations.CommitAfter; @@ -53,5 +49,4 @@ import dblearnstar.model.entities.TestTemplate; import dblearnstar.model.entities.TestType; -import dblearnstar.model.model.ComparatorTaskInTestInstance; import dblearnstar.model.model.UserInfo; import dblearnstar.webapp.annotations.AdministratorPage; @@ -63,5 +58,5 @@ @AdministratorPage -@Import(stylesheet = { "TestAdmin.css" }, module = { "zoneUpdateEffect", "bootstrap/modal", "bootstrap/collapse" }) +@Import(stylesheet = { "TestAdmin.css" }) public class TestAdminPage { @@ -96,59 +91,49 @@ @InjectComponent private Zone testInstanceZone; - @InjectComponent - private Zone testTemplateZone; @InjectPage private QueryTest queryTest; - @Persist - @Property + @Property + @Persist private TestTemplate editedTestTemplate; - @Persist - @Property + @Property + @Persist private TaskType chosentaskType; - @Persist - @Property + @Property + @Persist private TestType testType; - @Persist - @Property + @Property + @Persist + private TestInstance testInstance; + @Property + private TaskInTestInstance taskInTestInstance; + @Property + private TaskIsOfType taskIsOfType; + @Property + @Persist private TestInstance editedTestInstance; - @Persist - @Property + @Property + @Persist private TestInstanceParameters editedTestInstanceParameters; - @Persist - @Property + @Property + @Persist private Boolean creatingANewTask; - @Persist - @Property + @Property + @Persist private TaskInTestInstance editedTaskInTestInstance; - @Persist - @Property + @Property + @Persist private Boolean isNewTaskInTestInstance; - @Persist - @Property + @Property + @Persist private Task editedTask; - @Persist - @Property + @Property + @Persist private TestInstance whereToPutNewTask; - @Persist - @Property - private TestInstance selectedTestInstance; - @Property - private TestInstance listedTestInstance; - @Property - private TaskInTestInstance taskInTestInstance; - @Property - private TaskIsOfType taskIsOfType; public void onActivate() { logger.info("activated from {} by {} {}", request.getRemoteHost(), userInfo.getUserName(), request.getHeader("User-Agent")); - if (selectedTestInstance != null) { - selectedTestInstance = genericService.getByPK(TestInstance.class, selectedTestInstance.getTestInstanceId()); - } - if (editedTestInstance != null) { - editedTestInstance = genericService.getByPK(TestInstance.class, editedTestInstance.getTestInstanceId()); - } } @@ -158,5 +143,6 @@ public Object getModelTestTypes() { - return selectModelFactory.create(testManager.getAllTestTypes(), "title"); + return selectModelFactory.create(UsefulMethods.castList(TestType.class, genericService.getAll(TestType.class)), + "title"); } @@ -166,33 +152,38 @@ } - public List getTestInstancesByTestType() { - return testManager.getTestInstancesByTestType(testType.getTestTypeId()); + public Object getModelTestInstances() { + return selectModelFactory.create(testManager.getTestInstancesByTestType(testType.getTestTypeId()), "title"); + } + + public Object onValueChangedFromSelectTestInstance(TestInstance selectedTestInstance) { + testInstance = selectedTestInstance; + return testInstanceZone.getBody(); } public List getTaskInTestInstances() { - List list = selectedTestInstance.getTaskInTestInstances(); - ComparatorTaskInTestInstance ctti = new ComparatorTaskInTestInstance(); - Collections.sort(list, ctti); - return list; - } - - void onActionFromEditTestInstance(TestInstance ti) { - editedTestInstance = ti; - if (ti.getTestInstanceParameters().isEmpty()) { + return testInstance.getTaskInTestInstances(); + } + + void onActionFromEditTestInstance(TestInstance testInstance) { + editedTestInstance = testInstance; + if (testInstance.getTestInstanceParameters().isEmpty()) { editedTestInstanceParameters = new TestInstanceParameters(); editedTestInstanceParameters.setTestInstance(editedTestInstance); } else { - editedTestInstanceParameters = ti.getTestInstanceParameters().get(0); + editedTestInstanceParameters = testInstance.getTestInstanceParameters().get(0); } ajaxResponseRenderer.addRender(testInstanceEditZone); } - void onActionFromNewTestInstance(TestType tt) { + void onActionFromNewTestInstance(TestType testType) { editedTestInstance = new TestInstance(); - if (editedTestTemplate != null) { - editedTestInstance.setTestTemplate(editedTestTemplate); - } editedTestInstanceParameters = null; ajaxResponseRenderer.addRender(testInstanceEditZone); + } + + void onActionFromAddTask(TestInstance testInstance) { + editedTaskInTestInstance = new TaskInTestInstance(); + editedTaskInTestInstance.setTestInstance(testInstance); + isNewTaskInTestInstance = true; } @@ -204,5 +195,4 @@ editedTestInstance = null; editedTestInstanceParameters = null; - editedTestTemplate = null; } else { editedTestInstanceParameters = new TestInstanceParameters(); @@ -217,5 +207,4 @@ editedTestInstance = null; editedTestInstanceParameters = null; - editedTestTemplate = null; } @@ -232,5 +221,4 @@ void onActionFromDeleteTestInstance(TestInstance testInstance) { testInstance.getTestInstanceParameters().forEach(tip -> genericService.delete(tip)); - testInstance.getTaskInTestInstances().forEach(tti -> genericService.delete(tti)); genericService.delete(testInstance); } @@ -330,5 +318,4 @@ void onActionFromCancelFrmTask() { editedTask = null; - ajaxResponseRenderer.addRender(testInstanceZone); } @@ -351,12 +338,7 @@ whereToPutNewTask = null; creatingANewTask = null; - } else { - TaskIsOfType type = editedTask.getTaskIsOfTypes().get(0); - type.setTaskType(chosentaskType); - genericService.saveOrUpdate(type); } editedTask = null; - //ajaxResponseRenderer.addRender(testInstanceZone); } @@ -371,5 +353,4 @@ editedTestTemplate = new TestTemplate(); editedTestTemplate.setTestType(testType); - ajaxResponseRenderer.addRender(testTemplateZone); } @@ -378,14 +359,8 @@ genericService.saveOrUpdate(editedTestTemplate); editedTestTemplate = null; - ajaxResponseRenderer.addRender(testTemplateZone); - } - - void onCancelFrmTestTemplate() { - editedTestTemplate = null; - ajaxResponseRenderer.addRender(testTemplateZone); } public SelectModel getAllTaskTypes() { - return selectModelFactory.create(testManager.getAllTaskTypes(), "title"); + return selectModelFactory.create(genericService.getAll(TaskType.class), "title"); } @@ -401,24 +376,3 @@ } - @Inject - private BeanModelSource beanModelSource; - @Inject - private Messages messages; - @Property - @Persist - private BeanModel modelTestTemplate; - - void setupRender() { - modelTestTemplate = beanModelSource.createEditModel(TestTemplate.class, messages); - modelTestTemplate.add("model"); - modelTestTemplate.exclude("testTemplateId"); - } - - void onShowTestInstance(TestInstance ti) { - selectedTestInstance = ti; - } - - void onHideTestInstance() { - selectedTestInstance = null; - } } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestCollectionManagement.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestCollectionManagement.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestCollectionManagement.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -122,4 +122,16 @@ } + public String getCoding(TestCollection i) { + Integer broj = i.getOrdering(); + if (broj == null) { + broj = 0; + } + if (i.getParentCollection() == null) { + return Long.toString(broj) + "-"; + } else { + return getCoding(i.getParentCollection()) + Long.toString(broj) + "-"; + } + } + public List getListTestCollections() { List list = UsefulMethods.castList(TestCollection.class, Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TranslationPage.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TranslationPage.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,75 +1,0 @@ -package dblearnstar.webapp.pages.admin; - -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.annotations.Import; -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 dblearnstar.model.entities.Translation; -import dblearnstar.webapp.annotations.AdministratorPage; -import dblearnstar.webapp.annotations.InstructorPage; -import dblearnstar.webapp.services.GenericService; -import dblearnstar.webapp.services.TranslationService; -import dblearnstar.webapp.services.UsefulMethods; - -@AdministratorPage -@InstructorPage -@Import(stylesheet = { "TranslationPage.css" }) -public class TranslationPage { - - @Inject - private TranslationService translationService; - @Inject - private GenericService genericService; - - @Persist - @Property - private String filter; - - @Persist - @Property - private Translation editedTranslation; - - @Property - private Translation translationRow; - - public List getListTranslations() { - List l = UsefulMethods.castList(Translation.class, genericService.getAll(Translation.class)); - if (filter != null && filter.length() > 0) { - for (String filterWord : filter.split(" ")) { - l = l.stream().filter( - t -> (t.getOriginalObjectId() + t.getClassName() + t.getAttributeCode() + t.getTranslatedText()) - .toLowerCase().contains(filterWord.toLowerCase())) - .collect(Collectors.toList()); - } - } - return l; - } - - void onActionFromEditTranslation(Translation t) { - editedTranslation = t; - } - - void onActionFromNewTranslation() { - editedTranslation = new Translation(); - } - - void onActionFromCancelTranslation() { - editedTranslation = null; - } - - @CommitAfter - void onActionFromDeleteTranslation(Translation t) { - genericService.delete(t); - } - - @CommitAfter - void onSuccessFromFrmTranslation() { - genericService.save(editedTranslation); - editedTranslation = null; - } -} Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/pages/instructor/ActivityMonitor.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/instructor/ActivityMonitor.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,66 +1,0 @@ -package dblearnstar.webapp.pages.instructor; - -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.tapestry5.EventContext; -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 dblearnstar.model.entities.ActivityInTask; -import dblearnstar.model.entities.Person; -import dblearnstar.model.entities.TaskInTestInstance; -import dblearnstar.model.model.UserInfo; -import dblearnstar.webapp.annotations.AdministratorPage; -import dblearnstar.webapp.annotations.InstructorPage; -import dblearnstar.webapp.services.ActivityManager; - -@InstructorPage -@AdministratorPage -public class ActivityMonitor { - - @SessionState - private UserInfo userInfo; - - @Inject - private ActivityManager activityManager; - - private Person selectedPerson; - - private TaskInTestInstance selectedTaskInTestInstance; - - @Property - private ActivityInTask activityInTask; - - @Property - @Persist - private String filterType; - - public void onActivate(EventContext ec) { - if (!ec.isEmpty()) { - selectedPerson = ec.get(Person.class, 0); - selectedTaskInTestInstance = ec.get(TaskInTestInstance.class, 1); - } - } - - public Object[] onPassivate() { - Object[] a = { selectedPerson, selectedTaskInTestInstance }; - return a; - } - - public List getActivitiesInTaskForPerson() { - List list = activityManager.getActivitiesInTaskForPerson(selectedPerson, - selectedTaskInTestInstance); - if (filterType != null && filterType.length() > 0) { - return list.stream().filter(p -> p.getType().equals(filterType)).collect(Collectors.toList()); - } else { - return list; - } - } - - public String getHash() { - return Integer.toString(activityInTask.getPayload().trim().hashCode()); - } -} Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/pages/instructor/RelationSchemaEvaluation.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/instructor/RelationSchemaEvaluation.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,448 +1,0 @@ -package dblearnstar.webapp.pages.instructor; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.stream.Collectors; - -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.commons.Messages; -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 com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; - -import dblearnstar.model.entities.SolutionAssessment; -import dblearnstar.model.entities.StudentSubmitSolution; -import dblearnstar.model.entities.TaskInTestInstance; -import dblearnstar.model.model.ModelConstants; -import dblearnstar.model.model.Triplet; -import dblearnstar.model.model.UserInfo; -import dblearnstar.webapp.annotations.AdministratorPage; -import dblearnstar.webapp.annotations.InstructorPage; -import dblearnstar.webapp.services.EvaluationService; -import dblearnstar.webapp.services.GenericService; -import dblearnstar.webapp.services.SystemConfigService; -import net.objecthunter.exp4j.Expression; -import net.objecthunter.exp4j.ExpressionBuilder; - -@AdministratorPage -@InstructorPage -@Import(module = { "zoneUpdateEffect" }, stylesheet = { "SubmissionEvaluations.css" }) -public class RelationSchemaEvaluation { - - @Inject - private Logger logger; - @Inject - private Messages messages; - - @SessionState - private UserInfo userInfo; - - @Inject - private GenericService genericService; - @Inject - private EvaluationService evaluationService; - @Inject - private SystemConfigService systemConfigService; - - public String[] getModel() { - return ModelConstants.AllDBRelationalObjectTypes; - } - - @Property - private TaskInTestInstance taskInTestInstanceToGrade; - - @Property - private StudentSubmitSolution submission; - @Persist - @Property - private String filterType; - @Persist - @Property - private String filterTableName; - - @Persist - @Property - private String filterDB; - - @Property - private String oneHeader; - @Property - private String[] oneRow; - @Property - private String oneColumn; - - @Persist - @Property - List evaluationData; - @Persist - @Property - List resultsHeadersSimple; - @Persist - @Property - List resultsErrors; - @Property - String resultError; - - void onActivate(TaskInTestInstance taskInTestInstance) { - taskInTestInstanceToGrade = genericService.getByPK(TaskInTestInstance.class, - taskInTestInstance.getTaskInTestInstanceId()); - if (evaluationData == null || evaluationData.size() == 0) { - onLoadSavedData(); - ComparatorEvaluationData ced = new ComparatorEvaluationData(); - Collections.sort(evaluationData, ced); - } - } - - List getSubmissions() { - return evaluationService.getOnlyLastSubmissionsByStudentAndTaskInTestInstance(null, - taskInTestInstanceToGrade.getTestInstance(), taskInTestInstanceToGrade, true, false); - } - - public TaskInTestInstance onPassivate() { - return taskInTestInstanceToGrade; - } - - public List getFilteredEvaluationData() { - try { - List list = evaluationData; - if (filterType != null) { - list = list.stream().filter(r -> ((String) r[2]).contains(filterType)).collect(Collectors.toList()); - } - if (filterDB != null && filterDB.length() > 0) { - list = list.stream().filter(r -> ((String) r[3]).toLowerCase().contains(filterDB.toLowerCase())) - .collect(Collectors.toList()); - } - if (filterTableName != null && filterTableName.length() > 0) { - list = list.stream().filter(r -> ((String) r[4]).toLowerCase().contains(filterTableName.toLowerCase())) - .collect(Collectors.toList()); - } - return list; - } catch (Exception e) { - logger.error("filtering error {}", e.getMessage()); - return new ArrayList(); - } - } - - @Inject - private SelectModelFactory selectModelFactory; - - @InjectComponent - private Zone zEvaluationTable; - - @Inject - private Request request; - - @Inject - private AjaxResponseRenderer ajaxResponseRenderer; - - public void onSuccessFromFormFilter() { - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - private void setEvaluationPointGrade(Object[] context, String grade) { - String[] object = evaluationData.stream().filter(e -> Arrays.equals(e, context)).findFirst().orElse(null); - if (object == null) { - logger.error("{} not found", context); - } else { - object[1] = grade; - } - } - - public void onMarkPos(Object[] context) { - setEvaluationPointGrade(context, "1"); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public void onMarkPos2(Object[] context) { - setEvaluationPointGrade(context, "2"); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public void onMarkNeg(Object[] context) { - setEvaluationPointGrade(context, "-1"); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public void onMarkZero(Object[] context) { - setEvaluationPointGrade(context, "0"); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public void onMarkReset(Object[] context) { - setEvaluationPointGrade(context, null); - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public void onSetUngradedPos() { - for (String[] ss : getFilteredEvaluationData()) { - if (ss[1] == null || ss[1].equals("")) { - setEvaluationPointGrade(ss, "1"); - } - } - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public void onSetUngradedPos2() { - for (String[] ss : getFilteredEvaluationData()) { - if (ss[1] == null || ss[1].equals("")) { - setEvaluationPointGrade(ss, "2"); - } - } - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public void onSetUngradedNeg() { - for (String[] ss : getFilteredEvaluationData()) { - if (ss[1] == null || ss[1].equals("")) { - setEvaluationPointGrade(ss, "-1"); - } - } - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public void onSetUngradedZero() { - for (String[] ss : getFilteredEvaluationData()) { - if (ss[1] == null || ss[1].equals("")) { - setEvaluationPointGrade(ss, "0"); - } - } - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public void onResetGraded() { - for (String[] ss : getFilteredEvaluationData()) { - setEvaluationPointGrade(ss, null); - } - if (request.isXHR()) { - ajaxResponseRenderer.addRender(zEvaluationTable); - } - } - - public String getGenContext() { - return oneRow[0] + "!" + oneRow[1] + "!" + oneRow[2] + "!" + oneRow[3]; - } - - public String[] getParsedRow() { - return Arrays.copyOfRange(oneRow, 1, oneRow.length); - } - - public String getCorrectnessClass() { - if (oneRow != null && oneRow[1] != null) { - Integer grade = Integer.parseInt(oneRow[1]); - if (grade >= 2) { - return "grade-pos2"; - } else if (grade == 1) { - return "grade-pos"; - } else if (grade == 0) { - return "grade-zero"; - } else if (grade < 0) { - return "grade-neg"; - } else { - return ""; - } - } else { - return ""; - } - } - - private Long evalPoints(long submissionId, String evalPart) { - Long sum = 0L; - for (String[] tableUserDataPoint : evaluationData.stream() - .filter(e -> e[2].equals(evalPart) && e[0].equals(Long.toString(submissionId))) - .collect(Collectors.toList())) { - if (tableUserDataPoint[1] != null) { - sum += Long.parseLong(tableUserDataPoint[1]); - } - } - return sum; - } - - private long calcNumElements(long submissionId, String evalPart) { - return evaluationData.stream().filter(e -> e[2].equals(evalPart) && e[0].equals(Long.toString(submissionId))) - .collect(Collectors.toList()).size(); - } - - public void onLoadSavedData() { - evaluationData = new ArrayList(); - for (StudentSubmitSolution submission : getSubmissions()) { - if (submission.getEvaluations() != null && submission.getEvaluations().size() > 0) { - if (submission.getEvaluations().size() == 1) { - SolutionAssessment sa = submission.getEvaluations().get(0); - if (sa.getFeedbackSource() != null) { - ObjectMapper mapper = new ObjectMapper(); - mapper.enable(SerializationFeature.INDENT_OUTPUT); - try { - List partialData = mapper.readValue(sa.getFeedbackSource(), - new TypeReference>() { - }); - logger.info("From JSON {} {}", submission.getStudentSubmitSolutionId(), partialData.size()); - evaluationData.addAll(partialData); - } catch (Exception e) { - e.printStackTrace(); - } - } - } else { - throw new RuntimeException("Too many evaluations"); - } - } - } - } - - @CommitAfter - public void onSaveDataAndGenerateReports() { - for (StudentSubmitSolution submission : getSubmissions()) { - String assessmentComment = "

Evaluation report of the relational schema

\n"; - double total = 0; - String formula = systemConfigService.getCode("Task", taskInTestInstanceToGrade.getTask().getTaskId(), - "FORMULA"); - HashMap sums = new HashMap(); - - for (String s : ModelConstants.AllDBRelationalObjectTypes) { - Long points = evalPoints(submission.getStudentSubmitSolutionId(), s); - sums.put(s, points); - Long numElements = calcNumElements(submission.getStudentSubmitSolutionId(), s); - assessmentComment += "

Evaluting part " + s.toString() + ": we have found " - + numElements.toString() + " elements in your DB relational schema.
\n"; - assessmentComment += "After checking for correctness you were awarded " + points.toString() - + " points.

"; - } - - if (formula != null) { - Expression e = new ExpressionBuilder(formula) - .variables(ModelConstants.DBRelationalObjectTypesTABLE, - ModelConstants.DBRelationalObjectTypesPK, ModelConstants.DBRelationalObjectTypesFK, - ModelConstants.DBRelationalObjectTypesNN, ModelConstants.DBRelationalObjectTypesCHECK, - ModelConstants.DBRelationalObjectTypesUK, ModelConstants.DBRelationalObjectTypesDATA) - .build() - .setVariable(ModelConstants.DBRelationalObjectTypesTABLE, - sums.get(ModelConstants.DBRelationalObjectTypesTABLE)) - .setVariable(ModelConstants.DBRelationalObjectTypesPK, - sums.get(ModelConstants.DBRelationalObjectTypesPK)) - .setVariable(ModelConstants.DBRelationalObjectTypesFK, - sums.get(ModelConstants.DBRelationalObjectTypesFK)) - .setVariable(ModelConstants.DBRelationalObjectTypesNN, - sums.get(ModelConstants.DBRelationalObjectTypesNN)) - .setVariable(ModelConstants.DBRelationalObjectTypesCHECK, - sums.get(ModelConstants.DBRelationalObjectTypesCHECK)) - .setVariable(ModelConstants.DBRelationalObjectTypesUK, - sums.get(ModelConstants.DBRelationalObjectTypesUK)) - .setVariable(ModelConstants.DBRelationalObjectTypesDATA, - sums.get(ModelConstants.DBRelationalObjectTypesDATA)); - total = e.evaluate(); - } else { - total = -1; - } - - assessmentComment += "

Total score: " + total + "

"; - SolutionAssessment sa = null; - if (submission.getEvaluations() == null || submission.getEvaluations().size() == 0) { - sa = new SolutionAssessment(); - sa.setStudentSubmitSolution(submission); - } else { - sa = submission.getEvaluations().get(0); - } - sa.setGrade((float) total); - sa.setEvaluatedOn(new Date()); - sa.setFeedback(assessmentComment); - sa.setPassed(true); - - ObjectMapper mapper = new ObjectMapper(); - mapper.enable(SerializationFeature.INDENT_OUTPUT); - try { - List partialData = evaluationData.stream() - .filter(e -> e[0].equals(Long.toString(submission.getStudentSubmitSolutionId()))) - .collect(Collectors.toList()); - logger.info("To JSON {} {}", submission.getStudentSubmitSolutionId(), partialData.size()); - String json = mapper.writeValueAsString(partialData); - sa.setFeedbackSource(json); - } catch (Exception e) { - logger.error("JSON convertion {}", e.getMessage()); - } - genericService.saveOrUpdate(sa); - } - } - - void onRefreshData() { - Triplet, List, List> results = evaluationService - .getDDLEvaluationDataFromStudentDatabases(getSubmissions()); - evaluationData = results.getFirstItem(); - for (int i = 0; i < evaluationData.size(); i++) { - evaluationData.get(i)[3] = evaluationData.get(i)[3].replaceFirst("202122z_va_ispit_......", - "exam_by_******"); // @TODO: направено за SIGITE презентација да се преправи - } - resultsHeadersSimple = results.getSecondItem(); - resultsErrors = results.getThirdItem(); - } - - public class ComparatorEvaluationData implements Comparator { - - public String getCoding(String[] array) { - String res = ""; - for (int i = 4; i < array.length; i++) { - if (array[i] != null) { - res += array[i] + "|"; - } else { - res += "|"; - } - } - return res; - } - - @Override - public int compare(String[] s1, String[] s2) { - String coded1 = getCoding(s1); - String coded2 = getCoding(s2); - if (coded1.length() < coded2.length()) { - return -1; - } else { - if (coded1.length() > coded2.length()) { - return 1; - } else { - return coded1.compareTo(coded2); - } - } - } - - } - - void onClearErrors() { - resultsErrors = null; - } -} Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityDao.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityDao.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityDao.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -23,7 +23,5 @@ import java.util.List; -import dblearnstar.model.entities.ActivityInTask; import dblearnstar.model.entities.Person; -import dblearnstar.model.entities.TaskInTestInstance; public interface ActivityDao { @@ -31,8 +29,3 @@ List activePersonsInInterval(int seconds); - List getActivitiesInTaskForPerson(Person selectedPerson, - TaskInTestInstance selectedTaskInTestInstance); - - void recordActivityInTask(Person person, TaskInTestInstance taskInTestInstance, String type, String payload); - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityDaoImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityDaoImpl.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityDaoImpl.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -30,9 +30,6 @@ import org.apache.tapestry5.ioc.annotations.Inject; import org.hibernate.Session; -import org.slf4j.Logger; -import dblearnstar.model.entities.ActivityInTask; import dblearnstar.model.entities.Person; -import dblearnstar.model.entities.TaskInTestInstance; public class ActivityDaoImpl implements ActivityDao { @@ -40,7 +37,4 @@ @Inject private Session session; - - @Inject - private Logger logger; private Session getEntityManager() { @@ -60,30 +54,3 @@ } - @Override - public List getActivitiesInTaskForPerson(Person p, TaskInTestInstance tti) { - Query q = getEntityManager().createQuery(""" - select ait - from ActivityInTask ait - join ait.person p - join ait.taskInTestInstance tti - where p.personId=:personId and tti.taskInTestInstanceId=:taskInTestInstanceId - order by ait.whenOccured desc - """); - q.setParameter("personId", p.getPersonId()); - q.setParameter("taskInTestInstanceId", tti.getTaskInTestInstanceId()); - return UsefulMethods.castList(ActivityInTask.class, q.getResultList()); - } - - @Override - public void recordActivityInTask(Person person, TaskInTestInstance taskInTestInstance, String type, - String payload) { - ActivityInTask activityInTask = new ActivityInTask(); - activityInTask.setPerson(person); - activityInTask.setTaskInTestInstance(taskInTestInstance); - activityInTask.setType(type); - activityInTask.setWhenOccured(new Date()); - activityInTask.setPayload(payload); - getEntityManager().save(activityInTask); - } - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityManager.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityManager.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityManager.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -23,7 +23,5 @@ import java.util.List; -import dblearnstar.model.entities.ActivityInTask; import dblearnstar.model.entities.Person; -import dblearnstar.model.entities.TaskInTestInstance; public interface ActivityManager { @@ -31,8 +29,3 @@ public List activePersonsInInterval(int seconds); - public List getActivitiesInTaskForPerson(Person selectedPerson, - TaskInTestInstance selectedTaskInTestInstance); - - public void recordActivityInTask(Person person, TaskInTestInstance taskInTestInstance, String type, String payload); - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityManagerImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityManagerImpl.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/ActivityManagerImpl.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -21,12 +21,9 @@ package dblearnstar.webapp.services; -import java.util.Date; import java.util.List; import org.apache.tapestry5.ioc.annotations.Inject; -import dblearnstar.model.entities.ActivityInTask; import dblearnstar.model.entities.Person; -import dblearnstar.model.entities.TaskInTestInstance; public class ActivityManagerImpl implements ActivityManager { @@ -40,15 +37,3 @@ } - @Override - public List getActivitiesInTaskForPerson(Person selectedPerson, - TaskInTestInstance selectedTaskInTestInstance) { - return activityDao.getActivitiesInTaskForPerson(selectedPerson, selectedTaskInTestInstance); - } - - @Override - public void recordActivityInTask(Person person, TaskInTestInstance taskInTestInstance, String type, - String payload) { - activityDao.recordActivityInTask(person, taskInTestInstance, type, payload); - } - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/AppModule.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/AppModule.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/AppModule.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -46,5 +46,4 @@ 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; @@ -53,9 +52,6 @@ import dblearnstar.model.entities.Person; import dblearnstar.model.entities.PersonRole; -import dblearnstar.model.entities.Student; import dblearnstar.model.model.UserInfo; import dblearnstar.model.model.UserInfo.UserRole; -import dblearnstar.webapp.model.ApplicationConstants; -import dblearnstar.webapp.util.AppConfig; @ImportModule(Bootstrap4Module.class) @@ -63,5 +59,4 @@ public static void bind(ServiceBinder binder) { binder.bind(AccessControllerRequestFilter.class); - binder.bind(DigestService.class); binder.bind(GenericDao.class); binder.bind(GenericService.class); @@ -74,9 +69,8 @@ binder.bind(TestManager.class); binder.bind(TranslationService.class); - binder.bind(SystemConfigService.class); } public static void contributeFactoryDefaults(MappedConfiguration configuration) { - configuration.override(SymbolConstants.APPLICATION_VERSION, AppConfig.getString("app.version")); + configuration.override(SymbolConstants.APPLICATION_VERSION, "0.8-T5.7.2"); configuration.override(SymbolConstants.PRODUCTION_MODE, false); } @@ -84,6 +78,5 @@ public static void contributeApplicationDefaults(MappedConfiguration configuration) { configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en,mk"); - configuration.add(SymbolConstants.HMAC_PASSPHRASE, - AppConfig.getString("tapestry.hmac-passphrase") + UUID.randomUUID()); + configuration.add(SymbolConstants.HMAC_PASSPHRASE, "JxIJa1SIjasihd08as09!W!" + UUID.randomUUID()); configuration.add(SymbolConstants.ENABLE_HTML5_SUPPORT, true); configuration.add(SymbolConstants.COMPRESS_WHITESPACE, false); @@ -92,16 +85,4 @@ configuration.add(SymbolConstants.JAVASCRIPT_INFRASTRUCTURE_PROVIDER, "jquery"); - - configuration.add(SymbolConstants.EXCEPTION_REPORTS_DIR, - AppConfig.getString("additionalFiles.path") + AppConfig.getString("exceptionReports.path")); - } - - @Decorate(serviceInterface = ExceptionReporter.class) - public static ExceptionReporter preventExceptionFileWriting(final ExceptionReporter exceptionReporter) { - return new ExceptionReporter() { - @Override - public void reportException(Throwable exception) { - } - }; } @@ -154,74 +135,64 @@ userInfo.setUserName(null); - String userName = requestGlobals.getHTTPServletRequest().getRemoteUser(); - userInfo.setUserName(userName); - logger.info("External auth login by user {}. Checking privileges.", userName); - - Person loggedInPerson = (Person) session.getEntityManagerFactory().createEntityManager() - .createQuery("from Person p where userName=:userName").setParameter("userName", userName) - .getResultStream().findFirst().orElse(null); - - if (loggedInPerson == null) { - logger.debug("These is no Person with userName: {}", userName); - if (AppConfig.getString(ApplicationConstants.AUTH_AUTO_CREATE_USER).equalsIgnoreCase("true")) { - logger.debug(" Creating Person with userName: {}", userName); - loggedInPerson = new Person(); - loggedInPerson.setUserName(userName); - loggedInPerson.setFirstName(userName); - loggedInPerson.setLastName(userName); - logger.debug(" Creating Student for the Person with userName: {}", userName); - Student s = new Student(); - s.setPerson(loggedInPerson); - session.save(loggedInPerson); - session.save(s); - session.getSession().getTransaction().commit(); - logger.info(" Created user {}", userName); - loggedInPerson = (Person) session.getSession() - .createQuery("from Person p where userName=:userName") - .setParameter("userName", userName).getResultStream().findFirst().orElse(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 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(); + + if (!(loggedInPerson.getStudents().isEmpty())) { + logger.debug("Login user is student"); + userRoles.add(UserRole.STUDENT); + } + + for (PersonRole pr : personManager.getPersonRolesForPerson(loggedInPerson.getPersonId())) { + if (pr.getRole().getName().equals("ADMINISTRATOR")) { + logger.debug("Login user is administrator"); + userRoles.add(UserRole.ADMINISTRATOR); + } else if (pr.getRole().getName().equals("INSTRUCTOR")) { + logger.debug("Login user is instructor"); + userRoles.add(UserRole.INSTRUCTOR); + } + } + + 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()); + } else { + logger.error("userName is empty"); + } + // throw new NoSuchUserException(); + return userInfo; } - - if (loggedInPerson == null) { - userInfo.setUserRoles(null); - userInfo.setPersonId(null); - logger.info("Logged in userName: {} is not found", userInfo.getUserName()); - } else { - logger.debug("Logged in personId: {}", loggedInPerson.getPersonId()); - - List userRoles = new ArrayList(); - - if (!(loggedInPerson.getStudents().isEmpty())) { - logger.debug("Logged in user: {} is a student", userName); - userRoles.add(UserRole.STUDENT); - } - - for (PersonRole pr : personManager.getPersonRolesForPerson(loggedInPerson.getPersonId())) { - if (pr.getRole().getName().equals("ADMINISTRATOR")) { - logger.debug("Logged in user: {} is an administrator", userName); - userRoles.add(UserRole.ADMINISTRATOR); - } else if (pr.getRole().getName().equals("INSTRUCTOR")) { - logger.debug("Logged in user: {} is instructor", userName); - userRoles.add(UserRole.INSTRUCTOR); - } - } - - if (userRoles.size() == 0) { - logger.debug("Loggen in user: {} role is set to NONE", userName); - userRoles.add(UserRole.NONE); - } - - logger.debug("Logged in user: {} has {} roles", userName, userRoles.size()); - - userInfo.setUserName(userName); - userInfo.setPersonId(loggedInPerson.getPersonId()); - userInfo.setUserRoles(userRoles); - logger.debug("userInfo is now initialized for logged in user: {}", userName); - } - return userInfo; } }; configuration.add(UserInfo.class, new ApplicationStateContribution("session", userInfoCreator)); - } Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/services/DigestService.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/DigestService.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,7 +1,0 @@ -package dblearnstar.webapp.services; - -public interface DigestService { - - public String obfuscate(String shortText); - -} Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/services/DigestServiceImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/DigestServiceImpl.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,15 +1,0 @@ -package dblearnstar.webapp.services; - -import org.apache.commons.codec.digest.DigestUtils; - -import dblearnstar.webapp.util.AppConfig; - -public class DigestServiceImpl implements DigestService { - - @Override - public String obfuscate(String text) { - String message = AppConfig.getString("tapestry.hmac-passphrase") + text; - return DigestUtils.sha1Hex(message); - } - -} Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationService.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationService.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationService.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -21,11 +21,6 @@ package dblearnstar.webapp.services; -import java.sql.Connection; -import java.sql.SQLException; import java.util.List; -import dblearnstar.model.entities.Group; -import dblearnstar.model.entities.GroupMember; -import dblearnstar.model.entities.SolutionAssessment; import dblearnstar.model.entities.Student; import dblearnstar.model.entities.StudentSubmitSolution; @@ -46,7 +41,4 @@ public List getAllSolutionsForEvalutionFromTestInstance(TestInstance selectedTestInstance); - public List getAllSolutionsForEvalutionFromTaskInTestInstance( - TaskInTestInstance taskInTestInstance); - public List getAllSubmissionsOrdered(); @@ -57,26 +49,5 @@ TestInstance testInstance, TaskInTestInstance taskInTestInstance, Boolean onlyForEval, Boolean onlyCorrect); - public void reEvalSolution(String issuedByUserName, StudentSubmitSolution s); - - public Triplet, List, List> getResultsForPrintingPurposes(String userName, - String queryToRun, TestInstanceParameters tip, String schema, String type); - - /** - * @return - */ - Triplet, List, List> getEvalResultsForViewing(String userName, String queryToRun, - TaskInTestInstance taskInTestInstance, TestInstanceParameters tip, String schema); - - public List execQuery(StudentSubmitSolution submission, Connection connection, String gradingSchema, - String string) throws SQLException; - - public Triplet, List, List> getDDLEvaluationDataFromStudentDatabases( - List submissions); - - public List getSolutionAssessmentsWithDiscussionForTestInstance(long testInstanceId); - - public void reEvalListOfSubmissions(String userName, List list); - - public List groupMembersSortedByTestTotals(Group selectedGroup); + public void processSolution(String issuedByUserName, StudentSubmitSolution s); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/EvaluationServiceImpl.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -25,15 +25,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.sql.SQLWarning; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.Properties; -import java.util.regex.Pattern; - -import javax.persistence.Query; + import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder; @@ -48,7 +41,4 @@ import org.slf4j.Logger; -import dblearnstar.model.entities.Group; -import dblearnstar.model.entities.GroupMember; -import dblearnstar.model.entities.SolutionAssessment; import dblearnstar.model.entities.Student; import dblearnstar.model.entities.StudentSubmitSolution; @@ -57,6 +47,4 @@ import dblearnstar.model.entities.TestInstanceParameters; import dblearnstar.model.model.Triplet; -import dblearnstar.webapp.model.ApplicationConstants; -import dblearnstar.webapp.util.AppConfig; public class EvaluationServiceImpl implements EvaluationService { @@ -69,7 +57,4 @@ @Inject - private SystemConfigService systemConfigService; - - @Inject private Session session; @@ -78,87 +63,16 @@ } - private String prepareQueryStringCurrentTime(TaskInTestInstance taskInTestInstance, String query, String schema) { - String nowString = systemConfigService.getValue("Task", taskInTestInstance.getTask().getTaskId(), - "TEST_NOW_" + schema); - if (nowString == null) { - logger.warn("Missing system parameter {}", "TEST_NOW_" + schema); - } - logger.debug("TEST_NOW {}", nowString); - String queryStringModified = query; - String replaceString = schema + ".now()"; - if (nowString != null && nowString.length() == 35 && nowString.startsWith("TIMESTAMP '") - && nowString.endsWith("'")) { - String checkParse = nowString.substring(11, nowString.length() - 1); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - Date now = null; - try { - now = sdf.parse(checkParse); - replaceString = nowString; - } catch (ParseException e) { - logger.error("Parsing parameter {} failed with error {}", "TEST_NOW_" + schema, e.getMessage()); - } - } - queryStringModified = Pattern.compile(Pattern.quote("now()"), Pattern.CASE_INSENSITIVE) - .matcher(queryStringModified).replaceAll(replaceString); - queryStringModified = Pattern.compile(Pattern.quote("current_date"), Pattern.CASE_INSENSITIVE) - .matcher(queryStringModified).replaceAll(replaceString); - logger.debug( - "Modded query for evaluation is \n------------------------------\n{}\n==============================", - queryStringModified); - return queryStringModified; - } - - private String prepareQueryStringForViewing(TaskInTestInstance taskInTestInstance, String query, String schema, - String evalViewName, String userName) { - String queryStringModified = query; - queryStringModified = prepareQueryStringCurrentTime(taskInTestInstance, query, schema); - - String evalQueryString = // - " select 'In Submission' as WHERE, * from " // - + " ( ( " + queryStringModified + " ) " // - + " EXCEPT ALL " // - + " ( select * from " + evalViewName + " ) ) eden " // - + " UNION ALL " // - + " select 'In Correct Solution' as WHERE, * from " // - + " ( ( select * from " + evalViewName + " ) " // - + " EXCEPT ALL " // - + " ( " + queryStringModified + " ) ) dva " // - + " order by 1,2 "; - logger.debug("user {} issued evalQueryString for viewing: {}", userName, evalQueryString); - return evalQueryString; - } - - private String prepareQueryStringForEval(TaskInTestInstance taskInTestInstance, String query, String schema, - String evalViewName, String userName) { - String queryStringModified = query; - queryStringModified = prepareQueryStringCurrentTime(taskInTestInstance, query, schema); - - String evalQueryString = // - " select *, 'EDEN' from " // - + " ( ( " + queryStringModified + " ) " // - + " EXCEPT ALL " // - + " ( select * from " + evalViewName + " ) ) eden " // - + " UNION ALL " // - + " select *, 'DVA' from " // - + " ( ( select * from " + evalViewName + " ) " // - + " EXCEPT ALL " // - + " ( " + queryStringModified + " ) ) dva "; - logger.debug("user {} issued evalQueryString for evaluation: {}", userName, evalQueryString); - return evalQueryString; - } - - /** - * @return < resultsEval, resultsErrors, evaluation result > - */ - @Override - public Triplet, List, Boolean> evalResultsIn(String userName, String queryToRun, + @Override + public Triplet, List, Boolean> evalResultsIn(String userName, String queryString, TaskInTestInstance taskInTestInstance, TestInstanceParameters tip, String schema) { Triplet, List, Boolean> rslts = new Triplet, List, Boolean>( new ArrayList(), new ArrayList(), Boolean.valueOf(false)); - - if (queryToRun != null) { - String qtlc = queryToRun.toLowerCase(); + // rslts.firstItem will be used for resultsEval + // rslts.secondItem will be used for resultsErrors + // rslts.thirdItem will be used to pass evaluation result + if (queryString != null) { + String qtlc = queryString.toLowerCase(); if (qtlc.contains("delete") || qtlc.contains("update") || qtlc.contains("insert") || qtlc.contains("create") - || qtlc.contains("drop") || qtlc.contains("alter") || qtlc.contains("information_schema")) { + || qtlc.contains("drop") || qtlc.contains("alter")) { } else { Connection connection = null; @@ -175,9 +89,14 @@ connection.setSchema(schema); - String evalQueryString = prepareQueryStringForEval(taskInTestInstance, queryToRun, schema, - evalViewName, userName); + String queryStringManip = queryString.replace("now()", schema + ".now()"); + queryStringManip = queryStringManip.replace("current_date", schema + ".now()"); + + String evalQueryString = "((" + queryStringManip + ") except (select * from " + evalViewName + + ")) union ((select * from " + evalViewName + ") except (" + queryStringManip + "))"; + + logger.debug("user {} issued evalQueryString: {}", userName, evalQueryString); PreparedStatement pstmt = connection.prepareStatement(evalQueryString); - pstmt.setQueryTimeout(10 * 60); + pstmt.setQueryTimeout(30); ResultSet rs = pstmt.executeQuery(); if (rs.next()) { @@ -190,5 +109,4 @@ } rs.close(); - pstmt.close(); SQLWarning w = connection.getWarnings(); if (w != null) { @@ -197,5 +115,5 @@ connection.rollback(); } catch (Exception e) { - logger.error("Error occured when evaluating submission <<<\n{}\n>>> - {}", queryToRun, e.getMessage()); + logger.error("Error occured {}", e.getMessage()); if (e.getMessage().contains("ERROR: each EXCEPT query must have the same number of columns")) { rslts.getFirstItem().add(messages.get("sql-outputSchemaFormatError")); @@ -206,6 +124,4 @@ evalViewName, taskInTestInstance.getTaskInTestInstanceId()); rslts.getSecondItem().add(messages.get("sql-notPossibleToEvaluate")); - } else if (e.getMessage().toLowerCase().contains("DateStyle parameter was changed")) { - logger.error("" + e); } else { rslts.getSecondItem().add(e.getMessage()); @@ -277,14 +193,4 @@ @Override - public List getAllSolutionsForEvalutionFromTaskInTestInstance( - TaskInTestInstance taskInTestInstance) { - return UsefulMethods.castList(StudentSubmitSolution.class, getEntityManager().createQuery(""" - from StudentSubmitSolution sss where sss.notForEvaluation=false and - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - """).setParameter("taskInTestInstanceId", taskInTestInstance.getTaskInTestInstanceId()) - .getResultList()); - } - - @Override public List getAllSubmissionsOrdered() { return UsefulMethods.castList(StudentSubmitSolution.class, getEntityManager() @@ -344,56 +250,35 @@ return null; } - String newLine = System.getProperty("line.separator"); String queryStringIntro = """ - SELECT sss.* - FROM student_submit_solution sss - JOIN student_started_test sst ON sss.student_started_test_id=sst.student_started_test_id - WHERE - sst.test_instance_id=:testInstanceId + from StudentSubmitSolution sssL where + sssL.taskInTestInstance.testInstance.testInstanceId=:testInstanceId """; String queryStringMiddle = ""; if (student != null) { - queryStringMiddle += """ - AND sst.student_id=:studentId - """; - } else { - queryStringMiddle += """ - AND sst.student_id IN - ( - SELECT gm.student_id - FROM - group_focus_on_test gfot - JOIN group_member gm ON gm.group_id=gfot.group_id - WHERE gfot.test_instance_id=sst.test_instance_id - ) - """; + queryStringMiddle += " and sssL.studentStartedTest.student.studentId=:studentId "; } if (taskInTestInstance != null) { - queryStringMiddle += """ - AND sss.task_in_test_instance_id=:taskInTestInstanceId - """; + queryStringMiddle += " and sssL.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId "; } if (onlyCorrect != null && onlyCorrect) { queryStringMiddle += """ - AND sss.evaluation_simple - AND sss.evaluation_complex - AND sss.evaluation_exam + and sssL.evaluationSimple=true + and sssL.evaluationComplex=true + and sssL.evaluationExam=true """; } if (onlyForEval != null && onlyForEval) { - queryStringMiddle += """ - AND sss.not_for_evaluation=false - """; + queryStringMiddle += " and sssL.notForEvaluation=false "; } String queryStringOutro = """ - AND sss.submitted_on= - ( - SELECT max(sssin.submitted_on) FROM student_submit_solution sssin - WHERE sssin.student_started_test_id=sss.student_started_test_id AND sssin.task_in_test_instance_id=sss.task_in_test_instance_id - ) - order by sss.submitted_on desc + and sssL.submittedOn>=all ( + select sssR.submittedOn from StudentSubmitSolution sssR + where + sssL.studentStartedTest.student.studentId=sssR.studentStartedTest.student.studentId and + sssL.taskInTestInstance.taskInTestInstanceId=sssR.taskInTestInstance.taskInTestInstanceId + ) order by sssL.submittedOn desc """; - String queryString = queryStringIntro + queryStringMiddle + queryStringOutro; - Query q = getEntityManager().createNativeQuery(queryString, StudentSubmitSolution.class); + javax.persistence.Query q = getEntityManager() + .createQuery(queryStringIntro + queryStringMiddle + queryStringOutro); q.setParameter("testInstanceId", testInstance.getTestInstanceId()); if (student != null) { @@ -410,19 +295,16 @@ } - public void reEvalSolution(String issuedByUserName, StudentSubmitSolution s) { - TaskInTestInstance tti = s.getTaskInTestInstance(); - /* - * TODO: Only supports TestInstances with a single TestInstanceParameter line - */ - TestInstanceParameters tip = tti.getTestInstance().getTestInstanceParameters().get(0); - - logger.info("Reevaluation started for studentSubmitSolutionId: {}", s.getStudentSubmitSolutionId()); + public void processSolution(String issuedByUserName, StudentSubmitSolution s) { Triplet, List, Boolean> rsltsSimple = evalResultsIn(issuedByUserName, s.getSubmission(), - tti, tip, tip.getSchemaSimple()); + s.getTaskInTestInstance(), + s.getTaskInTestInstance().getTestInstance().getTestInstanceParameters().get(0), + s.getTaskInTestInstance().getTestInstance().getTestInstanceParameters().get(0).getSchemaSimple()); Triplet, List, Boolean> rsltsComplex = evalResultsIn(issuedByUserName, s.getSubmission(), - tti, tip, tip.getSchemaComplex()); - logger.info("Reevaluation Simple studentSubmitSolutionId: {} reevaluated as: {}", - s.getStudentSubmitSolutionId(), rsltsSimple.getThirdItem()); - logger.info("Reevaluation Complex studentSubmitSolutionId: {} reevaluated as: {}", + s.getTaskInTestInstance(), + s.getTaskInTestInstance().getTestInstance().getTestInstanceParameters().get(0), + s.getTaskInTestInstance().getTestInstance().getTestInstanceParameters().get(0).getSchemaComplex()); + logger.info("Reevaluation studentSubmitSolutionId Simple: {} reevaluated as {}", s.getStudentSubmitSolutionId(), + rsltsSimple.getThirdItem()); + logger.info("Reevaluation studentSubmitSolutionId Complex: {} reevaluated as {}", s.getStudentSubmitSolutionId(), rsltsComplex.getThirdItem()); if (rsltsSimple.getThirdItem() == true) { @@ -440,584 +322,3 @@ } - /** - * @return - */ - @Override - public Triplet, List, List> getResultsForPrintingPurposes(String userName, - String queryToRun, TestInstanceParameters tip, String schema, String type) { - List resultsSimple = new ArrayList(); - List resultsHeadersSimple = new ArrayList(); - List resultsErrors = new ArrayList(); - - if (queryToRun != null) { - String qtlc = queryToRun.toLowerCase(); - if (qtlc.contains("delete") || qtlc.contains("update") || qtlc.contains("insert") || qtlc.contains("create") - || qtlc.contains("drop") || qtlc.contains("alter") || qtlc.contains("information_schema")) { - resultsErrors.add(messages.get("sql-db-modifications")); - logger.error("Database modification or catalog or directory query issued by {}", userName); - } else { - resultsSimple = new ArrayList(); - resultsHeadersSimple = new ArrayList(); - - Connection connection = null; - int statusCounter = 0; - try { - Properties props = new Properties(); - props.setProperty("user", tip.getDbUser()); - props.setProperty("password", tip.getDbPass()); - String url = "jdbc:postgresql://" + tip.getHostname() + ":" + tip.getPort() + "/" + tip.getDbName(); - - connection = DriverManager.getConnection(url, props); - statusCounter = 1; - - connection.setClientInfo("ApplicationName", "dbLearn*Evaluator"); - connection.setReadOnly(true); - connection.setAutoCommit(false); - connection.setSavepoint(); - connection.setSchema(schema); - statusCounter = 2; - - ResultSet rs = connection.prepareStatement(queryToRun).executeQuery(); - boolean isNextRow = rs.next(); - int numColumns = rs.getMetaData().getColumnCount(); - for (int i = 1; i <= numColumns; i++) { - resultsHeadersSimple.add(rs.getMetaData().getColumnName(i)); - } - statusCounter = 3; - - int count = 1; - while (isNextRow && count < 500) { - Object[] o = new Object[numColumns]; - for (int i = 1; i <= numColumns; i++) { - o[i - 1] = rs.getObject(i); - } - resultsSimple.add(o); - isNextRow = rs.next(); - count++; - } - statusCounter = 4; - rs.close(); - SQLWarning w = connection.getWarnings(); - if (w != null) { - logger.debug("warning"); - resultsErrors.add(w.getMessage()); - } - if (count >= 500) { - logger.debug("count"); - resultsErrors.add(messages.get("sql-moreThan500Rows")); - } - connection.rollback(); - } catch (Exception e) { - if (statusCounter == 0) { - logger.error("Error when connecting to evaluation database for testinstance: {}", - tip.getTestInstance().getTestInstanceId()); - logger.debug("Exception: {}", e); - resultsErrors.add(messages.get("evalDBNA-label")); - } else { - logger.error( - "Connected to evaluation database for test instance {}, but failed in running query: {} ", - tip.getTestInstance().getTestInstanceId(), queryToRun); - logger.debug("Exception: {}", e); - resultsErrors.add(e.getMessage()); - } - } finally { - if (connection != null) { - try { - connection.close(); - } catch (Exception e) { - logger.error("Connection can't be closed {} {}", userName, e.getMessage()); - } - } - } - } - } else { - resultsSimple = new ArrayList(); - resultsHeadersSimple = new ArrayList(); - } - - Triplet, List, List> results = new Triplet, List, List>( - resultsSimple, resultsHeadersSimple, resultsErrors); - return results; - } - - /** - * @return - */ - @Override - public Triplet, List, List> getEvalResultsForViewing(String userName, - String queryToRun, TaskInTestInstance taskInTestInstance, TestInstanceParameters tip, String schema) { - List resultsSimple = new ArrayList(); - List resultsHeadersSimple = new ArrayList(); - List resultsErrors = new ArrayList(); - - if (queryToRun != null) { - String qtlc = queryToRun.toLowerCase(); - if (qtlc.contains("delete") || qtlc.contains("update") || qtlc.contains("insert") || qtlc.contains("create") - || qtlc.contains("drop") || qtlc.contains("alter") || qtlc.contains("information_schema")) { - resultsErrors.add(messages.get("sql-db-modifications")); - logger.error("Database modification or catalog or directory query issued by {}", userName); - } else { - resultsSimple = new ArrayList(); - resultsHeadersSimple = new ArrayList(); - - Connection connection = null; - String evalViewName = tip.getEvaluationViewPrefix() + taskInTestInstance.getTask().getTitle(); - - int statusCounter = 0; - - try { - Properties props = new Properties(); - props.setProperty("user", tip.getDbUser()); - props.setProperty("password", tip.getDbPass()); - String url = "jdbc:postgresql://" + tip.getHostname() + ":" + tip.getPort() + "/" + tip.getDbName(); - - connection = DriverManager.getConnection(url, props); - statusCounter = 1; - - connection.setClientInfo("ApplicationName", "dbLearnStarEvaluator"); - connection.setReadOnly(true); - connection.setAutoCommit(false); - connection.setSavepoint(); - connection.setSchema(schema); - statusCounter = 2; - - String evalQueryString = prepareQueryStringForViewing(taskInTestInstance, queryToRun, schema, - evalViewName, userName); - - PreparedStatement pstmt = connection.prepareStatement(evalQueryString); - pstmt.setQueryTimeout(10 * 60); - ResultSet rs = pstmt.executeQuery(); - boolean isNextRow = rs.next(); - int numColumns = rs.getMetaData().getColumnCount(); - for (int i = 1; i <= numColumns; i++) { - resultsHeadersSimple.add(rs.getMetaData().getColumnName(i)); - } - statusCounter = 3; - - int count = 1; - while (isNextRow && count < 500) { - Object[] o = new Object[numColumns]; - for (int i = 1; i <= numColumns; i++) { - o[i - 1] = rs.getObject(i); - } - resultsSimple.add(o); - isNextRow = rs.next(); - count++; - } - statusCounter = 4; - rs.close(); - SQLWarning w = connection.getWarnings(); - if (w != null) { - logger.debug("warning"); - resultsErrors.add(w.getMessage()); - } - if (count >= 500) { - logger.debug("count"); - resultsErrors.add(messages.get("sql-moreThan500Rows")); - } - connection.rollback(); - } catch (Exception e) { - if (statusCounter == 0) { - logger.error("Error when connecting to evaluation database for testinstance: {}", - tip.getTestInstance().getTestInstanceId()); - logger.debug("Exception: {}", e); - resultsErrors.add(messages.get("evalDBNA-label")); - } else { - if (e.getMessage().contains("ERROR: each EXCEPT query must have the same number of columns")) { - resultsErrors.add(messages.get("sql-outputSchemaFormatError")); - } else if (e.getMessage().contains("ERROR: EXCEPT types")) { - resultsErrors.add(messages.get("sql-outputSchemaFormatError")); - } else if (e.getMessage().toLowerCase().contains(evalViewName.toLowerCase())) { - logger.error( - "The view: {} with the correct solution for taskInTestInstanceId: {} is missing!", - evalViewName, taskInTestInstance.getTaskInTestInstanceId()); - resultsErrors.add(messages.get("sql-notPossibleToEvaluate")); - } else if (e.getMessage().toLowerCase().contains("DateStyle parameter was changed")) { - logger.error("" + e); - } else { - resultsErrors.add(e.getMessage()); - } - } - } finally { - if (connection != null) { - try { - connection.close(); - } catch (Exception e) { - logger.error("Connection can't be closed {} {}", userName, e.getMessage()); - } - } - } - } - } else { - resultsSimple = new ArrayList(); - resultsHeadersSimple = new ArrayList(); - } - - return new Triplet, List, List>(resultsSimple, resultsHeadersSimple, - resultsErrors); - } - - @Override - public List execQuery(StudentSubmitSolution submission, Connection connection, String gradingSchema, - String queryToRun) throws SQLException { - List resultData = new ArrayList(); - - PreparedStatement stat = connection.prepareStatement(queryToRun); - if (gradingSchema != null) { - stat.setString(1, gradingSchema); - } - ResultSet rs = stat.executeQuery(); - boolean isNextRow = rs.next(); - int numColumns = rs.getMetaData().getColumnCount(); - - logger.debug("Executing Query {} {} {} ", - submission.getStudentStartedTest().getStudent().getPerson().getUserName(), queryToRun, numColumns); - - while (isNextRow) { - String[] o = new String[numColumns + 2]; - o[0] = Long.toString(submission.getStudentSubmitSolutionId()); - o[1] = null; // grade - for (int i = 1; i <= numColumns; i++) { - Object ofromq = rs.getObject(i); - if (ofromq == null) { - o[i + 1] = null; - } else { - o[i + 1] = ofromq.toString(); - } - } - resultData.add(o); - isNextRow = rs.next(); - } - rs.close(); - - return resultData; - } - - @Override - public Triplet, List, List> getDDLEvaluationDataFromStudentDatabases( - List submissions) { - List ddlEvaluationData = new ArrayList(); - List resultsHeadersSimple = new ArrayList(); - List resultsDbConnErrors = new ArrayList(); - - String[] queryToRun = { - """ - select - 'TABLE' type, - current_database() as DB, - table_name, - (select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and ordinal_position=1) col1, - (select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and ordinal_position=2) col2, - (select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and ordinal_position=3) col3, - (select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and ordinal_position=4) col4, - (select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and ordinal_position=5) col5, - (select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and ordinal_position=6) col6, - (select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and ordinal_position=7) col7, - (select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and ordinal_position=8) col8, - (select column_name from information_schema.columns isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and ordinal_position=9) col9 - from information_schema.tables ist - where table_schema=? - order by table_catalog, table_name - """, - """ - select 'PK', - current_database() as DB, - table_name, - (select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=1) col1, - (select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=2) col2, - (select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=3) col3, - (select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=4) col4, - (select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=5) col5, - (select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=6) col6, - (select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=7) col7, - (select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=8) col8, - (select column_name from information_schema.key_column_usage isc where isc.table_catalog=ist.table_catalog and isc.table_schema=ist.table_schema and - isc.table_name=ist.table_name and isc.constraint_name=ist.constraint_name and isc.ordinal_position=9) col9 - from information_schema.table_constraints ist - where table_schema =? and ist.constraint_type='PRIMARY KEY' - order by table_catalog, table_schema, table_name - """, - """ - SELECT 'FK', - current_database() as DB, - conrelid::regclass AS table_from, - confrelid::regclass as table_to, - regexp_replace(pg_get_constraintdef(oid), '^FOREIGN KEY (.*) REFERENCES .*$', '\\1') foreign_key_columns, - regexp_replace(pg_get_constraintdef(oid), '^.*REFERENCES (.*).*$', '\\1') primary_key_columns - FROM pg_catalog.pg_constraint pc - WHERE pc.contype IN ('f') - AND pc.connamespace=?::regnamespace - ORDER BY 1,2,3 - """, - """ - select 'NN', - current_database() as DB, - table_name, - column_name - from information_schema.columns where is_nullable='NO' and table_schema=? - order by table_catalog, table_name; - """, - """ - SELECT 'CHECK', - current_database(), - source_table::regclass, - source_attr1.attname AS source_col1, - source_attr2.attname AS source_col2, - source_attr3.attname AS source_col3, - source_attr4.attname AS source_col4, - source_attr5.attname AS source_col5, - consrc - FROM - (SELECT consrc, connamespace, conname, - source_table, - target_table, - source_constraints[1] AS source_cons1, - source_constraints[2] AS source_cons2, - source_constraints[3] AS source_cons3, - source_constraints[4] AS source_cons4, - source_constraints[5] AS source_cons5 - FROM - (SELECT pg_get_constraintdef(oid) consrc, conname, connamespace, conrelid as source_table, - confrelid AS target_table, conkey AS source_constraints, confkey AS target_constraints - FROM pg_constraint - WHERE contype = 'c' - ) query1 - ) query2 - left outer join pg_attribute source_attr1 on source_attr1.attnum = source_cons1 AND source_attr1.attrelid = source_table - left outer join pg_attribute source_attr2 on source_attr2.attnum = source_cons2 AND source_attr2.attrelid = source_table - left outer join pg_attribute source_attr3 on source_attr3.attnum = source_cons3 AND source_attr3.attrelid = source_table - left outer join pg_attribute source_attr4 on source_attr4.attnum = source_cons4 AND source_attr4.attrelid = source_table - left outer join pg_attribute source_attr5 on source_attr5.attnum = source_cons5 AND source_attr5.attrelid = source_table - where (SELECT nspname FROM pg_namespace WHERE oid=connamespace)=? - """, - """ - SELECT 'UK', - current_database() as DB, - source_table::regclass, - source_attr1.attname AS source_col1, - source_attr2.attname AS source_col2, - source_attr3.attname AS source_col3, - source_attr4.attname AS source_col4, - source_attr5.attname AS source_col5, - consrc - FROM - (SELECT consrc, connamespace, conname, - source_table, - target_table, - source_constraints[1] AS source_cons1, - source_constraints[2] AS source_cons2, - source_constraints[3] AS source_cons3, - source_constraints[4] AS source_cons4, - source_constraints[5] AS source_cons5 - FROM - (SELECT pg_get_constraintdef(oid) consrc, conname, connamespace, conrelid as source_table, confrelid AS target_table, - conkey AS source_constraints, confkey AS target_constraints - FROM pg_constraint - WHERE contype = 'u' - ) query1 - ) query2 - left outer join pg_attribute source_attr1 on source_attr1.attnum = source_cons1 AND source_attr1.attrelid = source_table - left outer join pg_attribute source_attr2 on source_attr2.attnum = source_cons2 AND source_attr2.attrelid = source_table - left outer join pg_attribute source_attr3 on source_attr3.attnum = source_cons3 AND source_attr3.attrelid = source_table - left outer join pg_attribute source_attr4 on source_attr4.attnum = source_cons4 AND source_attr4.attrelid = source_table - left outer join pg_attribute source_attr5 on source_attr5.attnum = source_cons5 AND source_attr5.attrelid = source_table - where (SELECT nspname FROM pg_namespace WHERE oid=connamespace)=? - """, - """ - select 'DATA', - current_database() as DB, - c.table_name, - 0 as broj - from information_schema.tables c - where - c.table_schema=? and - c.table_name not in ('') - order by table_catalog, table_schema, table_name - """ }; - - if (submissions.size() < 100) { - Connection connectionEpm = null; - try { - connectionEpm = DriverManager.getConnection(AppConfig.getString(ApplicationConstants.EPRMS_JDBC_URL), - AppConfig.getString(ApplicationConstants.EPRMS_JDBC_USERNAME), - AppConfig.getString(ApplicationConstants.EPRMS_JDBC_PASSWORD)); - connectionEpm.setSchema(AppConfig.getString(ApplicationConstants.EPRMS_JDBC_SCHEMA)); - connectionEpm.setAutoCommit(false); - connectionEpm.setReadOnly(true); - PreparedStatement statEpm = connectionEpm.prepareStatement("select * from database where name like ?"); - - for (StudentSubmitSolution submission : submissions) { - String student = submission.getStudentStartedTest().getStudent().getPerson().getUserName(); - - Connection connection = null; - String DbPass = "", DbName = "", DbUser = ""; - String DbNameCensored = "*****"; - String gradingSchema = AppConfig.getString(ApplicationConstants.STUDENTDBS_JDBC_SCHEMA); - String mainUrl = AppConfig.getString(ApplicationConstants.STUDENTDBS_JDBC_URL); - - for (int n = 0; n < 7; n++) { - int statusCounter = 0; - - try { - SimpleDateFormat sdf = new SimpleDateFormat(ApplicationConstants.DATEFORMAT_CONDENSED); - String formattedTestDate = sdf - .format(submission.getStudentStartedTest().getTestInstance().getScheduledFor()); - - String likestring = "db%ispit%" + student + "%" + formattedTestDate + "%"; - statEpm.setString(1, likestring); - ResultSet rsEpm = statEpm.executeQuery(); - if (rsEpm != null && rsEpm.next()) { - DbPass = rsEpm.getString("password"); - DbName = rsEpm.getString("name"); - DbUser = rsEpm.getString("owner"); - } else { - logger.error("Did not find student data for {}", likestring); - resultsDbConnErrors.add(DbNameCensored + " - Did not find student data"); - } - - Properties props = new Properties(); - props.setProperty("user", DbUser); - props.setProperty("password", DbPass); - String url = mainUrl + "/" + DbName; - - connection = DriverManager.getConnection(url, props); - statusCounter = 1; - - connection.setClientInfo("ApplicationName", "dbLearn*RelationalEvaluator"); - connection.setReadOnly(true); - connection.setAutoCommit(false); - connection.setSavepoint(); - connection.setSchema(gradingSchema); - statusCounter = 2; - - List tempResults = execQuery(submission, connection, gradingSchema, - queryToRun[n]); - if (n == 6) { - for (String[] l : tempResults) { - String query = "SELECT count(*) FROM " + gradingSchema + "." + l[4]; - List countResults = execQuery(submission, connection, null, query); - if (countResults != null) { - - } - l[5] = countResults.get(0)[2]; - logger.debug("{} {} {} {} ", query, countResults.get(0)[0], countResults.get(0)[1], - countResults.get(0)[2]); - } - } - ddlEvaluationData.addAll(tempResults); - statusCounter = 4; // 3 should be before the preparedstatement, but it is not set - - SQLWarning w = connection.getWarnings(); - if (w != null) { - logger.debug("warning"); - resultsDbConnErrors.add(DbNameCensored + " - " + w.getMessage()); - } - connection.rollback(); - } catch (Exception e) { - if (statusCounter == 0) { - logger.error("{}", e.getMessage()); - resultsDbConnErrors.add(DbNameCensored + " - " + e.getMessage()); - } else { - logger.error( - "Connected to evaluation database {}, but failed in running query {} due to {}", - DbName, queryToRun[n], e.getMessage()); - logger.debug("Exception: {}", e); - resultsDbConnErrors.add(DbNameCensored + " - " + e.getMessage()); - } - } finally { - if (connection != null) { - try { - connection.close(); - } catch (Exception e) { - logger.error("Connection can't be closed {} {}", DbName, e.getMessage()); - } - } - } - } - } - } catch (Exception e) { - logger.error("Cant connect to epm due to {}", e.getMessage()); - } finally { - if (connectionEpm != null) { - try { - connectionEpm.close(); - } catch (Exception e) { - logger.error("EPM connection can't be closed {} ", e.getMessage()); - } - } - } - } - - return new Triplet, List, List>(ddlEvaluationData, resultsHeadersSimple, - resultsDbConnErrors); - } - - @Override - public List getSolutionAssessmentsWithDiscussionForTestInstance(long testInstanceId) { - return UsefulMethods.castList(SolutionAssessment.class, - getEntityManager() - .createQuery( - """ - select distinct ad.solutionEvaluation - from AssessmentDiscussion ad - where ad.solutionEvaluation.studentSubmitSolution.studentStartedTest.testInstance.testInstanceId=:testInstanceId - order by ad.solutionEvaluation.evaluatedOn - """) - .setParameter("testInstanceId", testInstanceId).getResultList()); - } - - @Override - public void reEvalListOfSubmissions(String userName, List list) { - list.forEach((studentSubmitSolution) -> { - try { - reEvalSolution(userName, studentSubmitSolution); - } catch (Exception e) { - logger.error("Fail evaluation for sssId: {}", studentSubmitSolution.getStudentSubmitSolutionId()); - } - }); - } - - @Override - public List groupMembersSortedByTestTotals(Group selectedGroup) { - return getEntityManager().createNativeQuery( - """ - SELECT - group_member_id, group_id, student_id - FROM ( - SELECT gm.group_member_id, gm.group_id, gm.student_id, ti.test_instance_id, titi.task_in_test_instance_id, max(sa.grade) test_task_grade, max(sss.submitted_on) prateno_na - FROM - "group" g - JOIN group_member gm ON g.group_id=gm.group_id - JOIN group_focus_on_test gfot ON g.group_id=gfot.group_id - JOIN test_instance ti ON ti.test_instance_id=gfot.test_instance_id - JOIN task_in_test_instance titi ON ti.test_instance_id=titi.test_instance_id - LEFT JOIN student_started_test sst ON sst.test_instance_id=ti.test_instance_id AND sst.student_id=gm.student_id - LEFT JOIN student_submit_solution sss ON titi.task_in_test_instance_id=sss.task_in_test_instance_id AND sss.student_started_test_id=sst.student_started_test_id - LEFT JOIN solution_assessment sa ON sss.student_submit_solution_id=sa.student_submit_solution_id - WHERE g.group_id=? - GROUP BY gm.group_member_id, ti.test_instance_id, titi.task_in_test_instance_id - ) temp1 - GROUP BY group_member_id, group_id, student_id - ORDER BY sum(test_task_grade) DESC, max(prateno_na) asc - """, - GroupMember.class).setParameter(1, selectedGroup.getGroupId()).getResultList(); - } - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/GenericDaoImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/GenericDaoImpl.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/GenericDaoImpl.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -94,6 +94,5 @@ @Override public List getAll(Class classToLoad) { - return UsefulMethods.castList(classToLoad, - getEntityManager().createQuery("from " + classToLoad.getName()).getResultList()); + return getEntityManager().createQuery("from " + classToLoad.getName()).getResultList(); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDao.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDao.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDao.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -46,5 +46,3 @@ public List getAllStudents(); - public boolean isInstructor(Person person); - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDaoImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDaoImpl.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonDaoImpl.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -30,5 +30,4 @@ import dblearnstar.model.entities.PersonRole; import dblearnstar.model.entities.Student; -import dblearnstar.model.model.ModelConstants; public class PersonDaoImpl implements PersonDao { @@ -137,27 +136,8 @@ getEntityManager().createQuery("from Student s order by s.person.lastName").getResultList()); } catch (Exception e) { - logger.error("getAllStudents {}", e); + logger.error("getAllStudents{}", e); return null; } } - @Override - public boolean isInstructor(Person person) { - try { - List list = getEntityManager() - .createQuery( - "from PersonRole pr where pr.person.personId=:personId and pr.role.name=:instructorRole") - .setParameter("personId", person.getPersonId()) - .setParameter("instructorRole", ModelConstants.InstructorRole).getResultList(); - if (list != null && list.size() > 0) { - return true; - } else { - return false; - } - } catch (Exception e) { - logger.error("isInstructor {}", e); - return false; - } - } - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManager.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManager.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManager.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -45,5 +45,3 @@ public List getAllStudents(); - public boolean isInstructor(Person person); - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManagerImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManagerImpl.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/PersonManagerImpl.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -84,8 +84,3 @@ return personDao.getAllStudents(); } - - @Override - public boolean isInstructor(Person person) { - return personDao.isInstructor(person); - } } Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/services/SystemConfigService.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/SystemConfigService.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,7 +1,0 @@ -package dblearnstar.webapp.services; - -public interface SystemConfigService { - public String getCode(String className, long originalObjectId, String type); - - public String getValue(String className, long originalObjectId, String type); -} Index: LearnStar-webApp/src/main/java/dblearnstar/webapp/services/SystemConfigServiceImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/SystemConfigServiceImpl.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,39 +1,0 @@ -package dblearnstar.webapp.services; - -import org.apache.tapestry5.ioc.annotations.Inject; - -import dblearnstar.model.entities.SystemParameter; - -public class SystemConfigServiceImpl implements SystemConfigService { - - @Inject - private GenericService genericService; - - @Override - public String getValue(String className, long originalObjectId, String type) { - SystemParameter sp = (UsefulMethods.castList(SystemParameter.class, - genericService.getAll(SystemParameter.class))).stream() - .filter(p -> p.getClassName().equals(className) && p.getOriginalObjectId() == originalObjectId - && p.getType().equals(type)) - .findFirst().orElse(null); - if (sp != null) { - return sp.getValue(); - } else { - return null; - } - } - - @Override - public String getCode(String className, long originalObjectId, String type) { - SystemParameter sp = (UsefulMethods.castList(SystemParameter.class, - genericService.getAll(SystemParameter.class))).stream() - .filter(p -> p.getClassName().equals(className) && p.getOriginalObjectId() == originalObjectId - && p.getType().equals(type)) - .findFirst().orElse(null); - if (sp != null) { - return sp.getCode(); - } else { - return null; - } - } -} Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManager.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -23,6 +23,5 @@ import java.util.List; -import dblearnstar.model.entities.Model; -import dblearnstar.model.entities.SolutionAssessment; +import dblearnstar.model.entities.Person; import dblearnstar.model.entities.Student; import dblearnstar.model.entities.StudentStartedTest; @@ -30,23 +29,7 @@ import dblearnstar.model.entities.Task; import dblearnstar.model.entities.TaskInTestInstance; -import dblearnstar.model.entities.TaskType; -import dblearnstar.model.entities.TestCollection; import dblearnstar.model.entities.TestInstance; -import dblearnstar.model.entities.TestType; public interface TestManager { - - public boolean accessToTaskInTestInstanceAllowed(Student student, TaskInTestInstance tti); - - public List getAllCurrentlyAvailableTestInstancesByTestType(long testTypeId); - - public List getAllEvaluationsOfSolutionsForTaskInTestInstance(long studentId, - long taskInTestInstanceId); - - public List getAllModels(); - - public List getAllTaskTypes(); - - public List getAllTaskTypesDefinedOverModel(Model chosenModel); public List getAllTestInstances(); @@ -54,27 +37,24 @@ public List getAllTestInstancesByTestType(long testTypeId); - public List getAllTestInstancesByTestTypeAndCollection(long testTypeId, long testCollectionId); + public List getAllCurrentlyAvailableTestInstancesByTestType(long testTypeId); - public List getAllTestTypes(); + public List getTestInstancesForStudent(long studentId); - public String getCodeType(StudentSubmitSolution submittedSolution); + public List getTestInstancesForStudentByTestType(long studentId, long testTypeId); - public List getCorrectSolutionsByStudentAndTaskInTestInstance(long studentId, - long taskInTestInstanceId); - - public List getEvaluatedSolutionsForTaskInTestInstance(long studentId, - long taskInTestInstanceId); + public Boolean isTaskInTestInstanceSolvedByStudent(long taskInTestInstanceId, long studentId); public Float getGradeForTaskInTestInstanceByStudent(long taskInTestInstanceId, long studentId); + + public Long getNumPersonsSuccessfulForTaskInTestInstance(long taskInTestInstanceId); + + public Long getNumPersonsTriedToSolveTaskInTestInstance(long taskInTestInstanceId); + + public List getStudentsSolving(); public List getHistoryOfSolutions(long taskInTestInstanceId, Boolean filterNotForEvalution, long studentId); - public List getIncorrectSolutionsByStudentAndTaskInTestInstance(long studentId, - long taskInTestInstanceId); - - public Long getNumPersonsSuccessfulForTaskInTestInstance(long taskInTestInstanceId); - - public Long getNumPersonsTriedToSolveTaskInTestInstance(long taskInTestInstanceId); + public StudentStartedTest studentStartTest(long studentId, long testInstanceId); public List getSolutionsByStudent(long studentId); @@ -83,35 +63,24 @@ long studentId); - public List getStudentsSolving(); + public List getTestInstancesByTestType(long testTypeId); + + public List getTasksByModel(long modelId); + + public List getCorrectSolutionsByStudentAndTaskInTestInstance(long studentId, + long taskInTestInstanceId); + + public List getIncorrectSolutionsByStudentAndTaskInTestInstance(long studentId, + long taskInTestInstanceId); + + public List getTasksInTestInstance(long testInstanceId); + + public void recordActivityInTask(Person person, TaskInTestInstance taskInTestInstance, String type, String payload); public List getStudentsWhoStartedTestInstance(TestInstance testInstance); - public List getTaskInTestInstancesByModel(long modelId); - - public List getTaskInTestInstancesByTaskType(TaskType taskType); - - public List getTaskInTestInstancesByTestInstance(long testInstanceId); - - public List getTasksByModel(long modelId); - - public List getTestCollectionsWithTestInstances(); - - public List getTestInstanceResultsByStudentSortedByTaskName(Student student, TestInstance testInstance); - - - public List getTestInstancesByTestType(long testTypeId); - - public List getTestInstancesForStudent(long studentId); - - public List getTestInstancesForStudentByTestType(long studentId, long testTypeId); - - public List getTestInstancesForStudentByTestTypeAndCollection(long studentId, long testTypeId, - long testCollectionId); + public List getEvaluatedSolutionsForTaskInTestInstance(long studentId, + long taskInTestInstanceId); public Float getTotalPoints(long studentId, long testInstanceId); - public Boolean isTaskInTestInstanceSolvedByStudent(long taskInTestInstanceId, long studentId); - - public StudentStartedTest studentStartTest(long studentId, long testInstanceId); - } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -34,6 +34,6 @@ import org.slf4j.Logger; -import dblearnstar.model.entities.Model; -import dblearnstar.model.entities.SolutionAssessment; +import dblearnstar.model.entities.ActivityInTask; +import dblearnstar.model.entities.Person; import dblearnstar.model.entities.Student; import dblearnstar.model.entities.StudentStartedTest; @@ -41,9 +41,5 @@ import dblearnstar.model.entities.Task; import dblearnstar.model.entities.TaskInTestInstance; -import dblearnstar.model.entities.TaskIsOfType; -import dblearnstar.model.entities.TaskType; -import dblearnstar.model.entities.TestCollection; import dblearnstar.model.entities.TestInstance; -import dblearnstar.model.entities.TestType; public class TestManagerImpl implements TestManager { @@ -53,79 +49,8 @@ @Inject - private GenericService genericService; - - @Inject private Session session; - @Override - public boolean accessToTaskInTestInstanceAllowed(Student student, TaskInTestInstance tti) { - // need a more appropriate implementation - return getTestInstancesForStudentByTestType(student.getStudentId(), - tti.getTestInstance().getTestTemplate().getTestType().getTestTypeId()).stream() - .anyMatch(ti -> ti.getTestInstanceId() == tti.getTestInstance().getTestInstanceId()); - } - - @Override - public List getAllCurrentlyAvailableTestInstancesByTestType(long testTypeId) { - return UsefulMethods.castList(TestInstance.class, getEntityManager().createQuery(""" - from TestInstance t - where - (t.scheduledFor is null or t.scheduledFor<=current_timestamp()) and - t.testTemplate.testType.testTypeId = :testTypeId - order by t.title desc - """).setParameter("testTypeId", testTypeId).getResultList()); - } - - @Override - public List getAllEvaluationsOfSolutionsForTaskInTestInstance(long studentId, - long taskInTestInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - select sa - from SolutionAssessment sa - where - sa.studentSubmitSolution.studentStartedTest.student.studentId = :studentId and - sa.studentSubmitSolution.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId - order by sa.evaluatedOn desc, sa.studentSubmitSolution.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - List output = UsefulMethods.castList(SolutionAssessment.class, q.getResultList()); - return output; - } catch (Exception e) { - logger.error("getAllEvaluationsOfSolutionsForTaskInTestInstance failed {}", e); - return null; - } - } - - @Override - public List getAllModels() { - return UsefulMethods.castList(Model.class, genericService.getAll(Model.class)); - } - - @Override - public List getAllTaskTypes() { - return UsefulMethods.castList(TaskType.class, genericService.getAll(TaskType.class)).stream() - .sorted((o1, o2) -> { - return o1.getTitle().compareTo(o2.getTitle()); - }).toList(); - } - - @Override - public List getAllTaskTypesDefinedOverModel(Model chosenModel) { - List list = UsefulMethods.castList(TaskType.class, - getEntityManager() - .createQuery( - """ - select distinct tiot.taskType - from TaskInTestInstance tti - join tti.task.taskIsOfTypes tiot - where - (tti.task.model.modelId is not null and tti.task.model.modelId=:modelId) or - (tti.testInstance.testTemplate.model.modelId is not null and tti.testInstance.testTemplate.model.modelId=:modelId) - order by tiot.taskType.title asc - """) - .setParameter("modelId", chosenModel.getModelId()).getResultList()); - return list; + private Session getEntityManager() { + return session.getSession(); } @@ -135,350 +60,4 @@ getEntityManager().createQuery("from TestInstance order by title desc").getResultList()); return testInstances; - } - - @Override - public List getAllTestInstancesByTestType(long testTypeId) { - String query = """ - from TestInstance t - where - t.testTemplate.testType.testTypeId = :testTypeId - order by t.ordering asc, t.title desc - """; - return UsefulMethods.castList(TestInstance.class, - getEntityManager().createQuery(query).setParameter("testTypeId", testTypeId).getResultList()); - } - - @Override - public List getAllTestInstancesByTestTypeAndCollection(long testTypeId, long testCollectionId) { - String query = """ - from TestInstance t - where - t.testTemplate.testType.testTypeId = :testTypeId and - t.testCollection.testCollectionId = :testCollectionId - order by t.ordering asc, t.title desc - """; - return UsefulMethods.castList(TestInstance.class, - getEntityManager().createQuery(query).setParameter("testTypeId", testTypeId) - .setParameter("testCollectionId", testCollectionId).getResultList()); - } - - @Override - public List getAllTestTypes() { - return UsefulMethods.castList(TestType.class, genericService.getAll(TestType.class)).stream() - .sorted((o1, o2) -> { - return o1.getTitle().compareTo(o2.getTitle()); - }).toList(); - } - - @Override - public String getCodeType(StudentSubmitSolution submittedSolution) { - List listTypes = submittedSolution.getTaskInTestInstance().getTask().getTaskIsOfTypes(); - if (listTypes != null && listTypes.size() > 0) { - return listTypes.get(0).getTaskType().getCodetype(); - } else { - return "/"; - } - } - - @Override - public List getCorrectSolutionsByStudentAndTaskInTestInstance(long studentId, - long taskInTestInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - select sss - from StudentSubmitSolution sss - left outer join sss.evaluations eval - where - ((eval.solutionAssessmentId is not null) or - (sss.evaluationSimple=true and sss.evaluationComplex=true)) and - sss.studentStartedTest.student.studentId=:studentId and - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - order by sss.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - } catch (Exception e) { - logger.error("getCorrectSolutionsByStudentAndTaskInTestInstance failed {}", e); - return null; - } - } - - private EntityManager getEntityManager() { - return session.getEntityManagerFactory().createEntityManager(); - } - - @Override - public List getEvaluatedSolutionsForTaskInTestInstance(long studentId, - long taskInTestInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - select sss - from StudentSubmitSolution sss - left outer join sss.evaluations eval - where - sss.studentStartedTest.student.studentId = :studentId and - sss.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId - order by eval.evaluatedOn desc, sss.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - List output = UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - return output; - } catch (Exception e) { - logger.error("getEvaluatedSolutionsForTaskInTestInstance failed {}", e); - return null; - } - } - - @Override - public Float getGradeForTaskInTestInstanceByStudent(long taskInTestInstanceId, long studentId) { - try { - return (Float) getEntityManager().createQuery(""" - select max(sa.grade) from SolutionAssessment sa join sa.studentSubmitSolution sss - where - sss.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId and - sss.studentStartedTest.student.studentId = :studentId - """).setParameter("taskInTestInstanceId", taskInTestInstanceId).setParameter("studentId", studentId) - .getSingleResult(); - } catch (Exception e) { - return null; - } - } - - @Override - public List getHistoryOfSolutions(long taskInTestInstanceId, Boolean filterNotForEvalution, - long studentId) { - return UsefulMethods.castList(StudentSubmitSolution.class, getEntityManager().createQuery(""" - from StudentSubmitSolution sss - where - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId and - sss.notForEvaluation=:filterNotForEvalution and - sss.studentStartedTest.student.studentId=:studentId - order by sss.submittedOn desc - """).setParameter("taskInTestInstanceId", taskInTestInstanceId).setParameter("studentId", studentId) - .setParameter("filterNotForEvalution", filterNotForEvalution).getResultList()); - } - - @Override - public List getIncorrectSolutionsByStudentAndTaskInTestInstance(long studentId, - long taskInTestInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - from StudentSubmitSolution sss - where - not(sss.evaluationSimple=true and sss.evaluationComplex=true) and - sss.studentStartedTest.student.studentId=:studentId and - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - order by sss.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - } catch (Exception e) { - logger.error("getIncorrectSolutionsByStudentAndTaskInTestInstance failed {}", e); - return null; - } - } - - @Override - public Long getNumPersonsSuccessfulForTaskInTestInstance(long taskInTestInstanceId) { - try { - return (Long) getEntityManager().createQuery(""" - select count(distinct sss.studentStartedTest.student.studentId) - from StudentSubmitSolution sss - where - sss.evaluationSimple=true and sss.evaluationComplex=true and - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - """).setParameter("taskInTestInstanceId", taskInTestInstanceId).getSingleResult(); - } catch (Exception e) { - return null; - } - } - - @Override - public Long getNumPersonsTriedToSolveTaskInTestInstance(long taskInTestInstanceId) { - try { - return (Long) getEntityManager().createQuery(""" - select count(distinct sss.studentStartedTest.student.studentId) - from StudentSubmitSolution sss - where sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - """).setParameter("taskInTestInstanceId", taskInTestInstanceId).getSingleResult(); - } catch (Exception e) { - return Long.valueOf(0); - } - } - - @Override - public List getSolutionsByStudent(long studentId) { - javax.persistence.Query q = getEntityManager().createQuery( - "from StudentSubmitSolution sss where sss.studentStartedTest.student.studentId = :studentId"); - q.setParameter("studentId", studentId); - return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - } - - @Override - public List getSolutionsOfTaskInTestInstanceByOtherStudents(long taskInTestInstanceId, - long studentId) { - javax.persistence.Query q = getEntityManager().createQuery(""" - from StudentSubmitSolution sss - where sss.evaluationSimple=true and - sss.evaluationComplex=true and - sss.studentStartedTest.student.studentId!=:studentId and - sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId - order by sss.submittedOn desc - """); - q.setParameter("studentId", studentId); - q.setParameter("taskInTestInstanceId", taskInTestInstanceId); - return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); - } - - @Override - public List getStudentsSolving() { - try { - Query query = getEntityManager().createQuery(""" - select p, count(distinct sss.taskInTestInstance.taskInTestInstanceId) - from StudentSubmitSolution sss - join sss.studentStartedTest sst - join sst.student s join s.person p - where - sss.evaluationExam=true and sss.submittedOn>:datum - group by p - order by count(distinct sss.taskInTestInstance.taskInTestInstanceId) desc - """); - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.MONTH, -3); - Date datum = cal.getTime(); - query.setParameter("datum", datum); - return query.getResultList(); - } catch (Exception e) { - return null; - } - } - - @Override - public List getStudentsWhoStartedTestInstance(TestInstance testInstance) { - try { - return UsefulMethods.castList(Student.class, getEntityManager().createQuery(""" - select s - from StudentStartedTest sst join sst.student s - where sst.testInstance.testInstanceId = :testInstanceId - order by s.person.lastName, s.person.firstName - """).setParameter("testInstanceId", testInstance.getTestInstanceId()).getResultList()); - } catch (Exception e) { - logger.error("Error {}", e.getMessage()); - return new ArrayList(); - } - } - - @Override - public List getTaskInTestInstancesByModel(long modelId) { - List tasks = UsefulMethods.castList(TaskInTestInstance.class, - getEntityManager() - .createQuery( - """ - from TaskInTestInstance tti - where - (tti.task.model.modelId is not null and tti.task.model.modelId=:modelId) or - (tti.testInstance.testTemplate.model.modelId is not null and tti.testInstance.testTemplate.model.modelId=:modelId) - order by tti.testInstance.title, tti.task.title - """) - .setParameter("modelId", modelId).getResultList()); - return tasks; - } - - @Override - public List getTaskInTestInstancesByTaskType(TaskType taskType) { - List tasks = UsefulMethods.castList(TaskInTestInstance.class, - getEntityManager().createQuery(""" - select tti - from TaskInTestInstance tti - join tti.task.taskIsOfTypes tiot - where - tiot.taskType.taskTypeId=:taskTypeId - order by tti.testInstance.title, tti.task.title - """).setParameter("taskTypeId", taskType.getTaskTypeId()).getResultList()); - return tasks; - } - - @Override - public List getTaskInTestInstancesByTestInstance(long testInstanceId) { - return UsefulMethods.castList(TaskInTestInstance.class, getEntityManager().createQuery(""" - from TaskInTestInstance tti - where tti.testInstance.testInstanceId = :testInstanceId - order by tti.task.title - """).setParameter("testInstanceId", testInstanceId).getResultList()); - } - - @Override - public List getTasksByModel(long modelId) { - List tasks = UsefulMethods.castList(Task.class, - getEntityManager().createQuery("from Task where model.modelId=:modelId") - .setParameter("modelId", modelId).getResultList()); - return tasks; - } - - @Override - public List getTestCollectionsWithTestInstances() { - try { - // TestCollections that have TestInstances - List list = UsefulMethods.castList(TestCollection.class, getEntityManager().createQuery(""" - select distinct ti.testCollection - from TestInstance ti - """).getResultList()); - // Add to them TestCollectionts that are Parents to another, or that have - // subCollections - List listAdded = UsefulMethods.castList(TestCollection.class, - getEntityManager().createQuery(""" - select distinct tc.parentCollection - from TestCollection tc - """).getResultList()); - list.addAll(listAdded); - return list; - } catch (Exception e) { - logger.error("Error {}", e.getMessage()); - return null; - } - } - - @Override - public List getTestInstanceResultsByStudentSortedByTaskName(Student student, TestInstance testInstance) { - try { - return getEntityManager() - .createNativeQuery( - """ - select - cast(max(sa.grade) as integer) max_grade, - max(case when sss.student_submit_solution_id is null then null when sss.evaluation_simple and sss.evaluation_complex - then 1 else 0 end)>0 should_pass, - max(case when sa.passed is not null and sa.passed then 1 when sa.passed is not null and not(sa.passed) then 0 else null end )>0 passed - from - task_in_test_instance titi - join task t on titi.task_id=t.task_id - left join student_started_test sst on sst.student_id=? - left join student_submit_solution sss on sss.task_in_test_instance_id=titi.task_in_test_instance_id and sss.student_started_test_id=sst.student_started_test_id - left join solution_assessment sa on sss.student_submit_solution_id=sa.student_submit_solution_id - where titi.test_instance_id=? - group by titi.task_in_test_instance_id, t.task_id, t.title, sst.student_id - order by t.title - """) - .setParameter(1, student.getStudentId()).setParameter(2, testInstance.getTestInstanceId()) - .getResultList(); - } catch (Exception e) { - logger.error(e.getMessage()); - return null; - } - } - - @Override - public List getTestInstancesByTestType(long testTypeId) { - javax.persistence.Query query = getEntityManager().createQuery( - """ - from TestInstance t - where t.testTemplate.testType.testTypeId = :testTypeId - order by t.title desc - """) - .setParameter("testTypeId", testTypeId); - return UsefulMethods.castList(TestInstance.class, query.getResultList()); } @@ -516,63 +95,24 @@ @Override - public List getTestInstancesForStudentByTestTypeAndCollection(long studentId, long testTypeId, - long testCollectionId) { + public List getAllTestInstancesByTestType(long testTypeId) { String query = """ - select ti - from TestInstance ti - join ti.testTemplate ttem - join ttem.testType tt - join ti.testCollection tc + from TestInstance t where - tt.testTypeId = :testTypeId and - tc.testCollectionId = :testCollectionId and - ( - ti.openToAllStudents=true or - ti in ( - select ti2 - from GroupMember gm - join gm.student s - join s.person p - join gm.group g - join g.groupFocusOnTests gft - join gft.testInstance ti2 - where - s.studentId=:studentId and - (now() between ti2.scheduledFor and ti2.scheduledUntil or - ti2.openForReviewByStudents=true) - ) - ) - order by ti.ordering asc, ti.title desc + t.testTemplate.testType.testTypeId = :testTypeId + order by t.title desc """; return UsefulMethods.castList(TestInstance.class, - getEntityManager().createQuery(query).setParameter("studentId", studentId) - .setParameter("testTypeId", testTypeId).setParameter("testCollectionId", testCollectionId) - .getResultList()); - } - - @Override - public Float getTotalPoints(long studentId, long testInstanceId) { - try { - Query q = getEntityManager().createQuery(""" - select max(sa.grade) as maksot - from SolutionAssessment sa - join sa.studentSubmitSolution sss - where - sss.taskInTestInstance.testInstance.testInstanceId = :testInstanceId and - sss.studentStartedTest.student.studentId = :studentId - group by sss.taskInTestInstance.taskInTestInstanceId - """); - q.setParameter("studentId", studentId); - q.setParameter("testInstanceId", testInstanceId); - Float total = (float) 0; - for (Float sa : UsefulMethods.castList(Float.class, q.getResultList())) { - if (sa != null) { - total += sa; - } - } - return total; - } catch (Exception e) { - return null; - } + getEntityManager().createQuery(query).setParameter("testTypeId", testTypeId).getResultList()); + } + + @Override + public List getAllCurrentlyAvailableTestInstancesByTestType(long testTypeId) { + return UsefulMethods.castList(TestInstance.class, getEntityManager().createQuery(""" + from TestInstance t + where + (t.scheduledFor is null or t.scheduledFor<=current_timestamp()) and + t.testTemplate.testType.testTypeId = :testTypeId + order by t.title desc + """).setParameter("testTypeId", testTypeId).getResultList()); } @@ -605,4 +145,84 @@ } } + } + + @Override + public Float getGradeForTaskInTestInstanceByStudent(long taskInTestInstanceId, long studentId) { + try { + return (Float) getEntityManager().createQuery(""" + select max(sa.grade) from SolutionAssessment sa join sa.studentSubmitSolution sss + where + sss.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId and + sss.studentStartedTest.student.studentId = :studentId + """).setParameter("taskInTestInstanceId", taskInTestInstanceId).setParameter("studentId", studentId) + .getSingleResult(); + } catch (Exception e) { + return null; + } + } + + @Override + public Long getNumPersonsSuccessfulForTaskInTestInstance(long taskInTestInstanceId) { + try { + return (Long) getEntityManager().createQuery(""" + select count(distinct sss.studentStartedTest.student.studentId) + from StudentSubmitSolution sss + where + sss.evaluationSimple=true and sss.evaluationComplex=true and + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + """).setParameter("taskInTestInstanceId", taskInTestInstanceId).getSingleResult(); + } catch (Exception e) { + return null; + } + } + + @Override + public Long getNumPersonsTriedToSolveTaskInTestInstance(long taskInTestInstanceId) { + try { + return (Long) getEntityManager().createQuery(""" + select count(distinct sss.studentStartedTest.student.studentId) + from StudentSubmitSolution sss + where sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + """).setParameter("taskInTestInstanceId", taskInTestInstanceId).getSingleResult(); + } catch (Exception e) { + return Long.valueOf(0); + } + } + + @Override + public List getStudentsSolving() { + try { + Query query = getEntityManager().createQuery(""" + select p, count(distinct sss.taskInTestInstance.taskInTestInstanceId) + from StudentSubmitSolution sss + join sss.studentStartedTest sst + join sst.student s join s.person p + where + sss.evaluationExam=true and sss.submittedOn>:datum + group by p + order by count(distinct sss.taskInTestInstance.taskInTestInstanceId) desc + """); + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.MONTH, -3); + Date datum = cal.getTime(); + query.setParameter("datum", datum); + return query.getResultList(); + } catch (Exception e) { + return null; + } + } + + @Override + public List getHistoryOfSolutions(long taskInTestInstanceId, Boolean filterNotForEvalution, + long studentId) { + return UsefulMethods.castList(StudentSubmitSolution.class, getEntityManager().createQuery(""" + from StudentSubmitSolution sss + where + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId and + sss.notForEvaluation=:filterNotForEvalution and + sss.studentStartedTest.student.studentId=:studentId + order by sss.submittedOn desc + """).setParameter("taskInTestInstanceId", taskInTestInstanceId).setParameter("studentId", studentId) + .setParameter("filterNotForEvalution", filterNotForEvalution).getResultList()); } @@ -633,3 +253,174 @@ } + @Override + public List getSolutionsByStudent(long studentId) { + javax.persistence.Query q = getEntityManager().createQuery( + "from StudentSubmitSolution sss where sss.studentStartedTest.student.studentId = :studentId"); + q.setParameter("studentId", studentId); + return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + } + + @Override + public List getSolutionsOfTaskInTestInstanceByOtherStudents(long taskInTestInstanceId, + long studentId) { + javax.persistence.Query q = getEntityManager().createQuery(""" + from StudentSubmitSolution sss + where sss.evaluationSimple=true and + sss.evaluationComplex=true and + sss.studentStartedTest.student.studentId!=:studentId and + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + order by sss.submittedOn desc + """); + q.setParameter("studentId", studentId); + q.setParameter("taskInTestInstanceId", taskInTestInstanceId); + return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + } + + @Override + public List getTestInstancesByTestType(long testTypeId) { + javax.persistence.Query query = getEntityManager().createQuery( + "from TestInstance t where t.testTemplate.testType.testTypeId = :testTypeId order by t.title desc") + .setParameter("testTypeId", testTypeId); + return UsefulMethods.castList(TestInstance.class, query.getResultList()); + } + + @Override + public List getTasksByModel(long modelId) { + List tasks = UsefulMethods.castList(Task.class, + getEntityManager().createQuery("from Task where model.modelId=:modelId") + .setParameter("modelId", modelId).getResultList()); + logger.info("model {} \n tasks {}", modelId, tasks.size()); + return tasks; + } + + @Override + public List getCorrectSolutionsByStudentAndTaskInTestInstance(long studentId, + long taskInTestInstanceId) { + try { + Query q = getEntityManager().createQuery(""" + select sss + from StudentSubmitSolution sss + left outer join sss.evaluations eval + where + ((eval.solutionAssessmentId is not null) or + (sss.evaluationSimple=true and sss.evaluationComplex=true)) and + sss.studentStartedTest.student.studentId=:studentId and + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + order by sss.submittedOn desc + """); + q.setParameter("studentId", studentId); + q.setParameter("taskInTestInstanceId", taskInTestInstanceId); + return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + } catch (Exception e) { + logger.error("getCorrectSolutionsByStudentAndTaskInTestInstance failed {}", e); + return null; + } + } + + @Override + public List getIncorrectSolutionsByStudentAndTaskInTestInstance(long studentId, + long taskInTestInstanceId) { + try { + Query q = getEntityManager().createQuery(""" + from StudentSubmitSolution sss + where + not(sss.evaluationSimple=true and sss.evaluationComplex=true) and + sss.studentStartedTest.student.studentId=:studentId and + sss.taskInTestInstance.taskInTestInstanceId=:taskInTestInstanceId + order by sss.submittedOn desc + """); + q.setParameter("studentId", studentId); + q.setParameter("taskInTestInstanceId", taskInTestInstanceId); + return UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + } catch (Exception e) { + logger.error("getIncorrectSolutionsByStudentAndTaskInTestInstance failed {}", e); + return null; + } + } + + @Override + public List getTasksInTestInstance(long testInstanceId) { + return UsefulMethods.castList(TaskInTestInstance.class, getEntityManager().createQuery(""" + from TaskInTestInstance tti + where tti.testInstance.testInstanceId = :testInstanceId + order by tti.task.title + """).setParameter("testInstanceId", testInstanceId).getResultList()); + } + + @Override + public void recordActivityInTask(Person person, TaskInTestInstance taskInTestInstance, String type, + String payload) { + ActivityInTask activityInTask = new ActivityInTask(); + activityInTask.setPerson(person); + activityInTask.setTaskInTestInstance(taskInTestInstance); + activityInTask.setType(type); + activityInTask.setWhenOccured(new Date()); + activityInTask.setPayload(payload); + session.save(activityInTask); + } + + @Override + public List getStudentsWhoStartedTestInstance(TestInstance testInstance) { + try { + return UsefulMethods.castList(Student.class, getEntityManager().createQuery(""" + select s + from StudentStartedTest sst join sst.student s + where sst.testInstance.testInstanceId = :testInstanceId + order by s.person.lastName, s.person.firstName + """).setParameter("testInstanceId", testInstance.getTestInstanceId()).getResultList()); + } catch (Exception e) { + logger.error("Error {}", e.getMessage()); + return new ArrayList(); + } + } + + @Override + public List getEvaluatedSolutionsForTaskInTestInstance(long studentId, + long taskInTestInstanceId) { + try { + Query q = getEntityManager().createQuery(""" + select sss + from StudentSubmitSolution sss + left outer join sss.evaluations eval + where + sss.studentStartedTest.student.studentId = :studentId and + sss.taskInTestInstance.taskInTestInstanceId = :taskInTestInstanceId + order by eval.evaluatedOn desc, sss.submittedOn desc + """); + q.setParameter("studentId", studentId); + q.setParameter("taskInTestInstanceId", taskInTestInstanceId); + List output = UsefulMethods.castList(StudentSubmitSolution.class, q.getResultList()); + return output; + } catch (Exception e) { + logger.error("getEvaluatedSolutionsForTaskInTestInstance failed {}", e); + return null; + } + } + + @Override + public Float getTotalPoints(long studentId, long testInstanceId) { + try { + Query q = getEntityManager().createQuery(""" + select max(sa.grade) + from SolutionAssessment sa + join sa.studentSubmitSolution sss + where + sss.taskInTestInstance.testInstance.testInstanceId = :testInstanceId and + sss.studentStartedTest.student.studentId = :studentId + group by sss.taskInTestInstance.taskInTestInstanceId + """); + q.setParameter("studentId", studentId); + q.setParameter("testInstanceId", testInstanceId); + float total = (float) 0; + for (Float sa : UsefulMethods.castList(Float.class, q.getResultList())) { + if (sa != null) { + total += sa; + } + } + return total; + } catch (Exception e) { + return null; + } + } + } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/UTF8Filter.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/UTF8Filter.java (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/UTF8Filter.java (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -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: dbLearnStar-webApp/src/main/resources/AppConfig.properties =================================================================== --- dbLearnStar-webApp/src/main/resources/AppConfig.properties (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/AppConfig.properties (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -3,6 +3,4 @@ #that will do an automatic conversion of the string bytestream if it was written with utf-8 #this can sometimes result with an error - -app.version=@version@ cas.server=@cas.server@ @@ -11,17 +9,4 @@ cas.war.context=@cas.war.context@ logout.redirectToServer=@logout.redirectToServer@ -auth.autoCreateUser=@auth.autoCreateUser@ - -eprms.jdbc.driver=@eprms.jdbc.driver@ -eprms.jdbc.url=@eprms.jdbc.url@ -eprms.jdbc.default_schema=@eprms.jdbc.default_schema@ -eprms.jdbc.username=@eprms.jdbc.username@ -eprms.jdbc.password=@eprms.jdbc.password@ - -studentdbs.jdbc.driver=@studentdbs.jdbc.driver@ -studentdbs.jdbc.url=@studentdbs.jdbc.url@ -studentdbs.jdbc.default_schema=@studentdbs.jdbc.default_schema@ -studentdbs.jdbc.username=@studentdbs.jdbc.username@ -studentdbs.jdbc.password=@studentdbs.jdbc.password@ date.upload.submission.format=yyyyMMdd-HHmmss @@ -30,6 +15,4 @@ date.gui.format=dd.MM.yyyy time.gui.format=HH:mm -datetime.gui.format=dd.MM.yyyy HH:mm:ss -date.condensed.format=yyyyMMdd additionalFiles.path=@additionalFiles.path@ @@ -39,5 +22,4 @@ xls.sheet.password=@xls.sheet.password@ upload.path.submissions=@upload.path.submissions@ -exceptionReports.path=@exceptionReports.path@ production.mode=@production.mode@ Index: LearnStar-webApp/src/main/resources/META-INF/assets/ComplaintsAndDiscussions.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/ComplaintsAndDiscussions.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,43 +1,0 @@ -.indentation0 { - margin: 0rem; -} - -.indentation1 { - margin-left: 0rem; -} - -.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%; -} Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/ExamsAndTasksOverviewPage.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/ExamsAndTasksOverviewPage.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/ExamsAndTasksOverviewPage.css (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -31,5 +31,5 @@ td.taskContentCell { - max-height: 3.7em; + max-height: 3em; overflow: hidden; display: block; @@ -39,7 +39,2 @@ border: none; } - -.card-header .btn:focus { - outline: none; - box-shadow: none; -} Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/QueryTest.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/QueryTest.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/QueryTest.css (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -21,4 +21,9 @@ } +.errorpanel { + position: relative; + margin: 0.5em 0em 0em 0em; +} + .resultspanel { position: relative; @@ -40,11 +45,13 @@ font-size: 80%; clear: both; - display: inline; - background: var(--main-bg-color-accent2); - padding: 0.2em; + display: block; } -.tas1kname { +.taskname { margin-top: 0; +} + +h3 { + margin-top: 0.5rem; } @@ -54,10 +61,7 @@ } -#taskDetails img { - max-width: 99%; -} - .code { font-family: 'Fira Code', monospace, mono; + font-size: 85%; line-height: 95%; padding: 0.0em !important; @@ -65,5 +69,4 @@ padding: 0.0em !important; font-size: 85%; - min-height:25em; } @@ -88,10 +91,2 @@ margin: 1em; } - -.close { - color: var(--main-font-color); -} - -.close:hover { - color: var(--main-font-color); -} Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/SolutionComparatorPage.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/SolutionComparatorPage.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/SolutionComparatorPage.css (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -2,5 +2,5 @@ /* https://www.w3schools.com/colors/colors_british.asp - Green */ - background: var(--color-correct); + background: #9dd29c; } @@ -8,5 +8,5 @@ /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ - background: var(--color-incorrect); + background: #c71c2c; color: white; } @@ -34,7 +34,8 @@ .feedback { overflow-wrap: normal; - overflow: auto; + overflow: scroll; + white-space: pre-line; hyphens: auto; - max-height: 20rem; + max-height: 25rem; } @@ -51,8 +52,2 @@ size: 2; } - -.solution { - overflow-x: auto; - overflow-y: auto; - max-height: 25rem; -} Index: LearnStar-webApp/src/main/resources/META-INF/assets/StudentGroupProgress.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/StudentGroupProgress.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,63 +1,0 @@ -.sgpTable { - font-size: 80%; -} - -.sgpHeadTestLabel { - padding: 0.2em !important; - vertical-align: middle; -} - -.sgpHeadTestInstance { - padding: 0.5em !important; - vertical-align: top !important; -} - -.sgpHeadFullNameLabel { - padding: 0.2em !important; -} - -.sgpHeadUserNameLabel { - padding: 0.2em !important; -} - -.sgpHeadTask { - text-orientation: sideways; - writing-mode: vertical-lr; - padding: 0.25em !important; - vertical-align: top !important; -} - -.sgpHeadTaskPoints { - font-weight: 400; - margin-top: 0.1em; -} - -.sgpHeadTotal { - text-orientation: sideways; - writing-mode: vertical-lr; - padding: 0.2em !important; - vertical-align: middle !important; - text-align: end !important; -} - -.sgpResFullName { - padding: 0.2em !important; - white-space: nowrap; - vertical-align: middle; -} - -.sgpResUserName { - padding: 0.2em !important; -} - -.sgpResPoints { - padding: 0.2em !important; - width: 2rem; - text-align: center !important; -} - -.sgpResTotal { - padding: 0.2em !important; - width: 5rem; - text-align: end !important; -} Index: LearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionEvaluations.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,212 +1,0 @@ -.sqlcode { - padding: 0.1em !important; - font-size: 75%; - /*white-space: pre-wrap; - break-word: all;*/ - overflow: scroll; -} - -.colSql { - -} - -th { -/* - font-size: 65% !important; - overflow: scroll; -*/ -} - -td[data-grid-property="submission"] { - max-width: 40rem; -} - - -td[data-grid-property="assessment"] { - max-width: 20rem; -} - -code p { - margin-top: 0px; - margin-bottom: 0px; - padding: 0px; -} - -.submittedCode { - max-width: 60em; - max-height: 12em; - font-size: 75%; - line-height: 0.85em !important; -} - -.submittedText { - max-width: 60em; - max-height: 14em; - line-height: 110% !important; -} - -#zSolution { - min-height:30em !important; -} - -.modalSubmission { - max-height: 10em !important; - background: var(--main-bg-color-accent) !important; - padding: 0.5em !important; - line-height: 100% !important; - min-height: 28rem; - font-size:90%; -} - -pre#kodot { - font-size: 75% !important; - line-height: 0.8em !important; - height: 25.5em !important; - overflow: auto; - white-space: pre-wrap !important; -} - -pre#kodot img { - max-width: 200%; -} - -.feedback { - max-height: 10em !important; - background: var(--main-bg-color-accent) !important; - padding: 0.5em; - /* max-width: 15em; */ - z-index: 5000 !important; -} - -.feedback .comment { - background: #dfd020; - color: black; -} - -.feedback .inlinecomment { - background: #dfd020; - color: black; - padding: 0.25em; -} - -.feedback img { - width:120%; -} - -table.tblCompareData tbody { - background: var( --main-bg-color); - font-size: 85%; -} - -table tbody tr.correct { - background: var(--color-correct) !important; -} - -table tbody tr.incorrect { - background: var(--color-incorrect) !important; -} - -table tbody tr.noeval { - background: var(--color-noevaluation) !important; -} - -table tbody tr.exception { - background: var(--color-exception) !important; -} - -#solution { - min-height: 20em; -} - -.modal #solution { - min-height: 50em !important; -} - -.nonSqlSolution .code { - white-space: pre-wrap; - break-word: all; - line-height:1.2em; -} - -.sqlSolution .code { - font-size:80%; - line-height:1em; -} - -.correct svg { - stroke: black !important; - stroke-width: 2px !important; -} - -.incorrect svg { - stroke: black !important; - stroke-width: 2px !important; -} - -.inSubmission { - background: green; - color: white; - padding:0.1em; -} - -.inCorrectSolution { - background: white; - color: black; - padding:0.1em; -} - - -/* fullscreen modal */ -.modal { - padding: 0 !important; -} - -.modal .modal-dialog { - width: 100%; - max-width: none; - height: 100%; - margin: 0; -} - -.modal .modal-content { - height: 100%; - border: 0; - border-radius: 0; -} - -.modal .modal-body { - overflow-y: auto; -} - -.grade-pos2 { - background-color: var(--color-correct-better); - color: white; -} - -.grade-pos { - background-color: var(--color-correct); - color: white; -} - -.grade-zero { - background-color: var(--color-incorrect); - color: white; -} - -.grade-neg { - background-color: var(--color-incorrect-wrong); - color: yellow; -} - -.actions { - white-space: nowrap; - background:var(--main-bg-color2); -} - -#zModal input[type="checkbox"] { - transform:scale(3, 3); -} - -#zModal #type,#grade { - width: 12em; -} Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionLogViewer.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionLogViewer.css (revision 9496f79ee76bb108366f956111b076bd1b817255) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/SubmissionLogViewer.css (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -0,0 +1,159 @@ +.sqlcode { + padding: 0.1em !important; + font-size: 75%; + white-space: pre-wrap; + break-word: all; + overflow: scroll; +} + +.colSql { + +} + +th { + font-size: 65% !important; + overflow: scroll; +} + +td { + font-size: 70% !important; + overflow: auto; +} + +td[data-grid-property="submittedOn"] { + /* width: 10em !important; */ + +} + +td[data-grid-property="evaluationExam"] { + width: 4em !important; + max-width: 5em !important; + word-break: break-all; +} + +td[data-grid-property="evaluationSimple"] { + width: 4em !important; + max-width: 5em !important; + word-break: break-all; +} + +td[data-grid-property="evaluationComplex"] { + width: 4em !important; + max-width: 5em !important; + word-break: break-all; +} + +td[data-grid-property="notForEvaluation"] { + width: 4em !important; + max-width: 5em !important; + word-break: break-all; +} + +td[data-grid-property="submittedBy"] { + width: 9em !important; +} + +td[data-grid-property="task"] { + max-width: 10em; +} + +td[data-grid-property="submission"] { + +} + +td[data-grid-property="submission"] .code { + font-size: 75% !important; + line-height: 0.8em !important; + height: 23em !important; + width: 99% !important; + white-space: pre-wrap; +} + +td[data-grid-property="submission"] .code img { + max-width: 80% !important; +} + +td[data-grid-property="assessment"] { + max-width: 12em !important; +} + +td[data-grid-property="assessment"] pre { + font-size: 75% !important; + line-height: 0.8em !important; + max-height: 10em !important; + white-space: pre-wrap; +} + +td a.btn { + font-size: 65%; +} + +td[data-grid-property="clientInfo"] { + max-width: 10%; +} + +td[data-grid-property="ipAddress"] { + max-width: 10%; +} + +code p { + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; +} + +.modalSubmission { + min-height: 13em; +} + +pre#kodot { + font-size: 75% !important; + line-height: 0.8em !important; + height: 25.5em !important; + overflow: auto; + white-space: pre-wrap !important; +} + +pre#kodot img { + max-width: 200%; +} + +.feedback { + max-height: 10em !important; + background: white !important; + padding: 0.25em; + /* max-width: 15em; */ + z-index: 5000 !important; +} + +.feedback .comment { + background: yellow; +} + +.feedback .inlinecomment { + background: yellow; +} + +table tbody tr.correct { + background: var(- -color-correct) !important; +} + +table tbody tr.incorrect { + background: var(- -color-incorrect) !important; +} + +table tbody tr.noeval { + background: var(- -color-noevaluation) !important; +} + +table tbody tr.exception { + background: var(- -color-exception) !important; +} + +.modal-dialog { + width: 70%; +} + +.card-body { + padding: 0.5em; +} Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/TestAdmin.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/TestAdmin.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/TestAdmin.css (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -1,5 +1,4 @@ .resultschema { - color: var(--dark); - background: var(--light); + display: none; } @@ -15,5 +14,5 @@ left: 5em; right: 5em; - background: var(--main-bg-color-accent); + background: white; border: 1px solid black; border-radius: 12px; Index: LearnStar-webApp/src/main/resources/META-INF/assets/TranslationPage.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/TranslationPage.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,4 +1,0 @@ -.translation { - max-height: 10em !important; - overflow: auto; -} Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/ckeditor-custom.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/ckeditor-custom.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/ckeditor-custom.css (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -13,5 +13,5 @@ .resultschema { - background: #e0e0e0; + background: #d0d0ff; margin-left: 0.5em; margin-right: 0.5em; @@ -20,6 +20,4 @@ div.box { padding: 0.5em; - background: #e8e8ff; - border-left: 3px black solid; + background: #e0e0e0; } - Index: LearnStar-webApp/src/main/resources/META-INF/assets/feedback-styles.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/feedback-styles.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,11 +1,0 @@ -.box { - padding: 0.5em; - background: var(--main-bg-color-box); - border-left: 3px black solid; -} - -.box::before { - content: ""; - color: black; - font-weight: 700; -} Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -1,66 +1,46 @@ :root { - --ck-z-default: 100; - --ck-z-modal: calc(var(--ck-z-default)+ 999); - --color-incorrect-wrong: #600f16ff; + --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: #e1553eff; + --color-incorrect: #c71c2c; + /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ - --color-correct: #74b979ff; - /* https://www.w3schools.com/colors/colors_british.asp - Olive green */ - --color-correct-better: #484837ff; + --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); - /* https://www.w3schools.com/colors/colors_british.asp - Carnival red */ - --color-incorrect: #7b000c; - /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ - --color-correct: #277c2c; - --inlinecomment-bg-color: #8faf10; - } +body, +h1, +h2, +h3, +h4, +h5, +h6, +.h1, +.h2, +.h3, +.h4, +.h5, +.h6 { + font-family: 'Fira Sans', Helvetica, Arial, sans-serif !important; } -body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { - font-family: 'Fira Sans', Helvetica, Arial, sans-serif !important; +h1,.h1 { + font-size:200%; } -h1, .h1 { - font-size: 200%; +h2,.h2 { + font-size:160%; } -h2, .h2 { - font-size: 160%; -} - -h3, .h3 { - font-size: 130%; +h3,.h3 { + font-size:130%; } body { - padding-top: 4.5em; + padding-top: 4em; } @@ -79,21 +59,4 @@ } -.result-queryError { - background: var(--color-incorrect); -} - -.result-queryCorrect { - background: var(--color-correct); -} - -.result-passed { - font-weight: 900; - color: #a0ffa0; -} - -.result-notpassed { - color: white; -} - .centered-hv { text-align: center; @@ -106,34 +69,34 @@ .inlinecomment { - background: var(--inlinecomment-bg-color); - margin-left: 5rem; + background: #ffffa0; + margin-left:5rem; border-left: 1px solid black; - padding: 0.1rem; - padding-left: 0.5rem; + padding-left:0.5rem; } @keyframes slidein { - from { - background:white; - } - 50% { - background:#ffffa0; - } - to { - background: white; - } + from { background: white; } + 50% { background: #ffffa0; } + to { background: white; } } .pagination li { - margin-left: 0.5em; + margin-left:0.5em; +} + +.maxpoints { + background: #c0c0c0; + font-weight: bold; + border-radius: 0.25em; + padding: 0.2em; } #mainnav { - background-color: #42119c !important; /* osnovna boja */ + background-color: #42119c !important; /* osnovna boja */ } #mainnav .nav-link { /* Paletton Shiny */ - color: #A074F0 !important; + color: #A074F0 !important; } @@ -150,11 +113,4 @@ } -.maxpoints { - background: #c0c0c0; - font-weight: bold; - border-radius: 0.25em; - padding: 0.2em; -} - .CodeMirror { border: 1px solid grey; @@ -162,5 +118,5 @@ height: 25rem !important; min-height: 10em; - font-family: 'Fira Code', monospace, mono !important; + font-family: 'Fira Code', monospace, mono !important; } @@ -169,89 +125,2 @@ } -.datefield-popup { - background: white; - color:black !important; - padding: 0.5em; - border-radius: 6px; - border: 1px solid black; -} - -.glyphicon-calendar { - background-color: var(--light); - color: var(--dark); -} - -.glyphicon-calendar::before { - content: "📅"; -} - -.datePicker .glyphicon-chevron-left::before { - content: "<"; -} - -.datePicker .glyphicon-chevron-right::before { - content: ">"; -} - -.solutionCorrect { - background-color: var(--color-correct) !important; -} - -.solutionInCorrect { - background-color: var(--color-incorrect) !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); - } - .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: dbLearnStar-webApp/src/main/resources/META-INF/modules/ModalBox.js =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/modules/ModalBox.js (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/modules/ModalBox.js (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -22,8 +22,10 @@ var activate = function(modalId, options) { + console.log("MODAL ACTIVATE"); $('#' + modalId).modal(options); } var hide = function(modalId) { + console.log("MODAL HIDE"); var $modal = $('#' + modalId); if ($modal.length > 0) { Index: dbLearnStar-webApp/src/main/resources/META-INF/modules/ckeditor-config-admin.js =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/modules/ckeditor-config-admin.js (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/modules/ckeditor-config-admin.js (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -24,6 +24,6 @@ }, paths: { - 'ckeditor-core': '../webjars/ckeditor/4.19.0/standard/ckeditor', - 'ckeditor-jquery': '../webjars/ckeditor/4.19.0/standard/adapters/jquery' + 'ckeditor-core': '../webjars/ckeditor/4.16.1/standard/ckeditor', + 'ckeditor-jquery': '../webjars/ckeditor/4.16.1/standard/adapters/jquery' } }); @@ -36,5 +36,5 @@ specialChars: ['σ', 'θ', 'π', '⨯', '⋈', 'ρ', '÷', '∪', '∩', '←', '→', '∨', '∧', '¬', '∀', '∃', '∄', '∈', '∉', '⊂', '⊃', - '⊆', '⊇', '≤', '≠', '≥', '»' ], + '⊆', '⊇', '≤', '≠', '≥'], toolbarGroups: [ { "name": "basicstyles", "groups": ["basicstyles"] }, @@ -46,5 +46,5 @@ stylesSet: [ { - name: 'Quote', + name: 'Box', element: 'div', attributes: { 'class': 'box' } @@ -65,6 +65,5 @@ removeButtons: 'Anchor,Strike,blockquote', contentsCss: [spec.csspath], - baseFloatZIndex: 40000, - height: '22rem' + baseFloatZIndex: 40000 }); }; Index: dbLearnStar-webApp/src/main/resources/META-INF/modules/ckeditor-config.js =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/modules/ckeditor-config.js (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/modules/ckeditor-config.js (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -24,6 +24,6 @@ }, paths: { - 'ckeditor-core': '../webjars/ckeditor/4.19.0/standard/ckeditor', - 'ckeditor-jquery': '../webjars/ckeditor/4.19.0/standard/adapters/jquery' + 'ckeditor-core': '../webjars/ckeditor/4.16.1/standard/ckeditor', + 'ckeditor-jquery': '../webjars/ckeditor/4.16.1/standard/adapters/jquery' } }); Index: LearnStar-webApp/src/main/resources/META-INF/modules/codemirror-error.js =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/modules/codemirror-error.js (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ (revision ) @@ -1,37 +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 . - * - ******************************************************************************/ - -define(["jquery", "bootstrap/modal"], function($) { - - var positionToError = function(errorPosition) { - line = window.editor.posFromIndex(errorPosition).line; - col = window.editor.posFromIndex(errorPosition).ch; - if (col > 1) - line++; - realposition = window.editor.posFromIndex(errorPosition - line); - window.editor.focus(); - window.editor.setCursor(realposition); - } - - return { - positionToError: positionToError - } - -}); Index: dbLearnStar-webApp/src/main/resources/META-INF/modules/codemirror-run.js =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/modules/codemirror-run.js (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/modules/codemirror-run.js (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -39,101 +39,70 @@ hintOptions: { tables: { - aktivnosti: ["a_id", "a_naslov", "a_opis", "a_procenka_chasovi_rabota", "a_glavna_aktivnost_id", "p_id"], - apteka: ["aptid", "aptime", "aptadresa"], - apteki: ["a_id", "aime"], - apteki_lokacii: ["a_id", "a_reden_br", "adresa", "tel_broj"], - apttelbroj: ["aptid", "telbroj"], - asistentiistrazhuvachi: ["br_chovek_stud", "br_chovek_prof", "br_proekt"], - banki: ["banka_id", "b_naziv", "b_adresa", "grad_id"], - banki: ["banka_id", "b_naziv", "b_adresa", "grad_id"], - bilshef: ["br_oddel", "datum_od", "br_chovek"], - chovek: ["lid", "lime"], - davapari: ["br_proekt", "br_sponzor"], - dogovor: ["fkomid", "aptid", "lid", "datumpoc", "datumkraj", "sodrzhina"], - dogovori: ["fk_id", "a_id", "datum_skl", "l_id", "datum_ist", "sodrzhina"], - doktori: ["l_id", "rab_iskustvo", "specijalnost"], - doktor: ["lid", "docmbr", "rabiskustvo", "specijalnost"], - edinici: ["eid", "eime"], - ekspozituri: ["banka_id", "eksp_br", "e_naziv", "e_adresa", "grad_id"], - ekvivalencii: ["predmet_pid", "ekvivalenten_na_pid"], - evaluacii: ["l_id", "z_reden_broj", "e_reden_broj", "e_naslov", "e_opis", "e_ocenka", "e_izvrshil_l_id", "datum_ocenuvanje"], - farmakomi_broevi: ["fk_id", "fk_reden_br", "tel_broj"], - farmakomi: ["fk_id", "fk_ime"], - fkompanija: ["fkomid", "fkomime"], - fkomtelbroj: ["fkomid", "telbroj"], - formiraniod: ["eid", "nid"], - gradovi: ["grad_id", "g_naziv"], - ima: ["kod", "oid"], - istrazhuvachi: ["br_chovek", "br_proekt"], - lek: ["lekid", "lekime", "sostav"], - lekovi: ["fk_id", "prod_id", "l_ime", "sostav"], - listaizbrani: ["sid", "semestar", "pid", "ocenka"], - lugje: ["identifikator", "ime", "adresa", "br_chovek", "embg", "ime_chovek", "vozrast"], - lugje: ["l_id", "ime", "adresa", "embg", "drzhava"], - lugje: ["l_id", "ime", "prezime", "email", "datum_ragjanje"], - lugje: ["l_id", "ime", "prezime", "embg", "datum_ragj"], - matichen: ["liddok", "lidpac", "mbroj"], - matichen_na: ["p_l_id", "m_datum_poch", "m_datum_kraj", "d_l_id"], - mentori: ["midentifikator"], - mesta: ["m_id", "m_ime"], - mozhe_da_se_natprevaruva: ["l_id", "o_id"], - nasoki: ["nid", "nime", "nmaxkrediti", "vkupnokreditidiplomiranje"], - nastavnici: ["l_id"], - nastavnici: ["nidentifikator", "uchid"], - natprevari: ["kod", "mesec", "opseg", "rang", "naziv"], + supervizor: ["lid"], + recept: ["recid", "datum", "doza", "liddok", "lidpac", "mbroj", "lekid"], + uchenici: ["uidentifikator", "uchid"], + studenti: ["br_chovek", "vid_studii", "br_chovek_sovetnik", "br_oddel"], + proekti: ["br_proekt", "ime_proekt", "br_chovek"], oblasti: ["br_oblast", "ime_oblast"], - oblasti: ["o_id", "o_naziv"], - oblasti: ["oid", "onaziv"], - oblast_na_natprevar: ["kod", "o_id"], - oceneto: ["kod", "m_id", "datum", "red_broj", "l_id", "ocenuvach_l_id"], - ocenuvachi: ["l_id"], - ocenuvachi: ["oidentifikator"], - ocenuva: ["kod", "data", "oidentifikator"], - ocenuvale: ["kod", "m_id", "datum", "l_id"], - oddeli: ["br_oddel", "ime_oddel", "br_chovek", "br_oblast"], - odgovorni_lica: ["smetka_br", "trans_br", "banka_id", "vrab_br"], - osvoeni: ["kod", "data", "uidentifikator", "midentifikator", "oidentifikator", "mesto", "bodovi"], - pacienti: ["l_id", "p_adresa"], - pacient: ["lid", "pacmbr", "pacadresa", "datumragj"], - podoblasti_nadoblasti: ["o_id", "nadoblast_o_id"], predmeti: ["pid", "pime", "pkrediti"], prijavnilistovi: ["sid", "semestar", "status"], - prodava: ["fk_id", "prod_id", "a_id", "cena"], + nasoki: ["nid", "nime", "nmaxkrediti", "vkupnokreditidiplomiranje"], + realizacii: ["kod", "data", "mesto"], + ocenuvachi: ["oidentifikator"], + natprevari: ["kod", "mesec", "opseg", "rang", "naziv"], + apteka: ["aptid", "aptime", "aptadresa"], + uchilishta: ["uchid", "uchnaziv", "uchadresa"], + edinici: ["eid", "eime"], + mentori: ["midentifikator"], + upisi: ["sid", "redbr", "semestar_od", "semestar_do", "zapishan_na_nasoka_nid"], + uchestvuval: ["kod", "data", "uchid", "uidentifikator", "midentifikator"], + lek: ["lekid", "lekime", "sostav"], + nastavnici: ["nidentifikator", "uchid"], + bilshef: ["br_oddel", "datum_od", "br_chovek"], + studenti: ["sid", "sindeks", "sime", "semail", "matichna_eid"], + fkompanija: ["fkomid", "fkomime"], + znae: ["uidentifikator", "oid"], + profesori: ["br_chovek", "specijalnost", "titula"], + istrazhuvachi: ["br_chovek", "br_proekt"], + oblasti: ["oid", "onaziv"], + asistentiistrazhuvachi: ["br_chovek_stud", "br_chovek_prof", "br_proekt"], + matichen: ["liddok", "lidpac", "mbroj"], + ima: ["kod", "oid"], prodavaprodukt: ["aptid", "fkomid", "prodid", "cena"], + ekvivalencii: ["predmet_pid", "ekvivalenten_na_pid"], + fkomtelbroj: ["fkomid", "telbroj"], + pacient: ["lid", "pacmbr", "pacadresa", "datumragj"], + apttelbroj: ["aptid", "telbroj"], + zakazhano: ["kod", "data", "uchid"], + chovek: ["lid", "lime"], + osvoeni: ["kod", "data", "uidentifikator", "midentifikator", "oidentifikator", "mesto", "bodovi"], + formiraniod: ["eid", "nid"], + sponzori: ["br_sponzor", "ime_sponzor"], + doktor: ["lid", "docmbr", "rabiskustvo", "specijalnost"], + ocenuva: ["kod", "data", "oidentifikator"], + raboti: ["br_chovek", "br_oddel", "procent"], + davapari: ["br_proekt", "br_sponzor"], + zadolzhitelni: ["nid", "pid"], produkt: ["fkomid", "prodid", "maxcena", "lekid", "prodime"], - proekti: ["br_proekt", "ime_proekt", "br_chovek"], + dogovor: ["fkomid", "aptid", "lid", "datumpoc", "datumkraj", "sodrzhina"], + oddeli: ["br_oddel", "ime_oddel", "br_chovek", "br_oblast"], + shefovi: ["br_oddel", "datum_od", "datum_do"], + listaizbrani: ["sid", "semestar", "pid", "ocenka"], + uchestvuval_vo: ["l_id", "p_id", "uloga"], + aktivnosti: ["a_id", "a_naslov", "a_opis", "a_procenka_chasovi_rabota", "a_glavna_aktivnost_id", "p_id"], + zapisnici: ["l_id", "z_reden_broj", "z_naslov", "z_opis", "z_rabotel_chasovi", "a_id", "datum_podnesen"], + evaluacii: ["l_id", "z_reden_broj", "e_reden_broj", "e_naslov", "e_opis", "e_ocenka", "e_izvrshil_l_id", "datum_ocenuvanje"], + lugje: ["identifikator", "ime", "adresa", "br_chovek", "embg", "ime_chovek", "vozrast"], + lugje: ["l_id", "ime", "prezime", "email", "datum_ragjanje"], proekti: ["p_id", "p_naslov", "p_opis"], - profesori: ["br_chovek", "specijalnost", "titula"], - rabotel_vo: ["l_id", "u_id"], - raboti: ["br_chovek", "br_oddel", "procent"], - raboti_kako: ["banka_id", "vrab_br", "rabmesto_id"], - rabotni_mesta: ["rabmesto_id", "rm_naziv"], - realizacii: ["kod", "data", "mesto"], - realizacii: ["kod", "m_id", "datum"], - recepti: ["p_l_id", "d_l_id", "datum_izd", "fk_id", "prod_id", "doza"], - recept: ["recid", "datum", "doza", "liddok", "lidpac", "mbroj", "lekid"], - registracii: ["kod", "m_id", "datum", "red_broj", "u_id"], - shefovi: ["br_oddel", "datum_od", "datum_do"], - sponzori: ["br_sponzor", "ime_sponzor"], - studenti: ["br_chovek", "vid_studii", "br_chovek_sovetnik", "br_oddel"], - studenti: ["sid", "sindeks", "sime", "semail", "matichna_eid"], - supervizori: ["l_id"], - supervizor: ["lid"], - uchenici: ["l_id"], - uchenici: ["uidentifikator", "uchid"], - uchestva_na_uchenici: ["kod", "m_id", "datum", "red_broj", "l_id", "ostvareni_bodovi", "osvoeno_mesto"], - uchestvuval: ["kod", "data", "uchid", "uidentifikator", "midentifikator"], - uchestvuval_vo: ["l_id", "p_id", "uloga"], - uchilishta: ["uchid", "uchnaziv", "uchadresa"], - uchilishta: ["u_id", "u_naziv", "l_id"], - upisi: ["sid", "redbr", "semestar_od", "semestar_do", "zapishan_na_nasoka_nid"], - vraboteni: ["banka_id", "vrab_br", "v_embg", "v_ime", "godina_vrab"], - zadolzhitelni: ["nid", "pid"], - zakazhano: ["kod", "data", "uchid"], - zapisnici: ["l_id", "z_reden_broj", "z_naslov", "z_opis", "z_rabotel_chasovi", "a_id", "datum_podnesen"], - znae: ["uidentifikator", "oid"], } } }); + line = window.editor.posFromIndex(queryTestErrorPosition).line; + col = window.editor.posFromIndex(queryTestErrorPosition).ch; + if (col > 1) + line++; + realposition = window.editor.posFromIndex(queryTestErrorPosition - line); + window.editor.setCursor(realposition); }); Index: dbLearnStar-webApp/src/main/resources/META-INF/modules/execSelection.js =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/modules/execSelection.js (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/modules/execSelection.js (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -22,13 +22,13 @@ $(document).keydown(function(e) { - if (e.ctrlKey && e.which == 13) { - $('#RunOnlySelection').click(); - //event.preventDefault(); - return false; - } - } - ); + if(e.ctrlKey && e.which == 13) { + $('#RunOnlySelection').click(); + //event.preventDefault(); + return false; + } + } + ); - function getEditorText(onlySelection) { + $('#RunOnlySelection').click(function() { tekst = ""; if (typeof window.editor === 'undefined') { @@ -46,19 +46,10 @@ } else { // CodeMirror - if (onlySelection) { - tekst = window.editor.getSelection(); - } else { - tekst = window.editor.getValue(); - } + tekst = window.editor.getSelection(); } if (tekst == null) tekst = "NULL"; + if (tekst == "") tekst = "NULL"; - - return tekst; - } - - $('#RunOnlySelection').click(function() { - tekst = getEditorText(true); ajax("execSelection", { @@ -73,5 +64,25 @@ $('#RunOnly').click(function() { - tekst = getEditorText(false); + tekst = ""; + if (typeof window.editor === 'undefined') { + tekst = "NOEDITOR"; + if (typeof CKEDITOR === 'undefined') { + tekst = "NOCMEDNOCKED"; + } else { + var editorarea = CKEDITOR.instances['editorarea']; + if (typeof editorarea === 'undefined') { + tekst = "OTHERCK"; + } else { + tekst = editorarea.getData(); + } + } + } else { + // CodeMirror + tekst = window.editor.getValue(); + } + + if (tekst == null) tekst = "NULL"; + + if (tekst == "") tekst = "NULL"; ajax("execAll", { @@ -86,5 +97,25 @@ $('#Evaluate').click(function() { - tekst = getEditorText(false); + tekst = ""; + if (typeof window.editor === 'undefined') { + tekst = "NOEDITOR"; + if (typeof CKEDITOR === 'undefined') { + tekst = "NOCMEDNOCKED"; + } else { + var editorarea = CKEDITOR.instances['editorarea']; + if (typeof editorarea === 'undefined') { + tekst = "OTHERCK"; + } else { + tekst = editorarea.getData(); + } + } + } else { + // CodeMirror + tekst = window.editor.getValue(); + } + + if (tekst == null) tekst = "NULL"; + + if (tekst == "") tekst = "NULL"; ajax("evalAll", { @@ -99,5 +130,25 @@ $('#PlanOnly').click(function() { - tekst = getEditorText(false); + tekst = ""; + if (typeof window.editor === 'undefined') { + tekst = "NOEDITOR"; + if (typeof CKEDITOR === 'undefined') { + tekst = "NOCMEDNOCKED"; + } else { + var editorarea = CKEDITOR.instances['editorarea']; + if (typeof editorarea === 'undefined') { + tekst = "OTHERCK"; + } else { + tekst = editorarea.getData(); + } + } + } else { + // CodeMirror + tekst = window.editor.getValue(); + } + + if (tekst == null) tekst = "NULL"; + + if (tekst == "") tekst = "NULL"; ajax("plan", { Index: dbLearnStar-webApp/src/main/resources/META-INF/modules/stillAlive.js =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/modules/stillAlive.js (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/modules/stillAlive.js (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -33,5 +33,5 @@ } else { tekst = editorarea.getData(); - if (tekst.length > 1000000) { + if (tekst.length > 8000) { tekst = "VERYLONGTEXT"; } @@ -52,21 +52,7 @@ "issuer": "stillAlive" }, - method: "POST", - success: function(response) { - $("#serverStatus").text(""); - $("#serverStatus").removeClass("mt-2 alert alert-danger"); - }, - failure: function(response) { - $("#serverStatus").text("Your browser is no longer able to establish a connection to the web-page at the server. Please save your work to a local file, and try to submit it later."); - $("#serverStatus").removeClass("mt-2 alert alert-danger"); - $("#serverStatus").addClass("mt-2 alert alert-danger"); - }, - exception: function(response) { - $("#serverStatus").text("A problem has occurred. Please save your work to a local file, and try to submit it later."); - $("#serverStatus").removeClass("mt-2 alert alert-danger"); - $("#serverStatus").addClass("mt-2 alert alert-danger"); - } + method: "POST" }); - }, 30000); + }, 10000); }); Index: dbLearnStar-webApp/src/main/resources/META-INF/modules/zoneUpdateEffect.js =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/modules/zoneUpdateEffect.js (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/META-INF/modules/zoneUpdateEffect.js (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -19,8 +19,8 @@ ******************************************************************************/ -define(["jquery", "t5/core/dom", "t5/core/events"], function($, dom, events) { +define([ "jquery", "t5/core/dom", "t5/core/events" ], function($, dom, events) { $('*[data-container-type="zone"]').on(events.zone.didUpdate, function() { - $(this).css("animation", "0.5s linear slidein"); + $(this).css("animation", "0.3s linear slidein"); }); Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Code.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Code.tml (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Code.tml (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -1,8 +1,12 @@ - -
+ 
+				
+					
+				
+
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Layout.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Layout.tml (revision 52641d04e432dbc9048e77086bb4b2df67187395) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Layout.tml (revision 9496f79ee76bb108366f956111b076bd1b817255) @@ -34,30 +34,7 @@ + -
@@ -101,7 +78,5 @@
- -