Changes for page Per Year

From version 17.2
edited by Andrea Omicini
on 22/10/2021 23:29
Change comment: There is no comment for this version
To version 12.3
edited by Andrea Omicini
on 22/06/2021 01:15
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,17 +1,4 @@
1 -{{include reference="Main.MacroSheet"/}}{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 -#set( $thesisMenu = true )
3 -#### 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
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#### get parameters
15 15  ## who
16 16  #set( $userNamePar = $context.getRequest().getParameter("user") )
17 17  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
... ... @@ -83,24 +83,48 @@
83 83   #set( $contactLastName = $contactdoc.display("last_name") )
84 84  #end
85 85  ##
86 -## $userSelected true and $roleSelected false means one user for all roles
73 +## $userSelected true means one user for all roles
87 87  ## $userSelected true and $roleSelected true for one user with one specific role
88 88  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
89 89  ## both false means all theses
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 // //
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 +> #stringEnIt("as a supervisor","come relatore") // //
84 + #end
85 + #if( $cosupervisor )
86 +> #stringEnIt("as a co-supervisor","come correlatore") // //
87 + #end
88 + #if( $contact )
89 +> #stringEnIt("as a contact","come contatto") // //
90 + #end
91 + #else
92 + #if( $supervisorLastName != "" )
93 +> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
94 + #end
95 + #if( $cosupervisorLastName != "" )
96 +> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
97 + #end
98 + #if( $contactLastName != "" )
99 +> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
100 + #end
95 95   #end
96 -#else
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
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 +##
104 104  #if ( $cosupervisor )
105 105   #set ( $roleSelectedFieldName = "coSupervisors" )
106 106  #elseif ( $contact )
... ... @@ -180,7 +180,7 @@
180 180  #set($thesisFound = $xwiki.searchDocuments($sql))
181 181  ##
182 182  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
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
194 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
184 184  
185 185  #end
186 186  {{/velocity}}