Changes for page Per Year

From version 8.3
edited by Andrea Omicini
on 21/06/2021 15:05
Change comment: There is no comment for this version
To version 12.7
edited by Andrea Omicini
on 22/06/2021 01:19
Change comment: There is no comment for this version

Summary

Details

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