Changes for page Per Year

From version 137.1
edited by Andrea Omicini
on 30/06/2023 16:56
Change comment: There is no comment for this version
To version 150.1
edited by Andrea Omicini
on 30/06/2023 21:14
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,66 +1,34 @@
1 1  {{velocity}}
2 -#template('apice_theses.vm')
2 +{{html wiki="true" clean="false"}}
3 +#template('apice_boolean.vm')
3 3  #### HANDLE PARAMETERS / START
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}}
5 +#template('apice_theses.vm')
6 +#template('apice_user_param.vm')
7 +## YEARS / START
8 +#set( $yearPar = $request.year.trim() )
9 +#set( $firstYearPar = $request.from.trim() )
10 +#set( $lastYearPar = $request.to.trim() )
11 +## years / personal
12 +#if( $isUserSpace )
13 + #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
14 + 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' " )
15 + #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
16 + #if( $personalThesisDocs.size() > 0 )
17 + #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
18 + #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" )
21 + #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
22 + #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
24 + #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
25 + #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
28 +## years / parameters takes precedence
29 +#set( $firstYear = $firstYearThesis )
30 +#set( $lastYear = $lastYearThesis )
31 +#template('apice_years_param.vm')
64 64  #### handle cycle
65 65  ## $cycleList gets the list of cycles to be shown
66 66  ## $oneCycle true if just one cycle to be shown
... ... @@ -83,77 +83,14 @@
83 83   #set( $cycle = "" )
84 84  #end
85 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
98 -#if( $yearPar )
99 - #set( $yearInt = $mathtool.toInteger($yearPar) )
100 - #if( $yearInt > 0 )
101 - #set( $firstYear = $yearInt )
102 - #set( $lastYear = $yearInt )
103 - #end
104 -#end
105 -#if( $firstYearPar )
106 - #set( $yearInt = $mathtool.toInteger($firstYearPar) )
107 - #if( $yearInt > 0 )
108 - #set( $firstYear = $yearInt )
109 - #end
110 -#end
111 -#if( $lastYearPar )
112 - #set( $yearInt = $mathtool.toInteger($lastYearPar) )
113 - #if( $yearInt > 0 )
114 - #set( $lastYear = $yearInt )
115 - #end
116 -#end
117 -#if( $lastYear < $firstYear )
118 -## swap
119 - #set( $yearTemp = $lastYear )
120 - #set( $lastYear = $firstYear )
121 - #set( $firstYear = $yearTemp )
122 -#end
123 -## invariant: $lastYear >= $firstYear
124 -#if( $lastYear > $firstYear )
125 - #set( $year = -1 )
126 - #set( $yearList = [$lastYear..$firstYear] )
127 - #set( $oneYear = false )
128 -#else
129 -## $lastYear = $firstYear
130 - #set( $year = $lastYear )
131 - #set( $yearList = [$year] )
132 - #set( $oneYear = true )
133 -#end
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 )
145 -#end
146 -##
147 -## handle inline / end
148 -##
149 149  #### HANDLE PARAMETERS / END
150 150  ##
151 -## query to structures
56 +## DATA STRUCTURES / START
152 152  #set( $itemMap = {} )
153 153  #set( $itemNo = 0 )
154 154  #foreach( $year in $yearList )
155 - #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
156 - 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 = '${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" )
157 157  ## do query
158 158   #set( $itemFound = $xwiki.searchDocuments($query) )
159 159  ## set counters
... ... @@ -163,12 +163,36 @@
163 163   #set( $itemNo = $itemNo + $itemYearNo )
164 164   #end
165 165  #end
71 +## DATA STRUCTURES / END
166 166  ##
167 -## output results
73 +## DISPLAY / START
168 168  ## page subtitle
169 -{{id name="top"/}}
170 ->(%%)$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}(%%)
171 -
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>
172 172  ## stop if no thesis is found
173 173  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
174 174  ## redundant double check
... ... @@ -182,16 +182,19 @@
182 182  (% 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)))
183 183  #end
184 184  ## theses displayed per year
114 +##
115 +#template('apice_thesis_macros.vm')
116 +##
185 185  #foreach( $year in $itemMap.keySet() )
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']]
118 +(% 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']]
119 +<div style="font-style: normal"><ul>
187 187  #foreach( $item in $itemMap[$year] )
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
121 +<li>#thesislinked($item)</li>
122 +#end
123 +</ul></div>
193 193   #set( $itemYearNo = $itemMap[$year].size() )
194 194  (% 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"]]
195 195  #end
127 +{{/html}}
196 196  {{/velocity}}
197 197  {{id name="bottom"/}}