Changes for page Per Year

From version 143.1
edited by Andrea Omicini
on 30/06/2023 17:10
Change comment: There is no comment for this version
To version 137.1
edited by Andrea Omicini
on 30/06/2023 16:56
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,34 +1,102 @@
1 1  {{velocity}}
2 -#template('apice_boolean.vm')
2 +#template('apice_theses.vm')
3 3  #### HANDLE PARAMETERS / START
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]) )
4 +##
5 +## inline display
6 +#set( $inlinePar = $request.inline.trim() )
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" )
17 17   #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
18 18   #stop
19 19   #end
20 - #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
21 - #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
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%" )
22 22   #end
23 - #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
24 - #set( $lastYearThesis = $.display('lastYear','view') )
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( $thesisCycles.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
25 25   #end
79 +#else
80 +## default: all cycles
81 + #set( $cycleList = $showcaseThesisCycles )
82 + #set( $oneCycle = false )
83 + #set( $cycle = "" )
26 26  #end
27 -## years / parameters takes precedence
28 -#set( $firstYear = $firstYearThesis )
29 -#set( $lastYear = $lastYearThesis )
85 +## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
86 +##
87 +## when
88 +#set( $yearPar = $request.year.trim() )
89 +#set( $firstYearPar = $request.from.trim() )
90 +#set( $lastYearPar = $request.to.trim() )
91 +#### handle when
92 +#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
93 +#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
94 +#if( $lastYear < $firstYear )
95 + #set( $lastYear = $firstYear )
96 +#end
97 +## parameters takes precedence
30 30  #if( $yearPar )
31 - #set( $yearInt = $numbertool.toNumber($yearPar) )
99 + #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) )
106 + #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) )
112 + #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 = "" )
134 +## handle when / end
135 +##
136 +## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
137 +##
138 +## handle inline / start
139 +##
140 +## default: false
141 +#set( $showInline = false )
142 +## check $inlinePar
143 +#if( $inlinePar != "" && $trueStringList.contains($inlinePar.toLowerCase()) )
144 + #set( $showInline = true )
87 87  #end
88 -## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
146 +##
147 +## handle inline / end
148 +##
89 89  #### HANDLE PARAMETERS / END
90 90  ##
91 91  ## query to structures
... ... @@ -122,18 +122,14 @@
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 -(% 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>
186 +(% 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']]
132 132  #foreach( $item in $itemMap[$year] )
133 -<li>#thesislinked($item)</li>
134 -#end
135 -</ul></div>
136 -{{/html}}
188 + #if( $showInline )
189 + #if( $foreach.first )
190 + #end
191 +* #else(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)|#end{{thesis inline=$showInline linked='title'}}$item{{/thesis}}
192 + #end
137 137   #set( $itemYearNo = $itemMap[$year].size() )
138 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"]]
139 139  #end