Changes for page Per Year
From version 127.2
edited by Andrea Omicini
on 21/06/2022 10:58
on 21/06/2022 10:58
Change comment:
There is no comment for this version
To version 123.2
edited by Andrea Omicini
on 20/01/2022 23:41
on 20/01/2022 23:41
Change comment:
There is no comment for this version
Summary
-
Page properties (3 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,0 +1,1 @@ 1 +#if($xcontext.language=='it')Tesi per anno e livello#{else}Theses per Year & Cycle#end - Default language
-
... ... @@ -1,0 +1,1 @@ 1 +en - Content
-
... ... @@ -1,14 +1,9 @@ 1 -= {{italiano}}Per anno e livello{{/italiano}}{{english}}Per Year & Cycle{{/english}} = 2 - 3 -{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}} 1 +{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{include reference="Environment" excludeFirstHeading="true"/}}{{velocity}} 4 4 #set( $thesisMenu = true ) 5 5 ## get environment variables & derived 6 -#set( $firstYear = $mathtool.toInteger($firstYearTh esis) )7 -#set( $lastYear = $mathtool.toInteger($lastYearTh esis) )4 +#set( $firstYear = $mathtool.toInteger($firstYearTh) ) 5 +#set( $lastYear = $mathtool.toInteger($lastYearTh) ) 8 8 #set( $yearList = [$lastYear..$firstYear] ) 9 -#set( $yearPar = 0 ) 10 -#set( $fromPar = 0 ) 11 -#set( $toPar = 0 ) 12 12 ### START YEAR 13 13 ## defaults 14 14 #set( $oneYear = false ) ... ... @@ -31,11 +31,11 @@ 31 31 #set( $selectedYear = $yearPar ) 32 32 #set( $yearList = [$yearPar] ) 33 33 #else 34 - #if( $fromPar != '' && $fromPar > 0 &&($fromPar > $firstYear) )29 + #if( $fromPar != '' && ($fromPar > $firstYear) ) 35 35 #set( $firstYear = $fromPar ) 36 36 #set( $yearList = [$lastYear..$firstYear] ) 37 37 #end 38 - #if( $toPar != '' && $toPar > 0 &&($toPar < $lastYear) )33 + #if( $toPar != '' && ($toPar < $lastYear) ) 39 39 #set( $lastYear = $toPar ) 40 40 #set( $yearList = [$lastYear..$firstYear] ) 41 41 #end ... ... @@ -94,21 +94,16 @@ 94 94 #set( $selectedCycle = $cyclePar ) 95 95 #end 96 96 ## $selectedCycle and $oneCycle set properly 97 -#if( $showPhDTheses ) 98 - #set( $cycles = $allThesisCycles ) 99 -#else 100 - #set( $cycles = $lowThesisCycles ) 101 -#end 102 102 ### END CYCLE 103 103 ## 104 104 ## title 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'/}}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'/}} 106 106 ## index 107 107 #if( !$oneYear ) 108 108 (% 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))) 109 109 ###elseif( $oneUser && !$oneCycle ) 110 110 #elseif( !$oneCycle ) 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)))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))) 112 112 #end{{id name='index'/}} 113 113 ## search theses 114 114 #set( $thesisNo = 0 ) ... ... @@ -118,16 +118,16 @@ 118 118 (% 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']] 119 119 #end 120 120 ## some selected year or year list / now $year 121 - #foreach( $cycle in $ cycles )111 + #foreach( $cycle in $allThesisCycles ) 122 122 #set( $thesisYearCycleNo = 0 ) 123 123 #if( !$oneCycle || $selectedCycle == $cycle ) 124 124 ## some selected cycle or all cycles / now $cycle 125 125 #if( $oneUser) 126 126 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5 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" ) 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" ) 128 128 #else 129 129 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2 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" ) 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" ) 131 131 #end 132 132 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 133 133 #set( $thesisFoundNo = $thesisFound.size() )