Changes for page Per Year
From version 17.3
edited by Andrea Omicini
on 25/10/2021 16:19
on 25/10/2021 16:19
Change comment:
There is no comment for this version
To version 20.1
edited by Andrea Omicini
on 25/10/2021 16:52
on 25/10/2021 16:52
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
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 = "" ) ... ... @@ -72,7 +72,7 @@ 72 72 #end 73 73 #end 74 74 #if( $supervisor ) 75 - #set( $roleSelected = true ) 75 + #set( $roleSelected = true ) 76 76 #set( $supervisorName = $userName ) 77 77 #set( $supervisordoc = $xwiki.getDocument($supervisorName) ) 78 78 #set( $supervisorFirstName = $supervisordoc.display("first_name") ) ... ... @@ -98,99 +98,60 @@ 98 98 ## if $userSelected false and $roleSelected true mean at least one role with an assigned user 99 99 ## both false means all theses 100 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 // // 101 + #if( $roleSelected ) 102 +>{{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 103 + 104 + #else 105 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName 106 + 105 105 #end 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) // // 109 + #if( $roleSelected ) 110 +>{{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 111 + 112 + #else 113 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} 114 + 111 111 #end 112 112 #end 113 113 ## 114 -#if 115 - #set 116 -#elseif 117 - #set 118 +#if( $cosupervisor ) 119 + #set( $roleSelectedFieldName = "coSupervisors" ) 120 +#elseif( $contact ) 121 + #set( $roleSelectedFieldName = "contact" ) 118 118 #else 119 - #set 123 + #set( $roleSelectedFieldName = "supervisor" ) 120 120 #end 121 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") 126 +#if( $selectedStatus == 'all' ) 127 + ALL STATUSES 128 +#else 129 +## some selected status 130 + #if( $userSelected ) 131 +## some user selected 132 + #if( $roleSelected ) 133 +## some specific role selected 134 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 135 + 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" ) 136 + #else 137 +## no specific role selected 138 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 139 + 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" ) 140 + #end 141 + #elseif( $roleSelected ) 142 +## no user selected, some role selected 143 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 144 + 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") 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") 146 +## no user selected, some role selected 147 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 148 + 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" ) 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)) 151 +#set( $thesisFound = $xwiki.searchDocuments($sql) ) 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 194 - 154 +##* #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 155 +* $thesis 195 195 #end 196 196 {{/velocity}}