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 89.2
edited by Andrea Omicini
on 29/10/2021 15:53
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,7 +1,6 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 3  #set( $oneYear = false )
4 -#set( $selectedYear = '' )
5 5  ### START YEAR
6 6  ## year parameter
7 7  #set( $yearPar = $mathtool.toInteger($request.year) )
... ... @@ -13,8 +13,7 @@
13 13  #if( $yearPar > 0 )
14 14   #set( $oneYear = true )
15 15   #set( $firstYear = $yearPar )
16 - #set( $lastYear = $yearPar )
17 - #set( $selectedYear = $yearPar )
15 + #set( $lastYear = $toPar )
18 18   #set( $yearList = [$yearPar] )
19 19  #else
20 20   #if( $fromPar != '' && ($fromPar > $firstYear) )
... ... @@ -27,7 +27,6 @@
27 27   #end
28 28   #if( $lastYear <= $firstYear )
29 29   #set( $oneYear = true )
30 - #set( $lastYear = $firstYear )
31 31   #set( $selectedYear = $firstYear )
32 32   #set( $yearList = [$firstYear] )
33 33   #else
... ... @@ -34,13 +34,31 @@
34 34   #set( $yearList = [$lastYear..$firstYear] )
35 35   #end
36 36  #end
37 -### END YEAR
34 +$oneYear
35 +$yearList
36 +#stop
37 +##check velocity variable, takes precedence
38 +#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
39 + #set( $oneStatus = true )
40 + #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
41 +#end
42 +## set ordering field
43 +#if( $selectedStatus == "available" )
44 + #set( $orderingDateFieldName = "availabilityDate" )
45 +#elseif( $selectedStatus == "ongoing" )
46 + #set( $orderingDateFieldName = "startDate" )
47 +#else
48 +## default for no selected status, too
49 + #set( $orderingDateFieldName = "endDate" )
50 +#end
51 +## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
52 +### END STATUS
38 38  ##
39 -### START USER & CYCLE
54 +### START USER & ROLE
40 40  #set( $userNamePar = $request.user.trim() )
41 41  ## default values
42 42  #set( $oneUser = false )
43 -#set( $oneCycle = false )
58 +#set( $oneRole = false )
44 44  #set( $userFirstName = "" )
45 45  #set( $userLastName = "" )
46 46  #if( $userName || $userNamePar )
... ... @@ -60,70 +60,87 @@
60 60   #stop
61 61   #end
62 62  ##user selected and existing user page
63 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
64 - #set( $selectedCycle = '' )
65 - #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
66 - #set( $oneCycle = true )
67 - #set( $selectedCycle = $cyclePar )
78 + #set( $rolePar = $request.role.trim().toLowerCase() )
79 + #set( $selectedRole = '' )
80 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
81 + #set( $oneRole = true )
82 + #set( $selectedRole = $rolePar )
68 68   #end
69 69  #end
70 -## $oneUser and $oneCycle set properly
71 -#if( $oneYear )$selectedYear#end
72 -#if( $oneUser )$selectedUser#end
73 -#if( $oneCycle )$selectedCycle#end
74 -### END USER & CYCLE
85 +## $oneUser and $oneRole set properly, other related variables set accordingly
86 +## $oneRole has meaning only if $oneUser
87 +## if $oneUser, $oneRole false means one user for all roles
88 +## if $oneUser, $oneRole true means one specific role for one user selected
89 +## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
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'/}}
92 +>#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#end#if( $oneRole ) / {{thesisRole short='yes'}}$selectedRole{{/thesisRole}}#end{{id name='top'/}}
78 78  ## index
79 -#if( !$oneYear )
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)))
81 -###elseif( $oneUser && !$oneCycle )
82 -#elseif( !$oneCycle )
83 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $allThesisCycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
94 +#if( !$oneStatus )
95 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $status in $allThesisStatuses )#if ($velocityCount > 1) | #end[[{{thesisStatus plural="true" uppercase="false"}}$status{{/thesisStatus}}>>||anchor="$status"]]#end)))
96 +#elseif( $oneUser && !$oneRole )
97 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[{{thesisRole}}$role{{/thesisRole}}>>||anchor="$role"]]#end)))
84 84  #end{{id name='index'/}}
85 85  ## search theses
86 86  #set( $thesisNo = 0 )
87 -#foreach( $year in $yearList )
88 - #if( !$oneYear || $selectedYear == $year )
89 - #set( $thesisYearNo = 0 )
90 - #if( !$oneYear )
91 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
101 +#foreach( $status in $allThesisStatuses )
102 + #if( !$oneStatus || $selectedStatus == $status )
103 + #set( $thesisStatusNo = 0 )
104 + #if( !$oneStatus )
105 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}{{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}
92 92   #end
93 -## some selected year or year list / now $year
94 - #foreach( $cycle in $allThesisCycles )
95 - #set( $thesisYearCycleNo = 0 )
96 - #if( !$oneCycle || $selectedCycle == $cycle )
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 )
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') )
107 +## some selected status or all statuses / now $status
108 + #if( $oneUser )
109 +## some user selected
110 + #foreach( $role in $allThesisRoles )
111 + #set( $thesisStatusRoleNo = 0 )
112 + #if( !$oneRole || $selectedRole == $role )
113 + #if( $role == "contact" )
114 + #set( $selectedRoleFieldName = "contacts" )
115 + #elseif( $role == "cosupervisor" )
116 + #set( $selectedRoleFieldName = "cosupervisors" )
117 + #else
118 + #set( $selectedRoleFieldName = "supervisors" )
119 + #end
120 +## some selected role or all roles / now $role
121 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
122 + 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 prop0.name = 'status' and prop1.name = '$selectedRoleFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )
123 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
124 + #set( $thesisFoundNo = $thesisFound.size() )
125 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
126 + #if( $thesisFoundNo > 0 && !$oneRole )
127 +(% style="border-style:#if( $oneStatus )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneStatus ){{id name='$role'/}}#else{{id name='$status-$role'/}}#end{{thesisRole plural='no' uppercase='yes' short='yes'}}$role{{/thesisRole}}
128 + #end
129 + #foreach( $thesis in $thesisFound )
130 + #set($thesisDoc = $xwiki.getDocument($thesis))
131 + #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 116   #end
117 - #if( $thesisFoundNo > 0 && !$oneCycle )
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"]]
135 + #if( $thesisFoundNo > 0 && !$oneRole )
136 +(% style="border-style:#if( $oneStatus )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( $oneStatus ){{id name='$role-bottom'/}}#else{{id name='$role-$status-bottom'/}}#end($thesisStatusRoleNo #if( $thesisStatusRoleNo == 1 ){{thesisStatus plural='no' uppercase='no' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='yes' uppercase='no' short='no'}}$status{{/thesisStatus}}#end {{stringEngIta eng='as' ita='come'/}} {{thesisRole short='yes'}}$role{{/thesisRole}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
119 119   #end
120 120   #end
121 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
139 + #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
122 122   #end
141 +## no user selected, no role selected
142 + #else
143 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
144 + 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 = 'status' and prop1.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' order by prop1.value desc" )
145 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
146 + #set( $thesisFoundNo = $thesisFound.size() )
147 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
148 + #foreach( $thesis in $thesisFound )
149 + #set($thesisDoc = $xwiki.getDocument($thesis))
150 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
151 +* [[$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
152 +
153 + #end
123 123   #end
124 - #if( !$oneYear )
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"]]
155 + #if( !$oneStatus )
156 +(% 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" %)|($thesisStatusNo #if($thesisStatusNo == 1){{thesisStatus plural='false' uppercase='false' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='true' uppercase='false' short='no'}}$status{{/thesisStatus}}#end{{id name='$status-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
126 126   #end
127 127   #end
159 +#end
128 128  {{id name='bottom'/}}
129 129  {{/velocity}}