Changes for page Per Year
From 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
To version 93.1
edited by Andrea Omicini
on 29/10/2021 16:15
on 29/10/2021 16:15
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 ... ... @@ -75,56 +75,79 @@ 75 75 ### END USER & CYCLE 76 76 ## 77 77 ## title 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'/}} 75 +>if( $oneRole ){{thesisCycle short='no'}}$selecteCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end 76 + 77 +##/ #if( $oneYear )$selectedYear#else$firstYear—$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}} 78 + 79 +#stop 80 + 81 + 79 79 ## index 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))) 83 +#if( !$oneStatus ) 84 +(% 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))) 85 +#elseif( $oneUser && !$oneRole ) 86 +(% 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))) 85 85 #end{{id name='index'/}} 86 86 ## search theses 87 87 #set( $thesisNo = 0 ) 88 -#foreach( $ yearin $yearList )89 - #if( !$one Year|| $selectedYear== $year)90 - #set( $thesis YearNo = 0 )91 - #if( !$one Year)92 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$ year'/}}$year90 +#foreach( $status in $allThesisStatuses ) 91 + #if( !$oneStatus || $selectedStatus == $status ) 92 + #set( $thesisStatusNo = 0 ) 93 + #if( !$oneStatus ) 94 +(% 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}} 93 93 #end 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') ) 96 +## some selected status or all statuses / now $status 97 + #if( $oneUser ) 98 +## some user selected 99 + #foreach( $role in $allThesisRoles ) 100 + #set( $thesisStatusRoleNo = 0 ) 101 + #if( !$oneRole || $selectedRole == $role ) 102 + #if( $role == "contact" ) 103 + #set( $selectedRoleFieldName = "contacts" ) 104 + #elseif( $role == "cosupervisor" ) 105 + #set( $selectedRoleFieldName = "cosupervisors" ) 106 + #else 107 + #set( $selectedRoleFieldName = "supervisors" ) 108 + #end 109 +## some selected role or all roles / now $role 110 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 111 + 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" ) 112 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 113 + #set( $thesisFoundNo = $thesisFound.size() ) 114 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo ) 115 + #if( $thesisFoundNo > 0 && !$oneRole ) 116 +(% 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}} 117 + #end 118 + #foreach( $thesis in $thesisFound ) 119 + #set($thesisDoc = $xwiki.getDocument($thesis)) 120 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 115 115 * [[$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 116 116 117 117 #end 118 - #if( $thesisFoundNo > 0 && !$one Cycle )119 -(% style="border-style:#if( $one Year)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 ){{thesisCycleplural='no' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#else{{thesisCycleplural='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"]]124 + #if( $thesisFoundNo > 0 && !$oneRole ) 125 +(% 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"]] 120 120 #end 121 121 #end 122 - #set( $thesis YearNo = $thesisYearNo + $thesisYearCycleNo )128 + #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo ) 123 123 #end 130 +## no user selected, no role selected 131 + #else 132 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 133 + 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" ) 134 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 135 + #set( $thesisFoundNo = $thesisFound.size() ) 136 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo ) 137 + #foreach( $thesis in $thesisFound ) 138 + #set($thesisDoc = $xwiki.getDocument($thesis)) 139 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 140 +* [[$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 141 + 142 + #end 124 124 #end 125 - #if( !$one Year)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" %)|($thesis YearNo #if($thesisYearNo == 1){{stringEngItaeng='thesisin'ita='tesinel'/}}#else{{stringEngItaeng='thesesin'ita='tesinel'/}}#end$year{{id name='$year-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]144 + #if( !$oneStatus ) 145 +(% 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"]] 127 127 #end 128 128 #end 148 +#end 129 129 {{id name='bottom'/}} 130 130 {{/velocity}}