Changes for page Per Year

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

Summary

Details

Page properties
Content
... ... @@ -34,6 +34,8 @@
34 34   #set( $yearList = [$lastYear..$firstYear] )
35 35   #end
36 36  #end
37 +$oneYear
38 +$yearList
37 37  ### END YEAR
38 38  ##
39 39  ### START USER & CYCLE
... ... @@ -40,10 +40,10 @@
40 40  #set( $userNamePar = $request.user.trim() )
41 41  ## default values
42 42  #set( $oneUser = false )
43 -#set( $selectedUser = '' )
45 +#set( $oneCycle = false )
44 44  #set( $userFirstName = "" )
45 45  #set( $userLastName = "" )
46 -#if( $userName || $userNamePar || $userNamePar != '' )
48 +#if( $userName || $userNamePar )
47 47  ## a user is specified for all roles
48 48   #if( !$userName )
49 49   #set( $selectedUser = "XWiki.$userNamePar" )
... ... @@ -59,31 +59,21 @@
59 59  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
60 60   #stop
61 61   #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
62 62  #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
71 71  ## $oneUser and $oneCycle set properly
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
73 +$oneUser
74 +$oneCycle
83 83  ### END USER & CYCLE
84 84  ##
85 85  ## title
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'/}}
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'/}}
87 87  ## index
88 88  #if( !$oneYear )
89 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)))
... ... @@ -91,46 +91,65 @@
91 91  #elseif( !$oneCycle )
92 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)))
93 93  #end{{id name='index'/}}
86 +
87 +#stop
88 +
94 94  ## search theses
95 95  #set( $thesisNo = 0 )
96 96  #foreach( $year in $yearList )
97 - #set( $thesisYearNo = 0 )
98 - #if( !$oneYear )
92 + #if( !$oneYear || $selectedYear == $year )
93 + #set( $thesisYearNo = 0 )
94 + #if( !$oneYear )
99 99  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
100 - #end
96 + #end
101 101  ## some selected year or year list / now $year
102 - #foreach( $cycle in $allThesisCycles )
103 - #set( $thesisYearCycleNo = 0 )
104 - #if( !$oneCycle || $selectedCycle == $cycle )
98 + #foreach( $cycle in $allThesisCycles )
99 + #set( $thesisYearCycleNo = 0 )
100 + #if( !$oneCycle || $selectedCycle == $cycle )
105 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" )
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( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
112 + #if( $thesisFoundNo > 0 && !$oneCycle )
113 +(% 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}}
114 + #end
115 + #foreach( $thesis in $thesisFound )
116 + #set($thesisDoc = $xwiki.getDocument($thesis))
117 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
118 +* [[$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
119 +
120 + #end
121 + #if( $thesisFoundNo > 0 && !$oneRole )
122 +(% 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"]]
123 + #end
124 + #end
125 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
112 112   #end
127 +## no user selected, no role selected
128 + #else
129 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
130 + 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" )
113 113   #set( $thesisFound = $xwiki.searchDocuments($sql) )
114 114   #set( $thesisFoundNo = $thesisFound.size() )
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
133 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
119 119   #foreach( $thesis in $thesisFound )
120 - #set( $thesisDoc = $xwiki.getDocument($thesis) )
121 - #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
135 + #set($thesisDoc = $xwiki.getDocument($thesis))
136 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
122 122  * [[$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
123 123  
124 124   #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
128 128   #end
129 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
141 + #if( !$oneStatus )
142 +(% 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"]]
143 + #end
130 130   #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
134 134  #end
135 135  {{id name='bottom'/}}
136 136  {{/velocity}}