Changes for page Per Year

From version 12.20
edited by Andrea Omicini
on 23/06/2021 01:55
Change comment: There is no comment for this version
To version 10.1
edited by Andrea Omicini
on 21/06/2021 15:10
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,15 +1,5 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters
2 -## hypothesis: $thesisStatus set, default "Completed"
3 -## to do: get from parameter
4 -#if( $thesisStatus == "Available" )
5 - #set( $orderingDateFieldName = "availabilityDate" )
6 -#elseif( $thesisStatus == "Ongoing" )
7 - #set( $orderingDateFieldName = "startDate" )
8 -#else
9 - #set( $thesisStatus = "Completed" )
10 - #set( $orderingDateFieldName = "endDate" )
11 -#end
12 -## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}
2 +#### get parameters
13 13  ## who
14 14  #set( $userNamePar = $context.getRequest().getParameter("user") )
15 15  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
... ... @@ -81,24 +81,48 @@
81 81   #set( $contactLastName = $contactdoc.display("last_name") )
82 82  #end
83 83  ##
84 -## $userSelected true and $roleSelected false means one user for all roles
74 +## $userSelected true means one user for all roles
85 85  ## $userSelected true and $roleSelected true for one user with one specific role
86 86  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
87 87  ## both false means all theses
88 -#if( $userSelected )
89 - #if( $roleSelected ) // //
90 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName / #if( $supervisor ){{stringEngIta eng="Supervisor" ita="Relatore"/}}#end#if( $cosupervisor ){{stringEngIta eng="Co-supervisor" ita="Correlatore"/}}#end#if( $contact ){{stringEngIta eng="Contact" ita="Contatto"/}}#end
91 - #else // //
92 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName
78 +
79 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
80 +
81 +#if( $roleSelected )
82 + #if( $userSelected )
83 + #if( $supervisor )
84 +* #stringEnIt("as a supervisor","come relatore")
85 + #end
86 + #if( $cosupervisor )
87 +* #stringEnIt("as a co-supervisor","come correlatore")
88 + #end
89 + #if( $contact )
90 +* #stringEnIt("as a contact","come contatto")
91 + #end
92 + #else
93 + #if( $supervisorLastName != "" )
94 +* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
95 + #end
96 + #if( $cosupervisorLastName != "" )
97 +* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
98 + #end
99 + #if( $contactLastName != "" )
100 +* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
101 + #end
93 93   #end
94 -#else
95 - #if( $roleSelected ) // //
96 -> #FullThesisStatusesString($thesisStatus)#if( $supervisorLastName != "" ) / $supervisorFirstName $supervisorLastName //({{stringEngIta eng="supervisor" ita="relatore"/}})//#end#if( $cosupervisorLastName != "" ) / $cosupervisorFirstName $cosupervisorLastName //({{stringEngIta eng="co-supervisor" ita="correlatore"/}})//#end#if( $contactLastName != "" ) / $contactFirstName $contactLastName //({{stringEngIta eng="Contact" ita="Contatto"/}})//#end
97 - #else // //
98 -> #FullThesisStatusesString($thesisStatus)
99 - #end
100 100  #end
101 101  ##
105 +## hypothesis: $thesisStatus set, default "Completed"
106 +## to do: get from parameter
107 +#if ($thesisStatus == "Available")
108 + #set ($orderingDateFieldName = "availabilityDate")
109 +#elseif ($thesisStatus == "Ongoing")
110 + #set ($orderingDateFieldName = "startDate")
111 +#else
112 + #set ($thesisStatus = "Completed")
113 + #set ($orderingDateFieldName = "endDate")
114 +#end
115 +##
102 102  #if ( $cosupervisor )
103 103   #set ( $roleSelectedFieldName = "coSupervisors" )
104 104  #elseif ( $contact )
... ... @@ -176,9 +176,9 @@
176 176   order by prop1.value desc")
177 177  #end
178 178  #set($thesisFound = $xwiki.searchDocuments($sql))
179 -##
193 +
180 180  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
181 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
195 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))// #end
182 182  
183 183  #end
184 -{{/html}}{{/velocity}}
198 +{{/velocity}}