Changes for page Per Year

From version 149.1
edited by Andrea Omicini
on 30/06/2023 20:37
Change comment: There is no comment for this version
To version 123.2
edited by Andrea Omicini
on 20/01/2022 23:41
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -$services.localization.render('peryear')
1 +#if($xcontext.language=='it')Tesi per anno e livello#{else}Theses per Year & Cycle#end
Default language
... ... @@ -1,0 +1,1 @@
1 +en
Content
... ... @@ -1,165 +1,146 @@
1 -{{velocity}}
2 -{{html wiki="true" clean="false"}}
3 -#template('apice_boolean.vm')
4 -#### HANDLE PARAMETERS / START
5 -#template('apice_theses.vm')
6 -#template('apice_user_param.vm')
7 -## YEARS / START
8 -#set( $yearPar = $request.year.trim() )
9 -#set( $firstYearPar = $request.from.trim() )
10 -#set( $lastYearPar = $request.to.trim() )
11 -## years / personal
12 -#if( $isUserSpace )
13 - #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
14 - where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${objectSpace}.Personal.${objectClass}' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
15 - #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
16 - #if( $personalThesisDocs.size() > 0 )
17 - #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
18 - #else
19 - #stop
20 - #end
21 - #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
22 - #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
23 - #end
24 - #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
25 - #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
26 - #end
1 +{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{include reference="Environment" excludeFirstHeading="true"/}}{{velocity}}
2 +#set( $thesisMenu = true )
3 +## get environment variables & derived
4 +#set( $firstYear = $mathtool.toInteger($firstYearTh) )
5 +#set( $lastYear = $mathtool.toInteger($lastYearTh) )
6 +#set( $yearList = [$lastYear..$firstYear] )
7 +### START YEAR
8 +## defaults
9 +#set( $oneYear = false )
10 +#set( $selectedYear = '' )
11 +## year parameters
12 +#if( $request.year )
13 + #set( $yearPar = $mathtool.toInteger($request.year) )
27 27  #end
28 -## years / parameters takes precedence
29 -#set( $firstYear = $firstYearThesis )
30 -#set( $lastYear = $lastYearThesis )
31 -#if( $yearPar )
32 - #set( $yearInt = $numbertool.toNumber($yearPar) )
33 - #if( $yearInt > 0 )
34 - #set( $firstYear = $yearInt )
35 - #set( $lastYear = $yearInt )
36 - #end
15 +#if( $request.from )
16 + #set( $fromPar = $mathtool.toInteger($request.from) )
37 37  #end
38 -#if( $firstYearPar )
39 - #set( $yearInt = $numbertool.toNumber($firstYearPar) )
40 - #if( $yearInt > 0 )
41 - #set( $firstYear = $yearInt )
42 - #end
18 +#if( $request.to )
19 + #set( $toPar = $mathtool.toInteger($request.to) )
43 43  #end
44 -#if( $lastYearPar )
45 - #set( $yearInt = $numbertool.toNumber($lastYearPar) )
46 - #if( $yearInt > 0 )
47 - #set( $lastYear = $yearInt )
48 - #end
49 -#end
50 -#if( $lastYear < $firstYear )
51 -## swap
52 - #set( $yearTemp = $lastYear )
53 - #set( $lastYear = $firstYear )
54 - #set( $firstYear = $yearTemp )
55 -#end
56 -## invariant: $lastYear >= $firstYear
57 -#if( $lastYear > $firstYear )
58 - #set( $year = -1 )
59 - #set( $yearList = [$lastYear..$firstYear] )
60 - #set( $oneYear = false )
61 -#else
62 -## $lastYear = $firstYear
63 - #set( $year = $lastYear )
64 - #set( $yearList = [$year] )
21 +##set years
22 +#if( $yearPar > 0 )
65 65   #set( $oneYear = true )
66 -#end
67 -## YEARS / END
68 -#### handle cycle
69 -## $cycleList gets the list of cycles to be shown
70 -## $oneCycle true if just one cycle to be shown
71 -#if( $request.cycle && $request.cycle.trim() != "" )
72 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
73 - #if( $thesisCycles.contains($cyclePar) )
74 -## 'cycle' parameter is an admissible thesis cycle value
75 - #set( $cycleList = [$cyclePar])
76 - #set( $oneCycle = true )
77 - #set( $cycle = $cyclePar )
24 + #set( $firstYear = $yearPar )
25 + #set( $lastYear = $yearPar )
26 + #set( $selectedYear = $yearPar )
27 + #set( $yearList = [$yearPar] )
28 +#else
29 + #if( $fromPar != '' && ($fromPar > $firstYear) )
30 + #set( $firstYear = $fromPar )
31 + #set( $yearList = [$lastYear..$firstYear] )
32 + #end
33 + #if( $toPar != '' && ($toPar < $lastYear) )
34 + #set( $lastYear = $toPar )
35 + #set( $yearList = [$lastYear..$firstYear] )
36 + #end
37 + #if( $lastYear <= $firstYear )
38 + #set( $oneYear = true )
39 + #set( $lastYear = $firstYear )
40 + #set( $selectedYear = $firstYear )
41 + #set( $yearList = [$firstYear] )
78 78   #else
79 -## 'cycle' parameter is not an admissible thesis cycle value
80 -{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
81 - #stop
43 + #set( $yearList = [$lastYear..$firstYear] )
82 82   #end
83 -#else
84 -## default: all cycles
85 - #set( $cycleList = $showcaseThesisCycles )
86 - #set( $oneCycle = false )
87 - #set( $cycle = "" )
88 88  #end
89 -## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
90 -#### HANDLE PARAMETERS / END
46 +## $selectedYear, $yearList and $oneYear set properly
47 +### END YEAR
91 91  ##
92 -## DATA STRUCTURES / START
93 -#set( $itemMap = {} )
94 -#set( $itemNo = 0 )
95 -#foreach( $year in $yearList )
96 - #set( $query = ", BaseObject as objThesis #if( $oneCycle ), StringProperty as propCycle #end, DateProperty as propEnddate, StringProperty as propStatus, LargeStringProperty as propSupervisor, LargeStringProperty as propCosupervisor, LargeStringProperty as propContact
97 - where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propEnddate.id.id = objThesis.id and propStatus.id.id = objThesis.id and propSupervisor.id.id = objThesis.id and propCosupervisor.id.id = objThesis.id and propContact.id.id = objThesis.id and propEnddate.name = 'end' and propStatus.name = 'status' and propSupervisor.name = 'supervisors' and propCosupervisor.name = 'cosupervisors' and propContact.name = 'contacts' #if( $oneCycle ) and propCycle.id.id = objThesis.id and propCycle.name = 'cycle' and propCycle.value = '$cycle' #end and year(propEnddate.value) = $year and lower(propStatus.value) = 'completed' #if( $oneUser )and ( propSupervisor.value like '%$userString%' or propCosupervisor.value like '%$userString%' or propContact.value like '%$userString%' )#end order by propEnddate.value desc" )
98 -## do query
99 - #set( $itemFound = $xwiki.searchDocuments($query) )
100 -## set counters
101 - #set( $itemYearNo = $itemFound.size() )
102 - #if( $itemYearNo > 0 )
103 - #set( $itemMap[$year] = $itemFound )
104 - #set( $itemNo = $itemNo + $itemYearNo )
105 - #end
49 +### START USER
50 +## default values
51 +#set( $oneUser = false )
52 +#set( $selectedUser = '' )
53 +#set( $userFirstName = "" )
54 +#set( $userLastName = "" )
55 +## user parameter
56 +#if( $request.user )
57 + #set( $userNamePar = $request.user.trim() )
106 106  #end
107 -## DATA STRUCTURES / END
108 -##
109 -## DISPLAY / START
110 -## page subtitle
111 -<div class="mainheader">
112 -$itemNo
113 -#if( $itemNo == 1 )
114 - #if( $oneCycle )
115 - {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
59 +#if( $userName || $userNamePar )
60 +## try to specify a user
61 + #if( !$userName )
62 + #set( $selectedUser = "XWiki.$userNamePar" )
116 116   #else
117 - $services.localization.render('thesis').toLowerCase()
64 + #set( $selectedUser = $userName )
118 118   #end
119 -#{else}
120 - #if( $oneCycle )
121 - {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
66 + #if( $xwiki.exists($selectedUser) )
67 + #set( $oneUser = true )
68 + #set( $userdoc = $xwiki.getDocument($selectedUser) )
69 + #set( $userFirstName = $userdoc.display("first_name") )
70 + #set( $userLastName = $userdoc.display("last_name") )
122 122   #else
123 - $services.localization.render('theses').toLowerCase()
72 +{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
73 + #stop
124 124   #end
125 -#{end}
126 -<span class="textsecondary">&ensp;/&ensp;</span>
127 -#if( $oneYear )
128 - $year
129 -#else
130 - $firstYear–$lastYear
131 -#{end}
132 -#if( $oneUser )
133 - <span class="textsecondary">&ensp;/&ensp;</span>
134 - $userFirstName $userLastName
135 135  #end
136 -</div>
137 -## stop if no thesis is found
138 -#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
139 -## redundant double check
140 - #stop
76 +## $selectedUser and $oneUser set properly
77 +### END USER
78 +##
79 +### START CYCLE
80 +#set( $oneCycle = false )
81 +#set( $selectedCycle = '' )
82 +## cycle parameter
83 +#if( $request.cycle )
84 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
141 141  #end
142 -## some theses found
143 -## page index
144 -#if( $itemMap.keySet().size() > 1 )
145 -## found more than one year
146 -{{id name="index"/}}
147 -(% 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>>$doc||anchor=$year]]#end)))
86 +## set cycle
87 +#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
88 + #set( $oneCycle = true )
89 + #set( $selectedCycle = $cyclePar )
148 148  #end
149 -## theses displayed per year
91 +## $selectedCycle and $oneCycle set properly
92 +### END CYCLE
150 150  ##
151 -#template('apice_thesis_macros.vm')
152 -##
153 -#foreach( $year in $itemMap.keySet() )
154 -(% 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']]
155 -<div style="font-style: normal"><ul>
156 -#foreach( $item in $itemMap[$year] )
157 -<li>#thesislinked($item)</li>
94 +## title
95 +>#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'/}}
96 +## index
97 +#if( !$oneYear )
98 +(% 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)))
99 +###elseif( $oneUser && !$oneCycle )
100 +#elseif( !$oneCycle )
101 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $allThesisCycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
102 +#end{{id name='index'/}}
103 +## search theses
104 +#set( $thesisNo = 0 )
105 +#foreach( $year in $yearList )
106 + #set( $thesisYearNo = 0 )
107 + #if( !$oneYear )
108 +(% 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']]
109 + #end
110 +## some selected year or year list / now $year
111 + #foreach( $cycle in $allThesisCycles )
112 + #set( $thesisYearCycleNo = 0 )
113 + #if( !$oneCycle || $selectedCycle == $cycle )
114 +## some selected cycle or all cycles / now $cycle
115 + #if( $oneUser)
116 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
117 + 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 prop5.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" )
118 + #else
119 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2
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 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" )
121 + #end
122 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
123 + #set( $thesisFoundNo = $thesisFound.size() )
124 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
125 + #if( $thesisFoundNo > 0 && !$oneCycle )
126 +(% 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']]
127 + #end
128 + #foreach( $thesis in $thesisFound )
129 +* {{thesis}}$thesis{{/thesis}}
130 + #end
131 + #if( $thesisFoundNo > 0 && !$oneCycle )
132 +(% 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"]]
133 + #end
134 + #end
135 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
136 + #end
137 + #if( !$oneYear )
138 +(% 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"]]
139 + #end
140 + #set( $thesisNo = $thesisNo + $thesisYearNo )
158 158  #end
159 -</ul></div>
160 - #set( $itemYearNo = $itemMap[$year].size() )
161 -(% 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 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
142 +#if( $thesisNo > 0 )
143 +(% 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)
162 162  #end
163 -{{/html}}
145 +{{id name='bottom'/}}
164 164  {{/velocity}}
165 -{{id name="bottom"/}}