Changes for page Per Year

From version 12.5
edited by Andrea Omicini
on 22/06/2021 01:17
Change comment: There is no comment for this version
To version 12.18
edited by Andrea Omicini
on 23/06/2021 01:39
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,45 +75,31 @@
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 ==
79 -
89 +> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // //
80 80  #if( $roleSelected )
81 81   #if( $userSelected )
82 - #if( $supervisor )
83 -
84 -> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
85 -
86 -#end
87 - #if( $cosupervisor )
88 -> #stringEnIt("as a co-supervisor","come correlatore") // //
92 + #if( $supervisor ) // //
93 +> * {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
89 89   #end
90 - #if( $contact )
91 -> #stringEnIt("as a contact","come contatto") // //
95 + #if( $cosupervisor ) // //
96 +>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
92 92   #end
98 + #if( $contact ) // //
99 +>> {{stringEngIta eng="as a contact" ita="come contatto"/}}
100 + #end
93 93   #else
94 - #if( $supervisorLastName != "" )
95 -> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
102 + #if( $supervisorLastName != "" ) // //
103 +>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
96 96   #end
97 - #if( $cosupervisorLastName != "" )
98 -> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
105 + #if( $cosupervisorLastName != "" ) // //
106 +>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
99 99   #end
100 - #if( $contactLastName != "" )
101 -> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
108 + #if( $contactLastName != "" ) // //
109 +>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
102 102   #end
103 103   #end
104 104  #end
105 105  ##
106 -## hypothesis: $thesisStatus set, default "Completed"
107 -## to do: get from parameter
108 -#if ($thesisStatus == "Available")
109 - #set ($orderingDateFieldName = "availabilityDate")
110 -#elseif ($thesisStatus == "Ongoing")
111 - #set ($orderingDateFieldName = "startDate")
112 -#else
113 - #set ($thesisStatus = "Completed")
114 - #set ($orderingDateFieldName = "endDate")
115 -#end
116 -##
117 117  #if ( $cosupervisor )
118 118   #set ( $roleSelectedFieldName = "coSupervisors" )
119 119  #elseif ( $contact )
... ... @@ -196,4 +196,4 @@
196 196  * #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
197 197  
198 198  #end
199 -{{/velocity}}
196 +{{/html}}{{/velocity}}