Changes for page Per Year
From version 8.3
edited by Andrea Omicini
on 21/06/2021 15:05
on 21/06/2021 15:05
Change comment:
There is no comment for this version
To version 6.1
edited by Andrea Omicini
on 16/06/2021 19:33
on 16/06/2021 19:33
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Syntax
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki 2.11 +XWiki 1.0 - Content
-
... ... @@ -1,4 +1,6 @@ 1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}} 1 +#includeMacros("Main.MacroSheet") 2 +#includeMacros("Theses.MacroSheet") 3 + 2 2 #### get parameters 3 3 ## who 4 4 #set( $userNamePar = $context.getRequest().getParameter("user") ) ... ... @@ -5,6 +5,7 @@ 5 5 #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") ) 6 6 #set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") ) 7 7 #set( $contactNamePar = $context.getRequest().getParameter("contact") ) 10 + 8 8 #### set default values 9 9 #set( $userSelected = false ) 10 10 #set( $roleSelected = false ) ... ... @@ -19,7 +19,7 @@ 19 19 #set( $contactName = "" ) 20 20 #set( $contactFirstName = "" ) 21 21 #set( $contactLastName = "" ) 22 - ##25 + 23 23 #### handle who & roles 24 24 ## 25 25 #if ( $userName || $userNamePar ) ## a user is specified for all roles ... ... @@ -70,38 +70,19 @@ 70 70 #set( $contactFirstName = $contactdoc.display("first_name") ) 71 71 #set( $contactLastName = $contactdoc.display("last_name") ) 72 72 #end 73 - ##76 + 74 74 ## $userSelected true means one user for all roles 75 75 ## $userSelected true and $roleSelected true for one user with one specific role 76 76 ## if $userSelected false and $roleSelected true mean at least one role with an assigned user 77 77 ## both false means all theses 78 - 79 -== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus) == 80 - 81 -#if( $roleSelected ) 82 - #if( $userSelected ) 83 - #if( $supervisor ) 84 -* #stringEnIt("as a supervisor","come relatore") 85 - #end 86 - #if( $cosupervisor ) 87 -* #stringEnIt("as a co-supervisor","come correlatore") 88 - #end 89 - #if( $contact ) 90 -* #stringEnIt("as a contact","come contatto") 91 - #end 92 - #else 93 - #if( $supervisorLastName != "" ) 94 -* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName 95 - #end 96 - #if( $cosupervisorLastName != "" ) 97 -* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName 98 - #end 99 - #if( $contactLastName != "" ) 100 -* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName 101 - #end 102 - #end 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()") 103 103 #end 104 - ##88 + 105 105 ## hypothesis: $thesisStatus set, default "Completed" 106 106 ## to do: get from parameter 107 107 #if ($thesisStatus == "Available") ... ... @@ -120,7 +120,9 @@ 120 120 #else 121 121 #set ( $roleSelectedFieldName = "supervisor" ) 122 122 #end 123 -## 107 + 108 +1.1 #ThesisStatusesString($thesisStatus) 109 + 124 124 #if ($userSelected) 125 125 #if ( $roleSelected ) 126 126 #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2 ... ... @@ -192,7 +192,7 @@ 192 192 #set($thesisFound = $xwiki.searchDocuments($sql)) 193 193 194 194 #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 195 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))//#end181 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) ~~(#thesisAuthorLink($thesis))~~ #end 196 196 197 197 #end 198 - {{/velocity}}184 +