Changes for page Per Year

From version 20.2
edited by Andrea Omicini
on 25/10/2021 17:00
Change comment: There is no comment for this version
To version 25.1
edited by Andrea Omicini
on 25/10/2021 17:52
Change comment: There is no comment for this version

Summary

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() )
... ... @@ -45,7 +45,8 @@
45 45  ##
46 46  #### handle who & roles
47 47  ##
48 -#if ( $userName || $userNamePar ) ## a user is specified for all roles
47 +#if ( $userName || $userNamePar )
48 +## 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,42 +87,13 @@
87 87   #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
88 88  #end
89 89  #if( $contact )
90 - #set( $roleSelected = true )
90 + #set( $roleSelected = true )
91 91   #set( $contactName = $userName )
92 92   #set( $contactdoc = $xwiki.getDocument($contactName) )
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 -## $userSelected true and $roleSelected false means one user for all roles
105 -## $userSelected true and $roleSelected true for one user with one specific role
106 -## if $userSelected false and $roleSelected true mean at least one role with an assigned user
107 -## both false means all theses
108 -#if( $userSelected )
109 - #if( $roleSelected )
110 ->{{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
111 -
112 - #else
113 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
114 -
115 - #end
116 -#else
117 - #if( $roleSelected )
118 ->{{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
119 -
120 - #else
121 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
122 -
123 - #end
124 -#end
125 -##
126 126  #if( $cosupervisor )
127 127   #set( $roleSelectedFieldName = "coSupervisors" )
128 128  #elseif( $contact )
... ... @@ -131,35 +131,41 @@
131 131   #set( $roleSelectedFieldName = "supervisor" )
132 132  #end
133 133  ##
134 -#if( $selectedStatus == 'all' )
135 - ALL STATUSES
136 -#else
137 -## some selected status
138 - #if( $userSelected )
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 ==
139 139  ## some user selected
140 - #if( $roleSelected )
116 + #if( $roleSelected )
141 141  ## some specific role selected
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
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 lower(prop0.value) = '$status' and prop1.value like '%$userName%' order by prop2.value desc" )
121 + #else
145 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" )
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) = '$status' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
125 + #end
126 + #else
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 lower(prop0.value) = 'status' and prop1.name = '$orderingDateFieldName' and prop0.value = '$status' order by prop1.value desc" )
148 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")
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" )
157 157   #end
158 -#end
159 -#set( $thesisFound = $xwiki.searchDocuments($sql) )
132 + $sql
133 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
134 + #set( $thesisFoundNo = $thesisFound.size() )
135 + $thesisFoundNo
160 160  ##
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)//#end
163 -* $thesis
137 + #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
138 +* [[$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
139 +
140 + #end
164 164  #end
165 165  {{/velocity}}