Changes for page Per Year

From version 132.2
edited by Andrea Omicini
on 30/01/2023 13:43
Change comment: There is no comment for this version
To version 165.1
edited by Andrea Omicini
on 06/07/2023 19:27
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,72 +1,38 @@
1 -= {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
2 -
3 -{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 -#set( $thesisMenu = true )
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}}
1 +{{velocity}}
2 +{{html wiki="true" clean="false"}}
3 +#template('apice_macros.vm')
4 +#setobjectspace("Theses")
5 +#template('apice_thesis_macros.vm')
6 +#### SET PARAMETERS / START
7 +#template('apice_user_param.vm')
8 +## years / personal
9 +#if( $isUserSpace )
10 + #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
11 + where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${mainSpace}.Personal.Class' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
12 + #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
13 + #if( $personalThesisDocs.size() > 0 )
14 + #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
15 + #else
16 16   #stop
17 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" )
27 - #else
28 - #set( $userName = "XWiki.$userNamePar" )
18 + #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
19 + #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
29 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 - #stop
21 + #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
22 + #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
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 54  #end
55 -#if( $oneUser )
56 - #if( $apiceUser )
57 - #set( $userString = "%$userName%" )
58 - #else
59 - #set( $userString = "%$userFirstName $userLastName%" )
60 - #end
61 -#else
62 - #set( $userString = "%%" )
63 -#end
64 -#### handle cycle
25 +## years / parameters takes precedence
26 +#set( $firstYear = $firstYearThesis )
27 +#set( $lastYear = $lastYearThesis )
28 +#template('apice_year_param.vm')
29 +##
30 +## CYCLES / START
65 65  ## $cycleList gets the list of cycles to be shown
66 66  ## $oneCycle true if just one cycle to be shown
67 67  #if( $request.cycle && $request.cycle.trim() != "" )
68 68   #set( $cyclePar = $request.cycle.trim().toUpperCase() )
69 - #if( $allThesisCycles.contains($cyclePar) )
35 + #if( $thesisCycles.contains($cyclePar) )
70 70  ## 'cycle' parameter is an admissible thesis cycle value
71 71   #set( $cycleList = [$cyclePar])
72 72   #set( $oneCycle = true )
... ... @@ -78,75 +78,21 @@
78 78   #end
79 79  #else
80 80  ## default: all cycles
81 - #if( $showPhDTheses )
82 - #set( $cycleList = $allThesisCycles )
83 - #else
84 - #set( $cycleList = $lowThesisCycles )
85 - #end
47 + #set( $cycleList = $showcaseThesisCycles )
86 86   #set( $oneCycle = false )
87 87   #set( $cycle = "" )
88 88  #end
89 89  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
52 +## CYCLES / END
90 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
102 -#if( $yearPar )
103 - #set( $yearInt = $mathtool.toInteger($yearPar) )
104 - #if( $yearInt > 0 )
105 - #set( $firstYear = $yearInt )
106 - #set( $lastYear = $yearInt )
107 - #end
108 -#end
109 -#if( $firstYearPar )
110 - #set( $yearInt = $mathtool.toInteger($firstYearPar) )
111 - #if( $yearInt > 0 )
112 - #set( $firstYear = $yearInt )
113 - #end
114 -#end
115 -#if( $lastYearPar )
116 - #set( $yearInt = $mathtool.toInteger($lastYearPar) )
117 - #if( $yearInt > 0 )
118 - #set( $lastYear = $yearInt )
119 - #end
120 -#end
121 -#if( $lastYear < $firstYear )
122 -## swap
123 - #set( $yearTemp = $lastYear )
124 - #set( $lastYear = $firstYear )
125 - #set( $firstYear = $yearTemp )
126 -#end
127 -## invariant: $lastYear >= $firstYear
128 -#if( $lastYear > $firstYear )
129 - #set( $year = -1 )
130 - #set( $yearList = [$lastYear..$firstYear] )
131 - #set( $oneYear = false )
132 -#else
133 -## $lastYear = $firstYear
134 - #set( $year = $lastYear )
135 - #set( $yearList = [$year] )
136 - #set( $oneYear = true )
137 -#end
138 -## handle when / end
54 +#### SET PARAMETERS / END
139 139  ##
140 -## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
141 -##
142 -#### HANDLE PARAMETERS / END
143 -##
144 -## query to structures
56 +## DATA STRUCTURES / START
145 145  #set( $itemMap = {} )
146 146  #set( $itemNo = 0 )
147 147  #foreach( $year in $yearList )
148 - #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
149 - 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" )
60 + #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
61 + where objThesis.name = doc.fullName and objThesis.className = '${mainSpace}.Class' and objThesis.name <> '${objectPool}.Template' 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" )
150 150  ## do query
151 151   #set( $itemFound = $xwiki.searchDocuments($query) )
152 152  ## set counters
... ... @@ -156,12 +156,36 @@
156 156   #set( $itemNo = $itemNo + $itemYearNo )
157 157   #end
158 158  #end
71 +## DATA STRUCTURES / END
159 159  ##
160 -## output results
73 +## DISPLAY / START
161 161  ## page subtitle
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}(%%)
164 -
75 +<div class="mainheader">
76 +$itemNo
77 +#if( $itemNo == 1 )
78 + #if( $oneCycle )
79 + {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
80 + #else
81 + $services.localization.render('thesis').toLowerCase()
82 + #end
83 +#{else}
84 + #if( $oneCycle )
85 + {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
86 + #else
87 + $services.localization.render('theses').toLowerCase()
88 + #end
89 +#{end}
90 +<span class="textsecondary">&ensp;/&ensp;</span>
91 +#if( $oneYear )
92 + $year
93 +#else
94 + $firstYear–$lastYear
95 +#{end}
96 +#if( $oneUser )
97 + <span class="textsecondary">&ensp;/&ensp;</span>
98 + $userFirstName $userLastName
99 +#end
100 +</div>
165 165  ## stop if no thesis is found
166 166  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
167 167  ## redundant double check
... ... @@ -171,17 +171,57 @@
171 171  ## page index
172 172  #if( $itemMap.keySet().size() > 1 )
173 173  ## found more than one year
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>>$doc||anchor=$year]]#end)))
110 +<div class="mainselectbar" id="index">
111 + #foreach( $year in $itemMap.keySet() )
112 + #if( !$foreach.first )
113 + &ensp;&bull;&ensp;
114 + #end
115 + [[$year>>||anchor="$year"]]
116 + #end
117 +</div>
176 176  #end
177 177  ## theses displayed per year
178 178  #foreach( $year in $itemMap.keySet() )
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}}
182 -#end
121 +## year top / start
122 +<div class="mainselectseparator">
123 + <a class="mainselectseparatorlink" id="$year" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end#if( $oneCycle )&cycle=$cycle#end")>
124 + $year
125 + </a>
126 +</div>
127 +## year top / end
128 +##
129 +## year display / start
130 +<div style="font-style: normal"><ul>
131 + #foreach( $item in $itemMap[$year] )
132 +<li>#thesisyear($item)</li>
133 + #end
134 +</ul></div>
135 +## year display / end
136 +##
137 +## year bottom / start
138 +<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
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"]]
140 + $itemYearNo
141 + #if( $oneCycle )
142 + #if( $itemYearNo == 1 )
143 + {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
144 + #else
145 + {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
146 + #end
147 + #else
148 + #if( $itemYearNo == 1 )
149 + $services.localization.render('thesis').toLowerCase()
150 + #else
151 + $services.localization.render('theses').toLowerCase()
152 + #end
153 + #end
154 + <span class="textsecondary">&ensp;/&ensp;</span>
155 + $year
156 + &ensp;&bull;&ensp;
157 + #anchorlinks()
158 +</div>
159 +## year bottom / end
185 185  #end
186 -{{/velocity}}
187 -{{id name="bottom"/}}
161 +## DISPLAY / END
162 +{{/html}}
163 +{{/velocity}}{{pageDisplay sort="objectservice"/}}