Changes for page Supervisors

From version 91.1
edited by Andrea Omicini
on 29/01/2023 21:23
Change comment: There is no comment for this version
To version 94.1
edited by Andrea Omicini
on 29/01/2023 21:43
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -13,8 +13,8 @@
13 13  ## subtitle
14 14  >{{stringEngIta eng="$objectEngPlural" ita= "$objectItaPlural"/}}#if( $oneUser ) / $userFirstName $userLastName#{end}
15 15  ## set query
16 - #set( $query = ", BaseObject as obj, LargeStringProperty as prop0, StringProperty as prop1, DateProperty as prop2
17 - 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 prop0.name = 'supervisors' #if( $oneUser )and prop0.value like '$userString'#end and prop1.name = 'status' and lower(prop1.value) = 'completed' and prop2.name = 'end' order by prop2.value desc" )
16 + #set( $query = ", BaseObject as obj, StringProperty as prop1, DateProperty as prop2
17 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop1.id.id = obj.id and prop2.id.id = obj.id and prop1.name = 'status' and lower(prop1.value) = 'completed' and prop2.name = 'end' order by prop2.value desc" )
18 18  ## execute query
19 19   #set( $itemFound = $xwiki.searchDocuments($query) )
20 20   #set( $itemFoundNo = $itemFound.size() )
... ... @@ -24,21 +24,22 @@
24 24   #foreach( $item in $itemFound )
25 25  ## set $doc & $obj
26 26   #set( $itemDoc = $xwiki.getDocument($item) )
27 - #set( $itemObj = $itemDoc.getObject("${objectSpace}.${objectClass}") )
28 - #set( $nameList = $itemObj.getValue("supervisors").split(",") )
27 + #if( $itemDoc.getValue("supervisors") != "" )
28 + #set( $nameList = $itemDoc.getValue("supervisors").split(",") )
29 29  ## set user-item map
30 - #foreach( $name in $nameList )
30 + #foreach( $name in $nameList )
31 31  #### build name lists
32 - #if( $nameMap.keySet().contains($name) )
32 + #if( $nameMap.keySet().contains($name) )
33 33  ## nameMap already contains current name
34 34  ## add $item to nameMap for current name
35 - #set( $discard = $nameMap[$name].add($item) )
36 - #elseif( !$oneUser || $oneUser && $name != $userName )
35 + #set( $discard = $nameMap[$name].add($item) )
36 + #elseif( !$oneUser || $oneUser && $name != $userName )
37 37  ## nameMap does not contain name or selected user
38 38  ## add name / selected user to nameMap
39 - #set( $nameMap[$name] = [] )
39 + #set( $nameMap[$name] = [] )
40 40   ## adding $item to nameMap for $name
41 - #set( $discard = $nameMap[$name].add($item) )
41 + #set( $discard = $nameMap[$name].add($item) )
42 + #end
42 42   #end
43 43   #end
44 44  #### END / feed name list from each item