Changes for page Per Year

From version 42.1
edited by Andrea Omicini
on 25/10/2021 20:44
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,14 +72,19 @@
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 )
77 -= $status =
78 + #set( $thesisStatusNo = 0 )
79 + #if( !$oneStatus )
80 +(% 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}}
81 + #end
78 78  ## some selected status or all statuses / now $status
79 79   #if( $oneUser )
80 80  == $selectedUser ==
81 81  ## some user selected
82 82   #foreach( $role in $allThesisRoles )
87 + #set( $thesisStatusRoleNo = 0 )
83 83   #if( !$oneRole || $selectedRole == $role )
84 84   #if( $role == "contact" )
85 85   #set( $selectedRoleFieldName = "contact" )
... ... @@ -93,10 +93,13 @@
93 93   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
94 94   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" )
95 95   #set( $thesisFound = $xwiki.searchDocuments($sql) )
101 + #set( $thesisFoundNo = $thesisFound.size() )
102 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
96 96   #foreach( $thesis in $thesisFound )
97 97  * $thesis
98 98   #end
99 99   #end
107 + #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
100 100   #end
101 101  ## no user selected, no role selected
102 102   #else
... ... @@ -103,14 +103,18 @@
103 103   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
104 104   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" )
105 105   #set( $thesisFound = $xwiki.searchDocuments($sql) )
114 + #set( $thesisFoundNo = $thesisFound.size() )
115 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
106 106   #foreach( $thesis in $thesisFound )
107 107  * $thesis
108 108   #end
109 109   #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
110 110   #end
111 111  ##
112 112  ## #set( $thesisFound = $xwiki.searchDocuments($sql) )
113 -## #set( $thesisFoundNo = $thesisFound.size() )
114 114  ## #set($thesisDoc = $xwiki.getDocument($thesis))
115 115  ## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
116 116  ##* [[$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