Sort study and knowledge results functionalities are implemented

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

diff --git a/Workspace/Siman/WebContent/study/searchStudy.jsp b/Workspace/Siman/WebContent/study/searchStudy.jsp
index aa73faf406643b35949097108780a751ae57cbae..2d4c909543e73de4019c9e6fab0e0e9ce5eb2e0a 100644 (file)
--- a/Workspace/Siman/WebContent/study/searchStudy.jsp
+++ b/Workspace/Siman/WebContent/study/searchStudy.jsp
@@ -191,13 +191,65 @@ $(document).ready(function () {
                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.manager" /></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="setStudyOrder">
+                <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="setStudyOrder">
+                <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="setStudyOrder">
+                <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="80">
+              <s:a action="setStudyOrder">
+                <s:param name="newSortedBy" value="%{'MODIFDATE'}"/>
+                <s:text name="label.modified"/>
+                <s:if test="#session.sortCriterion.toString() eq 'MODIFDATE'">
+                  <img src="<s:property value="arrowURL"/>" border="none" />
+                </s:if>
+              </s:a>
+            </td>
+            
+            <td width="150">
+              <s:a action="setStudyOrder">
+                <s:param name="newSortedBy" value="%{'RESPONSIBLE'}"/>
+                <s:text name="label.manager" />
+                <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="6"></td>
                </tr>
                <s:iterator value="result">
                        <tr>
@@ -210,6 +262,8 @@ $(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="%{lastModificationDate}"/></td>
                                <td><s:property value="getText(authorName)" /></td>
                        </tr>
                </s:iterator>