Changes for page Per Year

From version 43.2
edited by Andrea Omicini
on 25/10/2021 20:52
Change comment: There is no comment for this version
To version 44.1
edited by Andrea Omicini
on 25/10/2021 21:09
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -72,8 +72,10 @@
72 72  (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[$role>>||anchor="$role"]]#end)))
73 73  #end{{id name='index'/}}
74 74  ## search theses
75 +#set( $thesisNo = 0 )
75 75  #foreach( $status in $allThesisStatuses )
76 76   #if( !$oneStatus || $selectedStatus == $status )
78 + #set( $thesisStatusNo = 0 )
77 77   #if( !$oneStatus )
78 78  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}{{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}
79 79   #end
... ... @@ -82,6 +82,7 @@
82 82  == $selectedUser ==
83 83  ## some user selected
84 84   #foreach( $role in $allThesisRoles )
87 + #set( $thesisStatusRoleNo = 0 )
85 85   #if( !$oneRole || $selectedRole == $role )
86 86   #if( $role == "contact" )
87 87   #set( $selectedRoleFieldName = "contact" )
... ... @@ -95,10 +95,13 @@
95 95   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
96 96   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 = '$selectedRoleFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )
97 97   #set( $thesisFound = $xwiki.searchDocuments($sql) )
101 + #set( $thesisFoundNo = $thesisFound.size() )
102 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
98 98   #foreach( $thesis in $thesisFound )
99 99  * $thesis
100 100   #end
101 101   #end
107 + #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
102 102   #end
103 103  ## no user selected, no role selected
104 104   #else
... ... @@ -105,14 +105,18 @@
105 105   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
106 106   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 lower(prop0.value) = '$status' order by prop1.value desc" )
107 107   #set( $thesisFound = $xwiki.searchDocuments($sql) )
114 + #set( $thesisFoundNo = $thesisFound.size() )
115 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
108 108   #foreach( $thesis in $thesisFound )
109 109  * $thesis
110 110   #end
111 111   #end
120 + #if( !$oneStatus )
121 +(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}$thesisStatusNo {{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}
122 + #end
112 112   #end
113 113  ##
114 114  ## #set( $thesisFound = $xwiki.searchDocuments($sql) )
115 -## #set( $thesisFoundNo = $thesisFound.size() )
116 116  ## #set($thesisDoc = $xwiki.getDocument($thesis))
117 117  ## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
118 118  ##* [[$thesisObj.title>>$thesisDoc]] #if( $thesisDoc.getValue('studentUserName') != "" )//$thesisDoc.getValue('studentUserName')//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end