Changes for page Per Year

From version 103.5
edited by Andrea Omicini
on 30/10/2021 17:11
Change comment: There is no comment for this version
To version 101.1
edited by Andrea Omicini
on 30/10/2021 16:49
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
... ... @@ -68,21 +68,13 @@
68 68   #end
69 69  #end
70 70  ## $oneUser and $oneCycle set properly
71 -$yearList
72 -#if( $oneYear )
73 - $selectedYear
74 -#end
75 -#if( $oneUser )
76 - $selectedUser
77 -#end
78 -#if( $oneCycle )
79 - $selectedCycle
80 - {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
81 -#end
73 +#if( $oneYear )$selectedYear#end
74 +#if( $oneUser )$selectedUser#end
75 +#if( $oneCycle )$selectedCycle#end
82 82  ### END USER & CYCLE
83 83  ##
84 84  ## title
85 ->#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'/}}
79 +>#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'/}}
86 86  ## index
87 87  #if( !$oneYear )
88 88  (% 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)))
... ... @@ -93,43 +93,45 @@
93 93  ## search theses
94 94  #set( $thesisNo = 0 )
95 95  #foreach( $year in $yearList )
96 - #set( $thesisYearNo = 0 )
97 - #if( !$oneYear )
90 + #if( !$oneYear || $selectedYear == $year )
91 + #set( $thesisYearNo = 0 )
92 + #if( !$oneYear )
98 98  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
99 - #end
94 + #end
100 100  ## some selected year or year list / now $year
101 - #foreach( $cycle in $allThesisCycles )
102 - #set( $thesisYearCycleNo = 0 )
103 - #if( !$oneCycle || $selectedCycle == $cycle )
96 + #foreach( $cycle in $allThesisCycles )
97 + #set( $thesisYearCycleNo = 0 )
98 + #if( !$oneCycle || $selectedCycle == $cycle )
104 104  ## some selected cycle or all cycles / now $cycle
105 - #if( $oneUser)
106 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
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 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" )
108 - #else
109 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
110 - 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" )
111 - #end
112 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
113 - #set( $thesisFoundNo = $thesisFound.size() )
114 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
115 - #if( $thesisFoundNo > 0 && !$oneCycle )
100 + #if( $oneUser)
101 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
102 + 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" )
103 + #else
104 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
105 + 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" )
106 + #end
107 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
108 + #set( $thesisFoundNo = $thesisFound.size() )
109 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
110 + #if( $thesisFoundNo > 0 && !$oneCycle )
116 116  (% 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}}
117 - #end
118 - #foreach( $thesis in $thesisFound )
119 - #set( $thesisDoc = $xwiki.getDocument($thesis) )
120 - #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
112 + #end
113 + #foreach( $thesis in $thesisFound )
114 + #set( $thesisDoc = $xwiki.getDocument($thesis) )
115 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
121 121  * [[$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
122 122  
123 - #end
124 - #if( $thesisFoundNo > 0 && !$oneCycle )
118 + #end
119 + #if( $thesisFoundNo > 0 && !$oneCycle )
125 125  (% 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"]]
121 + #end
122 + #end
123 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
126 126   #end
127 127   #end
128 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
129 - #end
130 - #if( !$oneYear )
126 + #if( !$oneYear )
131 131  (% 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"]]
128 + #end
132 132   #end
133 -#end
134 134  {{id name='bottom'/}}
135 135  {{/velocity}}