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