Changes for page Per Year

From 7.1 to 7.2 From 20.2 to 20.3

From version 7.2

edited by Andrea Omicini
on 18/06/2021 00:21

Change comment: There is no comment for this version

To version 20.2

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

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 @@
--SelectPerStatus
++Theses per Status

Content

@@ -1,13 +1,36 @@
--{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}
++{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
++#set( $thesisMenu = true )
  #### get parameters
++## hypothesis: $thesisStatus set, default "Completed"
++## status parameter
++#set( $statusPar = $request.status.trim().toLowerCase() )
++#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
++  #set( $selectedStatus = $statusPar )
++#else
++  #set( $selectedStatus = 'all' )
++#end
++$selectedStatus
++##check velocity variable, takes precedence
++#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
++  #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
++#end
++## set ordering field
++#if( $selectedStatus == "available" )
++  #set( $orderingDateFieldName = "availabilityDate" )
++#elseif( $selectedStatus == "ongoing" )
++  #set( $orderingDateFieldName = "startDate" )
++#else
++  #set( $orderingDateFieldName = "endDate" )
++#end
++## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
  ## who
--#set( $userNamePar = $context.getRequest().getParameter("user") )
--#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
--#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
--#set( $contactNamePar = $context.getRequest().getParameter("contact") )
++#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( $roleSelected = false )
  #set( $userFirstName = "" )
  #set( $userLastName = "" )
  #set( $supervisorName = "" )
@@ -50,7 +50,7 @@
    #end
  #end
  #if( $supervisor )
--  #set( $roleSelected = true )
++  #set( $roleSelected = true )
    #set( $supervisorName = $userName )
    #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
    #set( $supervisorFirstName = $supervisordoc.display("first_name") )
@@ -70,131 +70,73 @@
    #set( $contactFirstName = $contactdoc.display("first_name") )
    #set( $contactLastName = $contactdoc.display("last_name") )
  #end
++$supervisor
++$cosupervisor
++$contact
++$userFirstName $userLastName
++$supervisorFirstName $supervisorLastName
++$cosupervisorFirstName $cosupervisorLastName
++$contactFirstName $contactLastName
  ##
--## $userSelected true means one user for all roles
++## $userSelected true and $roleSelected false means one user for all roles
  ## $userSelected true and $roleSelected true for one user with one specific role
  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
  ## both false means all theses
++#if( $userSelected )
++  #if( $roleSelected )
++>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{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
++  #else
++>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}  /  $userFirstName $userLastName
--== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus) ==
++  #end
++#else
++  #if( $roleSelected )
++>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{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
--#if( $roleSelected )
--  #if( $userSelected )
--    #if( $supervisor )
--* #stringEnIt("as a supervisor","come relatore")
--    #end
--    #if( $cosupervisor )
--* #stringEnIt("as a co-supervisor","come correlatore")
--    #end
--    #if( $contact )
--* #stringEnIt("as a contact","come contatto")
--    #end
    #else
--    #if( $supervisorLastName != "" )
--* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
--    #end
--    #if( $cosupervisorLastName != "" )
--* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
--    #end
--    #if( $contactLastName != "" )
--* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
--<p/>
--    #end
++>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
++
    #end
  #end
  ##
--## hypothesis: $thesisStatus set, default "Completed"
--## to do: get from parameter
--#if ($thesisStatus == "Available")
--  #set ($orderingDateFieldName = "availabilityDate")
--#elseif ($thesisStatus == "Ongoing")
--  #set ($orderingDateFieldName = "startDate")
++#if( $cosupervisor )
++  #set( $roleSelectedFieldName = "coSupervisors" )
++#elseif( $contact )
++  #set( $roleSelectedFieldName = "contact" )
  #else
--  #set ($thesisStatus = "Completed")
--  #set ($orderingDateFieldName = "endDate")
++  #set( $roleSelectedFieldName = "supervisor" )
  #end
--##
--#if ( $cosupervisor )
--  #set ( $roleSelectedFieldName = "coSupervisors" )
--#elseif ( $contact )
--  #set ( $roleSelectedFieldName = "contact" )
--#else
--  #set ( $roleSelectedFieldName = "supervisor" )
--#end
  ##
--#if ($userSelected)
--  #if ( $roleSelected )
--    #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
--    where obj.name=doc.fullName and
--      obj.className='Theses.ThesisClass' and
--      obj.name<>'Theses.ThesisClassTemplate' and
--      prop.id.id=obj.id and
--      prop1.id.id=obj.id and
--      prop2.id.id=obj.id and
--      prop.name='status' and
--      prop.value='$thesisStatus' and
--      prop1.name='$roleSelectedFieldName' and
--      prop2.name='$orderingDateFieldName' and
--      prop1.value like '%$userName%'
--    order by prop2.value desc")
++#if( $selectedStatus == 'all' )
++  ALL STATUSES
++#else
++## some selected status
++  #if( $userSelected )
++## some user selected
++    #if( $roleSelected )
++## some specific role selected
++      #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 = '$thesisStatus' 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 prop0.value = '$thesisStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
++    #end
++  #elseif( $roleSelected )
++## no user selected, some 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 prop1.value like '%$supervisorName%' and prop2.value like '%$cosupervisorName%' and prop3.value like '%$contactName%' order by prop4.value desc")
    #else
--    #set ($sql = ", BaseObject as obj, StringProperty as prop, 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
--      prop.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
--      prop.name='status' and
--      prop.value =  '$thesisStatus' and
--      prop1.name='supervisor' and
--      prop2.name='coSupervisors' and
--      prop3.name='contact' and
--      prop4.name='$orderingDateFieldName' and
--      ( prop1.value like '%$userName%' or
--      prop2.value like '%$userName%' or
--      prop3.value like '%$userName%')
--    order by prop4.value desc")
++## no user selected, some 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 prop0.value =  '$thesisStatus' order by prop1.value desc" )
    #end
--#elseif ( $roleSelected )
--  #set ($sql = ", BaseObject as obj, StringProperty as prop, 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
--    prop.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
--    prop.name='status' and
--    prop.value =  '$thesisStatus' and
--    prop1.name='supervisor' and
--    prop2.name='coSupervisors' and
--    prop3.name='contact' and
--    prop4.name='$orderingDateFieldName' and
--    prop1.value like '%$supervisorName%' and
--    prop2.value like '%$cosupervisorName%' and
--    prop3.value like '%$contactName%'
--  order by prop4.value desc")
--#else
--  #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1
--  where obj.name=doc.fullName and
--    obj.className='Theses.ThesisClass' and
--    obj.name<>'Theses.ThesisClassTemplate' and
--    prop.id.id=obj.id and
--    prop1.id.id=obj.id and
--    prop.name='status' and
--    prop.value =  '$thesisStatus' and
--    prop1.name='$orderingDateFieldName'
--  order by prop1.value desc")
  #end
--#set($thesisFound = $xwiki.searchDocuments($sql))
--
++#set( $thesisFound = $xwiki.searchDocuments($sql) )
++##
  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
--* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))// #end
--
++##* #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
++* $thesis
  #end
  {{/velocity}}