Changes for page Per Year
From version 5.2
edited by Andrea Omicini
on 16/06/2021 19:23
on 16/06/2021 19:23
Change comment:
There is no comment for this version
To version 7.1
edited by Andrea Omicini
on 18/06/2021 00:21
on 18/06/2021 00:21
Change comment:
Document converted from syntax xwiki/1.0 to syntax xwiki/2.1
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Syntax
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki 1.01 +XWiki 2.1 - Content
-
... ... @@ -1,6 +1,7 @@ 1 -#includeMacros("Main.MacroSheet") 2 -#includeMacros("Theses.MacroSheet2") 1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}} 3 3 3 +{{velocity filter="none"}} 4 +{{html clean="false" wiki="true"}} 4 4 #### get parameters 5 5 ## who 6 6 #set( $userNamePar = $context.getRequest().getParameter("user") ) ... ... @@ -7,7 +7,6 @@ 7 7 #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") ) 8 8 #set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") ) 9 9 #set( $contactNamePar = $context.getRequest().getParameter("contact") ) 10 - 11 11 #### set default values 12 12 #set( $userSelected = false ) 13 13 #set( $roleSelected = false ) ... ... @@ -22,7 +22,7 @@ 22 22 #set( $contactName = "" ) 23 23 #set( $contactFirstName = "" ) 24 24 #set( $contactLastName = "" ) 25 - 25 +## 26 26 #### handle who & roles 27 27 ## 28 28 #if ( $userName || $userNamePar ) ## a user is specified for all roles ... ... @@ -73,19 +73,40 @@ 73 73 #set( $contactFirstName = $contactdoc.display("first_name") ) 74 74 #set( $contactLastName = $contactdoc.display("last_name") ) 75 75 #end 76 - 76 +## 77 77 ## $userSelected true means one user for all roles 78 78 ## $userSelected true and $roleSelected true for one user with one specific role 79 79 ## if $userSelected false and $roleSelected true mean at least one role with an assigned user 80 80 ## both false means all theses 81 -#if ($userSelected) 82 -1 #stringEnIt("Theses with ","Tesi con") $userFirstName $userLastName #if($supervisor)#stringEnIt("as a supervisor","come relatore")#end#if($cosupervisor)#stringEnIt("as a co-supervisor","come correlatore")#end#if($contact)#stringEnIt("as a contact","come contatto")#end #stringEnIt("in the #apice() space","nello spazio #apice()") 83 -#elseif ( $roleSelected ) 84 -1 #stringEnIt("Theses","Tesi") #if($supervisorLastName != "") #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName#if($cosupervisorLastName != "" || $contactLastName != ""), #end#end#if($cosupervisorLastName != "") #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName#if($contactLastName != ""), #end#end #if($contactLastName != "") #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName#end #stringEnIt("in the #apice() space","nello spazio #apice()") 85 -#else 86 - 1 #stringEnIt("Theses","Tesi") #stringEnIt("in the #apice() space","nello spazio #apice()") 87 -#end 88 88 82 + 83 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus) == 84 + 85 +#if( $roleSelected ) 86 + #if( $userSelected ) 87 + #if( $supervisor ) 88 +* #stringEnIt("as a supervisor","come relatore") 89 + #end 90 + #if( $cosupervisor ) 91 +* #stringEnIt("as a co-supervisor","come correlatore") 92 + #end 93 + #if( $contact ) 94 +* #stringEnIt("as a contact","come contatto") 95 + #end 96 + #else 97 + #if( $supervisorLastName != "" ) 98 +* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName 99 + #end 100 + #if( $cosupervisorLastName != "" ) 101 +* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName 102 + #end 103 + #if( $contactLastName != "" ) 104 +* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName 105 +<p/> 106 + #end 107 + #end 108 +#end 109 +## 89 89 ## hypothesis: $thesisStatus set, default "Completed" 90 90 ## to do: get from parameter 91 91 #if ($thesisStatus == "Available") ... ... @@ -104,9 +104,7 @@ 104 104 #else 105 105 #set ( $roleSelectedFieldName = "supervisor" ) 106 106 #end 107 - 108 -1.1 #ThesisStatusesString($thesisStatus) 109 - 128 +## 110 110 #if ($userSelected) 111 111 #if ( $roleSelected ) 112 112 #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2 ... ... @@ -178,7 +178,9 @@ 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))~~#end200 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))// #end 182 182 183 183 #end 184 184 204 +{{/html}} 205 +{{/velocity}}