Changes for page Per Year

From version 146.1
edited by Andrea Omicini
on 30/06/2023 17:13
Change comment: There is no comment for this version
To version 153.1
edited by Andrea Omicini
on 30/06/2023 21:23
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,12 +1,9 @@
1 1  {{velocity}}
2 +{{html wiki="true" clean="false"}}
2 2  #template('apice_boolean.vm')
3 -#### HANDLE PARAMETERS / START
4 +#### SET PARAMETERS / START
4 4  #template('apice_theses.vm')
5 5  #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() )
10 10  ## years / personal
11 11  #if( $isUserSpace )
12 12   #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
... ... @@ -27,44 +27,9 @@
27 27  ## years / parameters takes precedence
28 28  #set( $firstYear = $firstYearThesis )
29 29  #set( $lastYear = $lastYearThesis )
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
27 +#template('apice_year_param.vm')
28 +##
29 +## CYCLES / START
68 68  ## $cycleList gets the list of cycles to be shown
69 69  ## $oneCycle true if just one cycle to be shown
70 70  #if( $request.cycle && $request.cycle.trim() != "" )
... ... @@ -86,14 +86,16 @@
86 86   #set( $cycle = "" )
87 87  #end
88 88  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
89 -#### HANDLE PARAMETERS / END
51 +## CYCLES / END
90 90  ##
91 -## query to structures
53 +#### SET PARAMETERS / END
54 +##
55 +## DATA STRUCTURES / START
92 92  #set( $itemMap = {} )
93 93  #set( $itemNo = 0 )
94 94  #foreach( $year in $yearList )
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" )
59 + #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
60 + 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" )
97 97  ## do query
98 98   #set( $itemFound = $xwiki.searchDocuments($query) )
99 99  ## set counters
... ... @@ -103,12 +103,36 @@
103 103   #set( $itemNo = $itemNo + $itemYearNo )
104 104   #end
105 105  #end
70 +## DATA STRUCTURES / END
106 106  ##
107 -## output results
72 +## DISPLAY / START
108 108  ## page subtitle
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 -
74 +<div class="mainheader">
75 +$itemNo
76 +#if( $itemNo == 1 )
77 + #if( $oneCycle )
78 + {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
79 + #else
80 + $services.localization.render('thesis').toLowerCase()
81 + #end
82 +#{else}
83 + #if( $oneCycle )
84 + {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
85 + #else
86 + $services.localization.render('theses').toLowerCase()
87 + #end
88 +#{end}
89 +<span class="textsecondary">&ensp;/&ensp;</span>
90 +#if( $oneYear )
91 + $year
92 +#else
93 + $firstYear–$lastYear
94 +#{end}
95 +#if( $oneUser )
96 + <span class="textsecondary">&ensp;/&ensp;</span>
97 + $userFirstName $userLastName
98 +#end
99 +</div>
112 112  ## stop if no thesis is found
113 113  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
114 114  ## redundant double check
... ... @@ -118,8 +118,14 @@
118 118  ## page index
119 119  #if( $itemMap.keySet().size() > 1 )
120 120  ## found more than one year
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)))
109 +<div class="mainselectbar" id="index">
110 + #foreach( $year in $itemMap.keySet() )
111 + #if( !$foreach.first )
112 + &ensp;&bull;&ensp;
113 + #end
114 + [[$year>>||anchor="$year"]]
115 + #end
116 +</div>
123 123  #end
124 124  ## theses displayed per year
125 125  ##
... ... @@ -127,15 +127,14 @@
127 127  ##
128 128  #foreach( $year in $itemMap.keySet() )
129 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"}}
131 131  <div style="font-style: normal"><ul>
132 132  #foreach( $item in $itemMap[$year] )
133 133  <li>#thesislinked($item)</li>
134 134  #end
135 135  </ul></div>
136 -{{/html}}
137 137   #set( $itemYearNo = $itemMap[$year].size() )
138 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"]]
139 139  #end
132 +{{/html}}
140 140  {{/velocity}}
141 141  {{id name="bottom"/}}