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.3
edited by Andrea Omicini
on 22/06/2021 01:15
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,12 @@
1 -{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 -#set( $thesisMenu = true )
3 -#### get parameters
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" )
19 - #set( $orderingDateFieldName = "availabilityDate" )
20 -#elseif( $selectedStatus == "ongoing" )
21 - #set( $orderingDateFieldName = "startDate" )
22 -#else
23 - #set( $orderingDateFieldName = "endDate" )
24 -#end
25 -## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#### get parameters
26 26  ## who
27 -#set( $userNamePar = $request.user )
28 -#set( $supervisorNamePar = $request.supervisor )
29 -#set( $cosupervisorNamePar = $request.cosupervisor )
30 -#set( $contactNamePar = $request.contact )
3 +#set( $userNamePar = $context.getRequest().getParameter("user") )
4 +#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
5 +#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
6 +#set( $contactNamePar = $context.getRequest().getParameter("contact") )
31 31  #### set default values
32 32  #set( $userSelected = false )
33 -#set( $roleSelected = false )
9 +#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 )
52 + #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,129 @@
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
73 +## $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  
115 - #else
116 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
78 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
117 117  
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 -
80 +#if( $roleSelected )
81 + #if( $userSelected )
82 + #if( $supervisor )
83 +> #stringEnIt("as a supervisor","come relatore") // //
84 + #end
85 + #if( $cosupervisor )
86 +> #stringEnIt("as a co-supervisor","come correlatore") // //
87 + #end
88 + #if( $contact )
89 +> #stringEnIt("as a contact","come contatto") // //
90 + #end
123 123   #else
124 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
125 -
92 + #if( $supervisorLastName != "" )
93 +> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
94 + #end
95 + #if( $cosupervisorLastName != "" )
96 +> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
97 + #end
98 + #if( $contactLastName != "" )
99 +> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
100 + #end
126 126   #end
127 127  #end
128 128  ##
129 -#if( $cosupervisor )
130 - #set( $roleSelectedFieldName = "coSupervisors" )
131 -#elseif( $contact )
132 - #set( $roleSelectedFieldName = "contact" )
104 +## hypothesis: $thesisStatus set, default "Completed"
105 +## to do: get from parameter
106 +#if ($thesisStatus == "Available")
107 + #set ($orderingDateFieldName = "availabilityDate")
108 +#elseif ($thesisStatus == "Ongoing")
109 + #set ($orderingDateFieldName = "startDate")
133 133  #else
134 - #set( $roleSelectedFieldName = "supervisor" )
111 + #set ($thesisStatus = "Completed")
112 + #set ($orderingDateFieldName = "endDate")
135 135  #end
136 -##
137 -#if( $selectedStatus == 'all' )
138 - ALL STATUSES
114 +##
115 +#if ( $cosupervisor )
116 + #set ( $roleSelectedFieldName = "coSupervisors" )
117 +#elseif ( $contact )
118 + #set ( $roleSelectedFieldName = "contact" )
139 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")
120 + #set ( $roleSelectedFieldName = "supervisor" )
121 +#end
122 +##
123 +#if ($userSelected)
124 + #if ( $roleSelected )
125 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
126 + where obj.name=doc.fullName and
127 + obj.className='Theses.ThesisClass' and
128 + obj.name<>'Theses.ThesisClassTemplate' and
129 + prop.id.id=obj.id and
130 + prop1.id.id=obj.id and
131 + prop2.id.id=obj.id and
132 + prop.name='status' and
133 + prop.value='$thesisStatus' and
134 + prop1.name='$roleSelectedFieldName' and
135 + prop2.name='$orderingDateFieldName' and
136 + prop1.value like '%$userName%'
137 + 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" )
139 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
140 + where obj.name=doc.fullName and
141 + obj.className='Theses.ThesisClass' and
142 + obj.name<>'Theses.ThesisClassTemplate' and
143 + prop.id.id=obj.id and
144 + prop1.id.id=obj.id and
145 + prop2.id.id=obj.id and
146 + prop3.id.id=obj.id and
147 + prop4.id.id=obj.id and
148 + prop.name='status' and
149 + prop.value = '$thesisStatus' and
150 + prop1.name='supervisor' and
151 + prop2.name='coSupervisors' and
152 + prop3.name='contact' and
153 + prop4.name='$orderingDateFieldName' and
154 + ( prop1.value like '%$userName%' or
155 + prop2.value like '%$userName%' or
156 + prop3.value like '%$userName%')
157 + order by prop4.value desc")
160 160   #end
159 +#elseif ( $roleSelected )
160 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
161 + where obj.name=doc.fullName and
162 + obj.className='Theses.ThesisClass' and
163 + obj.name<>'Theses.ThesisClassTemplate' and
164 + prop.id.id=obj.id and
165 + prop1.id.id=obj.id and
166 + prop2.id.id=obj.id and
167 + prop3.id.id=obj.id and
168 + prop4.id.id=obj.id and
169 + prop.name='status' and
170 + prop.value = '$thesisStatus' and
171 + prop1.name='supervisor' and
172 + prop2.name='coSupervisors' and
173 + prop3.name='contact' and
174 + prop4.name='$orderingDateFieldName' and
175 + prop1.value like '%$supervisorName%' and
176 + prop2.value like '%$cosupervisorName%' and
177 + prop3.value like '%$contactName%'
178 + order by prop4.value desc")
179 +#else
180 + #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1
181 + where obj.name=doc.fullName and
182 + obj.className='Theses.ThesisClass' and
183 + obj.name<>'Theses.ThesisClassTemplate' and
184 + prop.id.id=obj.id and
185 + prop1.id.id=obj.id and
186 + prop.name='status' and
187 + prop.value = '$thesisStatus' and
188 + prop1.name='$orderingDateFieldName'
189 + order by prop1.value desc")
161 161  #end
162 -#set( $thesisFound = $xwiki.searchDocuments($sql) )
191 +#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
194 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
195 +
167 167  #end
168 168  {{/velocity}}