Changes for page Per Year

From version 123.2
edited by Andrea Omicini
on 20/01/2022 23:41
Change comment: There is no comment for this version
To version 130.2
edited by Andrea Omicini
on 27/01/2023 19:27
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -#if($xcontext.language=='it')Tesi per anno e livello#{else}Theses per Year & Cycle#end
Default language
... ... @@ -1,1 +1,0 @@
1 -en
Content
... ... @@ -1,9 +1,14 @@
1 -{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{include reference="Environment" excludeFirstHeading="true"/}}{{velocity}}
1 += {{italiano}}Per anno e livello{{/italiano}}{{english}}Per Year & Cycle{{/english}} =
2 +
3 +{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 3  ## get environment variables & derived
4 -#set( $firstYear = $mathtool.toInteger($firstYearTh) )
5 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )
6 +#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
7 +#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
6 6  #set( $yearList = [$lastYear..$firstYear] )
9 +#set( $yearPar = 0 )
10 +#set( $fromPar = 0 )
11 +#set( $toPar = 0 )
7 7  ### START YEAR
8 8  ## defaults
9 9  #set( $oneYear = false )
... ... @@ -26,11 +26,11 @@
26 26   #set( $selectedYear = $yearPar )
27 27   #set( $yearList = [$yearPar] )
28 28  #else
29 - #if( $fromPar != '' && ($fromPar > $firstYear) )
34 + #if( $fromPar != '' && $fromPar > 0 && ($fromPar > $firstYear) )
30 30   #set( $firstYear = $fromPar )
31 31   #set( $yearList = [$lastYear..$firstYear] )
32 32   #end
33 - #if( $toPar != '' && ($toPar < $lastYear) )
38 + #if( $toPar != '' && $toPar > 0 && ($toPar < $lastYear) )
34 34   #set( $lastYear = $toPar )
35 35   #set( $yearList = [$lastYear..$firstYear] )
36 36   #end
... ... @@ -89,16 +89,21 @@
89 89   #set( $selectedCycle = $cyclePar )
90 90  #end
91 91  ## $selectedCycle and $oneCycle set properly
97 +#if( $showPhDTheses )
98 + #set( $cycles = $allThesisCycles )
99 +#else
100 + #set( $cycles = $lowThesisCycles )
101 +#end
92 92  ### END CYCLE
93 93  ##
94 94  ## title
95 ->#if( $oneCycle ){{thesisCycle uppercase='yes' 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'/}}
105 +>#if( $oneCycle ){{thesisCycle uppercase='yes' 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'/}}
96 96  ## index
97 97  #if( !$oneYear )
98 -(% 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)))
108 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if( $foreach.index > 0 ) | #end[[$year>>||anchor="$year"]]#end)))
99 99  ###elseif( $oneUser && !$oneCycle )
100 100  #elseif( !$oneCycle )
101 -(% 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)))
111 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $cycles )#if( $foreach.index > 0 ) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
102 102  #end{{id name='index'/}}
103 103  ## search theses
104 104  #set( $thesisNo = 0 )
... ... @@ -108,16 +108,16 @@
108 108  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc.name||queryString='year=$year#if( $oneCycle )&cycle=$selectedCycle#end']]
109 109   #end
110 110  ## some selected year or year list / now $year
111 - #foreach( $cycle in $allThesisCycles )
121 + #foreach( $cycle in $cycles )
112 112   #set( $thesisYearCycleNo = 0 )
113 113   #if( !$oneCycle || $selectedCycle == $cycle )
114 114  ## some selected cycle or all cycles / now $cycle
115 115   #if( $oneUser)
116 116   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
117 - 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 prop5.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and prop2.value = 'Completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" )
127 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' 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 prop5.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'end' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and lower(prop2.value) = 'completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" )
118 118   #else
119 119   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2
120 - 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 = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and prop2.value = 'Completed' order by prop1.value desc" )
130 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'end' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and lower(prop2.value) = 'completed' order by prop1.value desc" )
121 121   #end
122 122   #set( $thesisFound = $xwiki.searchDocuments($sql) )
123 123   #set( $thesisFoundNo = $thesisFound.size() )