Changes for page Per Year
From version 124.1
edited by Andrea Omicini
on 10/03/2022 12:31
on 10/03/2022 12:31
Change comment:
There is no comment for this version
To version 127.3
edited by Andrea Omicini
on 21/06/2022 10:59
on 21/06/2022 10:59
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -3,9 +3,12 @@ 3 3 {{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}} 4 4 #set( $thesisMenu = true ) 5 5 ## get environment variables & derived 6 -#set( $firstYear = $mathtool.toInteger($firstYearTh) ) 7 -#set( $lastYear = $mathtool.toInteger($lastYearTh) ) 6 +#set( $firstYear = $mathtool.toInteger($firstYearThesis) ) 7 +#set( $lastYear = $mathtool.toInteger($lastYearThesis) ) 8 8 #set( $yearList = [$lastYear..$firstYear] ) 9 +#set( $yearPar = 0 ) 10 +#set( $fromPar = 0 ) 11 +#set( $toPar = 0 ) 9 9 ### START YEAR 10 10 ## defaults 11 11 #set( $oneYear = false ) ... ... @@ -28,11 +28,11 @@ 28 28 #set( $selectedYear = $yearPar ) 29 29 #set( $yearList = [$yearPar] ) 30 30 #else 31 - #if( $fromPar != '' && ($fromPar > $firstYear) ) 34 + #if( $fromPar != '' && $fromPar > 0 && ($fromPar > $firstYear) ) 32 32 #set( $firstYear = $fromPar ) 33 33 #set( $yearList = [$lastYear..$firstYear] ) 34 34 #end 35 - #if( $toPar != '' && ($toPar < $lastYear) ) 38 + #if( $toPar != '' && $toPar > 0 && ($toPar < $lastYear) ) 36 36 #set( $lastYear = $toPar ) 37 37 #set( $yearList = [$lastYear..$firstYear] ) 38 38 #end ... ... @@ -91,16 +91,21 @@ 91 91 #set( $selectedCycle = $cyclePar ) 92 92 #end 93 93 ## $selectedCycle and $oneCycle set properly 97 +#if( $showPhDTheses ) 98 + #set( $cycles = $allThesisCycles ) 99 +#else 100 + #set( $cycles = $lowThesisCycles ) 101 +#end 94 94 ### END CYCLE 95 95 ## 96 96 ## title 97 ->#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'/}} 98 98 ## index 99 99 #if( !$oneYear ) 100 100 (% 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))) 101 101 ###elseif( $oneUser && !$oneCycle ) 102 102 #elseif( !$oneCycle ) 103 -(% 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 ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end))) 104 104 #end{{id name='index'/}} 105 105 ## search theses 106 106 #set( $thesisNo = 0 ) ... ... @@ -110,16 +110,16 @@ 110 110 (% 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']] 111 111 #end 112 112 ## some selected year or year list / now $year 113 - #foreach( $cycle in $ allThesisCycles )121 + #foreach( $cycle in $cycles ) 114 114 #set( $thesisYearCycleNo = 0 ) 115 115 #if( !$oneCycle || $selectedCycle == $cycle ) 116 116 ## some selected cycle or all cycles / now $cycle 117 117 #if( $oneUser) 118 118 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5 119 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.Thesis ClassTemplate' andobj.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 = 'Theses.ThesisClass' 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" ) 120 120 #else 121 121 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2 122 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.Thesis ClassTemplate' andobj.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 = 'Theses.ThesisClass' 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" ) 123 123 #end 124 124 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 125 125 #set( $thesisFoundNo = $thesisFound.size() )