Changes for page Per Year
From version 43.1
edited by Andrea Omicini
on 25/10/2021 20:51
on 25/10/2021 20:51
Change comment:
There is no comment for this version
To version 65.1
edited by Andrea Omicini
on 25/10/2021 22:36
on 25/10/2021 22:36
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -68,18 +68,22 @@ 68 68 ## index 69 69 #if( !$oneStatus ) 70 70 (% 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))) 71 -#elseif( !$oneRole ) 72 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[$role>>||anchor="$role"]]#end))) 71 +#elseif( $oneUser && !$oneRole ) 72 +(% 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))) 73 73 #end{{id name='index'/}} 74 74 ## search theses 75 +#set( $thesisNo = 0 ) 75 75 #foreach( $status in $allThesisStatuses ) 76 76 #if( !$oneStatus || $selectedStatus == $status ) 78 + #set( $thesisStatusNo = 0 ) 79 + #if( !$oneStatus ) 77 77 (% 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}} 81 + #end 78 78 ## some selected status or all statuses / now $status 79 79 #if( $oneUser ) 80 -== $selectedUser == 81 81 ## some user selected 82 82 #foreach( $role in $allThesisRoles ) 86 + #set( $thesisStatusRoleNo = 0 ) 83 83 #if( !$oneRole || $selectedRole == $role ) 84 84 #if( $role == "contact" ) 85 85 #set( $selectedRoleFieldName = "contact" ) ... ... @@ -89,14 +89,25 @@ 89 89 #set( $selectedRoleFieldName = "supervisor" ) 90 90 #end 91 91 ## some selected role or all roles / now $role 92 -=== $role === 93 93 #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 94 94 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" ) 95 95 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 99 + #set( $thesisFoundNo = $thesisFound.size() ) 100 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo ) 101 + #if( $thesisFoundNo > 0 && !$oneRole ) 102 +(% 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}} 103 + #end 96 96 #foreach( $thesis in $thesisFound ) 97 -* $thesis 105 + #set($thesisDoc = $xwiki.getDocument($thesis)) 106 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 107 +* [[$thesisObj.title>>$thesisDoc]] #if( $thesisDoc.getValue('studentUserName') != "" )//$thesisDoc.getValue('studentUserName')//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end 108 + 98 98 #end 110 + #if( $thesisFoundNo > 0 && !$oneRole ) 111 +(% 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"]] 112 + #end 99 99 #end 114 + #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo ) 100 100 #end 101 101 ## no user selected, no role selected 102 102 #else ... ... @@ -103,17 +103,19 @@ 103 103 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 104 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 = 'status' and prop1.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' order by prop1.value desc" ) 105 105 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 121 + #set( $thesisFoundNo = $thesisFound.size() ) 122 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo ) 106 106 #foreach( $thesis in $thesisFound ) 107 -* $thesis 124 + #set($thesisDoc = $xwiki.getDocument($thesis)) 125 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 126 +* [[$thesisObj.title>>$thesisDoc]] #if( $thesisDoc.getValue('studentUserName') != "" )//$thesisDoc.getValue('studentUserName')//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end 127 + 108 108 #end 109 109 #end 130 + #if( !$oneStatus ) 131 +(% 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"]] 132 + #end 110 110 #end 111 -## 112 -## #set( $thesisFound = $xwiki.searchDocuments($sql) ) 113 -## #set( $thesisFoundNo = $thesisFound.size() ) 114 -## #set($thesisDoc = $xwiki.getDocument($thesis)) 115 -## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 116 -##* [[$thesisObj.title>>$thesisDoc]] #if( $thesisDoc.getValue('studentUserName') != "" )//$thesisDoc.getValue('studentUserName')//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end 117 -## #end 118 118 #end 135 +{{id name='bottom'/}} 119 119 {{/velocity}}