Changes for page Per Status
From version 77.1
edited by Andrea Omicini
on 03/01/2023 00:07
on 03/01/2023 00:07
Change comment:
There is no comment for this version
To version 84.1
edited by Andrea Omicini
on 03/01/2023 00:18
on 03/01/2023 00:18
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -81,7 +81,6 @@ 81 81 #set( $statusList = [$statusPar] ) 82 82 #end 83 83 #end 84 -$statusList 85 85 ## 86 86 ## query to structures 87 87 #set( $pubMap = {} ) ... ... @@ -88,10 +88,10 @@ 88 88 #set( $pubNo = 0 ) 89 89 #foreach( $status in $statusList ) 90 90 #set( $from = ", BaseObject as obj, LargeStringProperty as prop0, LargeStringProperty as prop1, StringProperty as prop2" ) 91 - #set( $where = "obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'author' and prop1.name = 'editor' and ( prop0.value like '$userString' or ( prop0.value = '' and prop1.value like '$userString' ) ) and prop2.name = 'status' and prop2.value = 90 + #set( $where = "obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'author' and prop1.name = 'editor' and ( prop0.value like '$userString' or ( prop0.value = '' and prop1.value like '$userString' ) ) and prop2.name = 'status' and prop2.value = '$status'" ) 92 92 #set( $sql = $from + " where " + $where ) 93 93 #set( $pubFound = $xwiki.searchDocuments($sql) ) 94 -$pubFound.size() 93 + #set( $pubStatusNo = $pubFound.size() ) 95 95 #if( $pubStatusNo > 0 ) 96 96 #set( $pubMap[$status] = $pubFound ) 97 97 #set( $pubNo = $pubNo + $pubStatusNo ) ... ... @@ -111,8 +111,15 @@ 111 111 #if( $pubMap.keySet().size() > 1 ) 112 112 ## found more than one status 113 113 {{id name="index"/}} 114 -(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $status in $pubMap.keySet() )#if( !$foreach.first ) | #end[[ ${pubStatus uppercase='false' plural='true'}}$statusPar{{/pubStatus}}>>||anchor="$status"]]#end)))113 +(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $status in $pubMap.keySet() )#if( !$foreach.first ) | #end[[{{pubStatus uppercase='false' plural='true'}}$status{{/pubStatus}}>>||anchor="$status"]]#end))) 115 115 #end 116 - 117 - 115 +## pubs displayed per year 116 +#foreach( $status in $pubMap.keySet() ) 117 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}[[{{pubStatus uppercase='false' plural='true'}}$status{{/pubStatus}}>>$doc.name||queryString='status=$status#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end']] 118 + #foreach( $pub in $pubMap[$status] ) 119 +(% style="border-style:hidden hidden hidden hidden" %)|{{pub inline='false' linked='title'}}$pub{{/pub}} 120 + #end 121 + #set( $pubStatusNo = $pubMap[$year].size() ) 122 +(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($pubStatusNo #if( $pubStatusNo == 1 ){{stringEngIta eng='publication' ita='pubblicazione'/}} {{pubStatus uppercase='false' plural='false'}}$status{{/pubStatus}}#{else}{{stringEngIta eng='publications' ita='pubblicazioni'/}} {{pubStatus uppercase='false' plural='true'}}$status{{/pubStatus}}#end) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 123 +#end 118 118 {{/velocity}}