Changes for page Per Year

From version 165.1
edited by Andrea Omicini
on 06/07/2023 19:27
Change comment: There is no comment for this version
To version 146.1
edited by Andrea Omicini
on 30/06/2023 17:13
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,14 +1,16 @@
1 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
2 +#template('apice_boolean.vm')
3 +#### HANDLE PARAMETERS / START
4 +#template('apice_theses.vm')
7 7  #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() )
8 8  ## years / personal
9 9  #if( $isUserSpace )
10 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' " )
13 + 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' " )
12 12   #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
13 13   #if( $personalThesisDocs.size() > 0 )
14 14   #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
... ... @@ -25,9 +25,44 @@
25 25  ## years / parameters takes precedence
26 26  #set( $firstYear = $firstYearThesis )
27 27  #set( $lastYear = $lastYearThesis )
28 -#template('apice_year_param.vm')
29 -##
30 -## 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
31 31  ## $cycleList gets the list of cycles to be shown
32 32  ## $oneCycle true if just one cycle to be shown
33 33  #if( $request.cycle && $request.cycle.trim() != "" )
... ... @@ -49,16 +49,14 @@
49 49   #set( $cycle = "" )
50 50  #end
51 51  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
52 -## CYCLES / END
89 +#### HANDLE PARAMETERS / END
53 53  ##
54 -#### SET PARAMETERS / END
55 -##
56 -## DATA STRUCTURES / START
91 +## query to structures
57 57  #set( $itemMap = {} )
58 58  #set( $itemNo = 0 )
59 59  #foreach( $year in $yearList )
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" )
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" )
62 62  ## do query
63 63   #set( $itemFound = $xwiki.searchDocuments($query) )
64 64  ## set counters
... ... @@ -68,36 +68,12 @@
68 68   #set( $itemNo = $itemNo + $itemYearNo )
69 69   #end
70 70  #end
71 -## DATA STRUCTURES / END
72 72  ##
73 -## DISPLAY / START
107 +## output results
74 74  ## page subtitle
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>
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 +
101 101  ## stop if no thesis is found
102 102  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
103 103  ## redundant double check
... ... @@ -107,57 +107,24 @@
107 107  ## page index
108 108  #if( $itemMap.keySet().size() > 1 )
109 109  ## found more than one year
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>
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)))
118 118  #end
119 119  ## theses displayed per year
120 -#foreach( $year in $itemMap.keySet() )
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 128  ##
129 -## year display / start
126 +#template('apice_thesis_macros.vm')
127 +##
128 +#foreach( $year in $itemMap.keySet() )
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"}}
130 130  <div style="font-style: normal"><ul>
131 - #foreach( $item in $itemMap[$year] )
132 -<li>#thesisyear($item)</li>
133 - #end
132 +#foreach( $item in $itemMap[$year] )
133 +<li>#thesislinked($item)</li>
134 +#end
134 134  </ul></div>
135 -## year display / end
136 -##
137 -## year bottom / start
138 -<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
136 +{{/html}}
139 139   #set( $itemYearNo = $itemMap[$year].size() )
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
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"]]
160 160  #end
161 -## DISPLAY / END
162 -{{/html}}
163 -{{/velocity}}{{pageDisplay sort="objectservice"/}}
140 +{{/velocity}}
141 +{{id name="bottom"/}}