Changes for page Per Status
From version 90.1
edited by Andrea Omicini
on 22/06/2023 13:01
on 22/06/2023 13:01
Change comment:
There is no comment for this version
To version 86.6
edited by Andrea Omicini
on 22/06/2023 12:15
on 22/06/2023 12:15
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -31,7 +31,6 @@ 31 31 ## HANDLE INLINE / END 32 32 ## 33 33 ## HANDLE STATUS / START 34 -#template('apice_publications.vm') 35 35 ## $oneStatus false gets a list of statuses, true just one 36 36 #set( $oneStatus = false ) 37 37 #set( $showRejected = false ) ... ... @@ -106,113 +106,42 @@ 106 106 ## map & counter initialisation 107 107 #set( $itemMap = {} ) 108 108 #set( $itemNo = 0 ) 109 -## cycle over st atuses108 +## cycle over sorts 110 110 #foreach( $status in $statusList ) 111 - #set( $ query= ", BaseObject as obj,#if( $oneUser )LargeStringProperty as propAuthor, LargeStringProperty as propEditor,#endStringProperty as propStatus #if( !$hasEdit ), StringProperty as propAccess#end112 - where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${object Pool}.${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' ) )#endand 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'113 - #set( $ itemFound= $xwiki.searchDocuments($query))114 - ##setcounters115 - #set( $ itemStatusNo = $itemFound.size() )116 - #if( $ itemStatusNo > 0 )117 - #set( $ itemMap[$status] = $itemFound )118 - #set( $ itemNo = $itemNo + $itemStatusNo )110 + #set( $from = ", BaseObject as obj, LargeStringProperty as prop0, LargeStringProperty as prop1, StringProperty as prop2, StringProperty as prop3" ) 111 + #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 prop3.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' and prop3.name = 'access'#if( !$hasEdit ) and prop3.value <> 'hidden'#end" ) 112 + #set( $sql = $from + " where " + $where ) 113 + #set( $pubFound = $xwiki.searchDocuments($sql) ) 114 + #set( $pubStatusNo = $pubFound.size() ) 115 + #if( $pubStatusNo > 0 ) 116 + #set( $pubMap[$status] = $pubFound ) 117 + #set( $pubNo = $pubNo + $pubStatusNo ) 119 119 #end 120 120 #end 121 -$itemStatusNo 122 -## 123 123 ## output results 124 124 ## page subtitle 125 -<div style="display: flex"> 126 - <div class="mainheader"> 127 -$itemNo 128 -#if( $oneStatus ) 129 - #if( $itemNo == 1 ) 130 - $services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}").toLowerCase() 131 - #else 132 -$services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}_plural").toLowerCase() #end 133 -#else 134 - #if( $itemNo == 1 ) 135 - $services.localization.render('yetunpublished_singular').toLowerCase() 136 - #else 137 - $services.localization.render('yetunpublished').toLowerCase() 138 - #end 139 -#end 140 -#if( $oneUser ) 141 - <span class="textsecondary"> / </span> 142 - $userFirstName $userLastName 143 -#end 144 - </div> 145 - <div style="flex-grow: 1"> 146 - </div> 147 - <div"> 148 - <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","bibtex=$showBibtex&inline=#if( $showInline )false#{else}true#end#if( $oneStatus )&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> 149 - <a class="basebutton" style="padding: .5em" href='$doc.getURL("view","inline=$showInline&bibtex=#if( $showBibtex )false#{else}true#end#if( $oneStatus )&status=${statusList[0]}#end#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")'>#if( $showBibtex )text#{else}bib#end</a> 150 - </div> 151 -</div> 122 +{{id name="top"/}} 123 +>(%%)$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}(%%) 152 152 ## stop if no pubs are found 153 -#if( $ itemNo == 0 || $itemMap.keySet().size() == 0 )125 +#if( $pubNo == 0 || $pubMap.keySet().size() == 0 ) 154 154 ## redundant double check 155 155 #stop 156 156 #end 157 157 ## some pubs found 158 158 ## page index 159 -#if( $ itemMap.keySet().size() > 1 )131 +#if( $pubMap.keySet().size() > 1 ) 160 160 ## found more than one status 161 -<div class="mainselectbar" id="index"> 162 - #foreach( $status in $itemMap.keySet() ) 163 - #if( !$foreach.first ) 164 -  •  165 - #end 166 - [[$services.localization.render("${objectSpace}.${objectClass}_status_${status}_short_plural").toLowerCase()>>||anchor="$status"]] 167 - #end 168 -</div> 133 +{{id name="index"/}} 134 +(% 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))) 169 169 #end 170 -## 171 -#template('apice_publication_macros.vm') 172 -## 173 -#foreach( $status in $itemMap.keySet() ) 174 -## status top / start 175 -<div class="mainselectseparator"> 176 - <a class="mainselectseparatorlink" id="$status" href=$xwiki.getURL($doc,"view","status=$status#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")> 177 - $services.localization.render("${objectSpace}.${objectClass}_status_${status}_plural").toLowerCase() 178 - </a> 179 -</div> 180 -## status top / end 181 -## 182 -## status display / start 183 -<div> 184 - #if( $showInline && !$showBibtex ) 185 - <ul> 186 - #foreach( $item in $itemMap[$status] ) 187 - <li>#publinked($item)</li> 188 -## <li>#pubperstatus($item)</li> 189 - #end 190 - </ul> 191 - #else 192 - #foreach( $item in $itemMap[$sort] ) 193 - #if( $showBibtex) 194 - #if( $showInline ) 195 - ((({{{ $xwiki.getDocument($item).getValue('bibtex') }}}))) 196 - #else 197 - ((({{code language="bibtex"}}$xwiki.getDocument($item).getValue('bibtex'){{/code}}))) 198 - #end 199 - #else 200 - <div style="border-style:hidden hidden hidden hidden; font-size:smaller; line-height: 1.25em; margin-bottom: .5em"> 201 - #pubauthed($item)<br/> 202 - #pubtitle($item)<br/> 203 - <span class="textsecondary">(#pubstatus($item))</span> {{pubVenue linked="false"}}$item{{/pubVenue}} 204 - </div> 205 - #end 206 - #end 136 +## pubs displayed per year 137 +#foreach( $status in $pubMap.keySet() ) 138 +(% 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']] 139 + #foreach( $pub in $pubMap[$status] ) 140 +(% style="border-style:hidden hidden hidden hidden" %)|{{pub inline='false' linked='title'}}$pub{{/pub}} 207 207 #end 208 -</div> 209 -## status display / end 210 -## 211 -## status bottom / start 212 -<div #if( $foreach.last )id="bottom"#end class="mainselectbottom"> 213 - #set( $itemStatusNo = $itemMap[$status].size() ) 214 -$itemStatusNo #if( $itemStatusNo == 1 )$services.localization.render("${objectSpace}.${objectClass}_status_${status}").toLowerCase()#{else}$services.localization.render("${objectSpace}.${objectClass}_status_${status}_plural").toLowerCase()#end • [[{{stringEngIta eng='top' ita='in cima'/}}>>||anchor="top"]] • [[{{stringEngIta eng='index' ita='indice'/}}>>||anchor="index"]] • [[{{stringEngIta eng='bottom' ita='in fondo'/}}>>||anchor="bottom"]] 215 -</div> 142 + #set( $pubStatusNo = $pubMap[$status].size() ) 143 +(% 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"]] 216 216 ## status bottom / end 217 217 #end 218 218 {{/html}}