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