Changes for page Per Year
From version 87.3
edited by Andrea Omicini
on 29/10/2021 15:50
on 29/10/2021 15:50
Change comment:
There is no comment for this version
To version 99.1
edited by Andrea Omicini
on 30/10/2021 16:44
on 30/10/2021 16:44
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,58 +1,48 @@ 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) ) 7 7 #set( $fromPar = $mathtool.toInteger($request.from) ) 8 8 #set( $toPar = $mathtool.toInteger($request.to) ) 9 -#set( $firstYear = $mathtool.toInteger($firstYearTh) ) $firstYear10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) ) $lastYear10 +#set( $firstYear = $mathtool.toInteger($firstYearTh) ) 11 +#set( $lastYear = $mathtool.toInteger($lastYearTh) ) 11 11 #set( $yearList = [$lastYear..$firstYear] ) 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 - #if( $fromPar != '' && ($fromPar > $firstYear) ) 20 + #if( $fromPar != '' && ($fromPar > $firstYear) ) 19 19 #set( $firstYear = $fromPar ) 20 20 #set( $yearList = [$lastYear..$firstYear] ) 21 21 #end 22 - #if( $toPar != '' && ($toPar < $lastYear) ) LT24 + #if( $toPar != '' && ($toPar < $lastYear) ) 23 23 #set( $lastYear = $toPar ) 24 - #set( $yearList = [$lastYear..$firstYear] ) $yearList26 + #set( $yearList = [$lastYear..$firstYear] ) 25 25 #end 26 26 #if( $lastYear <= $firstYear ) 27 27 #set( $oneYear = true ) 30 + #set( $lastYear = $firstYear ) 28 28 #set( $selectedYear = $firstYear ) 32 + #set( $yearList = [$firstYear] ) 29 29 #else 30 30 #set( $yearList = [$lastYear..$firstYear] ) 31 31 #end 32 32 #end 33 -#stop 34 -##check velocity variable, takes precedence 35 -#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) ) 36 - #set( $oneStatus = true ) 37 - #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) 38 -#end 39 -## set ordering field 40 -#if( $selectedStatus == "available" ) 41 - #set( $orderingDateFieldName = "availabilityDate" ) 42 -#elseif( $selectedStatus == "ongoing" ) 43 - #set( $orderingDateFieldName = "startDate" ) 44 -#else 45 -## default for no selected status, too 46 - #set( $orderingDateFieldName = "endDate" ) 47 -#end 48 -## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly 49 -### END STATUS 37 +$oneYear 38 +$yearList 39 +### END YEAR 50 50 ## 51 -### START USER & ROLE41 +### START USER & CYCLE 52 52 #set( $userNamePar = $request.user.trim() ) 53 53 ## default values 54 54 #set( $oneUser = false ) 55 -#set( $one Role = false )45 +#set( $oneCycle = false ) 56 56 #set( $userFirstName = "" ) 57 57 #set( $userLastName = "" ) 58 58 #if( $userName || $userNamePar ) ... ... @@ -72,87 +72,69 @@ 72 72 #stop 73 73 #end 74 74 ##user selected and existing user page 75 - #set( $ rolePar = $request.role.trim().toLowerCase() )76 - #set( $selected Role = '' )77 - #if( $ rolePar != '' && $allThesisRoles.contains($rolePar) )78 - #set( $one Role = true )79 - #set( $selected Role = $rolePar )65 + #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 66 + #set( $selectedCycle = '' ) 67 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 68 + #set( $oneCycle = true ) 69 + #set( $selectedCycle = $cyclePar ) 80 80 #end 81 81 #end 82 -## $oneUser and $oneRole set properly, other related variables set accordingly 83 -## $oneRole has meaning only if $oneUser 84 -## if $oneUser, $oneRole false means one user for all roles 85 -## if $oneUser, $oneRole true means one specific role for one user selected 86 -## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status 72 +## $oneUser and $oneCycle set properly 73 +$oneUser 74 +$oneCycle 75 +### END USER & CYCLE 87 87 ## 88 88 ## title 89 ->#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'/}} 90 90 ## index 91 -#if( !$oneStatus ) 92 -(% 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))) 93 -#elseif( $oneUser && !$oneRole ) 94 -(% 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))) 95 95 #end{{id name='index'/}} 96 96 ## search theses 97 97 #set( $thesisNo = 0 ) 98 -#foreach( $ statusin $allThesisStatuses)99 - #if( !$one Status|| $selectedStatus== $status)100 - #set( $thesis StatusNo = 0 )101 - #if( !$one Status)102 -(% 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}}88 +#foreach( $year in $yearList ) 89 + #if( !$oneYear || $selectedYear == $year ) 90 + #set( $thesisYearNo = 0 ) 91 + #if( !$oneYear ) 92 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year 103 103 #end 104 -## some selected status or all statuses / now $status 105 - #if( $oneUser ) 106 -## some user selected 107 - #foreach( $role in $allThesisRoles ) 108 - #set( $thesisStatusRoleNo = 0 ) 109 - #if( !$oneRole || $selectedRole == $role ) 110 - #if( $role == "contact" ) 111 - #set( $selectedRoleFieldName = "contacts" ) 112 - #elseif( $role == "cosupervisor" ) 113 - #set( $selectedRoleFieldName = "cosupervisors" ) 114 - #else 115 - #set( $selectedRoleFieldName = "supervisors" ) 116 - #end 117 -## some selected role or all roles / now $role 118 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 119 - 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" ) 120 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 121 - #set( $thesisFoundNo = $thesisFound.size() ) 122 - #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo ) 123 - #if( $thesisFoundNo > 0 && !$oneRole ) 124 -(% 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}} 125 - #end 126 - #foreach( $thesis in $thesisFound ) 127 - #set($thesisDoc = $xwiki.getDocument($thesis)) 128 - #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 94 +## some selected year or year list / now $year 95 + #foreach( $cycle in $allThesisCycles ) 96 + #set( $thesisYearCycleNo = 0 ) 97 + #if( !$oneCycle || $selectedCycle == $cycle ) 98 +## some selected cycle or all cycles / now $cycle 99 + #if( $oneUser) 100 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4 101 + 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" ) 102 + #else 103 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 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 prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and prop1.value = '$year' order by prop2.value desc" ) 105 + #end 106 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 107 + #set( $thesisFoundNo = $thesisFound.size() ) 108 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo ) 109 + #if( $thesisFoundNo > 0 && !$oneCycle ) 110 +(% 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}} 111 + #end 112 + #foreach( $thesis in $thesisFound ) 113 + #set( $thesisDoc = $xwiki.getDocument($thesis) ) 114 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') ) 129 129 * [[$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 130 130 131 131 #end 132 - #if( $thesisFoundNo > 0 && !$one Role )133 -(% style="border-style:#if( $one Status)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 ){{thesisStatusplural='no' uppercase='no' short='no'}}$status{{/thesisStatus}}#else{{thesisStatusplural='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"]]118 + #if( $thesisFoundNo > 0 && !$oneCycle ) 119 +(% 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"]] 134 134 #end 135 135 #end 136 - #set( $thesis StatusNo = $thesisStatusNo + $thesisStatusRoleNo )122 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo ) 137 137 #end 138 -## no user selected, no role selected 139 - #else 140 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 141 - 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" ) 142 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 143 - #set( $thesisFoundNo = $thesisFound.size() ) 144 - #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo ) 145 - #foreach( $thesis in $thesisFound ) 146 - #set($thesisDoc = $xwiki.getDocument($thesis)) 147 - #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 148 -* [[$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 149 - 150 - #end 151 151 #end 152 - #if( !$one Status)153 -(% 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" %)|($thesis StatusNo #if($thesisStatusNo == 1){{thesisStatusplural='false' uppercase='false'short='no'}}$status{{/thesisStatus}}#else{{thesisStatusplural='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"]]125 + #if( !$oneYear ) 126 +(% 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"]] 154 154 #end 155 155 #end 156 -#end 157 157 {{id name='bottom'/}} 158 158 {{/velocity}}