#3057 show points on the import confirmation screen (#3060)

JohnMMMM · Jul 21, 2016 · 81cae08 · 81cae08
1 parent b7fd5c2
commit 81cae08
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.properties b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.properties
@@ -195,6 +195,9 @@ importExport.confirmation.description = Upon clicking <strong>Finish</strong>, y
 importExport.confirmation.update.heading = Updating Scores for Existing Gradebook Item(s):
 importExport.confirmation.create.heading = Creating New Gradebook Item(s):
 
+importExport.confirmation.title = Title
+importExport.confirmation.points = Points
+
 importExport.confirmation.success = Gradebook Items Imported successfully!
 importExport.confirmation.failure = Errors during Gradebook Item Import!
 

diff --git a/...va/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.html b/...va/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.html
@@ -4,30 +4,37 @@ <h2><wicket:message key="importExport.confirmation.heading" /></h2>
     <p><wicket:message key="importExport.confirmation.description" /></p>
 
     <div wicket:id="grades_update_container">
+    	<h3><wicket:message key="importExport.confirmation.update.heading" /></h3>
         <table class="table table-striped table-condensed grade_import_confirmation">
             <thead>
               <tr>
-                <th><wicket:message key="importExport.confirmation.update.heading" /></th>
+                <th><wicket:message key="importExport.confirmation.title" /></th>
+                <th><wicket:message key="importExport.confirmation.points" /></th>
               </tr>
             </thead>
             <tbody>
                 <tr wicket:id="grades_update">
                     <td><span wicket:id="itemTitle">[assignment 1]</span></td>
+                    <td><span wicket:id="itemPointValue">[50]</span></td>
                 </tr>
             </tbody>
         </table>
     </div>
 
+
     <div wicket:id="grades_create_container">
+   		<h3><wicket:message key="importExport.confirmation.create.heading" /></h3>
         <table class="table table-striped table-condensed grade_import_confirmation">
             <thead>
-                <tr>
-                    <th><wicket:message key="importExport.confirmation.create.heading" /></th>
-                </tr>
+              <tr>
+                <th><wicket:message key="importExport.confirmation.title" /></th>
+                <th><wicket:message key="importExport.confirmation.points" /></th>
+              </tr>
             </thead>
             <tbody>
                 <tr wicket:id="grades_create">
                     <td><span wicket:id="itemTitle">[assignment 1]</span></td>
+                    <td><span wicket:id="itemPointValue">[50]</span></td>
                 </tr>
             </tbody>
         </table>

diff --git a/...va/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java b/...va/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java
@@ -237,6 +237,7 @@ private ListView<ProcessedGradeItem> makeListView(final String markupId, final L
 			@Override
 			protected void populateItem(final ListItem<ProcessedGradeItem> item) {
 				item.add(new Label("itemTitle", new PropertyModel<String>(item.getDefaultModel(), "itemTitle")));
+				item.add(new Label("itemPointValue", new PropertyModel<String>(item.getDefaultModel(), "itemPointValue")));
 
 				final PropertyModel<String> commentLabelProp = new PropertyModel<String>(item.getDefaultModel(), "commentLabel");
 				final String commentLabel = commentLabelProp.getObject();
@@ -250,7 +251,7 @@ protected void populateItem(final ListItem<ProcessedGradeItem> item) {
 						@Override
 						public void afterRender(final Component component) {
 							super.afterRender(component);
-							component.getResponse().write("<tr class=\"comment\"><td class=\"item_title\"><span>" + commentLabel + "</span></td></tr>");
+							component.getResponse().write("<tr class=\"comment\"><td class=\"item_title\" colspan=\"2\"><span>" + commentLabel + "</span></td></tr>");
 						}
 					});
 				}