Changes for page Per Year

From version 116.1
edited by Andrea Omicini
on 30/10/2021 17:42
Change comment: There is no comment for this version
To version 107.1
edited by Andrea Omicini
on 30/10/2021 17:24
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -18,7 +18,7 @@
18 18  #if( $request.to )
19 19   #set( $toPar = $mathtool.toInteger($request.to) )
20 20  #end
21 -##set years
21 +#set years
22 22  #if( $yearPar > 0 )
23 23   #set( $oneYear = true )
24 24   #set( $firstYear = $yearPar )
... ... @@ -43,10 +43,9 @@
43 43   #set( $yearList = [$lastYear..$firstYear] )
44 44   #end
45 45  #end
46 -## $selectedYear, $yearList and $oneYear set properly
47 47  ### END YEAR
48 48  ##
49 -### START USER
48 +### START USER & CYCLE
50 50  ## default values
51 51  #set( $oneUser = false )
52 52  #set( $selectedUser = '' )
... ... @@ -56,8 +56,8 @@
56 56  #if( $request.user )
57 57   #set( $userNamePar = $request.user.trim() )
58 58  #end
59 -#if( $userName || $userNamePar )
60 -## try to specify a user
58 +#if( $userName || $userNamePar || $userNamePar != '' )
59 +## a user is specified for all roles
61 61   #if( !$userName )
62 62   #set( $selectedUser = "XWiki.$userNamePar" )
63 63   #else
... ... @@ -73,42 +73,30 @@
73 73   #stop
74 74   #end
75 75  #end
76 -## $selectedUser and $oneUser set properly
77 -### END USER
78 -##
79 -### START CYCLE
75 +##if user selected, existing user page
80 80  #set( $oneCycle = false )
81 81  #set( $selectedCycle = '' )
82 -## cycle parameter
83 -#if( $request.cycle )
84 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
85 -#end
86 -## set cycle
78 +#set( $cyclePar = $request.cycle.trim().toUpperCase() )
87 87  #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
88 88   #set( $oneCycle = true )
89 89   #set( $selectedCycle = $cyclePar )
90 90  #end
91 -## $selectedCycle and $oneCycle set properly
92 -### END CYCLE
83 +## $oneUser and $oneCycle set properly
84 +$yearList
93 93  #if( $oneYear )
94 94   $selectedYear
95 -#else
96 - $yearList
97 97  #end
98 98  #if( $oneUser )
99 99   $selectedUser
100 -#else
101 - ALL USERS
102 102  #end
103 103  #if( $oneCycle )
104 104   $selectedCycle
105 -#else
106 - ALL USERS
93 + {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
107 107  #end
108 108  ### END USER & CYCLE
109 109  ##
110 110  ## title
111 ->#if( $oneCycle ){{thesisCycle uppercase='yes' short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}}
98 +>#if( $oneCycle ){{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}}
112 112  ## index
113 113  #if( !$oneYear )
114 114  (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if ($velocityCount > 1) | #end[[$year>>||anchor="$year"]]#end)))
... ... @@ -129,14 +129,13 @@
129 129   #if( !$oneCycle || $selectedCycle == $cycle )
130 130  ## some selected cycle or all cycles / now $cycle
131 131   #if( $oneUser)
132 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
133 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop3.id.id = obj.id and prop4.id.id = obj.id and prop4.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and prop2.value = 'Completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" )
119 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
120 + where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop3.id.id = obj.id and prop4.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'year' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
134 134   #else
135 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2
136 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and prop2.value = 'Completed' order by prop1.value desc" )
122 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
123 + where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and year(prop1.value) = '$year' order by prop1.value desc" )
137 137   #end
138 138   #set( $thesisFound = $xwiki.searchDocuments($sql) )
139 -$sql
140 140   #set( $thesisFoundNo = $thesisFound.size() )
141 141   #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
142 142   #if( $thesisFoundNo > 0 && !$oneCycle )