Changes for page Per Year
From version 20.2
edited by Andrea Omicini
on 25/10/2021 17:00
on 25/10/2021 17:00
Change comment:
There is no comment for this version
To version 17.4
edited by Andrea Omicini
on 25/10/2021 16:33
on 25/10/2021 16:33
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -9,7 +9,6 @@ 9 9 #else 10 10 #set( $selectedStatus = 'all' ) 11 11 #end 12 -$selectedStatus 13 13 ##check velocity variable, takes precedence 14 14 #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) ) 15 15 #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) ... ... @@ -93,13 +93,6 @@ 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 104 ## $userSelected true and $roleSelected false means one user for all roles 105 105 ## $userSelected true and $roleSelected true for one user with one specific role ... ... @@ -134,32 +134,67 @@ 134 134 #if( $selectedStatus == 'all' ) 135 135 ALL STATUSES 136 136 #else 137 -## some selected status 138 138 #if( $userSelected ) 139 -## some user selected 140 140 #if( $roleSelected ) 141 -## some specific role selected 142 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") 132 + 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" ) 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" ) 134 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 135 + where obj.name=doc.fullName and 136 + obj.className='Theses.ThesisClass' and 137 + obj.name<>'Theses.ThesisClassTemplate' and 138 + prop.id.id=obj.id and 139 + prop1.id.id=obj.id and 140 + prop2.id.id=obj.id and 141 + prop3.id.id=obj.id and 142 + prop4.id.id=obj.id and 143 + prop.name='status' and 144 + prop.value = '$thesisStatus' and 145 + prop1.name='supervisor' and 146 + prop2.name='coSupervisors' and 147 + prop3.name='contact' and 148 + prop4.name='$orderingDateFieldName' and 149 + ( prop1.value like '%$userName%' or 150 + prop2.value like '%$userName%' or 151 + prop3.value like '%$userName%') 152 + order by prop4.value desc") 157 157 #end 154 +#elseif ( $roleSelected ) 155 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 156 + where obj.name=doc.fullName and 157 + obj.className='Theses.ThesisClass' and 158 + obj.name<>'Theses.ThesisClassTemplate' and 159 + prop.id.id=obj.id and 160 + prop1.id.id=obj.id and 161 + prop2.id.id=obj.id and 162 + prop3.id.id=obj.id and 163 + prop4.id.id=obj.id and 164 + prop.name='status' and 165 + prop.value = '$thesisStatus' and 166 + prop1.name='supervisor' and 167 + prop2.name='coSupervisors' and 168 + prop3.name='contact' and 169 + prop4.name='$orderingDateFieldName' and 170 + prop1.value like '%$supervisorName%' and 171 + prop2.value like '%$cosupervisorName%' and 172 + prop3.value like '%$contactName%' 173 + order by prop4.value desc") 174 +#else 175 + #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1 176 + where obj.name=doc.fullName and 177 + obj.className='Theses.ThesisClass' and 178 + obj.name<>'Theses.ThesisClassTemplate' and 179 + prop.id.id=obj.id and 180 + prop1.id.id=obj.id and 181 + prop.name='status' and 182 + prop.value = '$thesisStatus' and 183 + prop1.name='$orderingDateFieldName' 184 + order by prop1.value desc") 158 158 #end 159 -#set( 186 +#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)//#end163 - * $thesis189 +* #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 190 + 164 164 #end 165 165 {{/velocity}}