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 145.1
edited by Andrea Omicini
on 30/06/2023 17:11
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,13 +5,12 @@
1 -
2 -1. List item
3 -1. List item
4 -1. List item
5 5  {{velocity}}
6 -{{html wiki="true" clean="false"}}
7 7  #template('apice_boolean.vm')
8 -#### SET PARAMETERS / START
3 +#### HANDLE PARAMETERS / START
9 9  #template('apice_theses.vm')
10 10  #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() )
11 11  ## years / personal
12 12  #if( $isUserSpace )
13 13   #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
... ... @@ -28,9 +28,44 @@
28 28  ## years / parameters takes precedence
29 29  #set( $firstYear = $firstYearThesis )
30 30  #set( $lastYear = $lastYearThesis )
31 -#template('apice_year_param.vm')
32 -##
33 -## CYCLES / START
30 +#if( $yearPar )
31 + #set( $yearInt = $numbertool.toNumber($yearPar) )
32 + #if( $yearInt > 0 )
33 + #set( $firstYear = $yearInt )
34 + #set( $lastYear = $yearInt )
35 + #end
36 +#end
37 +#if( $firstYearPar )
38 + #set( $yearInt = $numbertool.toNumber($firstYearPar) )
39 + #if( $yearInt > 0 )
40 + #set( $firstYear = $yearInt )
41 + #end
42 +#end
43 +#if( $lastYearPar )
44 + #set( $yearInt = $numbertool.toNumber($lastYearPar) )
45 + #if( $yearInt > 0 )
46 + #set( $lastYear = $yearInt )
47 + #end
48 +#end
49 +#if( $lastYear < $firstYear )
50 +## swap
51 + #set( $yearTemp = $lastYear )
52 + #set( $lastYear = $firstYear )
53 + #set( $firstYear = $yearTemp )
54 +#end
55 +## invariant: $lastYear >= $firstYear
56 +#if( $lastYear > $firstYear )
57 + #set( $year = -1 )
58 + #set( $yearList = [$lastYear..$firstYear] )
59 + #set( $oneYear = false )
60 +#else
61 +## $lastYear = $firstYear
62 + #set( $year = $lastYear )
63 + #set( $yearList = [$year] )
64 + #set( $oneYear = true )
65 +#end
66 +## YEARS / END
67 +#### 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,14 @@
52 52   #set( $cycle = "" )
53 53  #end
54 54  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
55 -## CYCLES / END
89 +#### HANDLE PARAMETERS / END
56 56  ##
57 -#### SET PARAMETERS / END
58 -##
59 -## DATA STRUCTURES / START
91 +## 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" )
95 + #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
96 + 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
107 +## 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>
109 +{{id name="top"/}}
110 +>(%%)$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}(%%)
111 +
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>
121 +{{id name="index"/}}
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)))
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
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"}}
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">
136 +{{/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>
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"]]
149 149  #end
150 -## DISPLAY / END
151 -{{/html}}
152 -{{/velocity}}{{pageDisplay sort="objectservice"/}}
140 +{{/velocity}}
141 +{{id name="bottom"/}}