Changes for page Per Year

From version 17.3
edited by Andrea Omicini
on 25/10/2021 16:19
Change comment: There is no comment for this version
To version 6.4
edited by Andrea Omicini
on 18/06/2021 00:17
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -Theses per Status
1 +SelectPerStatus
Syntax
... ... @@ -1,1 +1,1 @@
1 -XWiki 2.1
1 +XWiki 1.0
Content
... ... @@ -1,32 +1,11 @@
1 -{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 -#set( $thesisMenu = true )
1 +#includeMacros("Main.MacroSheet")#includeMacros("Theses.MacroSheet")
2 +
3 3  #### get parameters
4 -## hypothesis: $thesisStatus set, default "Completed"
5 -## status parameter
6 -#set( $statusPar = $request.status.trim().toLowerCase() )
7 -#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
8 - #set( $selectedStatus = $statusPar )
9 -#else
10 - #set( $selectedStatus = 'all' )
11 -#end
12 -##check velocity variable, takes precedence
13 -#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14 - #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
15 -#end
16 -## set ordering field
17 -#if( $selectedStatus == "available" )
18 - #set( $orderingDateFieldName = "availabilityDate" )
19 -#elseif( $selectedStatus == "ongoing" )
20 - #set( $orderingDateFieldName = "startDate" )
21 -#else
22 - #set( $orderingDateFieldName = "endDate" )
23 -#end
24 -## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
25 25  ## who
26 -#set( $userNamePar = $request.user )
27 -#set( $supervisorNamePar = $request.supervisor )
28 -#set( $cosupervisorNamePar = $request.cosupervisor )
29 -#set( $contactNamePar = $request.contact )
5 +#set( $userNamePar = $context.getRequest().getParameter("user") )
6 +#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
7 +#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
8 +#set( $contactNamePar = $context.getRequest().getParameter("contact") )
30 30  #### set default values
31 31  #set( $userSelected = false )
32 32  #set( $roleSelected = false )
... ... @@ -93,24 +93,46 @@
93 93   #set( $contactLastName = $contactdoc.display("last_name") )
94 94  #end
95 95  ##
96 -## $userSelected true and $roleSelected false means one user for all roles
75 +## $userSelected true means one user for all roles
97 97  ## $userSelected true and $roleSelected true for one user with one specific role
98 98  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
99 99  ## both false means all theses
100 -#if( $userSelected )
101 - #if( $roleSelected ) // //
102 -> #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 // //
103 - #else // //
104 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // //
79 +1 #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus)
80 +#if( $roleSelected )
81 + #if( $userSelected )
82 + #if( $supervisor )
83 +* #stringEnIt("as a supervisor","come relatore")
84 + #end
85 + #if( $cosupervisor )
86 +* #stringEnIt("as a co-supervisor","come correlatore")
87 + #end
88 + #if( $contact )
89 +* #stringEnIt("as a contact","come contatto")
90 + #end
91 + #else
92 + #if( $supervisorLastName != "" )
93 +* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
94 + #end
95 + #if( $cosupervisorLastName != "" )
96 +* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
97 + #end
98 + #if( $contactLastName != "" )
99 +* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
100 + #end
105 105   #end
106 -#else
107 - #if( $roleSelected ) // //
108 -> #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 // //
109 - #else // //
110 -## > #FullThesisStatusesString($thesisStatus) // //
111 - #end
112 112  #end
113 113  ##
104 +## hypothesis: $thesisStatus set, default "Completed"
105 +## to do: get from parameter
106 +#if ($thesisStatus == "Available")
107 + #set ($orderingDateFieldName = "availabilityDate")
108 +#elseif ($thesisStatus == "Ongoing")
109 + #set ($orderingDateFieldName = "startDate")
110 +#else
111 + #set ($thesisStatus = "Completed")
112 + #set ($orderingDateFieldName = "endDate")
113 +#end
114 +##
114 114  #if ( $cosupervisor )
115 115   #set ( $roleSelectedFieldName = "coSupervisors" )
116 116  #elseif ( $contact )
... ... @@ -188,9 +188,9 @@
188 188   order by prop1.value desc")
189 189  #end
190 190  #set($thesisFound = $xwiki.searchDocuments($sql))
191 -##
192 +
192 192  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
193 -* #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
194 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) ~~(#thesisAuthorLink($thesis))~~ #end
194 194  
195 195  #end
196 -{{/velocity}}
197 +