Index: dbLearnStar-webApp/pom.xml =================================================================== --- dbLearnStar-webApp/pom.xml (revision e5e7a38817672282900b0e53ea729de9944cf9e0) +++ dbLearnStar-webApp/pom.xml (revision 30f0c2ec57a5b87fed9cd410f6d319a80f2733cf) @@ -14,5 +14,5 @@ dblearnstar dblearnstar - 0.14.1-SNAPSHOT + 0.15.0-SNAPSHOT dbLearnStar Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestAdminPage.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestAdminPage.java (revision e5e7a38817672282900b0e53ea729de9944cf9e0) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestAdminPage.java (revision 30f0c2ec57a5b87fed9cd410f6d319a80f2733cf) @@ -33,4 +33,7 @@ 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; @@ -93,4 +96,6 @@ @InjectComponent private Zone testInstanceZone; + @InjectComponent + private Zone testTemplateZone; @InjectPage @@ -130,4 +135,6 @@ @Property private TestInstance selectedTestInstance; + @Property + private TestInstance listedTestInstance; @Property private TaskInTestInstance taskInTestInstance; @@ -159,11 +166,6 @@ } - public Object getModelTestInstances() { - return selectModelFactory.create(testManager.getTestInstancesByTestType(testType.getTestTypeId()), "title"); - } - - public Object onValueChangedFromSelectTestInstance(TestInstance ti) { - selectedTestInstance = ti; - return testInstanceZone.getBody(); + public List getTestInstancesByTestType() { + return testManager.getTestInstancesByTestType(testType.getTestTypeId()); } @@ -193,10 +195,4 @@ editedTestInstanceParameters = null; ajaxResponseRenderer.addRender(testInstanceEditZone); - } - - void onActionFromAddTask(TestInstance testInstance) { - editedTaskInTestInstance = new TaskInTestInstance(); - editedTaskInTestInstance.setTestInstance(testInstance); - isNewTaskInTestInstance = true; } @@ -362,5 +358,5 @@ editedTask = null; - ajaxResponseRenderer.addRender(testInstanceZone); + //ajaxResponseRenderer.addRender(testInstanceZone); } @@ -375,4 +371,5 @@ editedTestTemplate = new TestTemplate(); editedTestTemplate.setTestType(testType); + ajaxResponseRenderer.addRender(testTemplateZone); } @@ -381,4 +378,10 @@ genericService.saveOrUpdate(editedTestTemplate); editedTestTemplate = null; + ajaxResponseRenderer.addRender(testTemplateZone); + } + + void onCancelFrmTestTemplate() { + editedTestTemplate = null; + ajaxResponseRenderer.addRender(testTemplateZone); } @@ -398,3 +401,24 @@ } + @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/services/TestManagerImpl.java =================================================================== --- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision e5e7a38817672282900b0e53ea729de9944cf9e0) +++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/services/TestManagerImpl.java (revision 30f0c2ec57a5b87fed9cd410f6d319a80f2733cf) @@ -474,5 +474,9 @@ 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") + """ + from TestInstance t + where t.testTemplate.testType.testTypeId = :testTypeId + order by t.title desc + """) .setParameter("testTypeId", testTypeId); return UsefulMethods.castList(TestInstance.class, query.getResultList()); Index: dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css =================================================================== --- dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css (revision e5e7a38817672282900b0e53ea729de9944cf9e0) +++ dbLearnStar-webApp/src/main/resources/META-INF/assets/site-overrides.css (revision 30f0c2ec57a5b87fed9cd410f6d319a80f2733cf) @@ -171,4 +171,5 @@ .datefield-popup { background: white; + color:black !important; padding: 0.5em; border-radius: 6px; @@ -183,4 +184,12 @@ .glyphicon-calendar::before { content: "📅"; +} + +.datePicker .glyphicon-chevron-left::before { + content: "<"; +} + +.datePicker .glyphicon-chevron-right::before { + content: ">"; } Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/TestAdminPage.tml =================================================================== --- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/TestAdminPage.tml (revision e5e7a38817672282900b0e53ea729de9944cf9e0) +++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/TestAdminPage.tml (revision 30f0c2ec57a5b87fed9cd410f6d319a80f2733cf) @@ -20,221 +20,231 @@

${message:testInstance-label}

-

- - ${message:symbol-createObjectAndAddToList} -

- -
-
- -
-
-
-
-
-
-

- ${message:symbol-edit} - ${message:symbol-removeObjectFromList} ${message:symbol-duplicate} -

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

Test - Instance Description PLACEHOLDER

-

- -

+
+ +
+ ${message:hide-label} +

${selectedTestInstance.title}

- -
- - - - - - - - - - - - - -
${message:task-label}${message:task-short-description-label}
-

${taskInTestInstance.task.title}

-

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

${message:symbol-edit} - ${message:task-label}
${message:symbol-edit} - ${message:taskInTestInstance-label}
- ${message:symbol-removeObjectFromList} - ${message:taskInTestInstance-label} - 		-

Task - description placeholder

-
+
+
+

+ ${message:symbol-edit} + ${message:symbol-removeObjectFromList} ${message:symbol-duplicate} +

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

Test + Instance Description PLACEHOLDER

+

+ +

+
+ +
+ + + + + + + + + + + + + +
${message:task-label}${message:task-short-description-label}
+

${taskInTestInstance.task.title}

+

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

${message:symbol-edit} + ${message:task-label}
+ ${message:editPointsInTaskInTestInstance-label}
${message:symbol-removeObjectFromList} + ${message:taskInTestInstance-label} + 		+

Task + description placeholder

+
+ ${message:symbol-createObjectAndAddToList} +
+
+ + +

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

+ + + ${message:show-label} + +
+ +
+
+ +
+
+ +
+ +
+
+

${message:testInstance-label}

+ +
+
+
+ ${message:TestTemplate-label} +
+
+
+ + +
+ + +
+ + + + ${message:cancel-label} +
+ +
+ frmTestInstance PLACEHOLDER + +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + + +
+
+ +
+
+ +
+
+ + + + +
+
+ +