Changes for page Per Year

From version 16.3
edited by Andrea Omicini
on 26/07/2021 23:16
Change comment: There is no comment for this version
To version 12.16
edited by Andrea Omicini
on 23/06/2021 01:38
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,4 +1,4 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#set( $thesisMenu = true ){{html clean="false" wiki="true"}}#### get parameters
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters
2 2  ## hypothesis: $thesisStatus set, default "Completed"
3 3  ## to do: get from parameter
4 4  #if( $thesisStatus == "Available" )
... ... @@ -81,22 +81,40 @@
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
84 +## $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 // //
91 - #else // //
92 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // //
88 +
89 +> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // //
90 +#if( $roleSelected )
91 + #if( $userSelected )
92 + #if( $supervisor )
93 +
94 +>> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
95 + #end
96 + #if( $cosupervisor )
97 +
98 +>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
99 + #end
100 + #if( $contact )
101 +
102 +>> {{stringEngIta eng="as a contact" ita="come contatto"/}}
103 + #end
104 + #else
105 + #if( $supervisorLastName != "" )
106 +
107 +>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
108 + #end
109 + #if( $cosupervisorLastName != "" )
110 +
111 +>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
112 + #end
113 + #if( $contactLastName != "" )
114 +
115 +>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
116 + #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  ##
102 102  #if ( $cosupervisor )
... ... @@ -178,7 +178,7 @@
178 178  #set($thesisFound = $xwiki.searchDocuments($sql))
179 179  ##
180 180  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
181 -* #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
199 +* #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 184  {{/html}}{{/velocity}}