Changes for page Per Year

From version 145.1
edited by Andrea Omicini
on 30/06/2023 17:11
Change comment: There is no comment for this version
To version 133.5
edited by Andrea Omicini
on 09/02/2023 00:43
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -$services.localization.render('peryear')
Content
... ... @@ -1,34 +1,108 @@
1 -{{velocity}}
2 -#template('apice_boolean.vm')
1 += {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
2 +
3 +{{include reference="Main.Environment" excludeFirstHeading="true"/}}{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 +#set( $thesisMenu = true )
3 3  #### HANDLE PARAMETERS / START
4 -#template('apice_theses.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]) )
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}}
18 + #stop
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" )
17 17   #else
30 + #set( $userName = "XWiki.$userNamePar" )
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
18 18   #stop
19 19   #end
20 - #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
21 - #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
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 +#end
57 +#if( $oneUser )
58 + #if( $apiceUser )
59 + #set( $userString = "%$userName%" )
60 + #else
61 + #set( $userString = "%$userFirstName $userLastName%" )
22 22   #end
23 - #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
24 - #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
63 +#else
64 + #set( $userString = "%%" )
65 +#end
66 +#### handle cycle
67 +## $cycleList gets the list of cycles to be shown
68 +## $oneCycle true if just one cycle to be shown
69 +#if( $request.cycle && $request.cycle.trim() != "" )
70 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
71 + #if( $allThesisCycles.contains($cyclePar) )
72 +## 'cycle' parameter is an admissible thesis cycle value
73 + #set( $cycleList = [$cyclePar])
74 + #set( $oneCycle = true )
75 + #set( $cycle = $cyclePar )
76 + #else
77 +## 'cycle' parameter is not an admissible thesis cycle value
78 +{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
79 + #stop
25 25   #end
81 +#else
82 +## default: all cycles
83 + #if( $showPhDTheses )
84 + #set( $cycleList = $allThesisCycles )
85 + #else
86 + #set( $cycleList = $lowThesisCycles )
87 + #end
88 + #set( $oneCycle = false )
89 + #set( $cycle = "" )
26 26  #end
27 -## years / parameters takes precedence
28 -#set( $firstYear = $firstYearThesis )
29 -#set( $lastYear = $lastYearThesis )
91 +## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
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
30 30  #if( $yearPar )
31 - #set( $yearInt = $numbertool.toNumber($yearPar) )
105 + #set( $yearInt = $mathtool.toInteger($yearPar) )
32 32   #if( $yearInt > 0 )
33 33   #set( $firstYear = $yearInt )
34 34   #set( $lastYear = $yearInt )
... ... @@ -35,13 +35,13 @@
35 35   #end
36 36  #end
37 37  #if( $firstYearPar )
38 - #set( $yearInt = $numbertool.toNumber($firstYearPar) )
112 + #set( $yearInt = $mathtool.toInteger($firstYearPar) )
39 39   #if( $yearInt > 0 )
40 40   #set( $firstYear = $yearInt )
41 41   #end
42 42  #end
43 43  #if( $lastYearPar )
44 - #set( $yearInt = $numbertool.toNumber($lastYearPar) )
118 + #set( $yearInt = $mathtool.toInteger($lastYearPar) )
45 45   #if( $yearInt > 0 )
46 46   #set( $lastYear = $yearInt )
47 47   #end
... ... @@ -63,29 +63,21 @@
63 63   #set( $yearList = [$year] )
64 64   #set( $oneYear = true )
65 65  #end
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 = "" )
140 +## handle when / end
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 )
87 87  #end
88 -## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
152 +##
153 +## handle inline / end
154 +##
89 89  #### HANDLE PARAMETERS / END
90 90  ##
91 91  ## query to structures
... ... @@ -107,7 +107,7 @@
107 107  ## output results
108 108  ## page subtitle
109 109  {{id name="top"/}}
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}(%%)
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}(%%)
111 111  
112 112  ## stop if no thesis is found
113 113  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
... ... @@ -122,20 +122,15 @@
122 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)))
123 123  #end
124 124  ## theses displayed per year
125 -##
126 -#template('apice_thesis_macros.vm')
127 -##
128 128  #foreach( $year in $itemMap.keySet() )
129 129  (% 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']]
130 -{{html wiki="true" clean="false"}}
131 -<div style="font-style: normal"><ul>
132 132  #foreach( $item in $itemMap[$year] )
133 -<li>#thesislinked($item)</li>
134 -#end
135 -</ul></div>
136 -{{/html}}
194 + #if( $showInline )#if( $foreach.first )
195 +
196 +#end* #else(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)|#end{{thesis inline=$showInline linked='title'}}$item{{/thesis}}
197 + #end
137 137   #set( $itemYearNo = $itemMap[$year].size() )
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"]]
199 +(% 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"]]
139 139  #end
140 140  {{/velocity}}
141 141  {{id name="bottom"/}}