Changes for page Supervisors

From version 75.1
edited by Andrea Omicini
on 08/11/2021 22:25
Change comment: There is no comment for this version
To version 69.2
edited by Andrea Omicini
on 08/11/2021 13:41
Change comment: Update document after refactoring.

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -#if($xcontext.language=="it")Nuvola dei tag delle tesi#{else}Thesis Tag Cloud#end
1 +Tag Cloud
Content
... ... @@ -1,100 +1,34 @@
1 -{{include reference='Theses.Environment'/}}{{include reference='Environment'/}}{{velocity}}
2 -## thesis page with menus
3 -#set( $thesisMenu = true )
4 -##
5 -#set( $userSelected = false )
6 -##
1 +{{include reference = "MacroSheet" /}}{{velocity}}
7 7  #if( !$request.tag )
8 -## START NO TAG specified in the query
9 - #if( $userName )
10 - #if( $xwiki.exists($userName) )
11 - #set( $userDoc = $xwiki.getDocument($userName) )
12 - #set( $userFirstName = $userDoc.display("first_name") )
13 - #set( $userLastName = $userDoc.display("last_name") )
14 - #set( $userSelected = true )
15 - #else
16 -{{warning}}"$userName" looks not like any known APICe user{{/warning}}
17 - #end
18 - #end
19 - #if( !$userSelected && $request.user )
20 - #if( $xwiki.exists("XWiki.$request.user") )
21 - #set( $userSelected = true )
22 - #set( $userName = "XWiki.$request.user" )
23 - #elseif( $xwiki.exists("$request.user") )
24 - #set( $userSelected = true )
25 - #set( $userName = "$request.user" )
26 - #else
27 -{{warning}}"$request.user" looks not like any known APICe user{{/warning}}
28 - #end
29 - #if( $userSelected )
30 - #set( $userDoc = $xwiki.getDocument($userName) )
31 - #set( $userFirstName = $userDoc.display("first_name") )
32 - #set( $userLastName = $userDoc.display("last_name") )
33 - #end
34 - #end
35 - #if( $userSelected )
36 -> **Tag Cloud** / {{stringEngIta eng = "Theses" ita = "tesi" /}} / $userFirstName **$userLastName**
3 +## no tag specified in the query
4 +>**Tag Cloud** / {{stringEngIta eng="Theses" ita="Tesi" /}}
37 37  
38 - #set( $from = ", BaseObject as obj0, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3" )
39 - #set( $where = "obj0.name = doc.fullName and obj0.className = 'Theses.ThesisClass' and obj0.name <> 'Theses.ThesisClassTemplate' and obj0.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj0.id and prop1.id.id = obj0.id and prop2.id.id = obj0.id and prop3.id.id = obj0.id and prop0.name = 'status' and lower(prop0.value) = 'completed' and prop1.name = 'supervisors' and prop2.name = 'cosupervisors' and prop3.name = 'contacts' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' )" )
40 - #else
41 ->**Tag Cloud** / {{stringEngIta eng="Theses" ita="tesi" /}}
42 -
43 - #set( $from = ", BaseObject as obj0, StringProperty as prop0" )
44 - #set( $where = "obj0.name = doc.fullName and obj0.className = 'Theses.ThesisClass' and obj0.name <> 'Theses.ThesisClassTemplate' and obj0.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj0.id and prop0.name = 'status' and lower(prop0.value) = 'completed'" )
45 - #end
46 - ##
47 - #set( $tagCount = $xwiki.tag.getTagCountForQuery($from, $where) )
48 - #set( $tagInstanceNo = 0 )
49 - #set( $tagNo = 0 )
50 -(% style='text-align:center' %)(((
51 - #foreach( $thesisTag in $tagCount.keySet() )
6 +#set( $from = ", BaseObject as obj0" )
7 +#set( $where = " obj0.name = doc.fullName and obj0.className = 'Theses.ThesisClass' and obj0.name <> 'Theses.ThesisClassTemplate' and obj0.name <> 'Theses.ThesisTemplate' " )
8 +#set( $tagCount = $xwiki.tag.getTagCountForQuery($from, $where) )
9 +(% style='text-align: center' %)(((
10 +#foreach( $thesisTag in $tagCount.keySet() )
52 52   #set( $thesisCount = $tagCount.get($thesisTag) )
53 - #set( $tagInstanceNo = $tagInstanceNo + $thesisCount )
54 - #set( $tagNo = $tagNo + 1 )
55 - #if( $thesisCount > 40 )#set( $tagSize = "140%" )
56 - #elseif( $thesisCount > 30 )#set( $tagSize = "135%" )
57 - #elseif( $thesisCount > 20 )#set( $tagSize = "130%" )
58 - #elseif( $thesisCount > 10 )#set( $tagSize = "125%" )
59 - #elseif( $thesisCount > 5 )#set( $tagSize = "120%" )
60 - #elseif( $thesisCount > 3 )#set( $tagSize = "110%" )
61 - #elseif( $thesisCount == 3 )#set( $tagSize = "105%" )
62 - #elseif( $thesisCount == 2 )#set( $tagSize = "100%" )
63 - #else#set( $tagSize = "90%" )
12 + #if( $thesisCount > 20 ) #set ( $tagSize = "140%" )
13 + #elseif( $thesisCount > 10 ) #set ( $tagSize = "130%" )
14 + #elseif( $thesisCount > 5 ) #set ( $tagSize = "120%" )
15 + #elseif( $thesisCount > 3 ) #set ( $tagSize = "110%" )
16 + #elseif( $thesisCount == 3 ) #set ( $tagSize = "105%" )
17 + #elseif( $thesisCount == 2 ) #set ( $tagSize = "100%" )
18 + #else#set ($tagSize = "90%" )
64 64   #end
65 - #set($urlEscapedTag = $escapetool.url($thesisTag))
66 - #set($htmlEscapedTag = $escapetool.xml($thesisTag))
67 -(% style='font-size:$tagSize' %) [[$thesisTag>>$doc||queryString='tag=$urlEscapedTag#if( $userSelected )&user=$userName#end']](% style='font-style:normal;color:$theme.textPrimaryColor';font-size:75%' %),,$thesisCount,,(%%) (%%)#end
20 + #set( $urlEscapedTag = $escapetool.url($thesisTag) )
21 + #set( $htmlEscapedTag = $escapetool.xml($thesisTag) )
22 +(% style='font-size:$tagSize' %) [[$thesisTag>>Theses.Tags||queryString="tag=$urlEscapedTag"]] (%%)#end
68 68  )))
69 -(% style="font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor" %)(((
70 - #if( $userSelected )
71 -[ $tagInstanceNo / $tagNo {{stringEngIta eng = "tags" ita = "tag"/}} ]
72 - #else
73 -[ $tagInstanceNo / $tagNo {{stringEngIta eng = "tags" ita = "tag"/}} ]
74 - #end
75 -)))
76 -## END NO TAG specified in the query
77 77  #else
78 -## START ONE TAG specified in the query
79 -## embodied page?
80 - #if( $userName && $userSpace )
81 - #set( $embodiedPage = true )
82 - #else
83 - #set( $embodiedPage = false )
84 - #end
85 - #if( $request.user )
86 -> Tag “**$request.tag**” / {{stringEngIta eng = "Theses" ita = "tesi" /}} / $userFirstName **$userLastName**
25 +## one tag specified in the query
26 +>Tag “**$request.tag**” / {{stringEngIta eng = "Theses" ita = "Tesi" /}}
87 87  
88 - #set( $from = ", BaseObject as obj0, DBStringListProperty as prop0 join prop0.list item, BaseObject as obj1, StringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, DateProperty as prop5" )
89 - #set ( $where = "obj0.className = 'XWiki.TagClass' and obj0.name = doc.fullName and obj0.id = prop0.id.id and prop0.id.name = 'tags' and lower(item) = lower('$request.tag') and obj1.name = doc.fullName and obj1.className = 'Theses.ThesisClass' and obj1.name <> 'Theses.ThesisClassTemplate' and obj1.name <> 'Theses.ThesisTemplate' and prop1.id.id = obj1.id and prop2.id.id = obj1.id and prop3.id.id = obj1.id and prop4.id.id = obj1.id and prop5.id.id = obj1.id and prop1.name = 'status' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop5.name = 'endDate' and lower(prop1.value) = 'completed' and ( prop2.value like '%$request.user%' or prop3.value like '%$request.user%' or prop4.value like '%$request.user%' ) order by prop5.value desc" )
90 - #else
91 ->Tag “**$request.tag**” / {{stringEngIta eng = "Theses" ita = "tesi" /}}
92 -
93 - #set( $from = ", BaseObject as obj0, DBStringListProperty as prop0 join prop0.list item, BaseObject as obj1, DateProperty as prop1, StringProperty as prop2" )
94 -#set( $where = "obj0.className = 'XWiki.TagClass' and obj0.name = doc.fullName and obj0.id = prop0.id.id and prop0.id.name = 'tags' and lower(item) = lower('$request.tag') and obj1.name = doc.fullName and obj1.className = 'Theses.ThesisClass' and obj1.name <> 'Theses.ThesisClassTemplate' and obj1.name <> 'Theses.ThesisTemplate' and prop1.id.id = obj1.id and prop2.id.id = obj1.id and prop1.name = 'endDate' and prop2.name = 'status' and lower(prop2.value) = 'completed' order by prop1.value desc" )
95 - #end
96 - #set( $sql = $from + " where " + $where )
97 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
28 +#set( $from = ", BaseObject as obj0, DBStringListProperty as prop0 join prop0.list item, BaseObject as obj1, DateProperty as prop1, StringProperty as prop2" )
29 +#set( $where = "obj0.className = 'XWiki.TagClass' and obj0.name = doc.fullName and obj0.id = prop0.id.id and prop0.id.name = 'tags' and lower(item) = lower('$request.tag') and obj1.name = doc.fullName and obj1.className = 'Theses.ThesisClass' and obj1.name <> 'Theses.ThesisClassTemplate' and obj1.name <> 'Theses.ThesisTemplate' and prop1.id.id = obj1.id and prop2.id.id = obj1.id and prop1.name = 'endDate' and prop2.name = 'status' and lower(prop2.value) <> 'out-of-date' order by prop1.value desc" )
30 +#set( $sql = $from + " where " + $where )
31 +#set( $thesisFound = $xwiki.searchDocuments($sql) )
98 98  ## show tag
99 99  (((
100 100  #foreach( $thesis in $thesisFound)
... ... @@ -102,15 +102,8 @@
102 102  * {{thesis}}$thesisDoc{{/thesis}}
103 103  #end
104 104  )))
105 - #if( $embodiedPage )
106 -(% style="font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor" %)((([ [[{{stringEngIta eng="tag cloud" ita="nuvola tag" /}}>>$doc.name]] / {{stringEngIta eng = "theses" ita = "tesi"/}} ])))(%%)
107 - #else
108 - #if( $request.user )
109 -(% style="font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor" %)((([ [[{{stringEngIta eng="tag cloud" ita="nuvola tag" /}}>>$doc.name||queryString="user=$request.user"]] / $userFirstName $userLastName / {{stringEngIta eng = "theses" ita = "tesi"/}} ])))(%%)
110 - #else
111 -(% style="font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor" %)((([ [[{{stringEngIta eng="tag cloud" ita="nuvola tag" /}}>>$doc.name||]] / {{stringEngIta eng = "theses" ita = "tesi"/}} ])))(%%)
112 - #end
113 - #end
114 114  
40 +(% style='font-style:oblique;font-size:smaller;text-align:right;color:gray' %)((([ [[tag cloud>>Tags]] / {{stringEngIta eng = "theses" ita = "tesi"/}} ])))(%%)
41 +
115 115  #end
116 116  {{/velocity}}