Changes for page Per Year

From version 13.1
edited by Andrea Omicini
on 25/06/2021 00:15
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 )
... ... @@ -178,7 +178,7 @@
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)#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
182 182  
183 183  #end
184 -{{/html}}{{/velocity}}
196 +{{/velocity}}