Changes for page Per Year

From version 17.5
edited by Andrea Omicini
on 25/10/2021 16:48
Change comment: There is no comment for this version
To version 20.4
edited by Andrea Omicini
on 25/10/2021 17:05
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -9,6 +9,7 @@
9 9  #else
10 10   #set( $selectedStatus = 'all' )
11 11  #end
12 +$selectedStatus
12 12  ##check velocity variable, takes precedence
13 13  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14 14   #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
... ... @@ -92,6 +92,25 @@
92 92   #set( $contactFirstName = $contactdoc.display("first_name") )
93 93   #set( $contactLastName = $contactdoc.display("last_name") )
94 94  #end
96 +$selectedStatus
97 +
98 +$userSelected
99 +
100 +$roleSelected
101 +
102 +$supervisor
103 +
104 +$cosupervisor
105 +
106 +$contact
107 +
108 +$userFirstName $userLastName
109 +
110 +$supervisorFirstName $supervisorLastName
111 +
112 +$cosupervisorFirstName $cosupervisorLastName
113 +
114 +$contactFirstName $contactLastName
95 95  ##
96 96  ## $userSelected true and $roleSelected false means one user for all roles
97 97  ## $userSelected true and $roleSelected true for one user with one specific role
... ... @@ -146,11 +146,12 @@
146 146  ## no user selected, some role selected
147 147   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
148 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" )
169 + #end
149 149  #end
150 -#set($thesisFound = $xwiki.searchDocuments($sql))
171 +#set( $thesisFound = $xwiki.searchDocuments($sql) )
151 151  ##
152 152  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
153 -* #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
154 -
174 +##* #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
175 +* $thesis
155 155  #end
156 156  {{/velocity}}