Changes for page Per Year

From version 12.16
edited by Andrea Omicini
on 23/06/2021 01:38
Change comment: There is no comment for this version
To version 11.1
edited by Andrea Omicini
on 21/06/2021 16:19
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") )
... ... @@ -86,37 +86,43 @@
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 88  
89 -> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // //
79 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
80 +
90 90  #if( $roleSelected )
91 91   #if( $userSelected )
92 92   #if( $supervisor )
93 -
94 ->> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
84 +* #stringEnIt("as a supervisor","come relatore")
95 95   #end
96 96   #if( $cosupervisor )
97 -
98 ->> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
87 +* #stringEnIt("as a co-supervisor","come correlatore")
99 99   #end
100 100   #if( $contact )
101 -
102 ->> {{stringEngIta eng="as a contact" ita="come contatto"/}}
90 +* #stringEnIt("as a contact","come contatto")
103 103   #end
104 104   #else
105 105   #if( $supervisorLastName != "" )
106 -
107 ->> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
94 +* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
108 108   #end
109 109   #if( $cosupervisorLastName != "" )
110 -
111 ->> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
97 +* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
112 112   #end
113 113   #if( $contactLastName != "" )
114 -
115 ->> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
100 +* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
116 116   #end
117 117   #end
118 118  #end
119 119  ##
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 +##
120 120  #if ( $cosupervisor )
121 121   #set ( $roleSelectedFieldName = "coSupervisors" )
122 122  #elseif ( $contact )
... ... @@ -194,9 +194,9 @@
194 194   order by prop1.value desc")
195 195  #end
196 196  #set($thesisFound = $xwiki.searchDocuments($sql))
197 -##
193 +
198 198  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
199 199  * #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
200 200  
201 201  #end
202 -{{/html}}{{/velocity}}
198 +{{/velocity}}