Changes for page Per Year

From version 96.4
edited by Andrea Omicini
on 30/10/2021 16:33
Change comment: There is no comment for this version
To version 86.1
edited by Andrea Omicini
on 29/10/2021 15:48
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,48 +1,58 @@
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) )
8 8  #set( $fromPar = $mathtool.toInteger($request.from) )
9 9  #set( $toPar = $mathtool.toInteger($request.to) )
10 -#set( $firstYear = $mathtool.toInteger($firstYearTh) )
11 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )
9 +#set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear
10 +#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
12 12  #set( $yearList = [$lastYear..$firstYear] )
13 13  #if( $yearPar > 0 )
14 14   #set( $oneYear = true )
15 15   #set( $firstYear = $yearPar )
16 - #set( $lastYear = $yearPar )
17 - #set( $selectedYear = $yearPar )
18 - #set( $yearList = [$yearPar] )
15 + #set( $lastYear = $toPar )
16 + #set( $yearList = [$yearPar] )$yearList
19 19  #else
20 - #if( $fromPar != '' && ($fromPar > $firstYear) )
18 + #if( $fromPar != '' && ($fromPar > $firstYear) )GT
21 21   #set( $firstYear = $fromPar )
22 22   #set( $yearList = [$lastYear..$firstYear] )
23 23   #end
24 - #if( $toPar != '' && ($toPar < $lastYear) )
22 + #if( $toPar != '' && $toPar > $lastYear)
25 25   #set( $lastYear = $toPar )
26 26   #set( $yearList = [$lastYear..$firstYear] )
27 27   #end
28 28   #if( $lastYear <= $firstYear )
29 29   #set( $oneYear = true )
30 - #set( $lastYear = $firstYear )
31 31   #set( $selectedYear = $firstYear )
32 - #set( $yearList = [$firstYear] )
33 33   #else
34 34   #set( $yearList = [$lastYear..$firstYear] )
35 35   #end
36 36  #end
37 -$oneYear
38 -$yearList
39 -### END YEAR
33 +#stop
34 +##check velocity variable, takes precedence
35 +#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
36 + #set( $oneStatus = true )
37 + #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
38 +#end
39 +## set ordering field
40 +#if( $selectedStatus == "available" )
41 + #set( $orderingDateFieldName = "availabilityDate" )
42 +#elseif( $selectedStatus == "ongoing" )
43 + #set( $orderingDateFieldName = "startDate" )
44 +#else
45 +## default for no selected status, too
46 + #set( $orderingDateFieldName = "endDate" )
47 +#end
48 +## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
49 +### END STATUS
40 40  ##
41 -### START USER & CYCLE
51 +### START USER & ROLE
42 42  #set( $userNamePar = $request.user.trim() )
43 43  ## default values
44 44  #set( $oneUser = false )
45 -#set( $oneCycle = false )
55 +#set( $oneRole = false )
46 46  #set( $userFirstName = "" )
47 47  #set( $userLastName = "" )
48 48  #if( $userName || $userNamePar )
... ... @@ -62,53 +62,54 @@
62 62   #stop
63 63   #end
64 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 )
75 + #set( $rolePar = $request.role.trim().toLowerCase() )
76 + #set( $selectedRole = '' )
77 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
78 + #set( $oneRole = true )
79 + #set( $selectedRole = $rolePar )
70 70   #end
71 71  #end
72 -## $oneUser and $oneCycle set properly
73 -$oneUser
74 -$oneCycle
75 -### END USER & CYCLE
82 +## $oneUser and $oneRole set properly, other related variables set accordingly
83 +## $oneRole has meaning only if $oneUser
84 +## if $oneUser, $oneRole false means one user for all roles
85 +## if $oneUser, $oneRole true means one specific role for one user selected
86 +## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
76 76  ##
77 77  ## title
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'/}}
89 +>#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'/}}
79 79  ## index
80 -#if( !$oneYear )
81 -(% 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)))
82 -###elseif( $oneUser && !$oneCycle )
83 -#elseif( !$oneCycle )
84 -(% 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)))
91 +#if( !$oneStatus )
92 +(% 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)))
93 +#elseif( $oneUser && !$oneRole )
94 +(% 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)))
85 85  #end{{id name='index'/}}
86 -
87 -#stop
88 -
89 89  ## search theses
90 90  #set( $thesisNo = 0 )
91 -#foreach( $year in $yearList )
92 - #if( !$oneYear || $selectedYear == $year )
93 - #set( $thesisYearNo = 0 )
94 - #if( !$oneYear )
95 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
98 +#foreach( $status in $allThesisStatuses )
99 + #if( !$oneStatus || $selectedStatus == $status )
100 + #set( $thesisStatusNo = 0 )
101 + #if( !$oneStatus )
102 +(% 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}}
96 96   #end
97 -## some selected year or year list / now $year
98 - #foreach( $cycle in $allThesisCycles )
99 - #set( $thesisYearCycleNo = 0 )
100 - #if( !$oneCycle || $selectedCycle == $cycle )
101 -## some selected cycle or all cycles / now $cycle
102 - #if( $oneUser)
103 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
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 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" )
105 - #else
106 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
107 - 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" )
108 - #end
109 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
110 - #set( $thesisFoundNo = $thesisFound.size() )
111 - #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
104 +## some selected status or all statuses / now $status
105 + #if( $oneUser )
106 +## some user selected
107 + #foreach( $role in $allThesisRoles )
108 + #set( $thesisStatusRoleNo = 0 )
109 + #if( !$oneRole || $selectedRole == $role )
110 + #if( $role == "contact" )
111 + #set( $selectedRoleFieldName = "contacts" )
112 + #elseif( $role == "cosupervisor" )
113 + #set( $selectedRoleFieldName = "cosupervisors" )
114 + #else
115 + #set( $selectedRoleFieldName = "supervisors" )
116 + #end
117 +## some selected role or all roles / now $role
118 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
119 + 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" )
120 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
121 + #set( $thesisFoundNo = $thesisFound.size() )
122 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
112 112   #if( $thesisFoundNo > 0 && !$oneRole )
113 113  (% 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}}
114 114   #end