Changes for page Per Year

From version 17.3
edited by Andrea Omicini
on 25/10/2021 16:19
Change comment: There is no comment for this version
To version 21.1
edited by Andrea Omicini
on 25/10/2021 17:47
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -29,7 +29,7 @@
29 29  #set( $contactNamePar = $request.contact )
30 30  #### set default values
31 31  #set( $userSelected = false )
32 -#set( $roleSelected = false )
32 +#set( $roleSelected = false )
33 33  #set( $userFirstName = "" )
34 34  #set( $userLastName = "" )
35 35  #set( $supervisorName = "" )
... ... @@ -44,7 +44,8 @@
44 44  ##
45 45  #### handle who & roles
46 46  ##
47 -#if ( $userName || $userNamePar ) ## a user is specified for all roles
47 +#if ( $userName || $userNamePar )
48 +## a user is specified for all roles
48 48   #set( $userSelected = true )
49 49   #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end
50 50   #set( $userdoc = $xwiki.getDocument($userName) )
... ... @@ -72,7 +72,7 @@
72 72   #end
73 73  #end
74 74  #if( $supervisor )
75 - #set( $roleSelected = true )
76 + #set( $roleSelected = true )
76 76   #set( $supervisorName = $userName )
77 77   #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
78 78   #set( $supervisorFirstName = $supervisordoc.display("first_name") )
... ... @@ -86,7 +86,7 @@
86 86   #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
87 87  #end
88 88  #if( $contact )
89 - #set( $roleSelected = true )
90 + #set( $roleSelected = true )
90 90   #set( $contactName = $userName )
91 91   #set( $contactdoc = $xwiki.getDocument($contactName) )
92 92   #set( $contactFirstName = $contactdoc.display("first_name") )
... ... @@ -93,104 +93,46 @@
93 93   #set( $contactLastName = $contactdoc.display("last_name") )
94 94  #end
95 95  ##
96 -## $userSelected true and $roleSelected false means one user for all roles
97 -## $userSelected true and $roleSelected true for one user with one specific role
98 -## if $userSelected false and $roleSelected true mean at least one role with an assigned user
99 -## both false means all theses
100 -#if( $userSelected )
101 - #if( $roleSelected ) // //
102 -> #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 // //
103 - #else // //
104 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // //
105 - #end
97 +#if( $cosupervisor )
98 + #set( $roleSelectedFieldName = "coSupervisors" )
99 +#elseif( $contact )
100 + #set( $roleSelectedFieldName = "contact" )
106 106  #else
107 - #if( $roleSelected ) // //
108 -> #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 // //
109 - #else // //
110 -## > #FullThesisStatusesString($thesisStatus) // //
111 - #end
102 + #set( $roleSelectedFieldName = "supervisor" )
112 112  #end
113 113  ##
114 -#if ( $cosupervisor )
115 - #set ( $roleSelectedFieldName = "coSupervisors" )
116 -#elseif ( $contact )
117 - #set ( $roleSelectedFieldName = "contact" )
118 -#else
119 - #set ( $roleSelectedFieldName = "supervisor" )
120 -#end
121 -##
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")
105 +## $roleSelected has meaning only if $userSelected
106 +## if $userSelected, $roleSelected false means one user for all roles
107 +## if $userSelected, $roleSelected true means one specific role for one user selected
108 +## if $userSelected is false, $roleSelected means nothing -- so all users, all roles / just status
109 +#foreach( $status in $allThesisStatuses )
110 + #if( $selectedStatus == 'all' || $selectedStatus == $status )
111 += $status =
112 +## some selected status or all statuses / now $status
113 + #if( $userSelected )
114 +== $userName ==
115 +## some user selected
116 + #if( $roleSelected )
117 +## some specific role selected
118 +=== $roleSelectedFieldName ===
119 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
120 + 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 = '$selectedStatus' and prop1.value like '%$userName%' order by prop2.value desc" )
121 + #else
122 +## no specific role selected
123 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
124 + 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 lower(prop0.value) = '$selectedStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
125 + #end
137 137   #else
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")
127 +## no user selected, no role selected
128 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
129 + 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 = '$selectedStatus' order by prop1.value desc" )
157 157   #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")
189 189  #end
190 -#set($thesisFound = $xwiki.searchDocuments($sql))
132 +#set( $thesisFound = $xwiki.searchDocuments($sql) )
133 +#set( $thesisFoundNo = $thesisFound.size() )
191 191  ##
192 192  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
193 -* #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
136 +* [[$thesisDoc.getValue("title")>>$thesisDoc]]#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
194 194  
195 195  #end
196 196  {{/velocity}}