Changes for page Per Status
From version 86.11
edited by Andrea Omicini
on 22/06/2023 12:53
on 22/06/2023 12:53
Change comment:
There is no comment for this version
To version 96.3
edited by Andrea Omicini
on 22/06/2023 20:10
on 22/06/2023 20:10
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -31,9 +31,11 @@ 31 31 ## HANDLE INLINE / END 32 32 ## 33 33 ## HANDLE STATUS / START 34 +#template('apice_publications.vm') 34 34 ## $oneStatus false gets a list of statuses, true just one 35 35 #set( $oneStatus = false ) 36 36 #set( $showRejected = false ) 38 +#set( $showPublished = false ) 37 37 ## $statusList gets the list of statuses to be shown 38 38 #set( $statusList = $publicationStatuses ) 39 39 ## ... ... @@ -41,12 +41,18 @@ 41 41 #if( $statusPar.toLowerCase() == "all" ) 42 42 ## 'all' value gets all unpublished papers including "Rejected" ones 43 43 #set( $showRejected = true ) 44 -#else 45 - #if( $publicationStatuses.contains($statusPar) ) 46 - ## 'status' parameter is an admissible publication status value 47 - #set( $oneStatus = true ) 48 - #set( $statusList = [$statusPar] ) 49 - #end 46 +#elseif( $statusPar.toLowerCase() == "published" ) 47 + #set( $oneStatus = true ) 48 + #set( $statusList = ["published"] ) 49 + #set( $showPublished = true ) 50 +#elseif( $statusPar.toLowerCase() == "rejected" ) 51 + #set( $oneStatus = true ) 52 + #set( $statusList = ["rejected"] ) 53 + #set( $showRejected = true ) 54 +#elseif( $publicationStatuses.contains($statusPar) ) 55 +## 'status' parameter is an admissible publication status value 56 + #set( $oneStatus = true ) 57 + #set( $statusList = [$statusPar] ) 50 50 #end 51 51 ## 52 52 ## HANDLE STATUS / END ... ... @@ -105,16 +105,18 @@ 105 105 ## map & counter initialisation 106 106 #set( $itemMap = {} ) 107 107 #set( $itemNo = 0 ) 108 -## cycle over s orts116 +## cycle over statuses 109 109 #foreach( $status in $statusList ) 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) ) 118 + #if( $status != "published" && $status != "rejected" || $status == "published" && $showPublished || $status == "rejected" && $showRejected ) 119 + #set( $query = ", BaseObject as obj, #if( $oneUser ) LargeStringProperty as propAuthor, LargeStringProperty as propEditor, #end StringProperty as propStatus #if( !$hasEdit ), StringProperty as propAccess #end 120 + 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" ) 121 + #set( $itemFound = $xwiki.searchDocuments($query) ) 113 113 ## set counters 114 - #set( $itemStatusNo = $itemFound.size() ) 115 - #if( $itemStatusNo > 0 ) 116 - #set( $itemMap[$status] = $itemFound ) 117 - #set( $itemNo = $itemNo + $itemStatusNo ) 123 + #set( $itemStatusNo = $itemFound.size() ) 124 + #if( $itemStatusNo > 0 ) 125 + #set( $itemMap[$status] = $itemFound ) 126 + #set( $itemNo = $itemNo + $itemStatusNo ) 127 + #end 118 118 #end 119 119 #end 120 120 ## ... ... @@ -125,14 +125,26 @@ 125 125 $itemNo 126 126 #if( $oneStatus ) 127 127 #if( $itemNo == 1 ) 138 + $services.localization.render('work').toLowerCase() 139 + <span class="textsecondary"> / </span> 128 128 $services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}").toLowerCase() 129 129 #else 130 -$services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}_plural").toLowerCase() #end 142 + $services.localization.render('works').toLowerCase() 143 + <span class="textsecondary"> / </span> 144 + $services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}_plural").toLowerCase() #end 131 131 #else 132 132 #if( $itemNo == 1 ) 133 - $services.localization.render('yetunpublished_singular').toLowerCase() 147 + #if( $showPublished ) 148 + $services.localization.render('work').toLowerCase() 149 + #else 150 + $services.localization.render('yetunpublished_singular').toLowerCase() 151 + #end 134 134 #else 135 - $services.localization.render('yetunpublished').toLowerCase() 153 + #if( $showPublished ) 154 + $services.localization.render('works').toLowerCase() 155 + #else 156 + $services.localization.render('yetunpublished').toLowerCase() 157 + #end 136 136 #end 137 137 #end 138 138 #if( $oneUser ) ... ... @@ -142,9 +142,11 @@ 142 142 </div> 143 143 <div style="flex-grow: 1"> 144 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> 167 + <div> 168 + <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> 169 +###if( $showPublished ) 170 + <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> 171 +###end 148 148 </div> 149 149 </div> 150 150 ## stop if no pubs are found ... ... @@ -155,7 +155,7 @@ 155 155 ## some pubs found 156 156 ## page index 157 157 #if( $itemMap.keySet().size() > 1 ) 158 -## found more than one s ort182 +## found more than one status 159 159 <div class="mainselectbar" id="index"> 160 160 #foreach( $status in $itemMap.keySet() ) 161 161 #if( !$foreach.first ) ... ... @@ -166,14 +166,50 @@ 166 166 </div> 167 167 #end 168 168 ## 169 -## pubs displayed per year 170 -#foreach( $status in $pubMap.keySet() ) 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']] 172 - #foreach( $pub in $pubMap[$status] ) 173 -(% style="border-style:hidden hidden hidden hidden" %)|{{pub inline='false' linked='title'}}$pub{{/pub}} 193 +#template('apice_publication_macros.vm') 194 +## 195 +#foreach( $status in $itemMap.keySet() ) 196 +## status top / start 197 +<div class="mainselectseparator"> 198 + <a class="mainselectseparatorlink" id="$status" href=$xwiki.getURL($doc,"view","status=$status#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")> 199 + $services.localization.render("${objectSpace}.${objectClass}_status_${status}_plural").toLowerCase() 200 + </a> 201 +</div> 202 +## status top / end 203 +## 204 +## status display / start 205 +<div> 206 + #if( $showInline && !$showBibtex ) 207 + <ul> 208 + #foreach( $item in $itemMap[$status] ) 209 + <li>#pubperstatus($item)</li> 210 + #end 211 + </ul> 212 + #else 213 + #foreach( $item in $itemMap[$status] ) 214 + #if( $showBibtex) 215 + #if( $showInline ) 216 + ((({{{ $xwiki.getDocument($item).getValue('bibtex') }}}))) 217 + #else 218 + ((({{code language="bibtex"}}$xwiki.getDocument($item).getValue('bibtex'){{/code}}))) 219 + #end 220 + #else 221 + <div style="border-style:hidden hidden hidden hidden; font-size:smaller; line-height: 1.25em; margin-bottom: .5em"> 222 + #pubauthed($item)<br/> 223 + #pubtitle($item)<br/> 224 + <span class="textsecondary">(#pubsort($item))</span> {{pubVenue linked="false"}}$item{{/pubVenue}} 225 + </div> 226 + #end 227 + #end 174 174 #end 175 - #set( $pubStatusNo = $pubMap[$status].size() ) 176 -(% 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"]] 229 +</div> 230 +## status display / end 231 +## 232 +## status bottom / start 233 +<div #if( $foreach.last )id="bottom"#end class="mainselectbottom"> 234 + #set( $itemStatusNo = $itemMap[$status].size() ) 235 +$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"]] 236 +</div> 177 177 ## status bottom / end 178 178 #end 179 179 {{/html}}