Changes for page Per Year

From version 156.1
edited by Andrea Omicini
on 30/06/2023 21:36
Change comment: There is no comment for this version
To version 142.1
edited by Andrea Omicini
on 30/06/2023 17:05
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,36 +5,67 @@
1 -
2 -1. List item
3 -1. List item
4 -1. List item
5 5  {{velocity}}
6 -{{html wiki="true" clean="false"}}
7 -#template('apice_boolean.vm')
8 -#### SET PARAMETERS / START
9 9  #template('apice_theses.vm')
10 -#template('apice_user_param.vm')
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
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}}
19 19   #stop
20 20   #end
21 - #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
22 - #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
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" )
23 23   #end
24 - #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
25 - #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
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
26 26   #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 = "" )
27 27  #end
28 -## years / parameters takes precedence
29 -#set( $firstYear = $firstYearThesis )
30 -#set( $lastYear = $lastYearThesis )
31 -#template('apice_year_param.vm')
32 -##
33 -## CYCLES / START
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
34 34  ## $cycleList gets the list of cycles to be shown
35 35  ## $oneCycle true if just one cycle to be shown
36 36  #if( $request.cycle && $request.cycle.trim() != "" )
... ... @@ -52,16 +52,66 @@
52 52   #set( $cycle = "" )
53 53  #end
54 54  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
55 -## CYCLES / END
56 56  ##
57 -#### SET PARAMETERS / END
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
58 58  ##
59 -## DATA STRUCTURES / START
136 +## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
137 +##
138 +#### HANDLE PARAMETERS / END
139 +##
140 +## query to structures
60 60  #set( $itemMap = {} )
61 61  #set( $itemNo = 0 )
62 62  #foreach( $year in $yearList )
63 - #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
64 - 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" )
65 65  ## do query
66 66   #set( $itemFound = $xwiki.searchDocuments($query) )
67 67  ## set counters
... ... @@ -71,36 +71,12 @@
71 71   #set( $itemNo = $itemNo + $itemYearNo )
72 72   #end
73 73  #end
74 -## DATA STRUCTURES / END
75 75  ##
76 -## DISPLAY / START
156 +## output results
77 77  ## page subtitle
78 -<div class="mainheader">
79 -$itemNo
80 -#if( $itemNo == 1 )
81 - #if( $oneCycle )
82 - {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
83 - #else
84 - $services.localization.render('thesis').toLowerCase()
85 - #end
86 -#{else}
87 - #if( $oneCycle )
88 - {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
89 - #else
90 - $services.localization.render('theses').toLowerCase()
91 - #end
92 -#{end}
93 -<span class="textsecondary">&ensp;/&ensp;</span>
94 -#if( $oneYear )
95 - $year
96 -#else
97 - $firstYear–$lastYear
98 -#{end}
99 -#if( $oneUser )
100 - <span class="textsecondary">&ensp;/&ensp;</span>
101 - $userFirstName $userLastName
102 -#end
103 -</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 +
104 104  ## stop if no thesis is found
105 105  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
106 106  ## redundant double check
... ... @@ -110,14 +110,8 @@
110 110  ## page index
111 111  #if( $itemMap.keySet().size() > 1 )
112 112  ## found more than one year
113 -<div class="mainselectbar" id="index">
114 - #foreach( $year in $itemMap.keySet() )
115 - #if( !$foreach.first )
116 - &ensp;&bull;&ensp;
117 - #end
118 - [[$year>>||anchor="$year"]]
119 - #end
120 -</div>
170 +{{id name="index"/}}
171 +(% 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)))
121 121  #end
122 122  ## theses displayed per year
123 123  ##
... ... @@ -124,29 +124,16 @@
124 124  #template('apice_thesis_macros.vm')
125 125  ##
126 126  #foreach( $year in $itemMap.keySet() )
127 -## year top / start
128 -<div class="mainselectseparator">
129 - <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")>
130 - $year
131 - </a>
132 -</div>
133 -## year top / end
134 -##
135 -## year display / start
178 +(% 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']]
179 +{{html wiki="true" clean="false"}}
136 136  <div style="font-style: normal"><ul>
137 137  #foreach( $item in $itemMap[$year] )
138 138  <li>#thesislinked($item)</li>
139 139  #end
140 140  </ul></div>
141 -## year display / end
142 -##
143 -## year bottom / start
144 -<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
185 +{{/html}}
145 145   #set( $itemYearNo = $itemMap[$year].size() )
146 -$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 &bull; #anchorlinks()
147 -## year bottom / end
148 -</div>
187 +(% 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"]]
149 149  #end
150 -## DISPLAY / END
151 -{{/html}}
152 -{{/velocity}}{{pageDisplay sort="objectservice"/}}
189 +{{/velocity}}
190 +{{id name="bottom"/}}