Changes for page Per Year

From version 6.3
edited by Andrea Omicini
on 18/06/2021 00:16
Change comment: There is no comment for this version
To version 12.8
edited by Andrea Omicini
on 22/06/2021 01:19
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -SelectPerStatus
Syntax
... ... @@ -1,1 +1,1 @@
1 -XWiki 1.0
1 +XWiki 2.1
Content
... ... @@ -1,13 +1,9 @@
1 -#includeMacros("Main.MacroSheet")
2 -#includeMacros("Theses.MacroSheet")
3 -
4 -#### get parameters
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#### get parameters
5 5  ## who
6 6  #set( $userNamePar = $context.getRequest().getParameter("user") )
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 -
21 +##
26 26  #### handle who & roles
27 27  ##
28 28  #if ( $userName || $userNamePar ) ## a user is specified for all roles
... ... @@ -73,36 +73,44 @@
73 73   #set( $contactFirstName = $contactdoc.display("first_name") )
74 74   #set( $contactLastName = $contactdoc.display("last_name") )
75 75  #end
76 -
72 +##
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 -1 #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus)
77 +
78 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
79 +
82 82  #if( $roleSelected )
83 83   #if( $userSelected )
84 84   #if( $supervisor )
85 -* #stringEnIt("as a supervisor","come relatore")
83 +
84 +> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
86 86   #end
87 87   #if( $cosupervisor )
88 -* #stringEnIt("as a co-supervisor","come correlatore")
87 +
88 +> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
89 89   #end
90 90   #if( $contact )
91 -* #stringEnIt("as a contact","come contatto")
91 +
92 +> {{stringEngIta eng="as a contact" ita="come contatto"/}}
92 92   #end
93 93   #else
94 94   #if( $supervisorLastName != "" )
95 -* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
96 +
97 +> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
96 96   #end
97 97   #if( $cosupervisorLastName != "" )
98 -* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
100 +
101 +> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
99 99   #end
100 100   #if( $contactLastName != "" )
101 -* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
104 +
105 +> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
102 102   #end
103 103   #end
104 104  #end
105 -
109 +##
106 106  ## hypothesis: $thesisStatus set, default "Completed"
107 107  ## to do: get from parameter
108 108  #if ($thesisStatus == "Available")
... ... @@ -121,7 +121,7 @@
121 121  #else
122 122   #set ( $roleSelectedFieldName = "supervisor" )
123 123  #end
124 -
128 +##
125 125  #if ($userSelected)
126 126   #if ( $roleSelected )
127 127   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -191,9 +191,9 @@
191 191   order by prop1.value desc")
192 192  #end
193 193  #set($thesisFound = $xwiki.searchDocuments($sql))
194 -
198 +##
195 195  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
196 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) ~~(#thesisAuthorLink($thesis))~~ #end
200 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
197 197  
198 198  #end
199 -
203 +{{/velocity}}