Changes for page Per Year

From version 12.15
edited by Andrea Omicini
on 23/06/2021 01:38
Change comment: There is no comment for this version
To version 12.11
edited by Andrea Omicini
on 23/06/2021 01:26
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,15 +1,4 @@
1 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
13 13  ## who
14 14  #set( $userNamePar = $context.getRequest().getParameter("user") )
15 15  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
... ... @@ -85,39 +85,50 @@
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 -
89 -> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // //
90 -
77 +##
78 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
79 +##
91 91  #if( $roleSelected )
92 92   #if( $userSelected )
93 93   #if( $supervisor )
94 94  
95 ->> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
84 +> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
96 96   #end
97 97   #if( $cosupervisor )
98 98  
99 ->> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
88 +> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
100 100   #end
101 101   #if( $contact )
102 -
103 ->> {{stringEngIta eng="as a contact" ita="come contatto"/}}
91 +
92 +> {{stringEngIta eng="as a contact" ita="come contatto"/}}
104 104   #end
105 105   #else
106 106   #if( $supervisorLastName != "" )
107 107  
108 ->> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
97 +> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
109 109   #end
110 110   #if( $cosupervisorLastName != "" )
111 111  
112 ->> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
101 +> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
113 113   #end
114 114   #if( $contactLastName != "" )
115 115  
116 ->> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
105 +> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
117 117   #end
118 118   #end
119 119  #end
120 120  ##
110 +## hypothesis: $thesisStatus set, default "Completed"
111 +## to do: get from parameter
112 +#if ($thesisStatus == "Available")
113 + #set ($orderingDateFieldName = "availabilityDate")
114 +#elseif ($thesisStatus == "Ongoing")
115 + #set ($orderingDateFieldName = "startDate")
116 +#else
117 + #set ($thesisStatus = "Completed")
118 + #set ($orderingDateFieldName = "endDate")
119 +#end
120 +##
121 121  #if ( $cosupervisor )
122 122   #set ( $roleSelectedFieldName = "coSupervisors" )
123 123  #elseif ( $contact )