Changes for page Per Year

From version 12.10
edited by Andrea Omicini
on 22/06/2021 15:12
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,9 +1,32 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#### get parameters
1 +{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 +#set( $thesisMenu = true )
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
2 2  ## who
3 -#set( $userNamePar = $context.getRequest().getParameter("user") )
4 -#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
5 -#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
6 -#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 )
7 7  #### set default values
8 8  #set( $userSelected = false )
9 9  #set( $roleSelected = false )
... ... @@ -70,54 +70,24 @@
70 70   #set( $contactLastName = $contactdoc.display("last_name") )
71 71  #end
72 72  ##
73 -## $userSelected true means one user for all roles
96 +## $userSelected true and $roleSelected false means one user for all roles
74 74  ## $userSelected true and $roleSelected true for one user with one specific role
75 75  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
76 76  ## both false means all theses
77 -##
78 -== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
79 -##
80 -#if( $roleSelected )
81 - #if( $userSelected )
82 - #if( $supervisor )
83 -
84 -> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
85 - #end
86 - #if( $cosupervisor )
87 -
88 -> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
89 - #end
90 - #if( $contact )
91 -
92 -> {{stringEngIta eng="as a contact" ita="come contatto"/}}
93 - #end
94 - #else
95 - #if( $supervisorLastName != "" )
96 -
97 -> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
98 - #end
99 - #if( $cosupervisorLastName != "" )
100 -
101 -> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
102 - #end
103 - #if( $contactLastName != "" )
104 -
105 -> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
106 - #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 // //
107 107   #end
108 -#end
109 -##
110 -## hypothesis: $thesisStatus set, default "Completed"
111 -## to do: get from parameter
112 -#if ($thesisStatus == "Available")
113 - #set ($orderingDateFieldName = "availabilityDate")
114 -#elseif ($thesisStatus == "Ongoing")
115 - #set ($orderingDateFieldName = "startDate")
116 116  #else
117 - #set ($thesisStatus = "Completed")
118 - #set ($orderingDateFieldName = "endDate")
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
119 119  #end
120 -##
113 +##
121 121  #if ( $cosupervisor )
122 122   #set ( $roleSelectedFieldName = "coSupervisors" )
123 123  #elseif ( $contact )
... ... @@ -197,7 +197,7 @@
197 197  #set($thesisFound = $xwiki.searchDocuments($sql))
198 198  ##
199 199  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
200 -* #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
201 201  
202 202  #end
203 203  {{/velocity}}