Changes for page Per Year

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