Changes for page Per Year

From version 12.17
edited by Andrea Omicini
on 23/06/2021 01:39
Change comment: There is no comment for this version
To version 12.4
edited by Andrea Omicini
on 22/06/2021 01:16
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,15 +1,4 @@
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"}}#### get parameters
13 13  ## who
14 14  #set( $userNamePar = $context.getRequest().getParameter("user") )
15 15  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
... ... @@ -86,31 +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 // //
78 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
79 +
90 90  #if( $roleSelected )
91 91   #if( $userSelected )
92 - #if( $supervisor ) // //
93 ->> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
82 + #if( $supervisor )
83 +> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
94 94   #end
95 - #if( $cosupervisor ) // //
96 ->> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
85 + #if( $cosupervisor )
86 +> #stringEnIt("as a co-supervisor","come correlatore") // //
97 97   #end
98 - #if( $contact ) // //
99 ->> {{stringEngIta eng="as a contact" ita="come contatto"/}}
88 + #if( $contact )
89 +> #stringEnIt("as a contact","come contatto") // //
100 100   #end
101 101   #else
102 - #if( $supervisorLastName != "" ) // //
103 ->> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
92 + #if( $supervisorLastName != "" )
93 +> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
104 104   #end
105 - #if( $cosupervisorLastName != "" ) // //
106 ->> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
95 + #if( $cosupervisorLastName != "" )
96 +> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
107 107   #end
108 - #if( $contactLastName != "" ) // //
109 ->> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
98 + #if( $contactLastName != "" )
99 +> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
110 110   #end
111 111   #end
112 112  #end
113 113  ##
104 +## hypothesis: $thesisStatus set, default "Completed"
105 +## to do: get from parameter
106 +#if ($thesisStatus == "Available")
107 + #set ($orderingDateFieldName = "availabilityDate")
108 +#elseif ($thesisStatus == "Ongoing")
109 + #set ($orderingDateFieldName = "startDate")
110 +#else
111 + #set ($thesisStatus = "Completed")
112 + #set ($orderingDateFieldName = "endDate")
113 +#end
114 +##
114 114  #if ( $cosupervisor )
115 115   #set ( $roleSelectedFieldName = "coSupervisors" )
116 116  #elseif ( $contact )
... ... @@ -193,4 +193,4 @@
193 193  * #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
194 194  
195 195  #end
196 -{{/html}}{{/velocity}}
197 +{{/velocity}}