Changes for page Per Status
From version 87.1
edited by Andrea Omicini
on 22/06/2023 12:58
on 22/06/2023 12:58
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 ) ... ... @@ -168,7 +168,7 @@ 168 168 ## 169 169 #template('apice_publication_macros.vm') 170 170 ## 171 -#foreach( $s ort in $itemMap.keySet() )195 +#foreach( $status in $itemMap.keySet() ) 172 172 ## status top / start 173 173 <div class="mainselectseparator"> 174 174 <a class="mainselectseparatorlink" id="$status" href=$xwiki.getURL($doc,"view","status=$status#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")> ... ... @@ -181,13 +181,12 @@ 181 181 <div> 182 182 #if( $showInline && !$showBibtex ) 183 183 <ul> 184 - #foreach( $item in $itemMap[$sort] ) 185 - <li>#publinked($item)</li> 186 -## <li>#pubperstatus($item)</li> 208 + #foreach( $item in $itemMap[$status] ) 209 + <li>#pubperstatus($item)</li> 187 187 #end 188 188 </ul> 189 189 #else 190 - #foreach( $item in $itemMap[$s ort] )213 + #foreach( $item in $itemMap[$status] ) 191 191 #if( $showBibtex) 192 192 #if( $showInline ) 193 193 ((({{{ $xwiki.getDocument($item).getValue('bibtex') }}}))) ... ... @@ -198,7 +198,7 @@ 198 198 <div style="border-style:hidden hidden hidden hidden; font-size:smaller; line-height: 1.25em; margin-bottom: .5em"> 199 199 #pubauthed($item)<br/> 200 200 #pubtitle($item)<br/> 201 - <span class="textsecondary">(#pubst atus($item))</span> {{pubVenue linked="false"}}$item{{/pubVenue}}224 + <span class="textsecondary">(#pubsort($item))</span> {{pubVenue linked="false"}}$item{{/pubVenue}} 202 202 </div> 203 203 #end 204 204 #end