Changes for page Per Year
From version 12.10
edited by Andrea Omicini
on 22/06/2021 15:12
on 22/06/2021 15:12
Change comment:
There is no comment for this version
To version 11.1
edited by Andrea Omicini
on 21/06/2021 16:19
on 21/06/2021 16:19
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,5 @@ 1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#### get parameters 1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}} 2 +#### get parameters 2 2 ## who 3 3 #set( $userNamePar = $context.getRequest().getParameter("user") ) 4 4 #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") ) ... ... @@ -74,35 +74,29 @@ 74 74 ## $userSelected true and $roleSelected true for one user with one specific role 75 75 ## if $userSelected false and $roleSelected true mean at least one role with an assigned user 76 76 ## both false means all theses 77 - ##78 + 78 78 == #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end == 79 - ##80 + 80 80 #if( $roleSelected ) 81 81 #if( $userSelected ) 82 82 #if( $supervisor ) 83 - 84 -> {{stringEngIta eng="as a supervisor" ita="come relatore"/}} 84 +* #stringEnIt("as a supervisor","come relatore") 85 85 #end 86 86 #if( $cosupervisor ) 87 - 88 -> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}} 87 +* #stringEnIt("as a co-supervisor","come correlatore") 89 89 #end 90 90 #if( $contact ) 91 - 92 -> {{stringEngIta eng="as a contact" ita="come contatto"/}} 90 +* #stringEnIt("as a contact","come contatto") 93 93 #end 94 94 #else 95 95 #if( $supervisorLastName != "" ) 96 - 97 -> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName 94 +* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName 98 98 #end 99 99 #if( $cosupervisorLastName != "" ) 100 - 101 -> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName 97 +* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName 102 102 #end 103 103 #if( $contactLastName != "" ) 104 - 105 -> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName 100 +* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName 106 106 #end 107 107 #end 108 108 #end ... ... @@ -195,7 +195,7 @@ 195 195 order by prop1.value desc") 196 196 #end 197 197 #set($thesisFound = $xwiki.searchDocuments($sql)) 198 - ##193 + 199 199 #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 200 200 * #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end 201 201