Changes for page Per Year
From version 17.2
edited by Andrea Omicini
on 22/10/2021 23:29
on 22/10/2021 23:29
Change comment:
There is no comment for this version
To version 69.1
edited by Andrea Omicini
on 29/10/2021 15:18
on 29/10/2021 15:18
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,0 +1,1 @@ 1 +#if($xcontext.language=='it')Tesi per anno#{else}Theses per Year#end - Content
-
... ... @@ -1,186 +1,161 @@ 1 -{{include reference=" Main.MacroSheet"/}}{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}1 +{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 2 #set( $thesisMenu = true ) 3 -#### get parameters 4 -## hypothesis: $thesisStatus set, default "Completed" 5 -## to do: get from parameter 6 -#if( $thesisStatus == "Available" ) 7 - #set( $orderingDateFieldName = "availabilityDate" ) 8 -#elseif( $thesisStatus == "Ongoing" ) 9 - #set( $orderingDateFieldName = "startDate" ) 3 +#set( $oneYear = false ) 4 +### START YEAR 5 +## year parameter 6 +#set( $yearPar = $mathtool.toInteger("$!$request.year") ) 7 +#set( $fromPar = $mathtool.toInteger("$!$request.from") ) 8 +#set( $toPar = $mathtool.toInteger("$!$request.to") ) 9 +#set( $firstYear = $firstYearTh ) 10 +#set( $lastYear = $lastYearTh ) 11 +#set( $yearList = [$lastYear..$firstYear] ) 12 +#if( $yearPar != '' ) 13 + #set( $oneYear = true ) 14 + #set( $selectedYear = $yearPar ) 10 10 #else 11 - #set( $thesisStatus = "Completed" ) 12 - #set( $orderingDateFieldName = "endDate" ) 13 -#end 14 -## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly 15 -## who 16 -#set( $userNamePar = $context.getRequest().getParameter("user") ) 17 -#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") ) 18 -#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") ) 19 -#set( $contactNamePar = $context.getRequest().getParameter("contact") ) 20 -#### set default values 21 -#set( $userSelected = false ) 22 -#set( $roleSelected = false ) 23 -#set( $userFirstName = "" ) 24 -#set( $userLastName = "" ) 25 -#set( $supervisorName = "" ) 26 -#set( $supervisorFirstName = "" ) 27 -#set( $supervisorLastName = "" ) 28 -#set( $cosupervisorName = "" ) 29 -#set( $cosupervisorFirstName = "" ) 30 -#set( $cosupervisorLastName = "" ) 31 -#set( $contactName = "" ) 32 -#set( $contactFirstName = "" ) 33 -#set( $contactLastName = "" ) 34 -## 35 -#### handle who & roles 36 -## 37 -#if ( $userName || $userNamePar ) ## a user is specified for all roles 38 - #set( $userSelected = true ) 39 - #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end 40 - #set( $userdoc = $xwiki.getDocument($userName) ) 41 - #set( $userFirstName = $userdoc.display("first_name") ) 42 - #set( $userLastName = $userdoc.display("last_name") ) 43 -#elseif ( $supervisorNamePar || $cosupervisorNamePar || $contactNamePar ) 44 - #set( $roleSelected = true ) 45 - #if ( $supervisorNamePar ) 46 - #set( $supervisorName = "XWiki.$supervisorNamePar" ) 47 - #set( $supervisordoc = $xwiki.getDocument($supervisorName) ) 48 - #set( $supervisorFirstName = $supervisordoc.display("first_name") ) 49 - #set( $supervisorLastName = $supervisordoc.display("last_name") ) 16 + #if( $fromPar != '' && $yearList.contains($fromPar) ) 17 + #set( $firstYear = $fromPar ) 18 + #set( $yearList = [$lastYear..$firstYear] ) 50 50 #end 51 - #if ( $cosupervisorNamePar ) 52 - #set( $cosupervisorName = "XWiki.$cosupervisorNamePar" ) 53 - #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) ) 54 - #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") ) 55 - #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") ) 20 + #if( $toPar != '' && $yearList.contains($toPar) ) 21 + #set( $lastYear = $toPar ) 22 + #set( $yearList = [$lastYear..$firstYear] ) 56 56 #end 57 - #if contactNamePar )58 - #set( $ contactName ="XWiki.$contactNamePar")59 - #set( $c ontactdoc= $xwiki.getDocument($contactName))60 - set( $contactFirstName = $contactdoc.display("first_name") )61 - #set( $ contactLastName= $contactdoc.display("last_name"))24 + #if( $lastYear <= $firstYear ) 25 + #set( $oneYear = true ) 26 + #set( $selectedYear = $firstYear ) 27 + #else 28 + #set( $yearList = [$lastYear..$firstYear] ) 62 62 #end 63 63 #end 64 -#if( $supervisor ) 65 - #set( $roleSelected = true ) 66 - #set( $supervisorName = $userName ) 67 - #set( $supervisordoc = $xwiki.getDocument($supervisorName) ) 68 - #set( $supervisorFirstName = $supervisordoc.display("first_name") ) 69 - #set( $supervisorLastName = $supervisordoc.display("last_name") ) 31 +$oneYear 32 +$selectedYear 33 +$firstYear 34 +$lastYear 35 +$yearList 36 +#stop 37 +##check velocity variable, takes precedence 38 +#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) ) 39 + #set( $oneStatus = true ) 40 + #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) 70 70 #end 71 -#if( $cosupervisor ) 72 - #set( $roleSelected = true ) 73 - #set( $cosupervisorName = $userName ) 74 - #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) ) 75 - #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") ) 76 - #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") ) 77 -#end 78 -#if( $contact ) 79 - #set( $roleSelected = true ) 80 - #set( $contactName = $userName ) 81 - #set( $contactdoc = $xwiki.getDocument($contactName) ) 82 - #set( $contactFirstName = $contactdoc.display("first_name") ) 83 - #set( $contactLastName = $contactdoc.display("last_name") ) 84 -#end 85 -## 86 -## $userSelected true and $roleSelected false means one user for all roles 87 -## $userSelected true and $roleSelected true for one user with one specific role 88 -## if $userSelected false and $roleSelected true mean at least one role with an assigned user 89 -## both false means all theses 90 -#if( $userSelected ) 91 - #if( $roleSelected ) // // 92 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName / #if( $supervisor ){{stringEngIta eng="Supervisor" ita="Relatore"/}}#end#if( $cosupervisor ){{stringEngIta eng="Co-supervisor" ita="Correlatore"/}}#end#if( $contact ){{stringEngIta eng="Contact" ita="Contatto"/}}#end // // 93 - #else // // 94 -> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // // 95 - #end 42 +## set ordering field 43 +#if( $selectedStatus == "available" ) 44 + #set( $orderingDateFieldName = "availabilityDate" ) 45 +#elseif( $selectedStatus == "ongoing" ) 46 + #set( $orderingDateFieldName = "startDate" ) 96 96 #else 97 - #if( $roleSelected ) // // 98 -> #FullThesisStatusesString($thesisStatus)#if( $supervisorLastName != "" ) / $supervisorFirstName $supervisorLastName //({{stringEngIta eng="supervisor" ita="relatore"/}})//#end#if( $cosupervisorLastName != "" ) / $cosupervisorFirstName $cosupervisorLastName //({{stringEngIta eng="co-supervisor" ita="correlatore"/}})//#end#if( $contactLastName != "" ) / $contactFirstName $contactLastName //({{stringEngIta eng="Contact" ita="Contatto"/}})//#end // // 99 - #else // // 100 -## > #FullThesisStatusesString($thesisStatus) // // 101 - #end 48 +## default for no selected status, too 49 + #set( $orderingDateFieldName = "endDate" ) 102 102 #end 51 +## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly 52 +### END STATUS 103 103 ## 104 -#if ( $cosupervisor ) 105 - #set ( $roleSelectedFieldName = "coSupervisors" ) 106 -#elseif ( $contact ) 107 - #set ( $roleSelectedFieldName = "contact" ) 108 -#else 109 - #set ( $roleSelectedFieldName = "supervisor" ) 110 -#end 111 -## 112 -#if ($userSelected) 113 - #if ( $roleSelected ) 114 - #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2 115 - where obj.name=doc.fullName and 116 - obj.className='Theses.ThesisClass' and 117 - obj.name<>'Theses.ThesisClassTemplate' and 118 - prop.id.id=obj.id and 119 - prop1.id.id=obj.id and 120 - prop2.id.id=obj.id and 121 - prop.name='status' and 122 - prop.value='$thesisStatus' and 123 - prop1.name='$roleSelectedFieldName' and 124 - prop2.name='$orderingDateFieldName' and 125 - prop1.value like '%$userName%' 126 - order by prop2.value desc") 54 +### START USER & ROLE 55 +#set( $userNamePar = $request.user.trim() ) 56 +## default values 57 +#set( $oneUser = false ) 58 +#set( $oneRole = false ) 59 +#set( $userFirstName = "" ) 60 +#set( $userLastName = "" ) 61 +#if( $userName || $userNamePar ) 62 +## a user is specified for all roles 63 + #if( !$userName ) 64 + #set( $selectedUser = "XWiki.$userNamePar" ) 127 127 #else 128 - #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 129 - where obj.name=doc.fullName and 130 - obj.className='Theses.ThesisClass' and 131 - obj.name<>'Theses.ThesisClassTemplate' and 132 - prop.id.id=obj.id and 133 - prop1.id.id=obj.id and 134 - prop2.id.id=obj.id and 135 - prop3.id.id=obj.id and 136 - prop4.id.id=obj.id and 137 - prop.name='status' and 138 - prop.value = '$thesisStatus' and 139 - prop1.name='supervisor' and 140 - prop2.name='coSupervisors' and 141 - prop3.name='contact' and 142 - prop4.name='$orderingDateFieldName' and 143 - ( prop1.value like '%$userName%' or 144 - prop2.value like '%$userName%' or 145 - prop3.value like '%$userName%') 146 - order by prop4.value desc") 66 + #set( $selectedUser = $userName ) 147 147 #end 148 -#elseif ( $roleSelected ) 149 - #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 150 - where obj.name=doc.fullName and 151 - obj.className='Theses.ThesisClass' and 152 - obj.name<>'Theses.ThesisClassTemplate' and 153 - prop.id.id=obj.id and 154 - prop1.id.id=obj.id and 155 - prop2.id.id=obj.id and 156 - prop3.id.id=obj.id and 157 - prop4.id.id=obj.id and 158 - prop.name='status' and 159 - prop.value = '$thesisStatus' and 160 - prop1.name='supervisor' and 161 - prop2.name='coSupervisors' and 162 - prop3.name='contact' and 163 - prop4.name='$orderingDateFieldName' and 164 - prop1.value like '%$supervisorName%' and 165 - prop2.value like '%$cosupervisorName%' and 166 - prop3.value like '%$contactName%' 167 - order by prop4.value desc") 168 -#else 169 - #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1 170 - where obj.name=doc.fullName and 171 - obj.className='Theses.ThesisClass' and 172 - obj.name<>'Theses.ThesisClassTemplate' and 173 - prop.id.id=obj.id and 174 - prop1.id.id=obj.id and 175 - prop.name='status' and 176 - prop.value = '$thesisStatus' and 177 - prop1.name='$orderingDateFieldName' 178 - order by prop1.value desc") 68 + #if( $xwiki.exists($selectedUser) ) 69 + #set( $oneUser = true ) 70 + #set( $userdoc = $xwiki.getDocument($selectedUser) ) 71 + #set( $userFirstName = $userdoc.display("first_name") ) 72 + #set( $userLastName = $userdoc.display("last_name") ) 73 + #else 74 +{{warning}} $selectedUser is not an {{apice/}} user{{/warning}} 75 + #stop 76 + #end 77 +##user selected and existing user page 78 + #set( $rolePar = $request.role.trim().toLowerCase() ) 79 + #set( $selectedRole = '' ) 80 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) ) 81 + #set( $oneRole = true ) 82 + #set( $selectedRole = $rolePar ) 83 + #end 179 179 #end 180 -#set($thesisFound = $xwiki.searchDocuments($sql)) 85 +## $oneUser and $oneRole set properly, other related variables set accordingly 86 +## $oneRole has meaning only if $oneUser 87 +## if $oneUser, $oneRole false means one user for all roles 88 +## if $oneUser, $oneRole true means one specific role for one user selected 89 +## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status 181 181 ## 182 -#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 183 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" || ( $thesisDoc.getValue("studentFirstName") != "" && $thesisDoc.getValue("studentLastName") != "" ) ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end 91 +## title 92 +>#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'/}} 93 +## index 94 +#if( !$oneStatus ) 95 +(% 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))) 96 +#elseif( $oneUser && !$oneRole ) 97 +(% 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))) 98 +#end{{id name='index'/}} 99 +## search theses 100 +#set( $thesisNo = 0 ) 101 +#foreach( $status in $allThesisStatuses ) 102 + #if( !$oneStatus || $selectedStatus == $status ) 103 + #set( $thesisStatusNo = 0 ) 104 + #if( !$oneStatus ) 105 +(% 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}} 106 + #end 107 +## some selected status or all statuses / now $status 108 + #if( $oneUser ) 109 +## some user selected 110 + #foreach( $role in $allThesisRoles ) 111 + #set( $thesisStatusRoleNo = 0 ) 112 + #if( !$oneRole || $selectedRole == $role ) 113 + #if( $role == "contact" ) 114 + #set( $selectedRoleFieldName = "contacts" ) 115 + #elseif( $role == "cosupervisor" ) 116 + #set( $selectedRoleFieldName = "cosupervisors" ) 117 + #else 118 + #set( $selectedRoleFieldName = "supervisors" ) 119 + #end 120 +## some selected role or all roles / now $role 121 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 122 + 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" ) 123 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 124 + #set( $thesisFoundNo = $thesisFound.size() ) 125 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo ) 126 + #if( $thesisFoundNo > 0 && !$oneRole ) 127 +(% 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}} 128 + #end 129 + #foreach( $thesis in $thesisFound ) 130 + #set($thesisDoc = $xwiki.getDocument($thesis)) 131 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 132 +* [[$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 184 184 134 + #end 135 + #if( $thesisFoundNo > 0 && !$oneRole ) 136 +(% 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"]] 137 + #end 138 + #end 139 + #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo ) 140 + #end 141 +## no user selected, no role selected 142 + #else 143 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 144 + 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" ) 145 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 146 + #set( $thesisFoundNo = $thesisFound.size() ) 147 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo ) 148 + #foreach( $thesis in $thesisFound ) 149 + #set($thesisDoc = $xwiki.getDocument($thesis)) 150 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 151 +* [[$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 152 + 153 + #end 154 + #end 155 + #if( !$oneStatus ) 156 +(% 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"]] 157 + #end 158 + #end 185 185 #end 160 +{{id name='bottom'/}} 186 186 {{/velocity}}