Changes for page Per Year

From version 107.1
edited by Andrea Omicini
on 30/10/2021 17:24
Change comment: There is no comment for this version
To version 98.1
edited by Andrea Omicini
on 30/10/2021 16:44
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,19 +43,18 @@
43 43   #set( $yearList = [$lastYear..$firstYear] )
44 44   #end
45 45  #end
37 +$oneYear
38 +$yearList
46 46  ### END YEAR
47 47  ##
48 48  ### START USER & CYCLE
42 +#set( $userNamePar = $request.user.trim() )
49 49  ## default values
50 50  #set( $oneUser = false )
51 -#set( $selectedUser = '' )
45 +#set( $oneCycle = false )
52 52  #set( $userFirstName = "" )
53 53  #set( $userLastName = "" )
54 -## user parameter
55 -#if( $request.user )
56 - #set( $userNamePar = $request.user.trim() )
57 -#end
58 -#if( $userName || $userNamePar || $userNamePar != '' )
48 +#if( $userName || $userNamePar )
59 59  ## a user is specified for all roles
60 60   #if( !$userName )
61 61   #set( $selectedUser = "XWiki.$userNamePar" )
... ... @@ -71,31 +71,21 @@
71 71  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
72 72   #stop
73 73   #end
64 +##user selected and existing user page
65 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
66 + #set( $selectedCycle = '' )
67 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
68 + #set( $oneCycle = true )
69 + #set( $selectedCycle = $cyclePar )
70 + #end
74 74  #end
75 -##if user selected, existing user page
76 -#set( $oneCycle = false )
77 -#set( $selectedCycle = '' )
78 -#set( $cyclePar = $request.cycle.trim().toUpperCase() )
79 -#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
80 - #set( $oneCycle = true )
81 - #set( $selectedCycle = $cyclePar )
82 -#end
83 83  ## $oneUser and $oneCycle set properly
84 -$yearList
85 -#if( $oneYear )
86 - $selectedYear
87 -#end
88 -#if( $oneUser )
89 - $selectedUser
90 -#end
91 -#if( $oneCycle )
92 - $selectedCycle
93 - {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
94 -#end
73 +$oneUser
74 +$oneCycle
95 95  ### END USER & CYCLE
96 96  ##
97 97  ## title
98 ->#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'/}}
78 +>#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'/}}
99 99  ## index
100 100  #if( !$oneYear )
101 101  (% 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)))
... ... @@ -106,42 +106,45 @@
106 106  ## search theses
107 107  #set( $thesisNo = 0 )
108 108  #foreach( $year in $yearList )
109 - #set( $thesisYearNo = 0 )
110 - #if( !$oneYear )
89 + #if( !$oneYear || $selectedYear == $year )
90 + #set( $thesisYearNo = 0 )
91 + #if( !$oneYear )
111 111  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
112 - #end
93 + #end
113 113  ## some selected year or year list / now $year
114 - #foreach( $cycle in $allThesisCycles )
115 - #set( $thesisYearCycleNo = 0 )
116 - #if( !$oneCycle || $selectedCycle == $cycle )
95 + #foreach( $cycle in $allThesisCycles )
96 + #set( $thesisYearCycleNo = 0 )
97 + #if( !$oneCycle || $selectedCycle == $cycle )
117 117  ## some selected cycle or all cycles / now $cycle
118 - #if( $oneUser)
119 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
120 - 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" )
121 - #else
122 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
123 - 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" )
124 - #end
125 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
126 - #set( $thesisFoundNo = $thesisFound.size() )
127 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
128 - #if( $thesisFoundNo > 0 && !$oneCycle )
99 + #if( $oneUser)
100 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
101 + 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%' || prop3.value like '%$selectedUser%' || prop4.value like '%$selectedUser%' ) order by prop2.value desc" )
102 + #else
103 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
104 + 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 prop2.value desc" )
105 + #end
106 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
107 + #set( $thesisFoundNo = $thesisFound.size() )
108 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
109 + #if( $thesisFoundNo > 0 && !$oneCycle )
129 129  (% 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}}
130 - #end
131 - #foreach( $thesis in $thesisFound )
132 - #set( $thesisDoc = $xwiki.getDocument($thesis) )
133 - #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
111 + #end
112 + #foreach( $thesis in $thesisFound )
113 + #set( $thesisDoc = $xwiki.getDocument($thesis) )
114 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
134 134  * [[$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
135 135  
136 - #end
137 - #if( $thesisFoundNo > 0 && !$oneCycle )
117 + #end
118 + #if( $thesisFoundNo > 0 && !$oneCycle )
138 138  (% 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"]]
120 + #end
121 + #end
122 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
139 139   #end
140 140   #end
141 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
142 - #end
143 - #if( !$oneYear )
125 + #if( !$oneYear )
144 144  (% 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"]]
127 + #end
145 145   #end
146 146  #end
147 147  {{id name='bottom'/}}