Changes for page Per Year
From version 90.3
edited by Andrea Omicini
on 29/10/2021 16:08
on 29/10/2021 16:08
Change comment:
There is no comment for this version
To version 96.4
edited by Andrea Omicini
on 30/10/2021 16:33
on 30/10/2021 16:33
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,6 +1,7 @@ 1 1 {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 2 #set( $thesisMenu = true ) 3 3 #set( $oneYear = false ) 4 +#set( $selectedYear = '' ) 4 4 ### START YEAR 5 5 ## year parameter 6 6 #set( $yearPar = $mathtool.toInteger($request.year) ) ... ... @@ -12,7 +12,8 @@ 12 12 #if( $yearPar > 0 ) 13 13 #set( $oneYear = true ) 14 14 #set( $firstYear = $yearPar ) 15 - #set( $lastYear = $toPar ) 16 + #set( $lastYear = $yearPar ) 17 + #set( $selectedYear = $yearPar ) 16 16 #set( $yearList = [$yearPar] ) 17 17 #else 18 18 #if( $fromPar != '' && ($fromPar > $firstYear) ) ... ... @@ -25,6 +25,7 @@ 25 25 #end 26 26 #if( $lastYear <= $firstYear ) 27 27 #set( $oneYear = true ) 30 + #set( $lastYear = $firstYear ) 28 28 #set( $selectedYear = $firstYear ) 29 29 #set( $yearList = [$firstYear] ) 30 30 #else ... ... @@ -70,45 +70,42 @@ 70 70 $oneUser 71 71 $oneCycle 72 72 ### END USER & CYCLE 73 -#stop 74 - 75 - 76 76 ## 77 77 ## title 78 ->#if( $one Status){{thesisStatus plural='yes'uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser )/$userFirstName**$userLastName**#end#if( $oneRole ) /{{thesisRoleshort='yes'}}$selectedRole{{/thesisRole}}#end{{id name='top'/}}78 +>#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'/}} 79 79 ## index 80 -#if( !$oneStatus ) 81 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $status in $allThesisStatuses )#if ($velocityCount > 1) | #end[[{{thesisStatus plural="true" uppercase="false"}}$status{{/thesisStatus}}>>||anchor="$status"]]#end))) 82 -#elseif( $oneUser && !$oneRole ) 83 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[{{thesisRole}}$role{{/thesisRole}}>>||anchor="$role"]]#end))) 80 +#if( !$oneYear ) 81 +(% 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))) 82 +###elseif( $oneUser && !$oneCycle ) 83 +#elseif( !$oneCycle ) 84 +(% 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))) 84 84 #end{{id name='index'/}} 86 + 87 +#stop 88 + 85 85 ## search theses 86 86 #set( $thesisNo = 0 ) 87 -#foreach( $ statusin $allThesisStatuses)88 - #if( !$one Status|| $selectedStatus== $status)89 - #set( $thesis StatusNo = 0 )90 - #if( !$one Status)91 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$ status'/}}{{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}91 +#foreach( $year in $yearList ) 92 + #if( !$oneYear || $selectedYear == $year ) 93 + #set( $thesisYearNo = 0 ) 94 + #if( !$oneYear ) 95 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year 92 92 #end 93 -## some selected status or all statuses / now $status 94 - #if( $oneUser ) 95 -## some user selected 96 - #foreach( $role in $allThesisRoles ) 97 - #set( $thesisStatusRoleNo = 0 ) 98 - #if( !$oneRole || $selectedRole == $role ) 99 - #if( $role == "contact" ) 100 - #set( $selectedRoleFieldName = "contacts" ) 101 - #elseif( $role == "cosupervisor" ) 102 - #set( $selectedRoleFieldName = "cosupervisors" ) 103 - #else 104 - #set( $selectedRoleFieldName = "supervisors" ) 105 - #end 106 -## some selected role or all roles / now $role 107 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 108 - 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 = 'status' and prop1.name = '$selectedRoleFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" ) 109 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 110 - #set( $thesisFoundNo = $thesisFound.size() ) 111 - #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo ) 97 +## some selected year or year list / now $year 98 + #foreach( $cycle in $allThesisCycles ) 99 + #set( $thesisYearCycleNo = 0 ) 100 + #if( !$oneCycle || $selectedCycle == $cycle ) 101 +## some selected cycle or all cycles / now $cycle 102 + #if( $oneUser) 103 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4 104 + 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%' || prop3.value like '%$selectedUser%' || prop4.value like '%$selectedUser%' ) order by prop2.value desc" ) 105 + #else 106 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 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 prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and prop1.value = '$year' order by prop2.value desc" ) 108 + #end 109 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 110 + #set( $thesisFoundNo = $thesisFound.size() ) 111 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo ) 112 112 #if( $thesisFoundNo > 0 && !$oneRole ) 113 113 (% style="border-style:#if( $oneStatus )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneStatus ){{id name='$role'/}}#else{{id name='$status-$role'/}}#end{{thesisRole plural='no' uppercase='yes' short='yes'}}$role{{/thesisRole}} 114 114 #end