Changes for page Per Year

From version 20.3
edited by Andrea Omicini
on 25/10/2021 17:04
Change comment: There is no comment for this version
To version 12.18
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,36 +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 -$selectedStatus
13 -##check velocity variable, takes precedence
14 -#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
15 - #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
16 -#end
17 -## set ordering field
18 -#if( $selectedStatus == "available" )
3 +## to do: get from parameter
4 +#if( $thesisStatus == "Available" )
19 19   #set( $orderingDateFieldName = "availabilityDate" )
20 -#elseif( $selectedStatus == "ongoing" )
6 +#elseif( $thesisStatus == "Ongoing" )
21 21   #set( $orderingDateFieldName = "startDate" )
22 22  #else
9 + #set( $thesisStatus = "Completed" )
23 23   #set( $orderingDateFieldName = "endDate" )
24 24  #end
25 25  ## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
26 26  ## who
27 -#set( $userNamePar = $request.user )
28 -#set( $supervisorNamePar = $request.supervisor )
29 -#set( $cosupervisorNamePar = $request.cosupervisor )
30 -#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") )
31 31  #### set default values
32 32  #set( $userSelected = false )
33 -#set( $roleSelected = false )
20 +#set( $roleSelected = false )
34 34  #set( $userFirstName = "" )
35 35  #set( $userLastName = "" )
36 36  #set( $supervisorName = "" )
... ... @@ -73,7 +73,7 @@
73 73   #end
74 74  #end
75 75  #if( $supervisor )
76 - #set( $roleSelected = true )
63 + #set( $roleSelected = true )
77 77   #set( $supervisorName = $userName )
78 78   #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
79 79   #set( $supervisorFirstName = $supervisordoc.display("first_name") )
... ... @@ -93,76 +93,117 @@
93 93   #set( $contactFirstName = $contactdoc.display("first_name") )
94 94   #set( $contactLastName = $contactdoc.display("last_name") )
95 95  #end
96 -$selectedStatus
97 -$userSelected
98 -$roleSelected
99 -$supervisor
100 -$cosupervisor
101 -$contact
102 -$userFirstName $userLastName
103 -$supervisorFirstName $supervisorLastName
104 -$cosupervisorFirstName $cosupervisorLastName
105 -$contactFirstName $contactLastName
106 106  ##
107 -## $userSelected true and $roleSelected false means one user for all roles
84 +## $userSelected true means one user for all roles
108 108  ## $userSelected true and $roleSelected true for one user with one specific role
109 109  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
110 110  ## both false means all theses
111 -#if( $userSelected )
112 - #if( $roleSelected )
113 ->{{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
114 114  
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
115 115   #else
116 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
117 -
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
118 118   #end
119 -#else
120 - #if( $roleSelected )
121 ->{{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
122 -
123 - #else
124 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
125 -
126 - #end
127 127  #end
128 128  ##
129 -#if( $cosupervisor )
130 - #set( $roleSelectedFieldName = "coSupervisors" )
131 -#elseif( $contact )
132 - #set( $roleSelectedFieldName = "contact" )
114 +#if ( $cosupervisor )
115 + #set ( $roleSelectedFieldName = "coSupervisors" )
116 +#elseif ( $contact )
117 + #set ( $roleSelectedFieldName = "contact" )
133 133  #else
134 - #set( $roleSelectedFieldName = "supervisor" )
119 + #set ( $roleSelectedFieldName = "supervisor" )
135 135  #end
136 136  ##
137 -#if( $selectedStatus == 'all' )
138 - ALL STATUSES
139 -#else
140 -## some selected status
141 - #if( $userSelected )
142 -## some user selected
143 - #if( $roleSelected )
144 -## some specific role selected
145 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
146 - 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" )
147 - #else
148 -## no specific role selected
149 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
150 - 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" )
151 - #end
152 - #elseif( $roleSelected )
153 -## no user selected, some role selected
154 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
155 - 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")
156 156   #else
157 -## no user selected, some role selected
158 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
159 - 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")
160 160   #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")
161 161  #end
162 -#set( $thesisFound = $xwiki.searchDocuments($sql) )
190 +#set($thesisFound = $xwiki.searchDocuments($sql))
163 163  ##
164 164  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
165 -##* #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
166 -* $thesis
193 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
194 +
167 167  #end
168 -{{/velocity}}
196 +{{/html}}{{/velocity}}