Changes for page Per Year

From version 11.1
edited by Andrea Omicini
on 21/06/2021 16:19
Change comment: There is no comment for this version
To version 17.2
edited by Andrea Omicini
on 22/10/2021 23:29
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,5 +1,17 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}
1 +{{include reference="Main.MacroSheet"/}}{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 +#set( $thesisMenu = true )
2 2  #### get parameters
4 +## hypothesis: $thesisStatus set, default "Completed"
5 +## to do: get from parameter
6 +#if( $thesisStatus == "Available" )
7 + #set( $orderingDateFieldName = "availabilityDate" )
8 +#elseif( $thesisStatus == "Ongoing" )
9 + #set( $orderingDateFieldName = "startDate" )
10 +#else
11 + #set( $thesisStatus = "Completed" )
12 + #set( $orderingDateFieldName = "endDate" )
13 +#end
14 +## 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") )
... ... @@ -71,48 +71,24 @@
71 71   #set( $contactLastName = $contactdoc.display("last_name") )
72 72  #end
73 73  ##
74 -## $userSelected true means one user for all roles
86 +## $userSelected true and $roleSelected false means one user for all roles
75 75  ## $userSelected true and $roleSelected true for one user with one specific role
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 -
79 -== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
80 -
81 -#if( $roleSelected )
82 - #if( $userSelected )
83 - #if( $supervisor )
84 -* #stringEnIt("as a supervisor","come relatore")
85 - #end
86 - #if( $cosupervisor )
87 -* #stringEnIt("as a co-supervisor","come correlatore")
88 - #end
89 - #if( $contact )
90 -* #stringEnIt("as a contact","come contatto")
91 - #end
92 - #else
93 - #if( $supervisorLastName != "" )
94 -* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
95 - #end
96 - #if( $cosupervisorLastName != "" )
97 -* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
98 - #end
99 - #if( $contactLastName != "" )
100 -* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
101 - #end
90 +#if( $userSelected )
91 + #if( $roleSelected ) // //
92 +> #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 // //
93 + #else // //
94 +> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // //
102 102   #end
103 -#end
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 111  #else
112 - #set ($thesisStatus = "Completed")
113 - #set ($orderingDateFieldName = "endDate")
97 + #if( $roleSelected ) // //
98 +> #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 // //
99 + #else // //
100 +## > #FullThesisStatusesString($thesisStatus) // //
101 + #end
114 114  #end
115 -##
103 +##
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 -
181 +##
194 194  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
195 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
183 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" || ( $thesisDoc.getValue("studentFirstName") != "" && $thesisDoc.getValue("studentLastName") != "" ) ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
196 196  
197 197  #end
198 198  {{/velocity}}