Changes for page Per Year

From version 131.2
edited by Andrea Omicini
on 29/01/2023 16:55
Change comment: There is no comment for this version
To version 131.1
edited by Andrea Omicini
on 27/01/2023 19:27
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,187 +1,156 @@
1 -= {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
1 += {{italiano}}Per anno e livello{{/italiano}}{{english}}Per Year & Cycle{{/english}} =
2 2  
3 3  {{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 4  #set( $thesisMenu = true )
5 -#### HANDLE PARAMETERS / START
6 -##
7 -## who
8 -#set( $userNamePar = $request.user.trim() )
9 -#set( $firstNamePar = $request.name.trim() )
10 -#set( $lastNamePar = $request.surname.trim() )
11 -#### handle who
12 -#if( $userName )
13 -## from a personal page, "XWiki.$userName" $userName form
14 - #if( !$xwiki.exists( $userName ) )
15 -{{warning}}User $userName does not exist{{/warning}}
16 - #stop
5 +## get environment variables & derived
6 +#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
7 +#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
8 +#set( $yearList = [$lastYear..$firstYear] )
9 +#set( $yearPar = 0 )
10 +#set( $fromPar = 0 )
11 +#set( $toPar = 0 )
12 +### START YEAR
13 +## defaults
14 +#set( $oneYear = false )
15 +#set( $selectedYear = '' )
16 +## year parameters
17 +#if( $request.year )
18 + #set( $yearPar = $mathtool.toInteger($request.year) )
19 +#end
20 +#if( $request.from )
21 + #set( $fromPar = $mathtool.toInteger($request.from) )
22 +#end
23 +#if( $request.to )
24 + #set( $toPar = $mathtool.toInteger($request.to) )
25 +#end
26 +##set years
27 +#if( $yearPar > 0 )
28 + #set( $oneYear = true )
29 + #set( $firstYear = $yearPar )
30 + #set( $lastYear = $yearPar )
31 + #set( $selectedYear = $yearPar )
32 + #set( $yearList = [$yearPar] )
33 +#else
34 + #if( $fromPar != '' && $fromPar > 0 && ($fromPar > $firstYear) )
35 + #set( $firstYear = $fromPar )
36 + #set( $yearList = [$lastYear..$firstYear] )
17 17   #end
18 - #set( $apiceUser = true )
19 - #set( $oneUser = true )
20 - #set( $userdoc = $xwiki.getDocument($userName) )
21 - #set( $userFirstName = $userdoc.display("first_name") )
22 - #set( $userLastName = $userdoc.display("last_name") )
23 -#elseif( $userNamePar )
24 -## from the URL, "user=$userNamePar" parameter
25 - #if( $userNamePar.contains('XWiki.') )
26 - #set( $userName = "$userNamePar" )
38 + #if( $toPar != '' && $toPar > 0 && ($toPar < $lastYear) )
39 + #set( $lastYear = $toPar )
40 + #set( $yearList = [$lastYear..$firstYear] )
41 + #end
42 + #if( $lastYear <= $firstYear )
43 + #set( $oneYear = true )
44 + #set( $lastYear = $firstYear )
45 + #set( $selectedYear = $firstYear )
46 + #set( $yearList = [$firstYear] )
27 27   #else
28 - #set( $userName = "XWiki.$userNamePar" )
48 + #set( $yearList = [$lastYear..$firstYear] )
29 29   #end
30 - #if( !$xwiki.exists( $userName ) )
31 - #if( $services.localization.currentLocale == 'it' )
32 -{{warning}}L'utente “$userNamePar” non esiste{{/warning}}
33 - #else
34 -{{warning}}User “$userNamePar” does not exist{{/warning}}
35 - #end
36 - #stop
37 - #end
38 - #set( $apiceUser = true )
39 - #set( $oneUser = true)
40 - #set( $userdoc = $xwiki.getDocument($userName) )
41 - #set( $userFirstName = $userdoc.display("first_name") )
42 - #set( $userLastName = $userdoc.display("last_name") )
43 -#elseif( $firstNamePar && $lastNamePar )
44 -## from the URL, "name=Firstname&surname=Lastname" parameter
45 - #set( $apiceUser = false )
46 - #set( $oneUser = true )
47 - #set( $userFirstName = $firstNamePar )
48 - #set( $userLastName = $lastNamePar )
49 -#else
50 - #set( $apiceUser = false )
51 - #set( $oneUser = false )
52 - #set( $userFirstName = "" )
53 - #set( $userLastName = "" )
54 54  #end
55 -#if( $oneUser )
56 - #if( $apiceUser )
57 - #set( $userString = "%$userName%" )
51 +## $selectedYear, $yearList and $oneYear set properly
52 +### END YEAR
53 +##
54 +### START USER
55 +## default values
56 +#set( $oneUser = false )
57 +#set( $selectedUser = '' )
58 +#set( $userFirstName = "" )
59 +#set( $userLastName = "" )
60 +## user parameter
61 +#if( $request.user )
62 + #set( $userNamePar = $request.user.trim() )
63 +#end
64 +#if( $userName || $userNamePar )
65 +## try to specify a user
66 + #if( !$userName )
67 + #set( $selectedUser = "XWiki.$userNamePar" )
58 58   #else
59 - #set( $userString = "%$userFirstName $userLastName%" )
69 + #set( $selectedUser = $userName )
60 60   #end
61 -#else
62 - #set( $userString = "%%" )
63 -#end
64 -#### handle cycle
65 -## $cycleList gets the list of cycles to be shown
66 -## $oneCycle true if just one cycle to be shown
67 -#if( $request.cycle && $request.cycle.trim() != "" )
68 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
69 - #if( $allThesisCycles.contains($cyclePar) )
70 -## 'cycle' parameter is an admissible thesis cycle value
71 - #set( $cycleList = [$cyclePar])
72 - #set( $oneCycle = true )
73 - #set( $cycle = $cyclePar )
71 + #if( $xwiki.exists($selectedUser) )
72 + #set( $oneUser = true )
73 + #set( $userdoc = $xwiki.getDocument($selectedUser) )
74 + #set( $userFirstName = $userdoc.display("first_name") )
75 + #set( $userLastName = $userdoc.display("last_name") )
74 74   #else
75 -## 'cycle' parameter is not an admissible thesis cycle value
76 -{{warning}}$cyclePar is not an admissible cycle for APICE theses{{/warning}}
77 +{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
77 77   #stop
78 78   #end
79 -#else
80 -## default: all cycles
81 - #if( $showPhDTheses )
82 - #set( $cycleList = $allThesisCycles )
83 - #else
84 - #set( $cycleList = $lowThesisCycles )
85 - #end
86 - #set( $oneCycle = false )
87 - #set( $cycle = "" )
88 88  #end
89 -## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
81 +## $selectedUser and $oneUser set properly
82 +### END USER
90 90  ##
91 -## when
92 -#set( $yearPar = $request.year.trim() )
93 -#set( $firstYearPar = $request.from.trim() )
94 -#set( $lastYearPar = $request.to.trim() )
95 -#### handle when
96 -#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
97 -#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
98 -#if( $lastYear < $firstYear )
99 - #set( $lastYear = $firstYear )
84 +### START CYCLE
85 +#set( $oneCycle = false )
86 +#set( $selectedCycle = '' )
87 +## cycle parameter
88 +#if( $request.cycle )
89 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
100 100  #end
101 -## parameters takes precedence
102 -#if( $yearPar )
103 - #set( $yearInt = $mathtool.toInteger($yearPar) )
104 - #if( $yearInt > 0 )
105 - #set( $firstYear = $yearInt )
106 - #set( $lastYear = $yearInt )
107 - #end
91 +## set cycle
92 +#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
93 + #set( $oneCycle = true )
94 + #set( $selectedCycle = $cyclePar )
108 108  #end
109 -#if( $firstYearPar )
110 - #set( $yearInt = $mathtool.toInteger($firstYearPar) )
111 - #if( $yearInt > 0 )
112 - #set( $firstYear = $yearInt )
113 - #end
114 -#end
115 -#if( $lastYearPar )
116 - #set( $yearInt = $mathtool.toInteger($lastYearPar) )
117 - #if( $yearInt > 0 )
118 - #set( $lastYear = $yearInt )
119 - #end
120 -#end
121 -#if( $lastYear < $firstYear )
122 -## swap
123 - #set( $yearTemp = $lastYear )
124 - #set( $lastYear = $firstYear )
125 - #set( $firstYear = $yearTemp )
126 -#end
127 -## invariant: $lastYear >= $firstYear
128 -#if( $lastYear > $firstYear )
129 - #set( $year = -1 )
130 - #set( $yearList = [$lastYear..$firstYear] )
131 - #set( $oneYear = false )
96 +## $selectedCycle and $oneCycle set properly
97 +#if( $showPhDTheses )
98 + #set( $cycles = $allThesisCycles )
132 132  #else
133 -## $lastYear = $firstYear
134 - #set( $year = $lastYear )
135 - #set( $yearList = [$year] )
136 - #set( $oneYear = true )
100 + #set( $cycles = $lowThesisCycles )
137 137  #end
138 -## handle when / end
102 +### END CYCLE
139 139  ##
140 -## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
141 -##
142 -#### HANDLE PARAMETERS / END
143 -##
144 -## query to structures
145 -#set( $itemMap = {} )
146 -#set( $itemNo = 0 )
104 +## title
105 +>#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'/}}
106 +## index
107 +#if( !$oneYear )
108 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if( $foreach.index > 0 ) | #end[[$year>>||anchor="$year"]]#end)))
109 +###elseif( $oneUser && !$oneCycle )
110 +#elseif( !$oneCycle )
111 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $cycles )#if( $foreach.index > 0 ) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
112 +#end{{id name='index'/}}
113 +## search theses
114 +#set( $thesisNo = 0 )
147 147  #foreach( $year in $yearList )
148 - #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
149 - 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 prop3.id.id = obj.id and prop4.id.id = obj.id and prop5.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'end' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' #if( $oneCycle ) and prop0.value = '$cycle'#end and year(prop1.value) = $year and lower(prop2.value) = 'completed' #if( $oneUser )and ( prop3.value like '%$userString%' or prop4.value like '%$userString%' or prop5.value like '%$userString%' )#end order by prop1.value desc" )
150 -## do query
151 - #set( $itemFound = $xwiki.searchDocuments($query) )
152 -## set counters
153 - #set( $itemYearNo = $itemFound.size() )
154 - #if( $itemYearNo > 0 )
155 - #set( $itemMap[$year] = $itemFound )
156 - #set( $itemNo = $itemNo + $itemYearNo )
116 + #set( $thesisYearNo = 0 )
117 + #if( !$oneYear )
118 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc.name||queryString='year=$year#if( $oneCycle )&cycle=$selectedCycle#end']]
157 157   #end
120 +## some selected year or year list / now $year
121 + #foreach( $cycle in $cycles )
122 + #set( $thesisYearCycleNo = 0 )
123 + #if( !$oneCycle || $selectedCycle == $cycle )
124 +## some selected cycle or all cycles / now $cycle
125 + #if( $oneUser)
126 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
127 + 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 prop3.id.id = obj.id and prop4.id.id = obj.id and prop5.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'end' 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 lower(prop2.value) = 'completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" )
128 + #else
129 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2
130 + 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 = 'cycle' and prop1.name = 'end' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and lower(prop2.value) = 'completed' order by prop1.value desc" )
131 + #end
132 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
133 + #set( $thesisFoundNo = $thesisFound.size() )
134 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
135 + #if( $thesisFoundNo > 0 && !$oneCycle )
136 +(% style="border-style:#if( $oneYear )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneYear ){{id name='$cycle'/}}#else{{id name='$year-$cycle'/}}#end[[{{thesisCycle plural='no' uppercase='yes' short='yes'}}$cycle{{/thesisCycle}}>>$doc.name||queryString='cycle=$cycle&year=$year']]
137 + #end
138 + #foreach( $thesis in $thesisFound )
139 +* {{thesis}}$thesis{{/thesis}}
140 + #end
141 + #if( $thesisFoundNo > 0 && !$oneCycle )
142 +(% style="border-style:#if( $oneYear )hidden solid solid hidden#{else}hidden dotted hidden hidden#end; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|#if( $oneYear ){{id name='$cycle-bottom'/}}#else{{id name='$cycle-$year-bottom'/}}#end($thesisYearCycleNo #if( $thesisYearCycleNo == 1 ){{thesisCycle plural='no' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#else{{thesisCycle plural='yes' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#end {{stringEngIta eng='in' ita='nel'/}} $year [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
143 + #end
144 + #end
145 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
146 + #end
147 + #if( !$oneYear )
148 +(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|($thesisYearNo #if($thesisYearNo == 1){{stringEngIta eng='thesis in' ita='tesi nel'/}}#else{{stringEngIta eng='theses in' ita='tesi nel'/}}#end $year{{id name='$year-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
149 + #end
150 + #set( $thesisNo = $thesisNo + $thesisYearNo )
158 158  #end
159 -##
160 -## output results
161 -## page subtitle
162 -{{id name="top"/}}
163 ->(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cyclePar{{/thesisCycle}}#else{{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
164 -
165 -## stop if no thesis is found
166 -#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
167 -## redundant double check
168 - #stop
152 +#if( $thesisNo > 0 )
153 +(% style="text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor; border-color:$theme.borderColor; border-bottom-style:dotted" %)|($thesisNo #if( $oneCycle )#if($thesisNo == 1){{thesisCycle plural='no' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#else{{thesisCycle plural='yes' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#end#else#if($thesisNo == 1){{stringEngIta eng='thesis' ita='tesi'/}}#else{{stringEngIta eng='theses' ita='tesi'/}}#end#end#if( $oneYear ) {{stringEngIta eng='in' ita='nel'/}} $selectedYear#else {{stringEngIta eng='from' ita='dal'/}} $firstYear {{stringEngIta eng='to' ita='al'/}} $lastYear#end)
169 169  #end
170 -## some theses found
171 -## page index
172 -#if( $itemMap.keySet().size() > 1 )
173 -## found more than one year
174 -{{id name="index"/}}
175 -(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $itemMap.keySet() )#if( !$foreach.first ) | #end[[$year>>||anchor=$year]]#end)))
176 -#end
177 -## theses displayed per year
178 -#foreach( $year in $itemMap.keySet() )
179 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc||style="text-decoration:none; color:$theme.textPrimaryColor" queryString='year=$year#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end#if( $oneCycle )&cycle=$cycle#end']]
180 -(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)#foreach( $item in $itemMap[$year] )
181 -|{{thesis inline='false' linked='title'}}$item{{/thesis}}
182 -#end
183 - #set( $itemYearNo = $itemMap[$year].size() )
184 -(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 ){{stringEngIta eng=$objectEngSingular.toLowerCase() ita=$objectItaSingular.toLowerCase()/}}#else{{stringEngIta eng=$objectEngPlural.toLowerCase() ita=$objectItaPlural.toLowerCase()/}}#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
185 -#end
155 +{{id name='bottom'/}}
186 186  {{/velocity}}
187 -{{id name="bottom"/}}