Changes for page Per Year
From version 108.2
edited by Andrea Omicini
on 30/10/2021 17:27
on 30/10/2021 17:27
Change comment:
There is no comment for this version
To version 96.5
edited by Andrea Omicini
on 30/10/2021 16:36
on 30/10/2021 16:36
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,24 +1,15 @@ 1 1 {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 2 #set( $thesisMenu = true ) 3 -## get environment variables & derived 3 +#set( $oneYear = false ) 4 +#set( $selectedYear = '' ) 5 +### START YEAR 6 +## year parameter 7 +#set( $yearPar = $mathtool.toInteger($request.year) ) 8 +#set( $fromPar = $mathtool.toInteger($request.from) ) 9 +#set( $toPar = $mathtool.toInteger($request.to) ) 4 4 #set( $firstYear = $mathtool.toInteger($firstYearTh) ) 5 5 #set( $lastYear = $mathtool.toInteger($lastYearTh) ) 6 6 #set( $yearList = [$lastYear..$firstYear] ) 7 -### START YEAR 8 -## defaults 9 -#set( $oneYear = false ) 10 -#set( $selectedYear = '' ) 11 -## year parameters 12 -#if( $request.year ) 13 - #set( $yearPar = $mathtool.toInteger($request.year) ) 14 -#end 15 -#if( $request.from ) 16 - #set( $fromPar = $mathtool.toInteger($request.from) ) 17 -#end 18 -#if( $request.to ) 19 - #set( $toPar = $mathtool.toInteger($request.to) ) 20 -#end 21 -##set years 22 22 #if( $yearPar > 0 ) 23 23 #set( $oneYear = true ) 24 24 #set( $firstYear = $yearPar ) ... ... @@ -43,20 +43,19 @@ 43 43 #set( $yearList = [$lastYear..$firstYear] ) 44 44 #end 45 45 #end 37 +$oneYear 38 +$yearList 46 46 ### END YEAR 47 47 ## 48 -### START USER 41 +### START USER & CYCLE 42 +#set( $userNamePar = $request.user.trim() ) 49 49 ## default values 50 50 #set( $oneUser = false ) 51 -#set( $ selectedUser='')45 +#set( $oneCycle = false ) 52 52 #set( $userFirstName = "" ) 53 53 #set( $userLastName = "" ) 54 -## user parameter 55 -#if( $request.user ) 56 - #set( $userNamePar = $request.user.trim() ) 57 -#end 58 58 #if( $userName || $userNamePar ) 59 -## trytospecifyauser49 +## a user is specified for all roles 60 60 #if( !$userName ) 61 61 #set( $selectedUser = "XWiki.$userNamePar" ) 62 62 #else ... ... @@ -71,36 +71,21 @@ 71 71 {{warning}} $selectedUser is not an {{apice/}} user{{/warning}} 72 72 #stop 73 73 #end 74 -#end 75 -### END USER 76 -##if user selected, existing user page 77 -### START CYCLE 78 -#set( $oneCycle = false ) 79 -#set( $selectedCycle = '' ) 80 -#if( $request.cycle ) 64 +##user selected and existing user page 81 81 #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 82 - $cyclePar 66 + #set( $selectedCycle = '' ) 67 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 68 + #set( $oneCycle = true ) 69 + #set( $selectedCycle = $cyclePar ) 70 + #end 83 83 #end 84 -#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 85 - #set( $oneCycle = true ) 86 - #set( $selectedCycle = $cyclePar ) 87 -#end 88 88 ## $oneUser and $oneCycle set properly 89 -$yearList 90 -#if( $oneYear ) 91 - $selectedYear 92 -#end 93 -#if( $oneUser ) 94 - $selectedUser 95 -#end 96 -#if( $oneCycle ) 97 - $selectedCycle 98 - {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}} 99 -#end 73 +$oneUser 74 +$oneCycle 100 100 ### END USER & CYCLE 101 101 ## 102 102 ## title 103 ->#if( $one Cycle ){{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#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'/}} 104 104 ## index 105 105 #if( !$oneYear ) 106 106 (% 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))) ... ... @@ -108,46 +108,65 @@ 108 108 #elseif( !$oneCycle ) 109 109 (% 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))) 110 110 #end{{id name='index'/}} 86 + 87 +#stop 88 + 111 111 ## search theses 112 112 #set( $thesisNo = 0 ) 113 113 #foreach( $year in $yearList ) 114 - #set( $thesisYearNo = 0 ) 115 - #if( !$oneYear ) 92 + #if( !$oneYear || $selectedYear == $year ) 93 + #set( $thesisYearNo = 0 ) 94 + #if( !$oneYear ) 116 116 (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year 117 - #end 96 + #end 118 118 ## some selected year or year list / now $year 119 - #foreach( $cycle in $allThesisCycles ) 120 - #set( $thesisYearCycleNo = 0 ) 121 - #if( !$oneCycle || $selectedCycle == $cycle ) 98 + #foreach( $cycle in $allThesisCycles ) 99 + #set( $thesisYearCycleNo = 0 ) 100 + #if( !$oneCycle || $selectedCycle == $cycle ) 122 122 ## some selected cycle or all cycles / now $cycle 123 - #if( $oneUser) 124 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4 125 - 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" ) 126 - #else 127 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 128 - 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" ) 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( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo ) 112 + #if( $thesisFoundNo > 0 && !$oneCycle ) 113 +(% 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}} 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( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo ) 129 129 #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" ) 130 130 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 131 131 #set( $thesisFoundNo = $thesisFound.size() ) 132 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo ) 133 - #if( $thesisFoundNo > 0 && !$oneCycle ) 134 -(% 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}} 135 - #end 133 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo ) 136 136 #foreach( $thesis in $thesisFound ) 137 - #set( 138 - #set( 135 + #set($thesisDoc = $xwiki.getDocument($thesis)) 136 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 139 139 * [[$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 140 140 141 141 #end 142 - #if( $thesisFoundNo > 0 && !$oneCycle ) 143 -(% 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"]] 144 - #end 145 145 #end 146 - #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 147 147 #end 148 - #if( !$oneYear ) 149 -(% 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"]] 150 - #end 151 151 #end 152 152 {{id name='bottom'/}} 153 153 {{/velocity}}