Changes for page Per Year

From version 12.4
edited by Andrea Omicini
on 22/06/2021 01:16
Change comment: There is no comment for this version
To version 12.14
edited by Andrea Omicini
on 23/06/2021 01:35
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,43 +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 -> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
94 +
95 +>> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
84 84   #end
85 85   #if( $cosupervisor )
86 -> #stringEnIt("as a co-supervisor","come correlatore") // //
98 +
99 +>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
87 87   #end
88 88   #if( $contact )
89 -> #stringEnIt("as a contact","come contatto") // //
102 +
103 +>> {{stringEngIta eng="as a contact" ita="come contatto"/}}
90 90   #end
91 91   #else
92 92   #if( $supervisorLastName != "" )
93 -> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
107 +
108 +>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
94 94   #end
95 95   #if( $cosupervisorLastName != "" )
96 -> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
111 +
112 +>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
97 97   #end
98 98   #if( $contactLastName != "" )
99 -> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
115 +
116 +>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
100 100   #end
101 101   #end
102 102  #end
103 103  ##
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 -##
115 115  #if ( $cosupervisor )
116 116   #set ( $roleSelectedFieldName = "coSupervisors" )
117 117  #elseif ( $contact )
... ... @@ -194,4 +194,4 @@
194 194  * #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
195 195  
196 196  #end
197 -{{/velocity}}
203 +{{/html}}{{/velocity}}