Changes for page Per Year

From 16.2 to 16.1 From 20.4 to 20.3

From version 20.3

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

Change comment: There is no comment for this version

To version 16.2

edited by Andrea Omicini
on 26/07/2021 23:15

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,0 @@
1		-Theses per Status

Content

@@ -1,36 +1,23 @@
--{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
--#set( $thesisMenu = true )
--#### get parameters
++{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#set( $thesisMenu = true ){{html clean="false" wiki="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" )
++## to do: get from parameter
++#if( $thesisStatus == "Available" )
    #set( $orderingDateFieldName = "availabilityDate" )
--#elseif( $selectedStatus == "ongoing" )
++#elseif( $thesisStatus == "Ongoing" )
    #set( $orderingDateFieldName = "startDate" )
  #else
++  #set( $thesisStatus = "Completed" )
    #set( $orderingDateFieldName = "endDate" )
  #end
  ## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
  ## who
--#set( $userNamePar = $request.user )
--#set( $supervisorNamePar = $request.supervisor )
--#set( $cosupervisorNamePar = $request.cosupervisor )
--#set( $contactNamePar = $request.contact )
++#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 default values
  #set( $userSelected = false )
--#set( $roleSelected = false )
++#set( $roleSelected = false )
  #set( $userFirstName = "" )
  #set( $userLastName = "" )
  #set( $supervisorName = "" )
@@ -73,7 +73,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") )
@@ -93,16 +93,6 @@
    #set( $contactFirstName = $contactdoc.display("first_name") )
    #set( $contactLastName = $contactdoc.display("last_name") )
  #end
--$selectedStatus
--$userSelected
--$roleSelected
--$supervisor
--$cosupervisor
--$contact
--$userFirstName $userLastName
--$supervisorFirstName $supervisorLastName
--$cosupervisorFirstName $cosupervisorLastName
--$contactFirstName $contactLastName
  ##
  ## $userSelected true and $roleSelected false means one user for all roles
  ## $userSelected true and $roleSelected true for one user with one specific role
@@ -109,60 +109,99 @@
  ## 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( $roleSelected ) // //
++> #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 // //
++  #else // //
++> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // //
    #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
--
--  #else
-->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
--
++  #if( $roleSelected ) // //
++> #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 // //
++  #else // //
++## > #FullThesisStatusesString($thesisStatus) // //
    #end
  #end
  ##
--#if( $cosupervisor )
--  #set( $roleSelectedFieldName = "coSupervisors" )
--#elseif( $contact )
--  #set( $roleSelectedFieldName = "contact" )
++#if ( $cosupervisor )
++  #set ( $roleSelectedFieldName = "coSupervisors" )
++#elseif ( $contact )
++  #set ( $roleSelectedFieldName = "contact" )
  #else
--  #set( $roleSelectedFieldName = "supervisor" )
++  #set ( $roleSelectedFieldName = "supervisor" )
  #end
  ##
--#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")
++#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")
    #else
--## 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" )
++    #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")
    #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") != ""  || ( $thesisDoc.getValue("studentFirstName") != "" &&  $thesisDoc.getValue("studentLastName") != "" ) ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
--* $thesis
++* #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
--{{/velocity}}
++{{/html}}{{/velocity}}