Changes for page Per Year

From version 149.1
edited by Andrea Omicini
on 30/06/2023 20:37
Change comment: There is no comment for this version
To version 141.1
edited by Andrea Omicini
on 30/06/2023 17:04
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,35 +1,102 @@
1 1  {{velocity}}
2 -{{html wiki="true" clean="false"}}
3 -#template('apice_boolean.vm')
4 -#### HANDLE PARAMETERS / START
5 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]) )
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}}
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" )
18 18   #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
19 19   #stop
20 20   #end
21 - #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
22 - #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%" )
23 23   #end
24 - #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
25 - #set( $lastYearThesis = $personalThesisDoc.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
26 26   #end
79 +#else
80 +## default: all cycles
81 + #set( $cycleList = $showcaseThesisCycles )
82 + #set( $oneCycle = false )
83 + #set( $cycle = "" )
27 27  #end
28 -## years / parameters takes precedence
29 -#set( $firstYear = $firstYearThesis )
30 -#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
31 31  #if( $yearPar )
32 - #set( $yearInt = $numbertool.toNumber($yearPar) )
99 + #set( $yearInt = $mathtool.toInteger($yearPar) )
33 33   #if( $yearInt > 0 )
34 34   #set( $firstYear = $yearInt )
35 35   #set( $lastYear = $yearInt )
... ... @@ -36,13 +36,13 @@
36 36   #end
37 37  #end
38 38  #if( $firstYearPar )
39 - #set( $yearInt = $numbertool.toNumber($firstYearPar) )
106 + #set( $yearInt = $mathtool.toInteger($firstYearPar) )
40 40   #if( $yearInt > 0 )
41 41   #set( $firstYear = $yearInt )
42 42   #end
43 43  #end
44 44  #if( $lastYearPar )
45 - #set( $yearInt = $numbertool.toNumber($lastYearPar) )
112 + #set( $yearInt = $mathtool.toInteger($lastYearPar) )
46 46   #if( $yearInt > 0 )
47 47   #set( $lastYear = $yearInt )
48 48   #end
... ... @@ -64,37 +64,18 @@
64 64   #set( $yearList = [$year] )
65 65   #set( $oneYear = true )
66 66  #end
67 -## YEARS / END
68 -#### handle cycle
69 -## $cycleList gets the list of cycles to be shown
70 -## $oneCycle true if just one cycle to be shown
71 -#if( $request.cycle && $request.cycle.trim() != "" )
72 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
73 - #if( $thesisCycles.contains($cyclePar) )
74 -## 'cycle' parameter is an admissible thesis cycle value
75 - #set( $cycleList = [$cyclePar])
76 - #set( $oneCycle = true )
77 - #set( $cycle = $cyclePar )
78 - #else
79 -## 'cycle' parameter is not an admissible thesis cycle value
80 -{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
81 - #stop
82 - #end
83 -#else
84 -## default: all cycles
85 - #set( $cycleList = $showcaseThesisCycles )
86 - #set( $oneCycle = false )
87 - #set( $cycle = "" )
88 -#end
89 -## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
134 +## handle when / end
135 +##
136 +## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
137 +##
90 90  #### HANDLE PARAMETERS / END
91 91  ##
92 -## DATA STRUCTURES / START
140 +## query to structures
93 93  #set( $itemMap = {} )
94 94  #set( $itemNo = 0 )
95 95  #foreach( $year in $yearList )
96 - #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
97 - 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" )
144 + #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
145 + 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" )
98 98  ## do query
99 99   #set( $itemFound = $xwiki.searchDocuments($query) )
100 100  ## set counters
... ... @@ -104,36 +104,12 @@
104 104   #set( $itemNo = $itemNo + $itemYearNo )
105 105   #end
106 106  #end
107 -## DATA STRUCTURES / END
108 108  ##
109 -## DISPLAY / START
156 +## output results
110 110  ## page subtitle
111 -<div class="mainheader">
112 -$itemNo
113 -#if( $itemNo == 1 )
114 - #if( $oneCycle )
115 - {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
116 - #else
117 - $services.localization.render('thesis').toLowerCase()
118 - #end
119 -#{else}
120 - #if( $oneCycle )
121 - {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
122 - #else
123 - $services.localization.render('theses').toLowerCase()
124 - #end
125 -#{end}
126 -<span class="textsecondary">&ensp;/&ensp;</span>
127 -#if( $oneYear )
128 - $year
129 -#else
130 - $firstYear–$lastYear
131 -#{end}
132 -#if( $oneUser )
133 - <span class="textsecondary">&ensp;/&ensp;</span>
134 - $userFirstName $userLastName
135 -#end
136 -</div>
158 +{{id name="top"/}}
159 +>(%%)$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}(%%)
160 +
137 137  ## stop if no thesis is found
138 138  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
139 139  ## redundant double check
... ... @@ -152,14 +152,15 @@
152 152  ##
153 153  #foreach( $year in $itemMap.keySet() )
154 154  (% 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']]
155 -<div style="font-style: normal"><ul>
179 +{{html wiki="true" clean="false"}}
180 +<div><ul>
156 156  #foreach( $item in $itemMap[$year] )
157 157  <li>#thesislinked($item)</li>
158 158  #end
159 159  </ul></div>
185 +{{/html}}
160 160   #set( $itemYearNo = $itemMap[$year].size() )
161 161  (% 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"]]
162 162  #end
163 -{{/html}}
164 164  {{/velocity}}
165 165  {{id name="bottom"/}}