Changes for page Per Year

From version 17.2
edited by Andrea Omicini
on 22/10/2021 23:29
Change comment: There is no comment for this version
To version 17.4
edited by Andrea Omicini
on 25/10/2021 16:33
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,0 +1,1 @@
1 +Theses per Status
Content
... ... @@ -1,25 +1,35 @@
1 -{{include reference="Main.MacroSheet"/}}{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
1 +{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 3  #### get parameters
4 4  ## hypothesis: $thesisStatus set, default "Completed"
5 -## to do: get from parameter
6 -#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" )
7 7   #set( $orderingDateFieldName = "availabilityDate" )
8 -#elseif( $thesisStatus == "Ongoing" )
19 +#elseif( $selectedStatus == "ongoing" )
9 9   #set( $orderingDateFieldName = "startDate" )
10 10  #else
11 - #set( $thesisStatus = "Completed" )
12 12   #set( $orderingDateFieldName = "endDate" )
13 13  #end
14 14  ## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
15 15  ## who
16 -#set( $userNamePar = $context.getRequest().getParameter("user") )
17 -#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
18 -#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
19 -#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 )
20 20  #### set default values
21 21  #set( $userSelected = false )
22 -#set( $roleSelected = false )
32 +#set( $roleSelected = false )
23 23  #set( $userFirstName = "" )
24 24  #set( $userLastName = "" )
25 25  #set( $supervisorName = "" )
... ... @@ -62,7 +62,7 @@
62 62   #end
63 63  #end
64 64  #if( $supervisor )
65 - #set( $roleSelected = true )
75 + #set( $roleSelected = true )
66 66   #set( $supervisorName = $userName )
67 67   #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
68 68   #set( $supervisorFirstName = $supervisordoc.display("first_name") )
... ... @@ -88,46 +88,42 @@
88 88  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
89 89  ## both false means all theses
90 90  #if( $userSelected )
91 - #if( $roleSelected ) // //
92 -> #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 // //
93 - #else // //
94 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // //
101 + #if( $roleSelected )
102 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{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 +
104 + #else
105 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
106 +
95 95   #end
96 96  #else
97 - #if( $roleSelected ) // //
98 -> #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 // //
99 - #else // //
100 -## > #FullThesisStatusesString($thesisStatus) // //
109 + #if( $roleSelected )
110 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{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
111 +
112 + #else
113 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
114 +
101 101   #end
102 102  #end
103 103  ##
104 -#if ( $cosupervisor )
105 - #set ( $roleSelectedFieldName = "coSupervisors" )
106 -#elseif ( $contact )
107 - #set ( $roleSelectedFieldName = "contact" )
118 +#if( $cosupervisor )
119 + #set( $roleSelectedFieldName = "coSupervisors" )
120 +#elseif( $contact )
121 + #set( $roleSelectedFieldName = "contact" )
108 108  #else
109 - #set ( $roleSelectedFieldName = "supervisor" )
123 + #set( $roleSelectedFieldName = "supervisor" )
110 110  #end
111 111  ##
112 -#if ($userSelected)
113 - #if ( $roleSelected )
114 - #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
115 - where obj.name=doc.fullName and
116 - obj.className='Theses.ThesisClass' and
117 - obj.name<>'Theses.ThesisClassTemplate' and
118 - prop.id.id=obj.id and
119 - prop1.id.id=obj.id and
120 - prop2.id.id=obj.id and
121 - prop.name='status' and
122 - prop.value='$thesisStatus' and
123 - prop1.name='$roleSelectedFieldName' and
124 - prop2.name='$orderingDateFieldName' and
125 - prop1.value like '%$userName%'
126 - order by prop2.value desc")
126 +#if( $selectedStatus == 'all' )
127 + ALL STATUSES
128 +#else
129 + #if( $userSelected )
130 + #if( $roleSelected )
131 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
132 + where obj.name = doc.fullName and obj.className='Theses.ThesisClass' and obj.name<>'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'status' and prop1.name = '$roleSelectedFieldName' and prop2.name = '$orderingDateFieldName' and prop0.value = '$thesisStatus' and prop1.value like '%$userName%' order by prop2.value desc" )
127 127   #else
128 128   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
129 129   where obj.name=doc.fullName and
130 - obj.className='Theses.ThesisClass' and
136 + obj.className='Theses.ThesisClass' and
131 131   obj.name<>'Theses.ThesisClassTemplate' and
132 132   prop.id.id=obj.id and
133 133   prop1.id.id=obj.id and