Changes for page Per Year

From version 102.1
edited by Andrea Omicini
on 30/10/2021 16:49
Change comment: There is no comment for this version
To version 109.1
edited by Andrea Omicini
on 30/10/2021 17:27
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,15 +1,24 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
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) )
3 +## get environment variables & derived
10 10  #set( $firstYear = $mathtool.toInteger($firstYearTh) )
11 11  #set( $lastYear = $mathtool.toInteger($lastYearTh) )
12 12  #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
13 13  #if( $yearPar > 0 )
14 14   #set( $oneYear = true )
15 15   #set( $firstYear = $yearPar )
... ... @@ -36,15 +36,18 @@
36 36  #end
37 37  ### END YEAR
38 38  ##
39 -### START USER & CYCLE
40 -#set( $userNamePar = $request.user.trim() )
48 +### START USER
41 41  ## default values
42 42  #set( $oneUser = false )
43 -#set( $oneCycle = false )
51 +#set( $selectedUser = '' )
44 44  #set( $userFirstName = "" )
45 45  #set( $userLastName = "" )
54 +## user parameter
55 +#if( $request.user )
56 + #set( $userNamePar = $request.user.trim() )
57 +#end
46 46  #if( $userName || $userNamePar )
47 -## a user is specified for all roles
59 +## try to specify a user
48 48   #if( !$userName )
49 49   #set( $selectedUser = "XWiki.$userNamePar" )
50 50   #else
... ... @@ -59,22 +59,36 @@
59 59  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
60 60   #stop
61 61   #end
62 -##user selected and existing user page
74 +#end
75 +### END USER
76 +##if user selected, existing user page
77 +### START CYCLE
78 +#set( $oneCycle = false )
79 +#set( $selectedCycle = '' )
80 +#if( $request.cycle )
63 63   #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
82 + $cyclePar
69 69  #end
84 +#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
85 + #set( $oneCycle = true )
86 + #set( $selectedCycle = $cyclePar )
87 +#end
70 70  ## $oneUser and $oneCycle set properly
71 -#if( $oneYear )$selectedYear#end
72 -#if( $oneUser )$selectedUser#end
73 -#if( $oneCycle )$selectedCycle#end
89 +$yearList
90 +#if( $oneYear )
91 + $selectedYear
92 +#end
93 +#if( $oneUser )
94 + $selectedUser
95 +#end
96 +#if( $oneCycle )
97 + $selectedCycle
98 + {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
99 +#end
74 74  ### END USER & CYCLE
75 75  ##
76 76  ## title
77 ->#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'/}}
103 +>#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 78  ## index
79 79  #if( !$oneYear )
80 80  (% 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)))
... ... @@ -85,45 +85,43 @@
85 85  ## search theses
86 86  #set( $thesisNo = 0 )
87 87  #foreach( $year in $yearList )
88 - #if( !$oneYear || $selectedYear == $year )
89 - #set( $thesisYearNo = 0 )
90 - #if( !$oneYear )
114 + #set( $thesisYearNo = 0 )
115 + #if( !$oneYear )
91 91  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
92 - #end
117 + #end
93 93  ## some selected year or year list / now $year
94 - #foreach( $cycle in $allThesisCycles )
95 - #set( $thesisYearCycleNo = 0 )
96 - #if( !$oneCycle || $selectedCycle == $cycle )
119 + #foreach( $cycle in $allThesisCycles )
120 + #set( $thesisYearCycleNo = 0 )
121 + #if( !$oneCycle || $selectedCycle == $cycle )
97 97  ## some selected cycle or all cycles / now $cycle
98 - #if( $oneUser)
99 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
100 - 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" )
101 - #else
102 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
103 - 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" )
104 - #end
105 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
106 - #set( $thesisFoundNo = $thesisFound.size() )
107 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
108 - #if( $thesisFoundNo > 0 && !$oneCycle )
123 + #if( $oneUser)
124 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
125 + 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" )
126 + #else
127 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
128 + 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" )
129 + #end
130 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
131 + #set( $thesisFoundNo = $thesisFound.size() )
132 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
133 + #if( $thesisFoundNo > 0 && !$oneCycle )
109 109  (% 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}}
110 - #end
111 - #foreach( $thesis in $thesisFound )
112 - #set( $thesisDoc = $xwiki.getDocument($thesis) )
113 - #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
135 + #end
136 + #foreach( $thesis in $thesisFound )
137 + #set( $thesisDoc = $xwiki.getDocument($thesis) )
138 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
114 114  * [[$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
115 115  
116 - #end
117 - #if( $thesisFoundNo > 0 && !$oneCycle )
141 + #end
142 + #if( $thesisFoundNo > 0 && !$oneCycle )
118 118  (% 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"]]
119 - #end
120 - #end
121 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
122 122   #end
123 123   #end
124 - #if( !$oneYear )
146 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
147 + #end
148 + #if( !$oneYear )
125 125  (% 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"]]
126 - #end
127 127   #end
151 +#end
128 128  {{id name='bottom'/}}
129 129  {{/velocity}}