Changes for page Per Year

From version 9.1
edited by Andrea Omicini
on 21/06/2021 15:09
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,5 +1,15 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}
2 -#### 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
3 3  ## who
4 4  #set( $userNamePar = $context.getRequest().getParameter("user") )
5 5  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
... ... @@ -76,43 +76,31 @@
76 76  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
77 77  ## both false means all theses
78 78  
79 -== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus) ==
80 -
89 +> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // //
81 81  #if( $roleSelected )
82 82   #if( $userSelected )
83 - #if( $supervisor )
84 -* #stringEnIt("as a supervisor","come relatore")
92 + #if( $supervisor ) // //
93 +> * {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
85 85   #end
86 - #if( $cosupervisor )
87 -* #stringEnIt("as a co-supervisor","come correlatore")
95 + #if( $cosupervisor ) // //
96 +>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
88 88   #end
89 - #if( $contact )
90 -* #stringEnIt("as a contact","come contatto")
98 + #if( $contact ) // //
99 +>> {{stringEngIta eng="as a contact" ita="come contatto"/}}
91 91   #end
92 92   #else
93 - #if( $supervisorLastName != "" )
94 -* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
102 + #if( $supervisorLastName != "" ) // //
103 +>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
95 95   #end
96 - #if( $cosupervisorLastName != "" )
97 -* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
105 + #if( $cosupervisorLastName != "" ) // //
106 +>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
98 98   #end
99 - #if( $contactLastName != "" )
100 -* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
108 + #if( $contactLastName != "" ) // //
109 +>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
101 101   #end
102 102   #end
103 103  #end
104 104  ##
105 -## hypothesis: $thesisStatus set, default "Completed"
106 -## to do: get from parameter
107 -#if ($thesisStatus == "Available")
108 - #set ($orderingDateFieldName = "availabilityDate")
109 -#elseif ($thesisStatus == "Ongoing")
110 - #set ($orderingDateFieldName = "startDate")
111 -#else
112 - #set ($thesisStatus = "Completed")
113 - #set ($orderingDateFieldName = "endDate")
114 -#end
115 -##
116 116  #if ( $cosupervisor )
117 117   #set ( $roleSelectedFieldName = "coSupervisors" )
118 118  #elseif ( $contact )
... ... @@ -190,9 +190,9 @@
190 190   order by prop1.value desc")
191 191  #end
192 192  #set($thesisFound = $xwiki.searchDocuments($sql))
193 -
191 +##
194 194  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
195 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))// #end
193 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
196 196  
197 197  #end
198 -{{/velocity}}
196 +{{/html}}{{/velocity}}