Changes for page Per Year
From version 12.19
edited by Andrea Omicini
on 23/06/2021 01:55
on 23/06/2021 01:55
Change comment:
There is no comment for this version
To version 17.2
edited by Andrea Omicini
on 22/10/2021 23:29
on 22/10/2021 23:29
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,4 +1,6 @@ 1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters 1 +{{include reference="Main.MacroSheet"/}}{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 +#set( $thesisMenu = true ) 3 +#### get parameters 2 2 ## hypothesis: $thesisStatus set, default "Completed" 3 3 ## to do: get from parameter 4 4 #if( $thesisStatus == "Available" ) ... ... @@ -86,16 +86,16 @@ 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 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 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 // // 93 93 #end 94 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) 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) // // 99 99 #end 100 100 #end 101 101 ## ... ... @@ -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") != "" ) //(#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 182 182 183 183 #end 184 -{{/ html}}{{/velocity}}186 +{{/velocity}}