Changes for page Per Year

From 23.1 to 22.1 From 72.1 to 71.1

From version 71.1

edited by Andrea Omicini
on 29/10/2021 15:22

Change comment: There is no comment for this version

To version 23.1

edited by Andrea Omicini
on 25/10/2021 17:49

Change comment: There is no comment for this version

Raw
Rendered

Summary

Page properties (2 modified, 0 added, 0 removed)

Details

Page properties

Title

@@ -1,1 +1,1 @@
--#if($xcontext.language=='it')Tesi per anno#{else}Theses per Year#end
++Theses per Status

Content

@@ -1,42 +1,16 @@
  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
  #set( $thesisMenu = true )
--#set( $oneYear = false )
--### START YEAR
--## year parameter
--#set( $yearPar = $mathtool.toInteger("$!$request.year") )
--#set( $fromPar = $mathtool.toInteger("$!$request.from") )
--#set( $toPar = $mathtool.toInteger("$!$request.to") )
--#set( $firstYear = $firstYearTh )
--#set( $lastYear = $lastYearTh )
--#set( $yearList = [$lastYear..$firstYear] )
--#if( $yearPar != '' )
--  #set( $oneYear = true )
--  #set( $selectedYear = $yearPar )
++#### get parameters
++## hypothesis: $thesisStatus set, default "Completed"
++## status parameter
++#set( $statusPar = $request.status.trim().toLowerCase() )
++#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
++  #set( $selectedStatus = $statusPar )
  #else
--  #if( $fromPar != '' && $yearList.contains($fromPar) )
--    #set( $firstYear = $fromPar )
--    #set( $yearList = [$lastYear..$firstYear] )
--  #end
--  #if( $toPar != '' && $yearList.contains($toPar) )
--    #set( $lastYear = $toPar )
--    #set( $yearList = [$lastYear..$firstYear] )
--  #end
--  #if( $lastYear <= $firstYear )
--    #set( $oneYear = true )
--    #set( $selectedYear = $firstYear )
--  #else
--    #set( $yearList = [$lastYear..$firstYear] )
--  #end
++  #set( $selectedStatus = 'all' )
  #end
--$oneYear
--$selectedYear
--$firstYear
--$lastYear
--$yearList
--#stop
  ##check velocity variable, takes precedence
  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
--  #set( $oneStatus = true )
    #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
  #end
  ## set ordering field
@@ -45,117 +45,122 @@
  #elseif( $selectedStatus == "ongoing" )
    #set( $orderingDateFieldName = "startDate" )
  #else
--## default for no selected status, too
    #set( $orderingDateFieldName = "endDate" )
  #end
--## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
--### END STATUS
--##
--### START USER & ROLE
--#set( $userNamePar = $request.user.trim() )
--## default values
--#set( $oneUser = false )
--#set( $oneRole = false )
++## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
++## who
++#set( $userNamePar = $request.user )
++#set( $supervisorNamePar = $request.supervisor )
++#set( $cosupervisorNamePar = $request.cosupervisor )
++#set( $contactNamePar = $request.contact )
++#### set default values
++#set( $userSelected = false )
++#set( $roleSelected = false )
  #set( $userFirstName = "" )
  #set( $userLastName = "" )
--#if( $userName || $userNamePar )
++#set( $supervisorName = "" )
++#set( $supervisorFirstName = "" )
++#set( $supervisorLastName = "" )
++#set( $cosupervisorName = "" )
++#set( $cosupervisorFirstName = "" )
++#set( $cosupervisorLastName = "" )
++#set( $contactName = "" )
++#set( $contactFirstName = "" )
++#set( $contactLastName = "" )
++##
++#### handle who & roles
++##
++#if ( $userName || $userNamePar )
  ## a user is specified for all roles
--  #if( !$userName )
--    #set( $selectedUser = "XWiki.$userNamePar" )
--  #else
--    #set( $selectedUser = $userName )
++  #set( $userSelected = true )
++  #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end
++  #set( $userdoc = $xwiki.getDocument($userName) )
++  #set( $userFirstName = $userdoc.display("first_name") )
++  #set( $userLastName = $userdoc.display("last_name") )
++#elseif ( $supervisorNamePar || $cosupervisorNamePar || $contactNamePar )
++  #set( $roleSelected = true )
++  #if ( $supervisorNamePar )
++    #set( $supervisorName = "XWiki.$supervisorNamePar" )
++    #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
++    #set( $supervisorFirstName = $supervisordoc.display("first_name") )
++    #set( $supervisorLastName = $supervisordoc.display("last_name") )
    #end
--  #if( $xwiki.exists($selectedUser) )
--    #set( $oneUser = true )
--    #set( $userdoc = $xwiki.getDocument($selectedUser) )
--    #set( $userFirstName = $userdoc.display("first_name") )
--    #set( $userLastName = $userdoc.display("last_name") )
--  #else
--{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
--    #stop
++  #if ( $cosupervisorNamePar )
++    #set( $cosupervisorName = "XWiki.$cosupervisorNamePar" )
++    #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) )
++    #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") )
++    #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
    #end
--##user selected and existing user page
--  #set( $rolePar = $request.role.trim().toLowerCase() )
--  #set( $selectedRole = '' )
--  #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
--    #set( $oneRole = true )
--    #set( $selectedRole = $rolePar )
++  #if ( $contactNamePar )
++    #set( $contactName = "XWiki.$contactNamePar" )
++    #set( $contactdoc = $xwiki.getDocument($contactName) )
++    #set( $contactFirstName = $contactdoc.display("first_name") )
++    #set( $contactLastName = $contactdoc.display("last_name") )
    #end
  #end
--## $oneUser and $oneRole set properly, other related variables set accordingly
--## $oneRole has meaning only if $oneUser
--## if $oneUser, $oneRole false means one user for all roles
--## if $oneUser, $oneRole true means one specific role for one user selected
--## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
++#if( $supervisor )
++  #set( $roleSelected = true )
++  #set( $supervisorName = $userName )
++  #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
++  #set( $supervisorFirstName = $supervisordoc.display("first_name") )
++  #set( $supervisorLastName = $supervisordoc.display("last_name") )
++#end
++#if( $cosupervisor )
++  #set( $roleSelected = true )
++  #set( $cosupervisorName = $userName )
++  #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) )
++  #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") )
++  #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
++#end
++#if( $contact )
++  #set( $roleSelected = true )
++  #set( $contactName = $userName )
++  #set( $contactdoc = $xwiki.getDocument($contactName) )
++  #set( $contactFirstName = $contactdoc.display("first_name") )
++  #set( $contactLastName = $contactdoc.display("last_name") )
++#end
  ##
--## title
-->#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'/}}
--## index
--#if( !$oneStatus )
--(% 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)))
--#elseif( $oneUser && !$oneRole )
--(% 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)))
--#end{{id name='index'/}}
--## search theses
--#set( $thesisNo = 0 )
++#if( $cosupervisor )
++  #set( $roleSelectedFieldName = "coSupervisors" )
++#elseif( $contact )
++  #set( $roleSelectedFieldName = "contact" )
++#else
++  #set( $roleSelectedFieldName = "supervisor" )
++#end
++##
++## $roleSelected has meaning only if $userSelected
++## if $userSelected, $roleSelected false means one user for all roles
++## if $userSelected, $roleSelected true means one specific role for one user selected
++## if $userSelected is false, $roleSelected means nothing -- so all users, all roles / just status
  #foreach( $status in $allThesisStatuses )
--  #if( !$oneStatus || $selectedStatus == $status )
--    #set( $thesisStatusNo = 0 )
--    #if( !$oneStatus )
--(% 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}}
--    #end
++  #if( $selectedStatus  == 'all' || $selectedStatus == $status )
++= $status =
  ## some selected status or all statuses / now $status
--    #if( $oneUser )
++    #if( $userSelected )
++== $userName ==
  ## some user selected
--      #foreach( $role in $allThesisRoles )
--        #set( $thesisStatusRoleNo = 0 )
--        #if( !$oneRole || $selectedRole == $role )
--          #if( $role == "contact" )
--            #set( $selectedRoleFieldName = "contacts" )
--          #elseif( $role == "cosupervisor" )
--            #set( $selectedRoleFieldName = "cosupervisors" )
--          #else
--            #set( $selectedRoleFieldName = "supervisors" )
--          #end
--## some selected role or all roles / now $role
--          #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
--        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" )
--          #set( $thesisFound = $xwiki.searchDocuments($sql) )
--          #set( $thesisFoundNo = $thesisFound.size() )
--          #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
--          #if( $thesisFoundNo > 0 && !$oneRole )
--(% 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}}
--          #end
--          #foreach( $thesis in $thesisFound )
--        #set($thesisDoc = $xwiki.getDocument($thesis))
--        #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
--* [[$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
--
--          #end
--          #if( $thesisFoundNo > 0 && !$oneRole )
--(% 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"]]
--          #end
--        #end
--        #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
++      #if( $roleSelected )
++## some specific role selected
++=== $roleSelectedFieldName ===
++        #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
++        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 = '$roleSelectedFieldName' and prop2.name = '$orderingDateFieldName' and prop0.value = '$status' and prop1.value like '%$userName%' order by prop2.value desc" )
++      #else
++## no specific role selected
++        #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
++        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 = 'status' and prop1.name = 'supervisor' and prop2.name = 'coSupervisors' and prop3.name = 'contact' and prop4.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
        #end
--## no user selected, no role selected
      #else
++## no user selected, no role selected
        #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
--      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" )
--      #set( $thesisFound = $xwiki.searchDocuments($sql) )
--      #set( $thesisFoundNo = $thesisFound.size() )
--      #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
--      #foreach( $thesis in $thesisFound )
--        #set($thesisDoc = $xwiki.getDocument($thesis))
--        #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
--* [[$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
--
--      #end
++      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 prop0.value =  '$status' order by prop1.value desc" )
      #end
--    #if( !$oneStatus )
--(% 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"]]
--    #end
    #end
++  #set( $thesisFound = $xwiki.searchDocuments($sql) )
++  #set( $thesisFoundNo = $thesisFound.size() )
++##
++  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
++* [[$thesisDoc.getValue("title")>>$thesisDoc]]#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
++
++  #end
  #end
--{{id name='bottom'/}}
  {{/velocity}}