Changes for page Per Status

From version 86.11
edited by Andrea Omicini
on 22/06/2023 12:53
Change comment: There is no comment for this version
To version 86.7
edited by Andrea Omicini
on 22/06/2023 12:35
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -108,64 +108,30 @@
108 108  ## cycle over sorts
109 109  #foreach( $status in $statusList )
110 110   #set( $query = ", BaseObject as obj, #if( $oneUser ) LargeStringProperty as propAuthor, LargeStringProperty as propEditor, #end StringProperty as propStatus #if( !$hasEdit ), StringProperty as propAccess #end
111 - where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectPool}.${objectTemplate}' #if( $oneUser ) and propAuthor.id.id = obj.id and propEditor.id.id = obj.id and propAuthor.name = 'author' and propEditor.name = 'editor' and ( propAuthor.value like '$userString' or ( propAuthor.value = '' and propEditor.value like '$userString' ) ) #end and propStatus.id.id = obj.id and propStatus.name = 'status' and propStatus.value = '$status' #if( !$hasEdit ) and propAccess.id.id = obj.id and propAccess.name = 'access' and propAccess.value <> 'hidden' #end" )
112 - #set( $itemFound = $xwiki.searchDocuments($query) )
113 -## set counters
114 - #set( $itemStatusNo = $itemFound.size() )
115 - #if( $itemStatusNo > 0 )
116 - #set( $itemMap[$status] = $itemFound )
117 - #set( $itemNo = $itemNo + $itemStatusNo )
111 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and propAuthor.id.id = obj.id and propEditor.id.id = obj.id and propStatus.id.id = obj.id and propAuthor.name = 'author' and propEditor.name = 'editor' and ( propAuthor.value like '$userString' or ( propAuthor.value = '' and propEditor.value like '$userString' ) ) and propStatus.name = 'status' and propStatus.value = '$status' #if( !$hasEdit ) and propAccess.id.id = obj.id and propAccess.name = 'access' and propAccess.value <> 'hidden' #end" )
112 + #set( $pubFound = $xwiki.searchDocuments($query) )
113 + #set( $pubStatusNo = $pubFound.size() )
114 + #if( $pubStatusNo > 0 )
115 + #set( $pubMap[$status] = $pubFound )
116 + #set( $pubNo = $pubNo + $pubStatusNo )
118 118   #end
119 119  #end
120 -##
121 121  ## output results
122 122  ## page subtitle
123 -<div style="display: flex">
124 - <div class="mainheader">
125 -$itemNo
126 -#if( $oneStatus )
127 - #if( $itemNo == 1 )
128 - $services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}").toLowerCase()
129 - #else
130 -$services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}_plural").toLowerCase() #end
131 -#else
132 - #if( $itemNo == 1 )
133 - $services.localization.render('yetunpublished_singular').toLowerCase()
134 - #else
135 - $services.localization.render('yetunpublished').toLowerCase()
136 - #end
137 -#end
138 -#if( $oneUser )
139 - <span class="textsecondary">&ensp;/&ensp;</span>
140 - $userFirstName $userLastName
141 -#end
142 - </div>
143 - <div style="flex-grow: 1">
144 - </div>
145 - <div">
146 - <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","bibtex=$showBibtex&inline=#if( $showInline )false#{else}true#end#if( $oneSort )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )#if( $showInline )formatted#{else}plain#end#else#if( $showInline )long#{else}short#end#end</a>
147 - <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","inline=$showInline&bibtex=#if( $showBibtex )false#{else}true#end#if( $oneSort )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )text#{else}bib#end</a>
148 - </div>
149 -</div>
121 +{{id name="top"/}}
122 +>(%%)$pubNo #if( $pubNo == 1 ){{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#{else}{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#{end} / #if( $oneStatus ){{pubStatus uppercase='false' plural='true'}}$statusPar{{/pubStatus}}#{else}{{pubStatus uppercase='false' plural='true'}}unpublished{{/pubStatus}}#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
150 150  ## stop if no pubs are found
151 -#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
124 +#if( $pubNo == 0 || $pubMap.keySet().size() == 0 )
152 152  ## redundant double check
153 153   #stop
154 154  #end
155 155  ## some pubs found
156 156  ## page index
157 -#if( $itemMap.keySet().size() > 1 )
158 -## found more than one sort
159 -<div class="mainselectbar" id="index">
160 - #foreach( $status in $itemMap.keySet() )
161 - #if( !$foreach.first )
162 - &ensp;&bull;&ensp;
163 - #end
164 - [[$services.localization.render("${objectSpace}.${objectClass}_status_${status}_short_plural").toLowerCase()>>||anchor="$status"]]
165 - #end
166 -</div>
130 +#if( $pubMap.keySet().size() > 1 )
131 +## found more than one status
132 +{{id name="index"/}}
133 +(% 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)))
167 167  #end
168 -##
169 169  ## pubs displayed per year
170 170  #foreach( $status in $pubMap.keySet() )
171 171  (% 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']]