Changes for page Per Year

From version 12.19
edited by Andrea Omicini
on 23/06/2021 01:55
Change comment: There is no comment for this version
To version 12.7
edited by Andrea Omicini
on 22/06/2021 01:19
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") )
... ... @@ -81,24 +81,59 @@
81 81   #set( $contactLastName = $contactdoc.display("last_name") )
82 82  #end
83 83  ##
84 -## $userSelected true and $roleSelected false means one user for all roles
73 +## $userSelected true means one user for all roles
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 -#if( $userSelected )
89 - #if( $roleSelected )
90 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName / #if( $supervisor ){{stringEngIta eng="Supervisor" ita="Relatore"/}}#end#if( $cosupervisor ){{stringEngIta eng="Co-supervisor" ita="Correlatore"/}}#end#if( $contact ){{stringEngIta eng="Contact" ita="Contatto"/}}#end
77 +
78 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
79 +
80 +#if( $roleSelected )
81 + #if( $userSelected )
82 + #if( $supervisor )
83 +
84 +> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
85 +
86 + #end
87 + #if( $cosupervisor )
88 +
89 +> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
90 +
91 + #end
92 + #if( $contact )
93 +
94 +> {{stringEngIta eng="as a contact" ita="come contatto"/}}
95 + #end
91 91   #else
92 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName
97 + #if( $supervisorLastName != "" )
98 +
99 +> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
100 +
101 + #end
102 + #if( $cosupervisorLastName != "" )
103 +
104 +> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
105 +
106 + #end
107 + #if( $contactLastName != "" )
108 +
109 +> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
110 +
111 + #end
93 93   #end
94 -#else
95 - #if( $roleSelected )
96 -> #FullThesisStatusesString($thesisStatus)#if( $supervisorLastName != "" ) / $supervisorFirstName $supervisorLastName //({{stringEngIta eng="supervisor" ita="relatore"/}})//#end#if( $cosupervisorLastName != "" ) / $cosupervisorFirstName $cosupervisorLastName //({{stringEngIta eng="co-supervisor" ita="correlatore"/}})//#end#if( $contactLastName != "" ) / $contactFirstName $contactLastName //({{stringEngIta eng="Contact" ita="Contatto"/}})//#end
97 - #else
98 -> #FullThesisStatusesString($thesisStatus)
99 - #end
100 100  #end
101 101  ##
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 +##
102 102  #if ( $cosupervisor )
103 103   #set ( $roleSelectedFieldName = "coSupervisors" )
104 104  #elseif ( $contact )
... ... @@ -181,4 +181,4 @@
181 181  * #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
182 182  
183 183  #end
184 -{{/html}}{{/velocity}}
208 +{{/velocity}}