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 16.3
edited by Andrea Omicini
on 26/07/2021 23:16
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -Theses per Status
Content
... ... @@ -1,32 +1,20 @@
1 -{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 -#set( $thesisMenu = true )
3 -#### get parameters
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#set( $thesisMenu = true ){{html clean="false" wiki="true"}}#### get parameters
4 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" )
3 +## to do: get from parameter
4 +#if( $thesisStatus == "Available" )
18 18   #set( $orderingDateFieldName = "availabilityDate" )
19 -#elseif( $selectedStatus == "ongoing" )
6 +#elseif( $thesisStatus == "Ongoing" )
20 20   #set( $orderingDateFieldName = "startDate" )
21 21  #else
9 + #set( $thesisStatus = "Completed" )
22 22   #set( $orderingDateFieldName = "endDate" )
23 23  #end
24 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 )
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") )
30 30  #### set default values
31 31  #set( $userSelected = false )
32 32  #set( $roleSelected = false )
... ... @@ -193,4 +193,4 @@
193 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 -{{/velocity}}
184 +{{/html}}{{/velocity}}