Merge pull request sakaiproject#195 from ottenhoff/SAM-2493

SAM-2493 authoring pages to use the updated 2.1.17 tablesorter
yuyilin · Feb 18, 2015 · 6bb84ef · 6bb84ef
2 parents 9690da8 + 3a7d78e
commit 6bb84ef
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 125 deletions.
diff --git a/...o-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorFrontDoorMessages.properties b/...o-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorFrontDoorMessages.properties
@@ -41,6 +41,7 @@ selected_groups=Selected Groups
 selected_group=Selected Group
 
 header_last_modified=Last Modified
+header_last_modified_date=Modified Date
 
 global_nav_assessmt=Assessments
 global_nav_pools=Question Pools

diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/CommonMessages.properties b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/CommonMessages.properties
@@ -29,6 +29,6 @@ correct=Correct
 action_preview=Preview
 action_print=Print
 action_duplicate=Duplicate
-action_select=Select
+action_select=-- Select Action --
 action_save=Save
 action_save_pair=Save Pairing
diff --git a/...pp/src/java/org/sakaiproject/tool/assessment/ui/listener/author/AuthorActionListener.java b/...pp/src/java/org/sakaiproject/tool/assessment/ui/listener/author/AuthorActionListener.java
@@ -85,8 +85,6 @@ public class AuthorActionListener
   private static Log log = LogFactory.getLog(AuthorActionListener.class);
   private HashMap<String, ArrayList<String>> groupUsersIdMap = new HashMap<String, ArrayList<String>>();
   private ArrayList<String> siteUsersIdList = new ArrayList<String>();
-  private String display_dateFormat= ContextUtil.getLocalizedString("org.sakaiproject.tool.assessment.bundle.GeneralMessages","output_data_picker_w_sec");
-  private SimpleDateFormat displayFormat = new SimpleDateFormat(display_dateFormat, new ResourceLoader().getLocale());
   private TimeUtil tu = new TimeUtil();
 
   // UVa, per SAK-2438 
@@ -204,7 +202,7 @@ public void prepareAssessmentsList(AuthorBean author, AssessmentService assessme
 			AssessmentFacade assessmentFacade= (AssessmentFacade) iter.next();
 			assessmentFacade.setTitle(FormattedText.convertFormattedTextToPlaintext(assessmentFacade.getTitle()));
 			try {
-				String lastModifiedDateDisplay = tu.getDisplayDateTime(displayFormat, assessmentFacade.getLastModifiedDate());
+				String lastModifiedDateDisplay = tu.getIsoDateWithLocalTime(assessmentFacade.getLastModifiedDate());
 				assessmentFacade.setLastModifiedDateForDisplay(lastModifiedDateDisplay);  
 			}
 			catch (Exception ex) {
@@ -318,7 +316,7 @@ public ArrayList getTakeableList(ArrayList assessmentList, GradingService gradin
 			  inActiveList.add(f);
 		  }
 		  try {
-				String lastModifiedDateDisplay = tu.getDisplayDateTime(displayFormat, f.getLastModifiedDate());
+				String lastModifiedDateDisplay = tu.getIsoDateWithLocalTime(f.getLastModifiedDate());
 				f.setLastModifiedDateForDisplay(lastModifiedDateDisplay);  
 			}
 			catch (Exception ex) {

diff --git a/samigo/samigo-app/src/webapp/css/tool_sam.css b/samigo/samigo-app/src/webapp/css/tool_sam.css
@@ -165,39 +165,11 @@ font-size:1.2em
 }
 
 .titlePending {
-	width: 67%;
+	width: 50%;
 }
 
 .titlePub {
-	width: 30%;
-}
-
-.lastModified {
-	width: 23%;
-}
-
-.releaseTo {
-	width: 11%;
-}
-
-.status {
-	width: 8%;
-}
-
-.inProgress {
-	width: 6%;
-}
-
-.submitted {
-	width: 6%;
-}
-
-.releaseDate {
-	width: 8%;
-}
-
-.dueDate {
-	width: 8%;
+	width: 28%;
 }
 
 .listAssessments th{

diff --git a/samigo/samigo-app/src/webapp/jsf/author/authorIndex.jsp b/samigo/samigo-app/src/webapp/jsf/author/authorIndex.jsp
@@ -38,8 +38,6 @@
       <div class="portletBody">
 
 <script type="text/javascript" src="/samigo-app/js/info.js"></script>
-<script type="text/javascript" src="/library/js/jquery/tablesorter/2.0.3/jquery.tablesorter-2.0.3.min.js"></script>
-<link type="text/css" href="/samigo-app/css/tool_sam.css" rel="stylesheet" media="all"/>
 <script type="text/JavaScript">
 
 function clickPendingSelectActionLink(field){
@@ -125,44 +123,12 @@ $(document).ready(function() {
 		}
 	);
 	
-	
-	$.tablesorter.addParser({
-		id: 'dlt',
-		is: function (s){ return false },
-		format: function(value, table, cell){
-			return cell.innerHTML.split('<br>')[0];
-		},
-		type: 'text'
-		});
-	
 	$("#authorIndexForm\\:coreAssessments").tablesorter( {
-		sortList: [[1,0],[2,0]],
-		headers: { 
-            0: { 
-                sorter: false 
-            }, 
-            2: { 
-                sorter: 'dlt' 
-            }        
-		}
+		sortList: [[1,0]]
 	});
 	
 	$("#authorIndexForm\\:published-assessments").tablesorter( {
-		sortList: [[2,0], [1,0], [8,0]],
-		headers: { 
-            0: { 
-                sorter: false 
-            }, 
-            3: { 
-                sorter: false 
-            }, 
-            4: { 
-                sorter: false 
-            }, 
-            8: { 
-                sorter: 'dlt' 
-            }            
-		}
+		sortList: [[2,0], [1,0]]
 	}); 
 });
 </script>
@@ -260,7 +226,7 @@ $(document).ready(function() {
  <!-- CORE ASSESSMENTS-->
  <h:outputText escape="false" rendered="#{authorization.createAssessment}" value="<div id=\"tabs-1\">"/>
   <t:dataTable cellpadding="0" cellspacing="0" rowClasses="list-row-even,list-row-odd" styleClass="tablesorter" id="coreAssessments" value="#{author.assessments}" var="coreAssessment" rendered="#{authorization.adminCoreAssessment}" summary="#{authorFrontDoorMessages.sum_coreAssessment}">
-    <t:column headerstyleClass="selectAction" styleClass="selectAction">
+    <t:column headerstyleClass="selectAction sorter-false" styleClass="selectAction">
       <f:facet name="header" >
 	   <h:outputText value="#{authorFrontDoorMessages.select_action}"/>
 	  </f:facet>
@@ -299,7 +265,12 @@ $(document).ready(function() {
         <h:outputText value="#{authorFrontDoorMessages.header_last_modified}"/>
 	  </f:facet>
   	  <h:outputText value="#{coreAssessment.lastModifiedBy}" />
-      <h:outputText escape="false" value="<br />"/>
+    </t:column>
+
+    <t:column headerstyleClass="lastModifiedDate" styleClass="lastModifiedDate">
+      <f:facet name="header">
+        <h:outputText value="#{authorFrontDoorMessages.header_last_modified_date}"/>
+	  </f:facet>
       <h:outputText value="#{coreAssessment.lastModifiedDateForDisplay}"/>      
     </t:column>
   </t:dataTable>
@@ -326,7 +297,7 @@ $(document).ready(function() {
 
   <t:dataTable id="published-assessments" rowClasses="list-row-even,list-row-odd" cellpadding="0" cellspacing="0" styleClass="tablesorter" rendered="#{authorization.adminPublishedAssessment}"
     value="#{author.publishedAssessments}" var="publishedAssessment" summary="#{authorFrontDoorMessages.sum_publishedAssessment}">
-    <t:column headerstyleClass="selectAction" styleClass="selectAction">
+    <t:column headerstyleClass="selectAction sorter-false" styleClass="selectAction">
 	  <f:facet name="header" >
 	   <h:outputText value="#{authorFrontDoorMessages.select_action}"/>
 	  </f:facet>
@@ -457,26 +428,30 @@ $(document).ready(function() {
         <h:outputText value="#{authorFrontDoorMessages.assessment_date} " />
       </f:facet>
       <h:outputText value="#{publishedAssessment.startDate}" >
-          <f:convertDateTime pattern="#{generalMessages.output_date_picker}"/>
-        </h:outputText>
+        <f:convertDateTime pattern="yyyy-MM-dd"/>
+      </h:outputText>
     </t:column>
 
 	<t:column headerstyleClass="dueDate" styleClass="dueDate">
       <f:facet name="header">
         <h:outputText value="#{authorFrontDoorMessages.assessment_due} " />
       </f:facet>
       <h:outputText value="#{publishedAssessment.dueDate}" >
-          <f:convertDateTime pattern="#{generalMessages.output_date_picker}"/>
+        <f:convertDateTime pattern="yyyy-MM-dd"/>
       </h:outputText>
     </t:column>
 
     <t:column headerstyleClass="lastModified" styleClass="lastModified">
       <f:facet name="header">
         <h:outputText value="#{authorFrontDoorMessages.header_last_modified}"/>
 	  </f:facet>
-
   	  <h:outputText value="#{publishedAssessment.lastModifiedBy}" />
-      <h:outputText escape="false" value="<br />"/>
+    </t:column>
+
+    <t:column headerstyleClass="lastModifiedDate" styleClass="lastModifiedDate">
+      <f:facet name="header">
+        <h:outputText value="#{authorFrontDoorMessages.header_last_modified_date}"/>
+	  </f:facet>
       <h:outputText value="#{publishedAssessment.lastModifiedDateForDisplay}"/>
     </t:column>
 

diff --git a/samigo/samigo-app/src/webapp/jsf/author/authorIndex_noHeader.jsp b/samigo/samigo-app/src/webapp/jsf/author/authorIndex_noHeader.jsp
@@ -34,8 +34,6 @@
       <div class="portletBody">
 
 <script type="text/javascript" src="/samigo-app/js/info.js"></script>
-<script type="text/javascript" src="/library/js/jquery/tablesorter/2.0.3/jquery.tablesorter-2.0.3.min.js"></script>
-<link type="text/css" href="/samigo-app/css/tool_sam.css" rel="stylesheet" media="all"/>
 <script type="text/JavaScript">
 
 function clickPendingSelectActionLink(field){
@@ -121,44 +119,12 @@ $(document).ready(function() {
 		}
 	);
 	
-	
-	$.tablesorter.addParser({
-		id: 'dlt',
-		is: function (s){ return false },
-		format: function(value, table, cell){
-			return cell.innerHTML.split('<br>')[0];
-		},
-		type: 'text'
-		});
-	
 	$("#authorIndexForm\\:coreAssessments").tablesorter( {
-		sortList: [[1,0],[2,0]],
-		headers: { 
-            0: { 
-                sorter: false 
-            }, 
-            2: { 
-                sorter: 'dlt' 
-            }        
-		}
+		sortList: [[1,0]]
 	});
 	
 	$("#authorIndexForm\\:published-assessments").tablesorter( {
-		sortList: [[2,0], [1,0], [8,0]],
-		headers: { 
-            0: { 
-                sorter: false 
-            }, 
-            3: { 
-                sorter: false 
-            }, 
-            4: { 
-                sorter: false 
-            }, 
-            8: { 
-                sorter: 'dlt' 
-            }            
-		}
+		sortList: [[2,0], [1,0]]
 	}); 
 });
 </script>
@@ -241,13 +207,13 @@ $(document).ready(function() {
 
 <div id="tabs">
 	<ul>
-		<h:outputText escape="false" value="<li><a href=\"#tabs-1\">" rendered="#{authorization.adminCoreAssessment}"/>
+		<h:outputText escape="false" value="<li><a href=\"#tabs-1\" onclick=\"resizeFrame();\">" rendered="#{authorization.adminCoreAssessment}"/>
 		<h:outputText escape="false" value="#{authorFrontDoorMessages.assessment_pending}:" rendered="#{authorization.adminCoreAssessment}"/>
 		<h:outputText escape="false" value="<span class=\"samigo-tab-sub\">" rendered="#{authorization.adminCoreAssessment}"/>
 		<h:outputText escape="false" value="#{authorFrontDoorMessages.assessment_pending_sub}" rendered="#{authorization.adminCoreAssessment}"/>
 		<h:outputText escape="false" value="</span></a></li>" rendered="#{authorization.adminCoreAssessment}"/>
 
-		<h:outputText escape="false" value="<li><a href=\"#tabs-2\">" rendered="#{authorization.adminPublishedAssessment}"/>
+		<h:outputText escape="false" value="<li><a href=\"#tabs-2\" onclick=\"resizeFrame();\">" rendered="#{authorization.adminPublishedAssessment}"/>
 		<h:outputText escape="false" value="#{authorFrontDoorMessages.assessment_pub}:" rendered="#{authorization.adminPublishedAssessment}"/>
 		<h:outputText escape="false" value="<span class=\"samigo-tab-sub\">" rendered="#{authorization.adminPublishedAssessment}"/>
 		<h:outputText escape="false" value="#{authorFrontDoorMessages.assessment_pub_sub}" rendered="#{authorization.adminPublishedAssessment}"/>
@@ -256,7 +222,7 @@ $(document).ready(function() {
  <!-- CORE ASSESSMENTS-->
  <h:outputText escape="false" rendered="#{authorization.createAssessment}" value="<div id=\"tabs-1\">"/>
   <t:dataTable cellpadding="0" cellspacing="0" rowClasses="list-row-even,list-row-odd" styleClass="tablesorter" id="coreAssessments" value="#{author.assessments}" var="coreAssessment" rendered="#{authorization.adminCoreAssessment}" summary="#{authorFrontDoorMessages.sum_coreAssessment}">
-    <t:column headerstyleClass="selectAction" styleClass="selectAction">
+    <t:column headerstyleClass="selectAction sorter-false" styleClass="selectAction">
       <f:facet name="header" >
 	   <h:outputText value="#{authorFrontDoorMessages.select_action}"/>
 	  </f:facet>
@@ -295,7 +261,12 @@ $(document).ready(function() {
         <h:outputText value="#{authorFrontDoorMessages.header_last_modified}"/>
 	  </f:facet>
   	  <h:outputText value="#{coreAssessment.lastModifiedBy}" />
-      <h:outputText escape="false" value="<br />"/>
+    </t:column>
+
+    <t:column headerstyleClass="lastModifiedDate" styleClass="lastModifiedDate">
+      <f:facet name="header">
+        <h:outputText value="#{authorFrontDoorMessages.header_last_modified_date}"/>
+	  </f:facet>
       <h:outputText value="#{coreAssessment.lastModifiedDateForDisplay}"/>      
     </t:column>
   </t:dataTable>
@@ -322,7 +293,7 @@ $(document).ready(function() {
 
   <t:dataTable id="published-assessments" rowClasses="list-row-even,list-row-odd" cellpadding="0" cellspacing="0" styleClass="tablesorter" rendered="#{authorization.adminPublishedAssessment}"
     value="#{author.publishedAssessments}" var="publishedAssessment" summary="#{authorFrontDoorMessages.sum_publishedAssessment}">
-    <t:column headerstyleClass="selectAction" styleClass="selectAction">
+    <t:column headerstyleClass="selectAction sorter-false" styleClass="selectAction">
 	  <f:facet name="header" >
 	   <h:outputText value="#{authorFrontDoorMessages.select_action}"/>
 	  </f:facet>
@@ -449,26 +420,30 @@ $(document).ready(function() {
         <h:outputText value="#{authorFrontDoorMessages.assessment_date} " />
       </f:facet>
       <h:outputText value="#{publishedAssessment.startDate}" >
-          <f:convertDateTime pattern="#{generalMessages.output_date_picker}"/>
-        </h:outputText>
+        <f:convertDateTime pattern="yyyy-MM-dd"/>
+      </h:outputText>
     </t:column>
 
 	<t:column headerstyleClass="dueDate" styleClass="dueDate">
       <f:facet name="header">
         <h:outputText value="#{authorFrontDoorMessages.assessment_due} " />
       </f:facet>
       <h:outputText value="#{publishedAssessment.dueDate}" >
-          <f:convertDateTime pattern="#{generalMessages.output_date_picker}"/>
+        <f:convertDateTime pattern="yyyy-MM-dd"/>
       </h:outputText>
     </t:column>
 
     <t:column headerstyleClass="lastModified" styleClass="lastModified">
       <f:facet name="header">
         <h:outputText value="#{authorFrontDoorMessages.header_last_modified}"/>
 	  </f:facet>
-
   	  <h:outputText value="#{publishedAssessment.lastModifiedBy}" />
-      <h:outputText escape="false" value="<br />"/>
+    </t:column>
+
+    <t:column headerstyleClass="lastModifiedDate" styleClass="lastModifiedDate">
+      <f:facet name="header">
+        <h:outputText value="#{authorFrontDoorMessages.header_last_modified_date}"/>
+	  </f:facet>
       <h:outputText value="#{publishedAssessment.lastModifiedDateForDisplay}"/>
     </t:column>