Changes for page Per Year

From version 111.1
edited by Andrea Omicini
on 30/10/2021 17:31
Change comment: There is no comment for this version
To version 102.2
edited by Andrea Omicini
on 30/10/2021 16:50
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,24 +1,15 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 -## get environment variables & derived
3 +#set( $oneYear = false )
4 +#set( $selectedYear = '' )
5 +### START YEAR
6 +## year parameter
7 +#set( $yearPar = $mathtool.toInteger($request.year) )
8 +#set( $fromPar = $mathtool.toInteger($request.from) )
9 +#set( $toPar = $mathtool.toInteger($request.to) )
4 4  #set( $firstYear = $mathtool.toInteger($firstYearTh) )
5 5  #set( $lastYear = $mathtool.toInteger($lastYearTh) )
6 6  #set( $yearList = [$lastYear..$firstYear] )
7 -### START YEAR
8 -## defaults
9 -#set( $oneYear = false )
10 -#set( $selectedYear = '' )
11 -## year parameters
12 -#if( $request.year )
13 - #set( $yearPar = $mathtool.toInteger($request.year) )
14 -#end
15 -#if( $request.from )
16 - #set( $fromPar = $mathtool.toInteger($request.from) )
17 -#end
18 -#if( $request.to )
19 - #set( $toPar = $mathtool.toInteger($request.to) )
20 -#end
21 -##set years
22 22  #if( $yearPar > 0 )
23 23   #set( $oneYear = true )
24 24   #set( $firstYear = $yearPar )
... ... @@ -43,21 +43,17 @@
43 43   #set( $yearList = [$lastYear..$firstYear] )
44 44   #end
45 45  #end
46 -## $selectedYear, $yearList and $oneYear set properly
47 47  ### END YEAR
48 48  ##
49 -### START USER
39 +### START USER & CYCLE
40 +#set( $userNamePar = $request.user.trim() )
50 50  ## default values
51 51  #set( $oneUser = false )
52 -#set( $selectedUser = '' )
43 +#set( $oneCycle = false )
53 53  #set( $userFirstName = "" )
54 54  #set( $userLastName = "" )
55 -## user parameter
56 -#if( $request.user )
57 - #set( $userNamePar = $request.user.trim() )
58 -#end
59 59  #if( $userName || $userNamePar )
60 -## try to specify a user
47 +## a user is specified for all roles
61 61   #if( !$userName )
62 62   #set( $selectedUser = "XWiki.$userNamePar" )
63 63   #else
... ... @@ -72,44 +72,28 @@
72 72  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
73 73   #stop
74 74   #end
75 -#end
76 -## $selectedUser and $oneUser set properly
77 -### END USER
78 -##
79 -### START CYCLE
80 -#set( $oneCycle = false )
81 -#set( $selectedCycle = '' )
82 -## cycle parameter
83 -#if( $request.cycle )
62 +##user selected and existing user page
84 84   #set( $cyclePar = $request.cycle.trim().toUpperCase() )
64 + #set( $selectedCycle = '' )
65 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
66 + #set( $oneCycle = true )
67 + #set( $selectedCycle = $cyclePar )
68 + #end
85 85  #end
86 -## set cycle
87 -#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
88 - #set( $oneCycle = true )
89 - #set( $selectedCycle = $cyclePar )
90 -#end
91 -## $selectedCycle and $oneCycle set properly
92 -### END CYCLE
93 -$yearList
70 +## $oneUser and $oneCycle set properly
94 94  #if( $oneYear )
95 95   $selectedYear
96 -#else
97 - $yearList
98 98  #end
99 99  #if( $oneUser )
100 100   $selectedUser
101 -#else
102 - ALL USERS
103 103  #end
104 104  #if( $oneCycle )
105 105   $selectedCycle
106 -#else
107 - ALL USERS
108 108  #end
109 109  ### END USER & CYCLE
110 110  ##
111 111  ## title
112 ->#if( $oneCycle ){{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}}
83 +>#if( $oneRole ){{thesisCycle short='no'}}$selecteCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}}
113 113  ## index
114 114  #if( !$oneYear )
115 115  (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if ($velocityCount > 1) | #end[[$year>>||anchor="$year"]]#end)))
... ... @@ -120,43 +120,45 @@
120 120  ## search theses
121 121  #set( $thesisNo = 0 )
122 122  #foreach( $year in $yearList )
123 - #set( $thesisYearNo = 0 )
124 - #if( !$oneYear )
94 + #if( !$oneYear || $selectedYear == $year )
95 + #set( $thesisYearNo = 0 )
96 + #if( !$oneYear )
125 125  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
126 - #end
98 + #end
127 127  ## some selected year or year list / now $year
128 - #foreach( $cycle in $allThesisCycles )
129 - #set( $thesisYearCycleNo = 0 )
130 - #if( !$oneCycle || $selectedCycle == $cycle )
100 + #foreach( $cycle in $allThesisCycles )
101 + #set( $thesisYearCycleNo = 0 )
102 + #if( !$oneCycle || $selectedCycle == $cycle )
131 131  ## some selected cycle or all cycles / now $cycle
132 - #if( $oneUser)
133 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
134 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' 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 prop0.name = 'cycle' and prop1.name = 'year' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
135 - #else
136 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
137 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and year(prop1.value) = '$year' order by prop1.value desc" )
138 - #end
139 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
140 - #set( $thesisFoundNo = $thesisFound.size() )
141 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
142 - #if( $thesisFoundNo > 0 && !$oneCycle )
104 + #if( $oneUser)
105 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
106 + where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' 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 prop0.name = 'cycle' and prop1.name = 'year' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop0.value = '$cycle' and prop1.value = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
107 + #else
108 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
109 + where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and prop1.value = '$year' order by prop1.value desc" )
110 + #end
111 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
112 + #set( $thesisFoundNo = $thesisFound.size() )
113 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
114 + #if( $thesisFoundNo > 0 && !$oneCycle )
143 143  (% style="border-style:#if( $oneYear )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneYear ){{id name='$cycle'/}}#else{{id name='$year-$cycle'/}}#end{{thesisCycle plural='no' uppercase='yes' short='yes'}}$cycle{{/thesisCycle}}
144 - #end
145 - #foreach( $thesis in $thesisFound )
146 - #set( $thesisDoc = $xwiki.getDocument($thesis) )
147 - #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
116 + #end
117 + #foreach( $thesis in $thesisFound )
118 + #set( $thesisDoc = $xwiki.getDocument($thesis) )
119 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
148 148  * [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) //($thesisObj.endDate)//#end#if( $thesisDoc.getValue('studentUserName') != "" ) [[$xwiki.getUserName($thesisDoc.getValue('studentUserName'), false)>>$thesisDoc.getValue('studentUserName')]]#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end
149 149  
150 - #end
151 - #if( $thesisFoundNo > 0 && !$oneCycle )
122 + #end
123 + #if( $thesisFoundNo > 0 && !$oneCycle )
152 152  (% style="border-style:#if( $oneYear )hidden solid solid hidden#{else}hidden dotted hidden hidden#end; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|#if( $oneYear ){{id name='$cycle-bottom'/}}#else{{id name='$cycle-$year-bottom'/}}#end($thesisYearCycleNo #if( $thesisYearCycleNo == 1 ){{thesisCycle plural='no' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#else{{thesisCycle plural='yes' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#end {{stringEngIta eng='in' ita='nel'/}} $year [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
125 + #end
126 + #end
127 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
153 153   #end
154 154   #end
155 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
156 - #end
157 - #if( !$oneYear )
130 + #if( !$oneYear )
158 158  (% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|($thesisYearNo #if($thesisYearNo == 1){{stringEngIta eng='thesis in' ita='tesi nel'/}}#else{{stringEngIta eng='theses in' ita='tesi nel'/}}#end$year{{id name='$year-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
132 + #end
159 159   #end
160 -#end
161 161  {{id name='bottom'/}}
162 162  {{/velocity}}