Changes for page Per Year

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

Summary

Details

Page properties
Content
... ... @@ -1,4 +1,15 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#### get parameters
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,54 +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"/}}
85 -
95 +>> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
86 86   #end
87 87   #if( $cosupervisor )
88 88  
89 -> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
90 -
99 +>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
91 91   #end
92 92   #if( $contact )
93 -
94 -> {{stringEngIta eng="as a contact" ita="come contatto"/}}
102 +
103 +>> {{stringEngIta eng="as a contact" ita="come contatto"/}}
95 95   #end
96 96   #else
97 97   #if( $supervisorLastName != "" )
98 98  
99 -> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
100 -
108 +>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
101 101   #end
102 102   #if( $cosupervisorLastName != "" )
103 103  
104 -> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
105 -
112 +>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
106 106   #end
107 107   #if( $contactLastName != "" )
108 108  
109 -> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
110 -
116 +>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
111 111   #end
112 112   #end
113 113  #end
114 114  ##
115 -## hypothesis: $thesisStatus set, default "Completed"
116 -## to do: get from parameter
117 -#if ($thesisStatus == "Available")
118 - #set ($orderingDateFieldName = "availabilityDate")
119 -#elseif ($thesisStatus == "Ongoing")
120 - #set ($orderingDateFieldName = "startDate")
121 -#else
122 - #set ($thesisStatus = "Completed")
123 - #set ($orderingDateFieldName = "endDate")
124 -#end
125 -##
126 126  #if ( $cosupervisor )
127 127   #set ( $roleSelectedFieldName = "coSupervisors" )
128 128  #elseif ( $contact )
... ... @@ -205,4 +205,4 @@
205 205  * #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
206 206  
207 207  #end
208 -{{/velocity}}
203 +{{/html}}{{/velocity}}