Changes for page Per Year

From version 20.2
edited by Andrea Omicini
on 25/10/2021 17:00
Change comment: There is no comment for this version
To version 12.14
edited by Andrea Omicini
on 23/06/2021 01:35
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,73 +93,124 @@
93 93   #set( $contactFirstName = $contactdoc.display("first_name") )
94 94   #set( $contactLastName = $contactdoc.display("last_name") )
95 95  #end
96 -$supervisor
97 -$cosupervisor
98 -$contact
99 -$userFirstName $userLastName
100 -$supervisorFirstName $supervisorLastName
101 -$cosupervisorFirstName $cosupervisorLastName
102 -$contactFirstName $contactLastName
103 103  ##
104 -## $userSelected true and $roleSelected false means one user for all roles
84 +## $userSelected true means one user for all roles
105 105  ## $userSelected true and $roleSelected true for one user with one specific role
106 106  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
107 107  ## both false means all theses
108 -#if( $userSelected )
109 - #if( $roleSelected )
110 ->{{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
111 111  
112 - #else
113 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
89 +> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end
114 114  
115 - #end
116 -#else
117 - #if( $roleSelected )
118 ->{{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
91 +#if( $roleSelected )
92 + #if( $userSelected )
93 + #if( $supervisor )
119 119  
95 +>> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
96 + #end
97 + #if( $cosupervisor )
98 +
99 +>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
100 + #end
101 + #if( $contact )
102 +
103 +>> {{stringEngIta eng="as a contact" ita="come contatto"/}}
104 + #end
120 120   #else
121 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
106 + #if( $supervisorLastName != "" )
122 122  
108 +>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
109 + #end
110 + #if( $cosupervisorLastName != "" )
111 +
112 +>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
113 + #end
114 + #if( $contactLastName != "" )
115 +
116 +>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
117 + #end
123 123   #end
124 124  #end
125 125  ##
126 -#if( $cosupervisor )
127 - #set( $roleSelectedFieldName = "coSupervisors" )
128 -#elseif( $contact )
129 - #set( $roleSelectedFieldName = "contact" )
121 +#if ( $cosupervisor )
122 + #set ( $roleSelectedFieldName = "coSupervisors" )
123 +#elseif ( $contact )
124 + #set ( $roleSelectedFieldName = "contact" )
130 130  #else
131 - #set( $roleSelectedFieldName = "supervisor" )
126 + #set ( $roleSelectedFieldName = "supervisor" )
132 132  #end
133 133  ##
134 -#if( $selectedStatus == 'all' )
135 - ALL STATUSES
136 -#else
137 -## some selected status
138 - #if( $userSelected )
139 -## some user selected
140 - #if( $roleSelected )
141 -## some specific role selected
142 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
143 - 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" )
144 - #else
145 -## no specific role selected
146 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
147 - 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" )
148 - #end
149 - #elseif( $roleSelected )
150 -## no user selected, some role selected
151 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
152 - 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")
129 +#if ($userSelected)
130 + #if ( $roleSelected )
131 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
132 + where obj.name=doc.fullName and
133 + obj.className='Theses.ThesisClass' and
134 + obj.name<>'Theses.ThesisClassTemplate' and
135 + prop.id.id=obj.id and
136 + prop1.id.id=obj.id and
137 + prop2.id.id=obj.id and
138 + prop.name='status' and
139 + prop.value='$thesisStatus' and
140 + prop1.name='$roleSelectedFieldName' and
141 + prop2.name='$orderingDateFieldName' and
142 + prop1.value like '%$userName%'
143 + order by prop2.value desc")
153 153   #else
154 -## no user selected, some role selected
155 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
156 - 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" )
145 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
146 + where obj.name=doc.fullName and
147 + obj.className='Theses.ThesisClass' and
148 + obj.name<>'Theses.ThesisClassTemplate' and
149 + prop.id.id=obj.id and
150 + prop1.id.id=obj.id and
151 + prop2.id.id=obj.id and
152 + prop3.id.id=obj.id and
153 + prop4.id.id=obj.id and
154 + prop.name='status' and
155 + prop.value = '$thesisStatus' and
156 + prop1.name='supervisor' and
157 + prop2.name='coSupervisors' and
158 + prop3.name='contact' and
159 + prop4.name='$orderingDateFieldName' and
160 + ( prop1.value like '%$userName%' or
161 + prop2.value like '%$userName%' or
162 + prop3.value like '%$userName%')
163 + order by prop4.value desc")
157 157   #end
165 +#elseif ( $roleSelected )
166 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
167 + where obj.name=doc.fullName and
168 + obj.className='Theses.ThesisClass' and
169 + obj.name<>'Theses.ThesisClassTemplate' and
170 + prop.id.id=obj.id and
171 + prop1.id.id=obj.id and
172 + prop2.id.id=obj.id and
173 + prop3.id.id=obj.id and
174 + prop4.id.id=obj.id and
175 + prop.name='status' and
176 + prop.value = '$thesisStatus' and
177 + prop1.name='supervisor' and
178 + prop2.name='coSupervisors' and
179 + prop3.name='contact' and
180 + prop4.name='$orderingDateFieldName' and
181 + prop1.value like '%$supervisorName%' and
182 + prop2.value like '%$cosupervisorName%' and
183 + prop3.value like '%$contactName%'
184 + order by prop4.value desc")
185 +#else
186 + #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1
187 + where obj.name=doc.fullName and
188 + obj.className='Theses.ThesisClass' and
189 + obj.name<>'Theses.ThesisClassTemplate' and
190 + prop.id.id=obj.id and
191 + prop1.id.id=obj.id and
192 + prop.name='status' and
193 + prop.value = '$thesisStatus' and
194 + prop1.name='$orderingDateFieldName'
195 + order by prop1.value desc")
158 158  #end
159 -#set( $thesisFound = $xwiki.searchDocuments($sql) )
197 +#set($thesisFound = $xwiki.searchDocuments($sql))
160 160  ##
161 161  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
162 -##* #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
163 -* $thesis
200 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
201 +
164 164  #end
165 -{{/velocity}}
203 +{{/html}}{{/velocity}}