Changes for page Per Year
From version 48.1
edited by Andrea Omicini
on 25/10/2021 21:31
on 25/10/2021 21:31
Change comment:
There is no comment for this version
To version 40.1
edited by Andrea Omicini
on 25/10/2021 20:41
on 25/10/2021 20:41
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -67,23 +67,19 @@ 67 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'/}} 68 68 ## index 69 69 #if( !$oneStatus ) 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))) 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( !$oneRole ) 72 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))) 73 73 #end{{id name='index'/}} 74 74 ## search theses 75 -#set( $thesisNo = 0 ) 76 76 #foreach( $status in $allThesisStatuses ) 77 77 #if( !$oneStatus || $selectedStatus == $status ) 78 - #set( $thesisStatusNo = 0 ) 79 - #if( !$oneStatus ) 80 -(% 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 77 += $status = 82 82 ## some selected status or all statuses / now $status 83 83 #if( $oneUser ) 80 +== $selectedUser == 84 84 ## some user selected 85 85 #foreach( $role in $allThesisRoles ) 86 - #set( $thesisStatusRoleNo = 0 ) 87 87 #if( !$oneRole || $selectedRole == $role ) 88 88 #if( $role == "contact" ) 89 89 #set( $selectedRoleFieldName = "contact" ) ... ... @@ -93,22 +93,14 @@ 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:hidden hidden hidden dotted; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|{{id name='$status-$role'/}}$role 98 - #end 92 +=== $role === 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 - #set( $thesisFoundNo = $thesisFound.size() ) 103 - #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo ) 104 104 #foreach( $thesis in $thesisFound ) 105 105 * $thesis 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" %)|($thesisStatusRoleNo $role $status)#if( $oneStatus ) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]#end{{id name='$role-$status-bottom'/}} 109 - #end 110 110 #end 111 - #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo ) 112 112 #end 113 113 ## no user selected, no role selected 114 114 #else ... ... @@ -115,18 +115,14 @@ 115 115 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 116 116 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" ) 117 117 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 118 - #set( $thesisFoundNo = $thesisFound.size() ) 119 - #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo ) 120 120 #foreach( $thesis in $thesisFound ) 121 121 * $thesis 122 122 #end 123 123 #end 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'/}} 126 - #end 127 127 #end 128 128 ## 129 129 ## #set( $thesisFound = $xwiki.searchDocuments($sql) ) 113 +## #set( $thesisFoundNo = $thesisFound.size() ) 130 130 ## #set($thesisDoc = $xwiki.getDocument($thesis)) 131 131 ## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 132 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