Changes for page Per Year

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

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -Theses per Status
Content
... ... @@ -1,35 +1,25 @@
1 -{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
1 +{{include reference="Main.MacroSheet"/}}{{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 -## 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 +## to do: get from parameter
6 +#if( $thesisStatus == "Available" )
18 18   #set( $orderingDateFieldName = "availabilityDate" )
19 -#elseif( $selectedStatus == "ongoing" )
8 +#elseif( $thesisStatus == "Ongoing" )
20 20   #set( $orderingDateFieldName = "startDate" )
21 21  #else
11 + #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 )
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") )
30 30  #### set default values
31 31  #set( $userSelected = false )
32 -#set( $roleSelected = false )
22 +#set( $roleSelected = false )
33 33  #set( $userFirstName = "" )
34 34  #set( $userLastName = "" )
35 35  #set( $supervisorName = "" )
... ... @@ -72,7 +72,7 @@
72 72   #end
73 73  #end
74 74  #if( $supervisor )
75 - #set( $roleSelected = true )
65 + #set( $roleSelected = true )
76 76   #set( $supervisorName = $userName )
77 77   #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
78 78   #set( $supervisorFirstName = $supervisordoc.display("first_name") )
... ... @@ -92,25 +92,6 @@
92 92   #set( $contactFirstName = $contactdoc.display("first_name") )
93 93   #set( $contactLastName = $contactdoc.display("last_name") )
94 94  #end
95 -$selectedStatus
96 -
97 -$userSelected
98 -
99 -$roleSelected
100 -
101 -$supervisor
102 -
103 -$cosupervisor
104 -
105 -$contact
106 -
107 -$userFirstName $userLastName
108 -
109 -$supervisorFirstName $supervisorLastName
110 -
111 -$cosupervisorFirstName $cosupervisorLastName
112 -
113 -$contactFirstName $contactLastName
114 114  ##
115 115  ## $userSelected true and $roleSelected false means one user for all roles
116 116  ## $userSelected true and $roleSelected true for one user with one specific role
... ... @@ -117,60 +117,99 @@
117 117  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
118 118  ## both false means all theses
119 119  #if( $userSelected )
120 - #if( $roleSelected )
121 ->{{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
122 -
123 - #else
124 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
125 -
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 // //
126 126   #end
127 127  #else
128 - #if( $roleSelected )
129 ->{{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
130 -
131 - #else
132 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
133 -
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) // //
134 134   #end
135 135  #end
136 136  ##
137 -#if( $cosupervisor )
138 - #set( $roleSelectedFieldName = "coSupervisors" )
139 -#elseif( $contact )
140 - #set( $roleSelectedFieldName = "contact" )
104 +#if ( $cosupervisor )
105 + #set ( $roleSelectedFieldName = "coSupervisors" )
106 +#elseif ( $contact )
107 + #set ( $roleSelectedFieldName = "contact" )
141 141  #else
142 - #set( $roleSelectedFieldName = "supervisor" )
109 + #set ( $roleSelectedFieldName = "supervisor" )
143 143  #end
144 144  ##
145 -#if( $selectedStatus == 'all' )
146 - ALL STATUSES
147 -#else
148 -## some selected status
149 - #if( $userSelected )
150 -## some user selected
151 - #if( $roleSelected )
152 -## some specific role selected
153 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
154 - 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" )
155 - #else
156 -## no specific role selected
157 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
158 - 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 prop3.id.id = obj.id and prop4.id.id = obj.id and prop0.name = 'status' and prop1.name = 'supervisor' and prop2.name = 'coSupervisors' and prop3.name = 'contact' and prop4.name = '$orderingDateFieldName' and prop0.value = '$thesisStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
159 - #end
160 - #elseif( $roleSelected )
161 -## no user selected, some role selected
162 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
163 - 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 prop3.id.id = obj.id and prop4.id.id = obj.id and prop0.name = 'status' and prop1.name = 'supervisor' and prop2.name = 'coSupervisors' and prop3.name = 'contact' and prop4.name = '$orderingDateFieldName' and prop1.value like '%$supervisorName%' and prop2.value like '%$cosupervisorName%' and prop3.value like '%$contactName%' order by prop4.value desc")
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")
164 164   #else
165 -## no user selected, some role selected
166 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
167 - 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 prop0.name = 'status' and prop1.name = '$orderingDateFieldName' and prop0.value = '$thesisStatus' order by prop1.value desc" )
128 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
129 + where obj.name=doc.fullName and
130 + obj.className='Theses.ThesisClass' and
131 + obj.name<>'Theses.ThesisClassTemplate' and
132 + prop.id.id=obj.id and
133 + prop1.id.id=obj.id and
134 + prop2.id.id=obj.id and
135 + prop3.id.id=obj.id and
136 + prop4.id.id=obj.id and
137 + prop.name='status' and
138 + prop.value = '$thesisStatus' and
139 + prop1.name='supervisor' and
140 + prop2.name='coSupervisors' and
141 + prop3.name='contact' and
142 + prop4.name='$orderingDateFieldName' and
143 + ( prop1.value like '%$userName%' or
144 + prop2.value like '%$userName%' or
145 + prop3.value like '%$userName%')
146 + order by prop4.value desc")
168 168   #end
148 +#elseif ( $roleSelected )
149 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
150 + where obj.name=doc.fullName and
151 + obj.className='Theses.ThesisClass' and
152 + obj.name<>'Theses.ThesisClassTemplate' and
153 + prop.id.id=obj.id and
154 + prop1.id.id=obj.id and
155 + prop2.id.id=obj.id and
156 + prop3.id.id=obj.id and
157 + prop4.id.id=obj.id and
158 + prop.name='status' and
159 + prop.value = '$thesisStatus' and
160 + prop1.name='supervisor' and
161 + prop2.name='coSupervisors' and
162 + prop3.name='contact' and
163 + prop4.name='$orderingDateFieldName' and
164 + prop1.value like '%$supervisorName%' and
165 + prop2.value like '%$cosupervisorName%' and
166 + prop3.value like '%$contactName%'
167 + order by prop4.value desc")
168 +#else
169 + #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1
170 + where obj.name=doc.fullName and
171 + obj.className='Theses.ThesisClass' and
172 + obj.name<>'Theses.ThesisClassTemplate' and
173 + prop.id.id=obj.id and
174 + prop1.id.id=obj.id and
175 + prop.name='status' and
176 + prop.value = '$thesisStatus' and
177 + prop1.name='$orderingDateFieldName'
178 + order by prop1.value desc")
169 169  #end
170 -#set( $thesisFound = $xwiki.searchDocuments($sql) )
180 +#set($thesisFound = $xwiki.searchDocuments($sql))
171 171  ##
172 172  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
173 -##* #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
174 -* $thesis
183 +* #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
184 +
175 175  #end
176 176  {{/velocity}}