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 12.17
edited by Andrea Omicini
on 23/06/2021 01:39
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,23 @@
1 -{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 -#set( $thesisMenu = true )
3 -#### get parameters
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### 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" )
3 +## to do: get from parameter
4 +#if( $thesisStatus == "Available" )
18 18   #set( $orderingDateFieldName = "availabilityDate" )
19 -#elseif( $selectedStatus == "ongoing" )
6 +#elseif( $thesisStatus == "Ongoing" )
20 20   #set( $orderingDateFieldName = "startDate" )
21 21  #else
9 + #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 )
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") )
30 30  #### set default values
31 31  #set( $userSelected = false )
32 -#set( $roleSelected = false )
20 +#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 )
63 + #set( $roleSelected = true )
76 76   #set( $supervisorName = $userName )
77 77   #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
78 78   #set( $supervisorFirstName = $supervisordoc.display("first_name") )
... ... @@ -92,85 +92,117 @@
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 -## $userSelected true and $roleSelected false means one user for all roles
84 +## $userSelected true means one user for all roles
116 116  ## $userSelected true and $roleSelected true for one user with one specific role
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 -#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 122  
89 +> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // //
90 +#if( $roleSelected )
91 + #if( $userSelected )
92 + #if( $supervisor ) // //
93 +>> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
94 + #end
95 + #if( $cosupervisor ) // //
96 +>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
97 + #end
98 + #if( $contact ) // //
99 +>> {{stringEngIta eng="as a contact" ita="come contatto"/}}
100 + #end
123 123   #else
124 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
125 -
102 + #if( $supervisorLastName != "" ) // //
103 +>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
104 + #end
105 + #if( $cosupervisorLastName != "" ) // //
106 +>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
107 + #end
108 + #if( $contactLastName != "" ) // //
109 +>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
110 + #end
126 126   #end
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 -
134 - #end
135 135  #end
136 136  ##
137 -#if( $cosupervisor )
138 - #set( $roleSelectedFieldName = "coSupervisors" )
139 -#elseif( $contact )
140 - #set( $roleSelectedFieldName = "contact" )
114 +#if ( $cosupervisor )
115 + #set ( $roleSelectedFieldName = "coSupervisors" )
116 +#elseif ( $contact )
117 + #set ( $roleSelectedFieldName = "contact" )
141 141  #else
142 - #set( $roleSelectedFieldName = "supervisor" )
119 + #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")
122 +#if ($userSelected)
123 + #if ( $roleSelected )
124 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
125 + where obj.name=doc.fullName and
126 + obj.className='Theses.ThesisClass' and
127 + obj.name<>'Theses.ThesisClassTemplate' and
128 + prop.id.id=obj.id and
129 + prop1.id.id=obj.id and
130 + prop2.id.id=obj.id and
131 + prop.name='status' and
132 + prop.value='$thesisStatus' and
133 + prop1.name='$roleSelectedFieldName' and
134 + prop2.name='$orderingDateFieldName' and
135 + prop1.value like '%$userName%'
136 + 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" )
138 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
139 + where obj.name=doc.fullName and
140 + obj.className='Theses.ThesisClass' and
141 + obj.name<>'Theses.ThesisClassTemplate' and
142 + prop.id.id=obj.id and
143 + prop1.id.id=obj.id and
144 + prop2.id.id=obj.id and
145 + prop3.id.id=obj.id and
146 + prop4.id.id=obj.id and
147 + prop.name='status' and
148 + prop.value = '$thesisStatus' and
149 + prop1.name='supervisor' and
150 + prop2.name='coSupervisors' and
151 + prop3.name='contact' and
152 + prop4.name='$orderingDateFieldName' and
153 + ( prop1.value like '%$userName%' or
154 + prop2.value like '%$userName%' or
155 + prop3.value like '%$userName%')
156 + order by prop4.value desc")
168 168   #end
158 +#elseif ( $roleSelected )
159 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
160 + where obj.name=doc.fullName and
161 + obj.className='Theses.ThesisClass' and
162 + obj.name<>'Theses.ThesisClassTemplate' and
163 + prop.id.id=obj.id and
164 + prop1.id.id=obj.id and
165 + prop2.id.id=obj.id and
166 + prop3.id.id=obj.id and
167 + prop4.id.id=obj.id and
168 + prop.name='status' and
169 + prop.value = '$thesisStatus' and
170 + prop1.name='supervisor' and
171 + prop2.name='coSupervisors' and
172 + prop3.name='contact' and
173 + prop4.name='$orderingDateFieldName' and
174 + prop1.value like '%$supervisorName%' and
175 + prop2.value like '%$cosupervisorName%' and
176 + prop3.value like '%$contactName%'
177 + order by prop4.value desc")
178 +#else
179 + #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1
180 + where obj.name=doc.fullName and
181 + obj.className='Theses.ThesisClass' and
182 + obj.name<>'Theses.ThesisClassTemplate' and
183 + prop.id.id=obj.id and
184 + prop1.id.id=obj.id and
185 + prop.name='status' and
186 + prop.value = '$thesisStatus' and
187 + prop1.name='$orderingDateFieldName'
188 + order by prop1.value desc")
169 169  #end
170 -#set( $thesisFound = $xwiki.searchDocuments($sql) )
190 +#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
193 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
194 +
175 175  #end
176 -{{/velocity}}
196 +{{/html}}{{/velocity}}