Changes for page Per Status

From version 89.1
edited by Andrea Omicini
on 22/06/2023 13:00
Change comment: There is no comment for this version
To version 97.1
edited by Andrea Omicini
on 25/06/2023 13:49
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,18 +1,9 @@
1 1  {{velocity}}
2 -{{html wiki="true" clean="false"}}
3 -## GET PARAMETERS / START
4 -## inline display
5 -#set( $inlinePar = $request.inline.trim().toLowerCase() )
2 +{{html clean="false" wiki="true"}}
3 +#template('apice_boolean.vm')
4 +## BIBTEX / START
6 6  ## show BibTeX
7 7  #set( $bibtexPar = $request.bibtex.trim().toLowerCase() )
8 -## who
9 -#set( $userNamePar = $request.user.trim() )
10 -#set( $firstNamePar = $request.name.trim() )
11 -#set( $lastNamePar = $request.surname.trim() )
12 -## GET PARAMETERS / END
13 -##
14 -#template('apice_boolean.vm')
15 -## HANDLE BIBTEX / START
16 16  ## default: false
17 17  #set( $showBibtex = false )
18 18  ## check $bibtexPar
... ... @@ -19,9 +19,11 @@
19 19  #if( $bibtexPar != "" && $trueStringList.contains($bibtexPar.toLowerCase()) )
20 20   #set( $showBibtex = true )
21 21  #end
22 -## HANDLE BIBTEX / END
13 +## BIBTEX / END
23 23  ##
24 -## HANDLE INLINE / START
15 +## INLINE / START
16 +## inline display
17 +#set( $inlinePar = $request.inline.trim().toLowerCase() )
25 25  ## default: true
26 26  #set( $showInline = true )
27 27  ## check $inlinePar
... ... @@ -28,12 +28,15 @@
28 28  #if( $inlinePar != "" && $falseStringList.contains($inlinePar) )
29 29   #set( $showInline = false )
30 30  #end
31 -## HANDLE INLINE / END
24 +## INLINE / END
25 +#template('apice_publications.vm')
26 +#template('apice_user_param.vm')
32 32  ##
33 -## HANDLE STATUS / START
28 +## STATUS / START
34 34  ## $oneStatus false gets a list of statuses, true just one
35 35  #set( $oneStatus = false )
36 36  #set( $showRejected = false )
32 +#set( $showPublished = false )
37 37  ## $statusList gets the list of statuses to be shown
38 38  #set( $statusList = $publicationStatuses )
39 39  ##
... ... @@ -41,85 +41,42 @@
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
40 +#elseif( $statusPar.toLowerCase() == "published" )
41 + #set( $oneStatus = true )
42 + #set( $statusList = ["published"] )
43 + #set( $showPublished = true )
44 +#elseif( $statusPar.toLowerCase() == "rejected" )
45 + #set( $oneStatus = true )
46 + #set( $statusList = ["rejected"] )
47 + #set( $showRejected = true )
48 +#elseif( $publicationStatuses.contains($statusPar) )
49 +## 'status' parameter is an admissible publication status value
50 + #set( $oneStatus = true )
51 + #set( $statusList = [$statusPar] )
50 50  #end
51 51  ##
52 -## HANDLE STATUS / END
53 -## HANDLE WHO / START
54 -#template('apice_macros.vm')
55 -#isuserspace()
56 -#if( $isUserSpace )
57 - #userspace()
58 -## from a personal page
59 - #set( $apiceUser = true )
60 - #set( $oneUser = true )
61 -#elseif( $userNamePar )
62 -## from the URL, "user=$userNamePar" parameter
63 - #if( $userNamePar.contains('XWiki.') )
64 - #set( $userName = "$userNamePar" )
65 - #else
66 - #set( $userName = "XWiki.$userNamePar" )
67 - #end
68 - #if( !$xwiki.exists( $userName ) )
69 - #if( $services.localization.currentLocale == 'it' )
70 -{{warning}}L'utente “$userNamePar” non esiste{{/warning}}
71 - #else
72 -{{warning}}User “$userNamePar” does not exist{{/warning}}
73 - #end
74 - #stop
75 - #end
76 - #set( $apiceUser = true )
77 - #set( $oneUser = true)
78 - #set( $userdoc = $xwiki.getDocument($userName) )
79 - #set( $userFirstName = $userdoc.display("first_name") )
80 - #set( $userLastName = $userdoc.display("last_name") )
81 -#elseif( $firstNamePar && $lastNamePar )
82 -## from the URL, "name=Firstname&surname=Lastname" parameter
83 - #set( $apiceUser = false )
84 - #set( $oneUser = true )
85 - #set( $userFirstName = $firstNamePar )
86 - #set( $userLastName = $lastNamePar )
87 -#else
88 - #set( $apiceUser = false )
89 - #set( $oneUser = false )
90 - #set( $userFirstName = "" )
91 - #set( $userLastName = "" )
92 -#end
93 -#if( $oneUser )
94 - #if( $apiceUser )
95 - #set( $userString = "%$userName%" )
96 - #else
97 - #set( $userString = "%$userFirstName $userLastName%" )
98 - #end
99 -#else
100 - #set( $userString = "%%" )
101 -#end
102 -## HANDLE WHO / END
54 +## STATUS / END
103 103  ##
104 -### query to structures
105 -## map & counter initialisation
56 +## DATA STRUCTURES / START
106 106  #set( $itemMap = {} )
107 107  #set( $itemNo = 0 )
108 108  ## 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) )
61 + #if( $status != "published" && $status != "rejected" || $status == "published" && $showPublished || $status == "rejected" && $showRejected )
62 + #set( $query = ", BaseObject as obj, #if( $oneUser ) LargeStringProperty as propAuthor, LargeStringProperty as propEditor, #end StringProperty as propStatus #if( !$hasEdit ), StringProperty as propAccess #end
63 + 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" )
64 + #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 )
66 + #set( $itemStatusNo = $itemFound.size() )
67 + #if( $itemStatusNo > 0 )
68 + #set( $itemMap[$status] = $itemFound )
69 + #set( $itemNo = $itemNo + $itemStatusNo )
70 + #end
118 118   #end
119 119  #end
120 -$itemStatusNo
73 +## DATA STRUCTURES / END
121 121  ##
122 -## output results
75 +## DISPLAY / START
123 123  ## page subtitle
124 124  <div style="display: flex">
125 125   <div class="mainheader">
... ... @@ -126,14 +126,26 @@
126 126  $itemNo
127 127  #if( $oneStatus )
128 128   #if( $itemNo == 1 )
82 + $services.localization.render('work').toLowerCase()
83 + <span class="textsecondary">&ensp;/&ensp;</span>
129 129   $services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}").toLowerCase()
130 130   #else
131 -$services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}_plural").toLowerCase() #end
86 + $services.localization.render('works').toLowerCase()
87 + <span class="textsecondary">&ensp;/&ensp;</span>
88 + $services.localization.render("${objectSpace}.${objectClass}_status_${statusList[0]}_plural").toLowerCase() #end
132 132  #else
133 133   #if( $itemNo == 1 )
134 - $services.localization.render('yetunpublished_singular').toLowerCase()
91 + #if( $showPublished )
92 + $services.localization.render('work').toLowerCase()
93 + #else
94 + $services.localization.render('yetunpublished_singular').toLowerCase()
95 + #end
135 135   #else
136 - $services.localization.render('yetunpublished').toLowerCase()
97 + #if( $showPublished )
98 + $services.localization.render('works').toLowerCase()
99 + #else
100 + $services.localization.render('yetunpublished').toLowerCase()
101 + #end
137 137   #end
138 138  #end
139 139  #if( $oneUser )
... ... @@ -143,9 +143,11 @@
143 143   </div>
144 144   <div style="flex-grow: 1">
145 145   </div>
146 - <div">
111 + <div>
147 147   <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>
113 +#if( $showPublished )
148 148   <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>
115 +#end
149 149   </div>
150 150  </div>
151 151  ## stop if no pubs are found
... ... @@ -183,12 +183,11 @@
183 183   #if( $showInline && !$showBibtex )
184 184   <ul>
185 185   #foreach( $item in $itemMap[$status] )
186 - <li>#publinked($item)</li>
187 -## <li>#pubperstatus($item)</li>
153 + <li>#pubperstatus($item)</li>
188 188   #end
189 189   </ul>
190 190   #else
191 - #foreach( $item in $itemMap[$sort] )
157 + #foreach( $item in $itemMap[$status] )
192 192   #if( $showBibtex)
193 193   #if( $showInline )
194 194   ((({{{ $xwiki.getDocument($item).getValue('bibtex') }}})))
... ... @@ -199,7 +199,7 @@
199 199   <div style="border-style:hidden hidden hidden hidden; font-size:smaller; line-height: 1.25em; margin-bottom: .5em">
200 200   #pubauthed($item)<br/>
201 201   #pubtitle($item)<br/>
202 - <span class="textsecondary">(#pubstatus($item))</span> {{pubVenue linked="false"}}$item{{/pubVenue}}
168 + <span class="textsecondary">(#pubsort($item))</span> {{pubVenue linked="false"}}$item{{/pubVenue}}
203 203   </div>
204 204   #end
205 205   #end
... ... @@ -214,5 +214,6 @@
214 214  </div>
215 215  ## status bottom / end
216 216  #end
183 +## DISPLAY / END
217 217  {{/html}}
218 218  {{/velocity}}{{pageDisplay sort="objectservice"/}}