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.20
edited by Andrea Omicini
on 23/06/2021 01:55
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,6 +1,4 @@
1 -{{include reference="Main.MacroSheet"/}}{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 -#set( $thesisMenu = true )
3 -#### get parameters
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters
4 4  ## hypothesis: $thesisStatus set, default "Completed"
5 5  ## to do: get from parameter
6 6  #if( $thesisStatus == "Available" )
... ... @@ -89,15 +89,15 @@
89 89  ## both false means all theses
90 90  #if( $userSelected )
91 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 // //
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
93 93   #else // //
94 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // //
92 +> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName
95 95   #end
96 96  #else
97 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 // //
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
99 99   #else // //
100 -## > #FullThesisStatusesString($thesisStatus) // //
98 +> #FullThesisStatusesString($thesisStatus)
101 101   #end
102 102  #end
103 103  ##
... ... @@ -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
181 +* #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 -{{/velocity}}
184 +{{/html}}{{/velocity}}