Changes for page Per Year
From version 57.1
edited by Andrea Omicini
on 25/10/2021 22:17
on 25/10/2021 22:17
Change comment:
There is no comment for this version
To version 67.2
edited by Andrea Omicini
on 26/10/2021 12:54
on 26/10/2021 12:54
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -64,12 +64,12 @@ 64 64 ## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status 65 65 ## 66 66 ## title 67 ->#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#end#if( $oneRole ) / $selectedRole#end{{id name='top'/}} 67 +>#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#end#if( $oneRole ) / {{thesisRole short='yes'}}$selectedRole{{/thesisRole}}#end{{id name='top'/}} 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 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 [[$role>>||anchor="$role"]]#end))) 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 75 #set( $thesisNo = 0 ) ... ... @@ -93,19 +93,22 @@ 93 93 #set( $selectedRoleFieldName = "supervisor" ) 94 94 #end 95 95 ## some selected role or all roles / now $role 96 - #if( !$oneRole ) 97 -(% 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}}$role{{/thesisRole}} 98 - #end 99 99 #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 100 100 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" ) 101 101 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 102 102 #set( $thesisFoundNo = $thesisFound.size() ) 103 103 #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 104 104 #foreach( $thesis in $thesisFound ) 105 -* $thesis 105 + #set($thesisDoc = $xwiki.getDocument($thesis)) 106 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 107 +* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end#if( $thesisDoc.getValue('studentUserName') != "" ) $thesisDoc.getValue('studentUserName')#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end 108 + 106 106 #end 107 - #if( !$oneRole ) 108 -(% 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=' yes'}}#else{{thesisStatus plural='yes' uppercase='no' short='yes'}}#end {{stringEngIta eng='as' ita='come'/}} {{thesisRole}}$role{{/thesisRole}}$status{{/thesisStatus}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]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"]] 109 109 #end 110 110 #end 111 111 #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo ) ... ... @@ -118,19 +118,16 @@ 118 118 #set( $thesisFoundNo = $thesisFound.size() ) 119 119 #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo ) 120 120 #foreach( $thesis in $thesisFound ) 121 -* $thesis 124 + #set($thesisDoc = $xwiki.getDocument($thesis)) 125 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 126 +* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end#if( $thesisDoc.getValue('studentUserName') != "" ) $thesisDoc.getValue('studentUserName')#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end 127 + 122 122 #end 123 123 #end 124 124 #if( !$oneStatus ) 125 -(% 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=' true'}}$status{{/thesisStatus}}#else{{thesisStatus plural='true' uppercase='false' short='true'}}$status{{/thesisStatus}}#end{{id name='$status-bottom'/}} [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]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"]] 126 126 #end 127 127 #end 128 -## 129 -## #set( $thesisFound = $xwiki.searchDocuments($sql) ) 130 -## #set($thesisDoc = $xwiki.getDocument($thesis)) 131 -## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 132 -##* [[$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 133 -## #end 134 134 #end 135 135 {{id name='bottom'/}} 136 136 {{/velocity}}