Changes for page Per Year

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

Summary

Details

Page properties
Content
... ... @@ -1,4 +1,15 @@
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
2 2  ## who
3 3  #set( $userNamePar = $context.getRequest().getParameter("user") )
4 4  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
... ... @@ -75,49 +75,38 @@
75 75  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
76 76  ## both false means all theses
77 77  ##
78 -== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
89 +> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName / #end
79 79  ##
80 80  #if( $roleSelected )
81 81   #if( $userSelected )
82 82   #if( $supervisor )
83 83  
84 -> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
95 +>> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
85 85   #end
86 86   #if( $cosupervisor )
87 87  
88 -> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
99 +>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
89 89   #end
90 90   #if( $contact )
91 -
92 -> {{stringEngIta eng="as a contact" ita="come contatto"/}}
102 +
103 +>> {{stringEngIta eng="as a contact" ita="come contatto"/}}
93 93   #end
94 94   #else
95 95   #if( $supervisorLastName != "" )
96 96  
97 -> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
108 +>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
98 98   #end
99 99   #if( $cosupervisorLastName != "" )
100 100  
101 -> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
112 +>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
102 102   #end
103 103   #if( $contactLastName != "" )
104 104  
105 -> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
116 +>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
106 106   #end
107 107   #end
108 108  #end
109 109  ##
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 )