Changes for page Per Year

From version 135.1
edited by Andrea Omicini
on 24/04/2023 13:17
Change comment: There is no comment for this version
To version 153.1
edited by Andrea Omicini
on 30/06/2023 21:23
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,0 +1,1 @@
1 +$services.localization.render('peryear')
Content
... ... @@ -1,74 +1,37 @@
1 -= {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
2 -
3 -{{include reference="Classes.Environment" excludeFirstHeading="true"/}}{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 -#set( $thesisMenu = true )
5 -#### HANDLE PARAMETERS / START
6 -##
7 -## inline display
8 -#set( $inlinePar = $request.inline.trim() )
9 -## who
10 -#set( $userNamePar = $request.user.trim() )
11 -#set( $firstNamePar = $request.name.trim() )
12 -#set( $lastNamePar = $request.surname.trim() )
13 -#### handle who
14 -#if( $userName )
15 -## from a personal page, "XWiki.$userName" $userName form
16 - #if( !$xwiki.exists( $userName ) )
17 -{{warning}}User $userName does not exist{{/warning}}
1 +{{velocity}}
2 +{{html wiki="true" clean="false"}}
3 +#template('apice_boolean.vm')
4 +#### SET PARAMETERS / START
5 +#template('apice_theses.vm')
6 +#template('apice_user_param.vm')
7 +## years / personal
8 +#if( $isUserSpace )
9 + #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
10 + 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' " )
11 + #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
12 + #if( $personalThesisDocs.size() > 0 )
13 + #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
14 + #else
18 18   #stop
19 19   #end
20 - #set( $apiceUser = true )
21 - #set( $oneUser = true )
22 - #set( $userdoc = $xwiki.getDocument($userName) )
23 - #set( $userFirstName = $userdoc.display("first_name") )
24 - #set( $userLastName = $userdoc.display("last_name") )
25 -#elseif( $userNamePar )
26 -## from the URL, "user=$userNamePar" parameter
27 - #if( $userNamePar.contains('XWiki.') )
28 - #set( $userName = "$userNamePar" )
29 - #else
30 - #set( $userName = "XWiki.$userNamePar" )
17 + #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
18 + #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
31 31   #end
32 - #if( !$xwiki.exists( $userName ) )
33 - #if( $services.localization.currentLocale == 'it' )
34 -{{warning}}L'utente “$userNamePar” non esiste{{/warning}}
35 - #else
36 -{{warning}}User “$userNamePar” does not exist{{/warning}}
37 - #end
38 - #stop
20 + #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
21 + #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
39 39   #end
40 - #set( $apiceUser = true )
41 - #set( $oneUser = true)
42 - #set( $userdoc = $xwiki.getDocument($userName) )
43 - #set( $userFirstName = $userdoc.display("first_name") )
44 - #set( $userLastName = $userdoc.display("last_name") )
45 -#elseif( $firstNamePar && $lastNamePar )
46 -## from the URL, "name=Firstname&surname=Lastname" parameter
47 - #set( $apiceUser = false )
48 - #set( $oneUser = true )
49 - #set( $userFirstName = $firstNamePar )
50 - #set( $userLastName = $lastNamePar )
51 -#else
52 - #set( $apiceUser = false )
53 - #set( $oneUser = false )
54 - #set( $userFirstName = "" )
55 - #set( $userLastName = "" )
56 56  #end
57 -#if( $oneUser )
58 - #if( $apiceUser )
59 - #set( $userString = "%$userName%" )
60 - #else
61 - #set( $userString = "%$userFirstName $userLastName%" )
62 - #end
63 -#else
64 - #set( $userString = "%%" )
65 -#end
66 -#### handle cycle
24 +## years / parameters takes precedence
25 +#set( $firstYear = $firstYearThesis )
26 +#set( $lastYear = $lastYearThesis )
27 +#template('apice_year_param.vm')
28 +##
29 +## CYCLES / START
67 67  ## $cycleList gets the list of cycles to be shown
68 68  ## $oneCycle true if just one cycle to be shown
69 69  #if( $request.cycle && $request.cycle.trim() != "" )
70 70   #set( $cyclePar = $request.cycle.trim().toUpperCase() )
71 - #if( $allThesisCycles.contains($cyclePar) )
34 + #if( $thesisCycles.contains($cyclePar) )
72 72  ## 'cycle' parameter is an admissible thesis cycle value
73 73   #set( $cycleList = [$cyclePar])
74 74   #set( $oneCycle = true )
... ... @@ -80,86 +80,21 @@
80 80   #end
81 81  #else
82 82  ## default: all cycles
83 - #if( $showPhDTheses )
84 - #set( $cycleList = $allThesisCycles )
85 - #else
86 - #set( $cycleList = $lowThesisCycles )
87 - #end
46 + #set( $cycleList = $showcaseThesisCycles )
88 88   #set( $oneCycle = false )
89 89   #set( $cycle = "" )
90 90  #end
91 91  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
51 +## CYCLES / END
92 92  ##
93 -## when
94 -#set( $yearPar = $request.year.trim() )
95 -#set( $firstYearPar = $request.from.trim() )
96 -#set( $lastYearPar = $request.to.trim() )
97 -#### handle when
98 -#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
99 -#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
100 -#if( $lastYear < $firstYear )
101 - #set( $lastYear = $firstYear )
102 -#end
103 -## parameters takes precedence
104 -#if( $yearPar )
105 - #set( $yearInt = $mathtool.toInteger($yearPar) )
106 - #if( $yearInt > 0 )
107 - #set( $firstYear = $yearInt )
108 - #set( $lastYear = $yearInt )
109 - #end
110 -#end
111 -#if( $firstYearPar )
112 - #set( $yearInt = $mathtool.toInteger($firstYearPar) )
113 - #if( $yearInt > 0 )
114 - #set( $firstYear = $yearInt )
115 - #end
116 -#end
117 -#if( $lastYearPar )
118 - #set( $yearInt = $mathtool.toInteger($lastYearPar) )
119 - #if( $yearInt > 0 )
120 - #set( $lastYear = $yearInt )
121 - #end
122 -#end
123 -#if( $lastYear < $firstYear )
124 -## swap
125 - #set( $yearTemp = $lastYear )
126 - #set( $lastYear = $firstYear )
127 - #set( $firstYear = $yearTemp )
128 -#end
129 -## invariant: $lastYear >= $firstYear
130 -#if( $lastYear > $firstYear )
131 - #set( $year = -1 )
132 - #set( $yearList = [$lastYear..$firstYear] )
133 - #set( $oneYear = false )
134 -#else
135 -## $lastYear = $firstYear
136 - #set( $year = $lastYear )
137 - #set( $yearList = [$year] )
138 - #set( $oneYear = true )
139 -#end
140 -## handle when / end
53 +#### SET PARAMETERS / END
141 141  ##
142 -## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
143 -##
144 -## handle inline / start
145 -##
146 -## default: false
147 -#set( $showInline = false )
148 -## check $inlinePar
149 -#if( $inlinePar != "" && $trueStringList.contains($inlinePar.toLowerCase()) )
150 - #set( $showInline = true )
151 -#end
152 -##
153 -## handle inline / end
154 -##
155 -#### HANDLE PARAMETERS / END
156 -##
157 -## query to structures
55 +## DATA STRUCTURES / START
158 158  #set( $itemMap = {} )
159 159  #set( $itemNo = 0 )
160 160  #foreach( $year in $yearList )
161 - #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
162 - 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" )
59 + #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
60 + 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" )
163 163  ## do query
164 164   #set( $itemFound = $xwiki.searchDocuments($query) )
165 165  ## set counters
... ... @@ -169,12 +169,36 @@
169 169   #set( $itemNo = $itemNo + $itemYearNo )
170 170   #end
171 171  #end
70 +## DATA STRUCTURES / END
172 172  ##
173 -## output results
72 +## DISPLAY / START
174 174  ## page subtitle
175 -{{id name="top"/}}
176 ->(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/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}(%%)
177 -
74 +<div class="mainheader">
75 +$itemNo
76 +#if( $itemNo == 1 )
77 + #if( $oneCycle )
78 + {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
79 + #else
80 + $services.localization.render('thesis').toLowerCase()
81 + #end
82 +#{else}
83 + #if( $oneCycle )
84 + {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
85 + #else
86 + $services.localization.render('theses').toLowerCase()
87 + #end
88 +#{end}
89 +<span class="textsecondary">&ensp;/&ensp;</span>
90 +#if( $oneYear )
91 + $year
92 +#else
93 + $firstYear–$lastYear
94 +#{end}
95 +#if( $oneUser )
96 + <span class="textsecondary">&ensp;/&ensp;</span>
97 + $userFirstName $userLastName
98 +#end
99 +</div>
178 178  ## stop if no thesis is found
179 179  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
180 180  ## redundant double check
... ... @@ -184,20 +184,29 @@
184 184  ## page index
185 185  #if( $itemMap.keySet().size() > 1 )
186 186  ## found more than one year
187 -{{id name="index"/}}
188 -(% 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)))
109 +<div class="mainselectbar" id="index">
110 + #foreach( $year in $itemMap.keySet() )
111 + #if( !$foreach.first )
112 + &ensp;&bull;&ensp;
113 + #end
114 + [[$year>>||anchor="$year"]]
115 + #end
116 +</div>
189 189  #end
190 190  ## theses displayed per year
119 +##
120 +#template('apice_thesis_macros.vm')
121 +##
191 191  #foreach( $year in $itemMap.keySet() )
192 -(% 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#if( $showInline )&inline=true#end']]
123 +(% 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']]
124 +<div style="font-style: normal"><ul>
193 193  #foreach( $item in $itemMap[$year] )
194 - #if( $showInline )
195 - #if( $foreach.first )
196 - #end
197 -* #else(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)|#end{{thesis inline=$showInline linked='title'}}$item{{/thesis}}
198 - #end
126 +<li>#thesislinked($item)</li>
127 +#end
128 +</ul></div>
199 199   #set( $itemYearNo = $itemMap[$year].size() )
200 -(% 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"]]
130 +(% 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"]]
201 201  #end
132 +{{/html}}
202 202  {{/velocity}}
203 203  {{id name="bottom"/}}