Changes for page Supervisors

From version 90.1
edited by Andrea Omicini
on 29/01/2023 21:18
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
... ... @@ -4,88 +4,6 @@
4 4  ## thesis page with menus
5 5  #set( $thesisMenu = true )
6 6  ##
7 -#### get parameters
8 -## user
9 -#if( $request.user && $request.user.trim() != "" )
10 - #set( $userNamePar = $request.user.trim() )
11 - #if( !$userNamePar.contains('XWiki.') )
12 - #set( $userNamePar = "XWiki.$userNamePar" )
13 - #end
14 - #if( !$xwiki.exists( $userNamePar ) )
15 -{{warning}}{{italiano}}L'utente “$userNamePar” non esiste{{/italiano}}{{english}}User “$userNamePar” does not exist{{/english{{/warning}}
16 - #set( $userNamePar = "" )
17 - #end
18 -#else
19 - #set( $userNamePar = "" )
20 -#end
21 -## $userNamePar is either empty or an XWiki user name
22 -##
23 -## name
24 -#if( $request.name && $request.name.trim() != "" )
25 - #set( $firstNamePar = $request.name.trim() )
26 -#else
27 - #set( $firstNamePar = "" )
28 -#end
29 -## surname
30 -#if( $request.surname && $request.surname.trim() != "" )
31 - #set( $lastNamePar = $request.surname.trim() )
32 -#else
33 - #set( $lastNamePar = "" )
34 -#end
35 -## name and surname should be both instantiated, or none
36 -#if( $firstNamePar == "" || $lastNamePar == "")
37 - #set( $firstNamePar = "" )
38 - #set( $lastNamePar = "" )
39 -#end
40 -## firstNamePar and lastNamePar are both instantiated, or none
41 -##
42 -#### variable defaults
43 -#set( $oneUser = false )
44 -#set( $apiceUser = false )
45 -#set( $userFirstName = "" )
46 -#set( $userLastName = "" )
47 -#### handle who
48 -#if( $userName )
49 -## from a personal page, "XWiki.$userName" $userName form
50 - #if( !$xwiki.exists( $userName ) )
51 -{{warning}}User $userName does not exist{{/warning}}
52 - #else
53 -## $userName is an XWiki user name
54 - #set( $oneUser = true )
55 - #set( $apiceUser = true )
56 - #set( $userDoc = $xwiki.getDocument($userName) )
57 - #set( $userFirstName = $userDoc.display("first_name") )
58 - #set( $userLastName = $userDoc.display("last_name") )
59 - #end
60 -#elseif( $userNamePar != "" )
61 - #set( $oneUser = true)
62 - #set( $apiceUser = true )
63 - #set( $userName = $userNamePar )
64 - #set( $userdoc = $xwiki.getDocument($userName) )
65 - #set( $userFirstName = $userdoc.display("first_name") )
66 - #set( $userLastName = $userdoc.display("last_name") )
67 -#elseif( $firstNamePar != "" && $lastNamePar != "" )
68 -## from the URL, "name=Firstname&surname=Lastname" parameter
69 - #set( $oneUser = true )
70 - #set( $apiceUser = false )
71 - #set( $userFirstName = $firstNamePar )
72 - #set( $userLastName = $lastNamePar )
73 -#end
74 -#if( $oneUser )
75 - #if( $apiceUser )
76 - #set( $userString = "%$userName%" )
77 - #set( $parameterString = "user=$userName" )
78 - #else
79 - #set( $userName = "$userFirstName $userLastName" )
80 - #set( $userString = "%$userName%" )
81 - #set( $parameterString = "name=$userFirstName&surname=$userLastName" )
82 - #end
83 -#else
84 - #set( $userName = "" )
85 - #set( $userString = "" )
86 - #set( $parameterString = "" )
87 -#end
88 -##
89 89  #### tag parameter possibly brings name to be used as tag
90 90  ## no tag parameter --> just the cloud
91 91  ## yes tag parameter --> the item list
... ... @@ -95,8 +95,8 @@
95 95  ## subtitle
96 96  >{{stringEngIta eng="$objectEngPlural" ita= "$objectItaPlural"/}}#if( $oneUser ) / $userFirstName $userLastName#{end}
97 97  ## set query
98 - #set( $query = ", BaseObject as obj, LargeStringProperty as prop0, StringProperty as prop1, DateProperty as prop2
99 - 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" )
100 100  ## execute query
101 101   #set( $itemFound = $xwiki.searchDocuments($query) )
102 102   #set( $itemFoundNo = $itemFound.size() )
... ... @@ -106,21 +106,22 @@
106 106   #foreach( $item in $itemFound )
107 107  ## set $doc & $obj
108 108   #set( $itemDoc = $xwiki.getDocument($item) )
109 - #set( $itemObj = $itemDoc.getObject("${objectSpace}.${objectClass}") )
110 - #set( $nameList = $itemObj.getValue("supervisors").split(",") )
27 + #if( $itemDoc.getValue("supervisors") != "" )
28 + #set( $nameList = $itemDoc.getValue("supervisors").split(",") )
111 111  ## set user-item map
112 - #foreach( $name in $nameList )
30 + #foreach( $name in $nameList )
113 113  #### build name lists
114 - #if( $nameMap.keySet().contains($name) )
32 + #if( $nameMap.keySet().contains($name) )
115 115  ## nameMap already contains current name
116 116  ## add $item to nameMap for current name
117 - #set( $discard = $nameMap[$name].add($item) )
118 - #elseif( !$oneUser || $oneUser && $name != $userName )
35 + #set( $discard = $nameMap[$name].add($item) )
36 + #elseif( !$oneUser || $oneUser && $name != $userName )
119 119  ## nameMap does not contain name or selected user
120 120  ## add name / selected user to nameMap
121 - #set( $nameMap[$name] = [] )
39 + #set( $nameMap[$name] = [] )
122 122   ## adding $item to nameMap for $name
123 - #set( $discard = $nameMap[$name].add($item) )
41 + #set( $discard = $nameMap[$name].add($item) )
42 + #end
124 124   #end
125 125   #end
126 126  #### END / feed name list from each item
... ... @@ -142,21 +142,17 @@
142 142   #elseif( $nameItemNo == 2 )#set( $tagSize = "100%" )
143 143   #else#set( $tagSize = "90%" )
144 144   #end
145 -[[(% style='font-size:$tagSize; white-space: nowrap' %){{namesFromUsers linked='false'}}$name{{/namesFromUsers}}(%%)>>$doc||queryString='tag=$name#if( $oneUser )&$parameterString#end']](% style='font-style:normal;color:$theme.textPrimaryColor;font-size:75%' %),,$nameItemNo,, (%%) #end
64 +[[(% style='font-size:$tagSize; white-space: nowrap' %){{namesFromUsers linked='false'}}$name{{/namesFromUsers}}(%%)>>$doc||queryString='tag=$name']](% style='font-style:normal;color:$theme.textPrimaryColor;font-size:75%' %),,$nameItemNo,, (%%) #end
146 146  )))
147 147  ## cloud bottom
148 148  (% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)(((
149 -#if( $oneUser )
150 -[ $nameFoundNo #if( $nameFoundNo == 1 ){{stringEngIta eng="co-supervisor" ita="co-supervisore"/}}#else{{stringEngIta eng="co-supervisors" ita="co-supervisori"/}}#end / $itemFoundNo #if( $itemFoundNo == 1 ){{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#else{{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}}#end ]
151 -#else
152 152  [ $nameFoundNo #if( $nameFoundNo == 1 ){{stringEngIta eng="supervisor" ita="supervisore"/}}#else{{stringEngIta eng="supervisors" ita="supervisori"/}}#end / $itemFoundNo #if( $itemFoundNo == 1 ){{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#else{{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end ]
153 -#end
154 154  )))
155 155  #### YES TAG PARAMETER
156 156  #else
157 157  ## set query
158 158   #set( $query = ", BaseObject as obj, LargeStringProperty as prop0, StringProperty as prop1, DateProperty as prop2
159 - 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' and prop0.value like '%$request.tag%' #if( $request.user )and prop0.value like '%$request.user%'#end #if( $request.name && $request.surname )and prop0.value like '%$request.name $request.surname%'#end and prop1.name = 'status' and lower(prop1.value) = 'completed' and prop2.name = 'end' order by prop2.value desc" )
74 + 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' and prop0.value like '%$request.tag%' and prop1.name = 'status' and lower(prop1.value) = 'completed' and prop2.name = 'end' order by prop2.value desc" )
160 160  ## execute query
161 161   #set( $itemFound = $xwiki.searchDocuments($query) )
162 162   #set( $itemFoundNo = $itemFound.size() )
... ... @@ -168,23 +168,7 @@
168 168  [[image:icon:book]] {{thesis}}$item{{/thesis}}
169 169   #end
170 170  )))
171 -## embodied page?
172 - #if( $userName && $userSpace )
173 - #set( $embodiedPage = true )
174 - #else
175 - #set( $embodiedPage = false )
176 - #end
177 -## talk list bottom
178 - #if( $embodiedPage )
179 -(% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)((([ [[{{stringEngIta eng="co-supervisor cloud" ita="nuvola co-supervisori" /}}>>$doc]] / {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}} ])))(%%)
180 - #else
181 - #if( $request.user )
182 -(% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)((([ [[{{stringEngIta eng="co-supervisor cloud" ita="nuvola co-supervisori" /}}>>$doc||queryString="user=$request.user"]] / {{namesFromUsers linked='false'}}$request.user{{/namesFromUsers}} / {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}} ])))(%%)
183 - #elseif( $request.name && $request.surname )
184 -(% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)((([ [[{{stringEngIta eng="co-supervisor cloud" ita="nuvola co-supervisori" /}}>>$doc||queryString="name=$request.name&surname=$request.surname"]] / {{namesFromUsers linked='false'}}$request.name $request.surname{{/namesFromUsers}} / {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}} ])))(%%)
185 - #else
86 +## thesis list bottom
186 186  (% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)((([ [[{{stringEngIta eng="supervisor cloud" ita="nuvola supervisori" /}}>>$doc||]] / {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}} ])))(%%)
187 - #end
188 - #end
189 189  #end
190 190  {{/velocity}}