Changes for page Per Year

From version 12.18
edited by Andrea Omicini
on 23/06/2021 01:39
Change comment: There is no comment for this version
To version 17.3
edited by Andrea Omicini
on 25/10/2021 16:19
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,0 +1,1 @@
1 +Theses per Status
Content
... ... @@ -1,20 +1,32 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters
1 +{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 +#set( $thesisMenu = true )
3 +#### get parameters
2 2  ## hypothesis: $thesisStatus set, default "Completed"
3 -## to do: get from parameter
4 -#if( $thesisStatus == "Available" )
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" )
5 5   #set( $orderingDateFieldName = "availabilityDate" )
6 -#elseif( $thesisStatus == "Ongoing" )
19 +#elseif( $selectedStatus == "ongoing" )
7 7   #set( $orderingDateFieldName = "startDate" )
8 8  #else
9 - #set( $thesisStatus = "Completed" )
10 10   #set( $orderingDateFieldName = "endDate" )
11 11  #end
12 12  ## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
13 13  ## who
14 -#set( $userNamePar = $context.getRequest().getParameter("user") )
15 -#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
16 -#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
17 -#set( $contactNamePar = $context.getRequest().getParameter("contact") )
26 +#set( $userNamePar = $request.user )
27 +#set( $supervisorNamePar = $request.supervisor )
28 +#set( $cosupervisorNamePar = $request.cosupervisor )
29 +#set( $contactNamePar = $request.contact )
18 18  #### set default values
19 19  #set( $userSelected = false )
20 20  #set( $roleSelected = false )
... ... @@ -81,34 +81,22 @@
81 81   #set( $contactLastName = $contactdoc.display("last_name") )
82 82  #end
83 83  ##
84 -## $userSelected true means one user for all roles
96 +## $userSelected true and $roleSelected false means one user for all roles
85 85  ## $userSelected true and $roleSelected true for one user with one specific role
86 86  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
87 87  ## both false means all theses
88 -
89 -> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // //
90 -#if( $roleSelected )
91 - #if( $userSelected )
92 - #if( $supervisor ) // //
93 -> * {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
94 - #end
95 - #if( $cosupervisor ) // //
96 ->> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
97 - #end
98 - #if( $contact ) // //
99 ->> {{stringEngIta eng="as a contact" ita="come contatto"/}}
100 - #end
101 - #else
102 - #if( $supervisorLastName != "" ) // //
103 ->> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
104 - #end
105 - #if( $cosupervisorLastName != "" ) // //
106 ->> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
107 - #end
108 - #if( $contactLastName != "" ) // //
109 ->> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
110 - #end
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 // //
111 111   #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  ##
114 114  #if ( $cosupervisor )
... ... @@ -190,7 +190,7 @@
190 190  #set($thesisFound = $xwiki.searchDocuments($sql))
191 191  ##
192 192  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
193 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
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 194  
195 195  #end
196 -{{/html}}{{/velocity}}
196 +{{/velocity}}