Changes for page Per Year

From version 7.1
edited by Andrea Omicini
on 18/06/2021 00:21
Change comment: Document converted from syntax xwiki/1.0 to syntax xwiki/2.1
To version 12.10
edited by Andrea Omicini
on 22/06/2021 15:12
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -SelectPerStatus
Content
... ... @@ -1,8 +1,4 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}
2 -
3 -{{velocity filter="none"}}
4 -{{html clean="false" wiki="true"}}
5 -#### get parameters
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#### get parameters
6 6  ## who
7 7  #set( $userNamePar = $context.getRequest().getParameter("user") )
8 8  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
... ... @@ -78,31 +78,35 @@
78 78  ## $userSelected true and $roleSelected true for one user with one specific role
79 79  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
80 80  ## both false means all theses
81 -
82 -
83 -== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus) ==
84 -
77 +##
78 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
79 +##
85 85  #if( $roleSelected )
86 86   #if( $userSelected )
87 87   #if( $supervisor )
88 -* #stringEnIt("as a supervisor","come relatore")
83 +
84 +> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
89 89   #end
90 90   #if( $cosupervisor )
91 -* #stringEnIt("as a co-supervisor","come correlatore")
87 +
88 +> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
92 92   #end
93 93   #if( $contact )
94 -* #stringEnIt("as a contact","come contatto")
91 +
92 +> {{stringEngIta eng="as a contact" ita="come contatto"/}}
95 95   #end
96 96   #else
97 97   #if( $supervisorLastName != "" )
98 -* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
96 +
97 +> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
99 99   #end
100 100   #if( $cosupervisorLastName != "" )
101 -* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
100 +
101 +> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
102 102   #end
103 103   #if( $contactLastName != "" )
104 -* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
105 -<p/>
104 +
105 +> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
106 106   #end
107 107   #end
108 108  #end
... ... @@ -195,11 +195,9 @@
195 195   order by prop1.value desc")
196 196  #end
197 197  #set($thesisFound = $xwiki.searchDocuments($sql))
198 -
198 +##
199 199  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
200 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))// #end
200 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
201 201  
202 202  #end
203 -
204 -{{/html}}
205 205  {{/velocity}}