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 96.1
edited by Andrea Omicini
on 30/10/2021 16:03
on 30/10/2021 16:03
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,7 +1,6 @@ 1 1 {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 2 #set( $thesisMenu = true ) 3 3 #set( $oneYear = false ) 4 -#set( $selectedYear = '' ) 5 5 ### START YEAR 6 6 ## year parameter 7 7 #set( $yearPar = $mathtool.toInteger($request.year) ) ... ... @@ -13,8 +13,7 @@ 13 13 #if( $yearPar > 0 ) 14 14 #set( $oneYear = true ) 15 15 #set( $firstYear = $yearPar ) 16 - #set( $lastYear = $yearPar ) 17 - #set( $selectedYear = $yearPar ) 15 + #set( $lastYear = $toPar ) 18 18 #set( $yearList = [$yearPar] ) 19 19 #else 20 20 #if( $fromPar != '' && ($fromPar > $firstYear) ) ... ... @@ -27,7 +27,6 @@ 27 27 #end 28 28 #if( $lastYear <= $firstYear ) 29 29 #set( $oneYear = true ) 30 - #set( $lastYear = $firstYear ) 31 31 #set( $selectedYear = $firstYear ) 32 32 #set( $yearList = [$firstYear] ) 33 33 #else ... ... @@ -34,6 +34,8 @@ 34 34 #set( $yearList = [$lastYear..$firstYear] ) 35 35 #end 36 36 #end 34 +$oneYear 35 +$yearList 37 37 ### END YEAR 38 38 ## 39 39 ### START USER & CYCLE ... ... @@ -68,67 +68,81 @@ 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 70 +$oneUser 71 +$oneCycle 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'/}}75 +>#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))) 88 -###elseif( $oneUser && !$oneCycle ) 89 -#elseif( !$oneCycle ) 79 +#elseif( $oneUser && !$oneCycle ) 90 90 (% 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))) 91 91 #end{{id name='index'/}} 82 + 83 +#stop 84 + 92 92 ## search theses 93 93 #set( $thesisNo = 0 ) 94 -#foreach( $year in $yearList ) 95 - #set( $thesisYearNo = 0 ) 96 - #if( !$oneYear ) 97 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year 98 - #end 99 -## some selected year or year list / now $year 100 - #foreach( $cycle in $allThesisCycles ) 101 - #set( $thesisYearCycleNo = 0 ) 102 - #if( !$oneCycle || $selectedCycle == $cycle ) 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" ) 87 +#foreach( $status in $allThesisStatuses ) 88 + #if( !$oneStatus || $selectedStatus == $status ) 89 + #set( $thesisStatusNo = 0 ) 90 + #if( !$oneStatus ) 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}} 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 ) 112 + #if( $thesisFoundNo > 0 && !$oneRole ) 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 + #end 115 + #foreach( $thesis in $thesisFound ) 116 + #set($thesisDoc = $xwiki.getDocument($thesis)) 117 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 118 +* [[$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 119 + 120 + #end 121 + #if( $thesisFoundNo > 0 && !$oneRole ) 122 +(% style="border-style:#if( $oneStatus )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( $oneStatus ){{id name='$role-bottom'/}}#else{{id name='$role-$status-bottom'/}}#end($thesisStatusRoleNo #if( $thesisStatusRoleNo == 1 ){{thesisStatus plural='no' uppercase='no' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='yes' uppercase='no' short='no'}}$status{{/thesisStatus}}#end {{stringEngIta eng='as' ita='come'/}} {{thesisRole short='yes'}}$role{{/thesisRole}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 123 + #end 124 + #end 125 + #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo ) 110 110 #end 127 +## no user selected, no role selected 128 + #else 129 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 130 + 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 = 'status' and prop1.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' order by prop1.value desc" ) 111 111 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 112 112 #set( $thesisFoundNo = $thesisFound.size() ) 113 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo ) 114 - #if( $thesisFoundNo > 0 && !$oneCycle ) 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 133 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo ) 117 117 #foreach( $thesis in $thesisFound ) 118 - #set( 119 - #set( 135 + #set($thesisDoc = $xwiki.getDocument($thesis)) 136 + #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 122 #end 123 - #if( $thesisFoundNo > 0 && !$oneCycle ) 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"]] 125 - #end 126 126 #end 127 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo ) 141 + #if( !$oneStatus ) 142 +(% 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" %)|($thesisStatusNo #if($thesisStatusNo == 1){{thesisStatus plural='false' uppercase='false' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='true' uppercase='false' short='no'}}$status{{/thesisStatus}}#end{{id name='$status-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 143 + #end 128 128 #end 129 - #if( !$oneYear ) 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"]] 131 - #end 132 132 #end 133 133 {{id name='bottom'/}} 134 134 {{/velocity}}