Changes for page Per Year

From version 132.1
edited by Andrea Omicini
on 30/01/2023 13:13
Change comment: There is no comment for this version
To version 144.1
edited by Andrea Omicini
on 30/06/2023 17:11
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,106 +1,34 @@
1 -= {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
2 -
3 -{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 -#set( $thesisMenu = true )
1 +{{velocity}}
2 +#template('apice_boolean.vm')
5 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
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" )
4 +#template('apice_publications.vm')
5 +#template('apice_user_param.vm')
6 +## YEARS / START
7 +#set( $yearPar = $request.year.trim() )
8 +#set( $firstYearPar = $request.from.trim() )
9 +#set( $lastYearPar = $request.to.trim() )
10 +## years / personal
11 +#if( $isUserSpace )
12 + #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
13 + 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' " )
14 + #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
15 + #if( $personalThesisDocs.size() > 0 )
16 + #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
27 27   #else
28 - #set( $userName = "XWiki.$userNamePar" )
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 36   #stop
37 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 -#end
55 -#if( $oneUser )
56 - #if( $apiceUser )
57 - #set( $userString = "%$userName%" )
58 - #else
59 - #set( $userString = "%$userFirstName $userLastName%" )
20 + #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
21 + #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
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 )
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 - #stop
23 + #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
24 + #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
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
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 )
100 -#end
101 -## parameters takes precedence
27 +## years / parameters takes precedence
28 +#set( $firstYear = $firstYearThesis )
29 +#set( $lastYear = $lastYearThesis )
102 102  #if( $yearPar )
103 - #set( $yearInt = $mathtool.toInteger($yearPar) )
31 + #set( $yearInt = $numbertool.toNumber($yearPar) )
104 104   #if( $yearInt > 0 )
105 105   #set( $firstYear = $yearInt )
106 106   #set( $lastYear = $yearInt )
... ... @@ -107,13 +107,13 @@
107 107   #end
108 108  #end
109 109  #if( $firstYearPar )
110 - #set( $yearInt = $mathtool.toInteger($firstYearPar) )
38 + #set( $yearInt = $numbertool.toNumber($firstYearPar) )
111 111   #if( $yearInt > 0 )
112 112   #set( $firstYear = $yearInt )
113 113   #end
114 114  #end
115 115  #if( $lastYearPar )
116 - #set( $yearInt = $mathtool.toInteger($lastYearPar) )
44 + #set( $yearInt = $numbertool.toNumber($lastYearPar) )
117 117   #if( $yearInt > 0 )
118 118   #set( $lastYear = $yearInt )
119 119   #end
... ... @@ -135,10 +135,29 @@
135 135   #set( $yearList = [$year] )
136 136   #set( $oneYear = true )
137 137  #end
138 -## handle when / end
139 -##
140 -## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
141 -##
66 +## YEARS / END
67 +#### handle cycle
68 +## $cycleList gets the list of cycles to be shown
69 +## $oneCycle true if just one cycle to be shown
70 +#if( $request.cycle && $request.cycle.trim() != "" )
71 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
72 + #if( $thesisCycles.contains($cyclePar) )
73 +## 'cycle' parameter is an admissible thesis cycle value
74 + #set( $cycleList = [$cyclePar])
75 + #set( $oneCycle = true )
76 + #set( $cycle = $cyclePar )
77 + #else
78 +## 'cycle' parameter is not an admissible thesis cycle value
79 +{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
80 + #stop
81 + #end
82 +#else
83 +## default: all cycles
84 + #set( $cycleList = $showcaseThesisCycles )
85 + #set( $oneCycle = false )
86 + #set( $cycle = "" )
87 +#end
88 +## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
142 142  #### HANDLE PARAMETERS / END
143 143  ##
144 144  ## query to structures
... ... @@ -160,7 +160,7 @@
160 160  ## output results
161 161  ## page subtitle
162 162  {{id name="top"/}}
163 ->(%%)$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}(%%)
110 +>(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('thesis').toLowerCase()#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('theses').toLowerCase()#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
164 164  
165 165  ## stop if no thesis is found
166 166  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
... ... @@ -172,16 +172,23 @@
172 172  #if( $itemMap.keySet().size() > 1 )
173 173  ## found more than one year
174 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)))
122 +(% 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)))
176 176  #end
177 177  ## theses displayed per year
125 +##
126 +#template('apice_thesis_macros.vm')
127 +##
178 178  #foreach( $year in $itemMap.keySet() )
179 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}}
130 +{{html wiki="true" clean="false"}}
131 +<div style="font-style: normal"><ul>
132 +#foreach( $item in $itemMap[$year] )
133 +<li>#thesislinked($item)</li>
182 182  #end
135 +</ul></div>
136 +{{/html}}
183 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"]]
138 +(% 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"]]
185 185  #end
186 186  {{/velocity}}
187 187  {{id name="bottom"/}}