Index: dbLearnStar-webApp/pom.xml =================================================================== --- dbLearnStar-webApp/pom.xml (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/pom.xml (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -14,5 +14,5 @@ dblearnstar dblearnstar - 0.8.6 + 0.8.7 dbLearnStar Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/QueryTest.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/QueryTest.java (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/QueryTest.java (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -28,8 +28,4 @@ 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; @@ -37,5 +33,4 @@ import java.util.Enumeration; import java.util.List; -import java.util.Properties; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/SubmissionEvaluations.java (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -46,4 +46,8 @@ 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.SolutionAssessment; @@ -70,5 +74,5 @@ @AdministratorPage @Import(stylesheet = { "SubmissionEvaluations.css", "feedback-styles.css" }, module = { "zoneUpdateEffect", - "bootstrap/modal", "bootstrap/collapse", "PrettyPrint" }) + "bootstrap/modal", "bootstrap/collapse" }) public class SubmissionEvaluations { @@ -85,7 +89,7 @@ @Inject private Messages messages; - @Inject private PropertyConduitSource pcs; + @Inject private SelectModelFactory selectModelFactory; @@ -110,5 +114,4 @@ @InjectComponent private Zone zStudent; - @InjectComponent private Zone zSubmissions; @@ -117,59 +120,69 @@ @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 hideClientInfo; + @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; - - @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; - - @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 private String resultsError; @Property - @Persist - private List resultsErrors2; + private String oneHeader; + @Property + private Object[] oneRow; + @Property + private Object oneColumn; public void onActivate() { @@ -194,4 +207,7 @@ filterTaskInTestInstance = genericService.getByPK(TaskInTestInstance.class, filterTaskInTestInstance.getTaskInTestInstanceId()); + } + if (prettyFormat == null) { + prettyFormat = false; } } @@ -387,4 +403,5 @@ editedAssessment = new SolutionAssessment(); editedAssessment.setStudentSubmitSolution(s); + prettyFormat = false; if (request.isXHR()) { ajaxResponseRenderer.addRender(zModal); @@ -394,4 +411,5 @@ void onActionFromEditAssessment(SolutionAssessment sa) { editedAssessment = sa; + prettyFormat = false; if (request.isXHR()) { ajaxResponseRenderer.addRender(zModal); @@ -447,11 +465,4 @@ } - @Property - private String oneHeader; - @Property - private Object[] oneRow; - @Property - private Object oneColumn; - void onActionFromViewEvaluationResults(StudentSubmitSolution s) { if (resultsEvaluation1 != null) { @@ -490,3 +501,28 @@ } + 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(); + } + } + } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/AppModule.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/AppModule.java (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/AppModule.java (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -74,5 +74,5 @@ public static void contributeFactoryDefaults(MappedConfiguration configuration) { - configuration.override(SymbolConstants.APPLICATION_VERSION, "0.8.7"); + configuration.override(SymbolConstants.APPLICATION_VERSION, AppConfig.getString("app.version")); configuration.override(SymbolConstants.PRODUCTION_MODE, false); } Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/GenericDaoImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/GenericDaoImpl.java (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/GenericDaoImpl.java (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -94,5 +94,6 @@ @Override public List getAll(Class classToLoad) { - return getEntityManager().createQuery("from " + classToLoad.getName()).getResultList(); + return UsefulMethods.castList(classToLoad, + getEntityManager().createQuery("from " + classToLoad.getName()).getResultList()); } Index: dbLearnStar-webApp/src/main/resources/AppConfig.properties =================================================================== --- dbLearnStar-webApp/src/main/resources/AppConfig.properties (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/resources/AppConfig.properties (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -3,4 +3,6 @@ #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@ Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/TestAdmin.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/TestAdmin.css (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/TestAdmin.css (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) Index: LearnStar-webApp/src/main/resources/META-INF/modules/PrettyPrint.js =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/modules/PrettyPrint.js (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ (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"], function($) { - - var originalCode = null; - - $("#reformat").click(function() { - newsql = ''; - if (originalCode != null) { - newsql = originalCode; - originalCode = null; - } else { - originalCode = $("#solution > code").text(); - newsql = window.sqlFormatter.format(originalCode); - } - $("#solution > code").text(newsql); - }); - -}); Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Code.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Code.tml (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/Code.tml (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -1,3 +1,3 @@ - Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/ModalBox.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/ModalBox.tml (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/components/ModalBox.tml (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -1,5 +1,5 @@ - +

Group Focus On Tests

+
    @@ -70,7 +75,7 @@
- +
${group.title} - + ${message:symbol-delete} - +
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/Reevaluation.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/Reevaluation.tml (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/Reevaluation.tml (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -8,9 +8,9 @@
- + t:add="actions" t:exclude="testInstanceId, scheduledFor,description"> + ${message:reevaluate-label} - +
-
+ +
- Beautify + Format SQL +
@@ -113,7 +116,5 @@
- -
- +
@@ -121,8 +122,8 @@ id="FormEditor" t:autofocus="true">
-
+
-
@@ -318,5 +319,4 @@
- + Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/TestAdminPage.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/TestAdminPage.tml (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/TestAdminPage.tml (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -3,55 +3,59 @@ xmlns:p="tapestry:parameter"> -

${message:testType-label}

- -
-
- - - -
-
+

${message:admin/TestAdmin-pagelink}

+ +

${message:testType-label}

+ +
+ +
+ +
+ +

${message:testInstance-label}

+

${message:symbol-createObjectAndAddToList} + t:context="testType" t:id="newTestInstance"> + ${message:symbol-createObjectAndAddToList}

-
-
-

${message:testInstance-label}

- -
-
- - -
-
-
-
+
+
+ +
+
-
+

${message:symbol-edit} - ${message:symbol-removeObjectFromList} - ${message:symbol-duplicate} + t:context="selectedTestInstance" t:id="editTestInstance"> ${message:symbol-edit} + ${message:symbol-removeObjectFromList} ${message:symbol-duplicate}

-

- ${message:scheduledFor-label}: ${selectedTestInstance.scheduledFor} - ${message:scheduledUntil-label}: ${selectedTestInstance.scheduledUntil} -

+
+
${message:scheduledFor-label}:
+
${selectedTestInstance.scheduledFor}
+
${message:scheduledUntil-label}:
+
${selectedTestInstance.scheduledUntil}
+

Test Instance Description PLACEHOLDER

@@ -62,11 +66,10 @@
-
+
- - + @@ -77,24 +80,26 @@

${taskInTestInstance.task.title}

${message:task-points-label}: - ${taskInTestInstance.points}

+ ${taskInTestInstance.points}

${message:symbol-edit} + ${message:task-label}
${message:symbol-edit} + ${message:taskInTestInstance-label}
+ ${message:symbol-removeObjectFromList} + ${message:taskInTestInstance-label} - - @@ -109,4 +114,5 @@ + @@ -160,9 +166,9 @@ ${message:testTemplate-label} - - -
+ class="col-12 btn btn-primary"> ${message:testTemplate-label} + + +
Index: dbLearnStar-webApp/src/main/webapp/WEB-INF/app.properties =================================================================== --- dbLearnStar-webApp/src/main/webapp/WEB-INF/app.properties (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/webapp/WEB-INF/app.properties (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -3,4 +3,5 @@ about-text=

Continuation of the usage of the system, implies agreement and acknowledgement with all of these terms.

\n\n

Access to the system

\n\n

Using this system during an exam term is only allowed for users that are enlisted for taking the exam in that specific exam term, while the access of all other persons is strictcly forbidden. Usage of the system during an exam term is under a stricter set of rules defined and announced during the exam by the professor responsible for organisation of the exam.

\n\n

The usage of this system in period when there are no scheduled exam terms is not mandatory, and it is left to the free will of each student. The records about the type of usage in such periods will not be taken into account in the calculation of the final course grade.

\n\n

General terms

\n\n

This system is used for educational and scientific-research purpose with the aim of advancement of the teaching in the area of Databases. The system contains a dataset of exam questions and solutions for the course in Databases, and is available to students of the course as an additional help in learning SQL and formulating correct questions.

\n\n

The system executes your queries in at least two database instances of each test schema. The results of the execution in the first instance are made available to you immediately upon execution, while the execution in the second and other instances are intentionally hidden (in order to simulate the execution of the query and evaluate it's correctness as future modifications that are unknown to you will occur in the database). The final goal is to test each query in multiple test situations and evaluate it's correctness in all such situations.

\n\n

The system is currently under development and many new database schemas will be added and new exam tasks will be constructed, with new test instances. After each addition of new test instances, all your queries will be automatically reevaluated. All your submissions will be kept so that you can compare if some query was correct in one moment and become incorrect in a later reevaluation.\n

\n action-label=Action +actions-label=Actions addAssessment-label=Add assessment addToList-label=Add @@ -105,4 +106,6 @@ onlyTestInstancesWithDiscussionsAreShown-label=Only the test instances having discussions are listed OpenDiscussions-pagelink=Open Discussions +openToAllStudents-label=Open to all students +openForReviewByStudents-label=Open for review by students otherSolutions-label=Solutions by other persons passed-label=Passed @@ -151,5 +154,5 @@ symbol-addObjectToList=⊞ Add to list symbol-cancel=Cancel -symbol-createObjectAndAddToList=⊡ Create +symbol-createObjectAndAddToList=Create symbol-delete=Delete symbol-duplicate=Duplicate @@ -161,4 +164,5 @@ task-actions-label=Task Actions task-label=Task +taskInTestInstance-label=Task in a test task-points-label=Task points task-short-description-label=Task short description Index: dbLearnStar-webApp/src/main/webapp/WEB-INF/app_mk.properties =================================================================== --- dbLearnStar-webApp/src/main/webapp/WEB-INF/app_mk.properties (revision 62d99bc37ac1b7ba2274433ad95d5dfbadd11f73) +++ dbLearnStar-webApp/src/main/webapp/WEB-INF/app_mk.properties (revision 33d1011215fb8ead30ed3e8ccccb1c05832828df) @@ -3,4 +3,5 @@ about-text=

Продолжувањето со употребата на системот значи согласност со наведеното во продолжение\:

\n\n

Пристап до системот

\n\n

Користењето на системот за време на испитен термин е дозволено само за корисници кои се пријавени за полагање во тој испитен термин, додека приклучувањето од било кои други лица е забрането. Користењето за време на испит е со посебни правила индицирани од наставникот кој го организира испитот.

\n\n

Користењето на системот надвор од испитен термин е необврзувачко и целосно оставено на вашата слободна волја, а записите за употребата или неупотребата на системот нема да бидат користени како основа за формирањето на оценката на предметот.\n\n

Општи услови

\n\n\n

Овој систем ќе се користи во наставни и научно-истражувачки цели за унапредување на наставата од областа Бази на податоци. Системот содржи база на испитни прашања и решенија по предметот Бази на податоци достапна за студентите на предметот како дополнителна помош во учењето SQL и формулирањето коректни прашања.

\n\n

Системот ги извршува вашите прашалници во две или повеќе инстанци од секоја база. Резултатите од извршувањето во првата инстанца можете да ги гледате, додека резултатите од извршувањето на другите инстанци намерно се скриени (за да симулираат ситуација на измени во базата). Целта е да се тестира прашалникот во неколку тест ситуации и да се евалуира врз основа на коректност во сите тест ситуации.\n

\n\n

Системот е во развој и постојано ќе се додаваат нови дизајни на бази и нови комбинации задачи за решавање, како и нови тест инстанци на постојните бази. По секое додавање на нови тест инстанци ќе бидат реевалуирани вашите испратени решенија за коректност во сите нови тест инстанци. Историјатот на вашите испраќања секогаш ќе се чува, па секогаш може да споредите дали некој прашалник што порано функционирал сега веќе не функционира (најчесто поради некој специјален случај во новите тест податоци).\n

\n action-label=Акција +actions-label=Акции addAssessment-label=Додади проценка addToList-label=Додади @@ -14,5 +15,5 @@ admin/StudentGroupProgress-pagelink=Прогрес admin/SubmissionEvaluations-pagelink=Прегледување поднесоци -admin/TestAdmin-pagelink=Тестови +admin/TestAdmin-pagelink=Администрација на тестови admin/TestCollectionManagement-pagelink=Колекции тестови serverTime-label=Време на серверот @@ -70,4 +71,5 @@ greeting=dbLearn* group-label=Група +groupId-label=Бр. група help-for-codemirror=CTRL+SPACE за автоматско дополнување\nCTRL+ENTER Извршување на селекцијата\nCTRL+V пастира слика копирана од друг програм help-for-codemirror-text=CTRL+V пастира слика копирана од друг програм @@ -105,4 +107,7 @@ onlyTestInstancesWithDiscussionsAreShown-label=Прикажани се само тест инстанците на кои има дискусии OpenDiscussions-pagelink=Отворени дискусии +openToAllStudents-label=Отворен за решавање за студенти +openForReviewByStudents-label=Отворено за увид за студенти +ordering-label=Редослед otherSolutions-label=Решенија од други студенти за истата задача passed-label=Положено @@ -125,5 +130,5 @@ save-label=Зачувај scheduledFor-label=Почеток -scheduledUntil-label=крај +scheduledUntil-label=Крај selectStudent-label=Изберете студент selectTaskInTestInstance-label=Изберете задача во тест инстанцата @@ -149,7 +154,7 @@ submittedBy-label=Испратено од submittedOn-label=Поднесено на -symbol-addObjectToList=⊞ Додади +symbol-addObjectToList=Додади symbol-cancel=Откажи -symbol-createObjectAndAddToList=⊡ Креирај +symbol-createObjectAndAddToList=Креирај symbol-delete=Бриши symbol-duplicate=Дуплирај @@ -161,4 +166,5 @@ task-actions-label=Акции task-label=Задача +taskInTestInstance-label=Задача во тест task-points-label=Поени task-short-description-label=Опис на задачата @@ -170,4 +176,5 @@ TestTemplate-label=Тест шаблон testType-label=Тип тест +title-label=Назив toggleNavigation-label=Смени навигација toggle-status-label=Смени статус
${message:task-label}${message:task-short-description-label}${message:task-actions-label}${message:task-short-description-label}
+

Task description placeholder

- 		${message:symbol-edit} - Task
${message:symbol-edit} Task - in Test Instance
${message:symbol-removeObjectFromList}