Sort study and knowledge results functionalities are implemented

[tools/siman.git] / Workspace / Siman / WebContent / study / searchKnowledge.jsp

diff --git a/Workspace/Siman/WebContent/study/searchKnowledge.jsp b/Workspace/Siman/WebContent/study/searchKnowledge.jsp
index 50e641ad5874bc476b94ee1c1d0594de592a9123..229a33248e90078972a3d48917c78893328d01ca 100644 (file)
--- a/Workspace/Siman/WebContent/study/searchKnowledge.jsp
+++ b/Workspace/Siman/WebContent/study/searchKnowledge.jsp
@@ -187,14 +187,56 @@ $(document).ready(function () {
        <table width=100% cellpadding="0" cellspacing="0" border="0"
                class="text">
                <tr height="20" valign="bottom">
-                       <td width="20"></td>
-                       <td width="80"><s:text name="label.reference" /></td>
-                       <td><s:text name="label.title" /><img
-                               src="<s:url value="/skin/icon.sortup.png"/>" border="none" /></td>
-                       <td width="150"><s:text name="label.author" /></td>
-               </tr>
+              <td width="20"></td>
+       
+           <s:if test="#session.isDescendingOrder">
+             <s:url var="arrowURL" value="/skin/icon.sortup.png"/>
+           </s:if><s:else>
+             <s:url var="arrowURL" value="/skin/icon.sortdown.png"/>
+           </s:else>
+           
+           <td width="80">
+             <s:a action="setKnowledgeOrder">
+               <s:param name="newSortedBy" value="%{'REFERENCE'}"/>
+               <s:text name="label.reference" />
+               <s:if test="#session.sortCriterion.toString() eq 'REFERENCE'">
+                 <img src="<s:property value="arrowURL"/>" border="none" />
+               </s:if>
+             </s:a>
+           </td>
+           
+           <td>
+             <s:a action="setKnowledgeOrder">
+               <s:param name="newSortedBy" value="%{'NAME'}"/>
+               <s:text name="label.title" />
+               <s:if test="#session.sortCriterion.toString() eq 'NAME'">
+                 <img src="<s:property value="arrowURL"/>" border="none" />
+               </s:if>
+             </s:a>
+           </td>
+           
+           <td width="80">
+             <s:a action="setKnowledgeOrder">
+               <s:param name="newSortedBy" value="%{'CREATEDATE'}"/>
+               <s:text name="label.created"/>
+               <s:if test="#session.sortCriterion.toString() eq 'CREATEDATE'">
+                 <img src="<s:property value="arrowURL"/>" border="none" />
+               </s:if>
+             </s:a>
+           </td>
+           
+           <td width="150">
+             <s:a action="setKnowledgeOrder">
+               <s:param name="newSortedBy" value="%{'RESPONSIBLE'}"/>
+               <s:text name="label.author" />
+               <s:if test="#session.sortCriterion.toString() eq 'RESPONSIBLE'">
+                 <img src="<s:property value="arrowURL"/>" border="none" />
+               </s:if>
+             </s:a>
+           </td>
+        </tr>
                <tr height="1" bgcolor="#AAAAAA">
-                       <td colspan="4"></td>
+                       <td colspan="5"></td>
                </tr>
                <s:iterator value="result">
                        <tr>
@@ -207,6 +249,7 @@ $(document).ready(function () {
                                </s:url> <s:a href="%{open}" cssClass="link">
                                        <s:property value="title" />
                                </s:a></td>
+                <td><s:property value="%{date}"/></td>
                                <td><s:property value="getText(authorName)" /></td>
                        </tr>
                </s:iterator>