Changes for page Per Year
From version 20.15
edited by Andrea Omicini
on 25/10/2021 17:29
on 25/10/2021 17:29
Change comment:
There is no comment for this version
To version 17.5
edited by Andrea Omicini
on 25/10/2021 16:48
on 25/10/2021 16:48
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -44,8 +44,7 @@ 44 44 ## 45 45 #### handle who & roles 46 46 ## 47 -#if ( $userName || $userNamePar ) 48 -## a user is specified for all roles 47 +#if ( $userName || $userNamePar ) ## a user is specified for all roles 49 49 #set( $userSelected = true ) 50 50 #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end 51 51 #set( $userdoc = $xwiki.getDocument($userName) ) ... ... @@ -87,7 +87,7 @@ 87 87 #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") ) 88 88 #end 89 89 #if( $contact ) 90 - #set( $roleSelected = true ) 89 + #set( $roleSelected = true ) 91 91 #set( $contactName = $userName ) 92 92 #set( $contactdoc = $xwiki.getDocument($contactName) ) 93 93 #set( $contactFirstName = $contactdoc.display("first_name") ) ... ... @@ -98,25 +98,21 @@ 98 98 ## $userSelected true and $roleSelected true for one user with one specific role 99 99 ## if $userSelected false and $roleSelected true mean at least one role with an assigned user 100 100 ## both false means all theses 101 -#if( $selectedStatus == 'all' ) 102 -ALLL 103 -#else 104 - #if( $userSelected ) 105 - #if( $roleSelected ) 106 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/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 100 +#if( $userSelected ) 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 107 107 108 - #else 109 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName 110 - 111 - #end 112 112 #else 113 - #if( $roleSelected ) 114 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/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 105 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName 115 115 116 - #else 117 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} 107 + #end 108 +#else 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 118 118 119 - #end 112 + #else 113 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} 114 + 120 120 #end 121 121 #end 122 122 ## ... ... @@ -137,11 +137,11 @@ 137 137 #if( $roleSelected ) 138 138 ## some specific role selected 139 139 #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 140 - 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" )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" ) 141 141 #else 142 142 ## no specific role selected 143 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 lower(prop0.value)= '$selectedStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )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" ) 145 145 #end 146 146 #elseif( $roleSelected ) 147 147 ## no user selected, some role selected ... ... @@ -150,14 +150,12 @@ 150 150 #else 151 151 ## no user selected, some role selected 152 152 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 153 - 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" ) 154 - #end 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" ) 155 155 #end 156 -#set( $thesisFound = $xwiki.searchDocuments($sql) ) 157 -#set( $thesisFoundNo = $thesisFound.size() ) 150 +#set($thesisFound = $xwiki.searchDocuments($sql)) 158 158 ## 159 159 #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 160 -* [[$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)//#end153 +* #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 161 161 162 162 #end 163 163 {{/velocity}}