Changes for page Per Year

From version 16.2
edited by Andrea Omicini
on 26/07/2021 23:15
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,23 +1,35 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#set( $thesisMenu = true ){{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 -#set( $roleSelected = false )
32 +#set( $roleSelected = false )
21 21  #set( $userFirstName = "" )
22 22  #set( $userLastName = "" )
23 23  #set( $supervisorName = "" )
... ... @@ -60,7 +60,7 @@
60 60   #end
61 61  #end
62 62  #if( $supervisor )
63 - #set( $roleSelected = true )
75 + #set( $roleSelected = true )
64 64   #set( $supervisorName = $userName )
65 65   #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
66 66   #set( $supervisorFirstName = $supervisordoc.display("first_name") )
... ... @@ -86,46 +86,42 @@
86 86  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
87 87  ## both false means all theses
88 88  #if( $userSelected )
89 - #if( $roleSelected ) // //
90 -> #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 // //
91 - #else // //
92 -> #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 +
93 93   #end
94 94  #else
95 - #if( $roleSelected ) // //
96 -> #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 // //
97 - #else // //
98 -## > #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 +
99 99   #end
100 100  #end
101 101  ##
102 -#if ( $cosupervisor )
103 - #set ( $roleSelectedFieldName = "coSupervisors" )
104 -#elseif ( $contact )
105 - #set ( $roleSelectedFieldName = "contact" )
118 +#if( $cosupervisor )
119 + #set( $roleSelectedFieldName = "coSupervisors" )
120 +#elseif( $contact )
121 + #set( $roleSelectedFieldName = "contact" )
106 106  #else
107 - #set ( $roleSelectedFieldName = "supervisor" )
123 + #set( $roleSelectedFieldName = "supervisor" )
108 108  #end
109 109  ##
110 -#if ($userSelected)
111 - #if ( $roleSelected )
112 - #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
113 - where obj.name=doc.fullName and
114 - obj.className='Theses.ThesisClass' and
115 - obj.name<>'Theses.ThesisClassTemplate' and
116 - prop.id.id=obj.id and
117 - prop1.id.id=obj.id and
118 - prop2.id.id=obj.id and
119 - prop.name='status' and
120 - prop.value='$thesisStatus' and
121 - prop1.name='$roleSelectedFieldName' and
122 - prop2.name='$orderingDateFieldName' and
123 - prop1.value like '%$userName%'
124 - 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" )
125 125   #else
126 126   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
127 127   where obj.name=doc.fullName and
128 - obj.className='Theses.ThesisClass' and
136 + obj.className='Theses.ThesisClass' and
129 129   obj.name<>'Theses.ThesisClassTemplate' and
130 130   prop.id.id=obj.id and
131 131   prop1.id.id=obj.id and
... ... @@ -181,4 +181,4 @@
181 181  * #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}}
192 +{{/velocity}}