Changes for page Per Year

From version 95.1
edited by Andrea Omicini
on 29/10/2021 16:17
Change comment: There is no comment for this version
To version 106.1
edited by Andrea Omicini
on 30/10/2021 17:19
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,6 +1,7 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 3  #set( $oneYear = false )
4 +#set( $selectedYear = '' )
4 4  ### START YEAR
5 5  ## year parameter
6 6  #set( $yearPar = $mathtool.toInteger($request.year) )
... ... @@ -12,7 +12,8 @@
12 12  #if( $yearPar > 0 )
13 13   #set( $oneYear = true )
14 14   #set( $firstYear = $yearPar )
15 - #set( $lastYear = $toPar )
16 + #set( $lastYear = $yearPar )
17 + #set( $selectedYear = $yearPar )
16 16   #set( $yearList = [$yearPar] )
17 17  #else
18 18   #if( $fromPar != '' && ($fromPar > $firstYear) )
... ... @@ -25,6 +25,7 @@
25 25   #end
26 26   #if( $lastYear <= $firstYear )
27 27   #set( $oneYear = true )
30 + #set( $lastYear = $firstYear )
28 28   #set( $selectedYear = $firstYear )
29 29   #set( $yearList = [$firstYear] )
30 30   #else
... ... @@ -31,8 +31,6 @@
31 31   #set( $yearList = [$lastYear..$firstYear] )
32 32   #end
33 33  #end
34 -$oneYear
35 -$yearList
36 36  ### END YEAR
37 37  ##
38 38  ### START USER & CYCLE
... ... @@ -39,10 +39,10 @@
39 39  #set( $userNamePar = $request.user.trim() )
40 40  ## default values
41 41  #set( $oneUser = false )
42 -#set( $oneCycle = false )
43 +#set( $selectedUser = '' )
43 43  #set( $userFirstName = "" )
44 44  #set( $userLastName = "" )
45 -#if( $userName || $userNamePar )
46 +#if( $userName || $userNamePar || $userNamePar != '' )
46 46  ## a user is specified for all roles
47 47   #if( !$userName )
48 48   #set( $selectedUser = "XWiki.$userNamePar" )
... ... @@ -58,91 +58,78 @@
58 58  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
59 59   #stop
60 60   #end
61 -##user selected and existing user page
62 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
63 - #set( $selectedCycle = '' )
64 - #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
65 - #set( $oneCycle = true )
66 - #set( $selectedCycle = $cyclePar )
67 - #end
68 68  #end
63 +##if user selected, existing user page
64 +#set( $oneCycle = false )
65 +#set( $selectedCycle = '' )
66 +#set( $cyclePar = $request.cycle.trim().toUpperCase() )
67 +#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
68 + #set( $oneCycle = true )
69 + #set( $selectedCycle = $cyclePar )
70 +#end
69 69  ## $oneUser and $oneCycle set properly
70 -$oneUser
71 -$oneCycle
72 +$yearList
73 +#if( $oneYear )
74 + $selectedYear
75 +#end
76 +#if( $oneUser )
77 + $selectedUser
78 +#end
79 +#if( $oneCycle )
80 + $selectedCycle
81 + {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
82 +#end
72 72  ### END USER & CYCLE
73 73  ##
74 74  ## title
75 ->#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'/}}
76 -
77 -#stop
78 -
79 -
86 +>#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'/}}
80 80  ## index
81 -#if( !$oneStatus )
82 -(% 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)))
83 -#elseif( $oneUser && !$oneRole )
84 -(% 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)))
88 +#if( !$oneYear )
89 +(% 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)))
90 +###elseif( $oneUser && !$oneCycle )
91 +#elseif( !$oneCycle )
92 +(% 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)))
85 85  #end{{id name='index'/}}
86 86  ## search theses
87 87  #set( $thesisNo = 0 )
88 -#foreach( $status in $allThesisStatuses )
89 - #if( !$oneStatus || $selectedStatus == $status )
90 - #set( $thesisStatusNo = 0 )
91 - #if( !$oneStatus )
92 -(% 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}}
93 - #end
94 -## some selected status or all statuses / now $status
95 - #if( $oneUser )
96 -## some user selected
97 - #foreach( $role in $allThesisRoles )
98 - #set( $thesisStatusRoleNo = 0 )
99 - #if( !$oneRole || $selectedRole == $role )
100 - #if( $role == "contact" )
101 - #set( $selectedRoleFieldName = "contacts" )
102 - #elseif( $role == "cosupervisor" )
103 - #set( $selectedRoleFieldName = "cosupervisors" )
104 - #else
105 - #set( $selectedRoleFieldName = "supervisors" )
106 - #end
107 -## some selected role or all roles / now $role
108 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
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 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" )
110 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
111 - #set( $thesisFoundNo = $thesisFound.size() )
112 - #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
113 - #if( $thesisFoundNo > 0 && !$oneRole )
114 -(% 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}}
115 - #end
116 - #foreach( $thesis in $thesisFound )
117 - #set($thesisDoc = $xwiki.getDocument($thesis))
118 - #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
119 -* [[$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
120 -
121 - #end
122 - #if( $thesisFoundNo > 0 && !$oneRole )
123 -(% 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"]]
124 - #end
125 - #end
126 - #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
96 +#foreach( $year in $yearList )
97 + #set( $thesisYearNo = 0 )
98 + #if( !$oneYear )
99 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
100 + #end
101 +## some selected year or year list / now $year
102 + #foreach( $cycle in $allThesisCycles )
103 + #set( $thesisYearCycleNo = 0 )
104 + #if( !$oneCycle || $selectedCycle == $cycle )
105 +## some selected cycle or all cycles / now $cycle
106 + #if( $oneUser)
107 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
108 + 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" )
109 + #else
110 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
111 + 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" )
127 127   #end
128 -## no user selected, no role selected
129 - #else
130 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
131 - 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" )
132 132   #set( $thesisFound = $xwiki.searchDocuments($sql) )
133 133   #set( $thesisFoundNo = $thesisFound.size() )
134 - #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
115 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
116 + #if( $thesisFoundNo > 0 && !$oneCycle )
117 +(% 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}}
118 + #end
135 135   #foreach( $thesis in $thesisFound )
136 - #set($thesisDoc = $xwiki.getDocument($thesis))
137 - #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
120 + #set( $thesisDoc = $xwiki.getDocument($thesis) )
121 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
138 138  * [[$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
139 139  
140 140   #end
125 + #if( $thesisFoundNo > 0 && !$oneCycle )
126 +(% 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"]]
127 + #end
141 141   #end
142 - #if( !$oneStatus )
143 -(% 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"]]
144 - #end
129 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
145 145   #end
131 + #if( !$oneYear )
132 +(% 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"]]
133 + #end
146 146  #end
147 147  {{id name='bottom'/}}
148 148  {{/velocity}}