Changes for page Per Year

From 85.1 to 86.1 From 100.1 to 100.2

From version 86.1

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

Change comment: There is no comment for this version

To version 100.1

edited by Andrea Omicini
on 30/10/2021 16:45

Change comment: There is no comment for this version

Raw
Rendered

Summary

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

Details

Page properties

Content

@@ -1,58 +1,48 @@
  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
  #set( $thesisMenu = true )
  #set( $oneYear = false )
++#set( $selectedYear = '' )
  ### START YEAR
  ## year parameter
  #set( $yearPar = $mathtool.toInteger($request.year) )
  #set( $fromPar = $mathtool.toInteger($request.from) )
  #set( $toPar = $mathtool.toInteger($request.to) )
--#set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear
--#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
++#set( $firstYear = $mathtool.toInteger($firstYearTh) )
++#set( $lastYear = $mathtool.toInteger($lastYearTh) )
  #set( $yearList = [$lastYear..$firstYear] )
  #if( $yearPar > 0 )
    #set( $oneYear = true )
    #set( $firstYear = $yearPar )
--  #set( $lastYear = $toPar )
--  #set( $yearList = [$yearPar] )$yearList
++  #set( $lastYear = $yearPar )
++  #set( $selectedYear = $yearPar )
++  #set( $yearList = [$yearPar] )
  #else
--  #if( $fromPar != '' && ($fromPar > $firstYear) )GT
++  #if( $fromPar != '' && ($fromPar > $firstYear)  )
      #set( $firstYear = $fromPar )
      #set( $yearList = [$lastYear..$firstYear] )
    #end
--  #if( $toPar != '' && $toPar > $lastYear)
++  #if( $toPar != '' && ($toPar < $lastYear) )
      #set( $lastYear = $toPar )
      #set( $yearList = [$lastYear..$firstYear] )
    #end
    #if( $lastYear <= $firstYear )
      #set( $oneYear = true )
++    #set( $lastYear = $firstYear )
      #set( $selectedYear = $firstYear )
++    #set( $yearList = [$firstYear] )
    #else
      #set( $yearList = [$lastYear..$firstYear] )
    #end
  #end
--#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
--#if( $selectedStatus == "available" )
--  #set( $orderingDateFieldName = "availabilityDate" )
--#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
++$oneYear
++$yearList
++### END YEAR
  ##
--### START USER & ROLE
++### START USER & CYCLE
  #set( $userNamePar = $request.user.trim() )
  ## default values
  #set( $oneUser = false )
--#set( $oneRole = false )
++#set( $oneCycle = false )
  #set( $userFirstName = "" )
  #set( $userLastName = "" )
  #if( $userName || $userNamePar )
@@ -72,87 +72,69 @@
      #stop
    #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 )
++  #set( $cyclePar = $request.cycle.trim().toUpperCase() )
++  #set( $selectedCycle = '' )
++  #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
++    #set( $oneCycle = true )
++    #set( $selectedCycle = $cyclePar )
    #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
++## $oneUser and $oneCycle set properly
++$oneUser
++$oneCycle
++### END USER & CYCLE
  ##
  ## 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'/}}
++>#if( $oneRole ){{thesisCycle short='no'}}$selecteCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end  /  #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser )  /  $userFirstName **$userLastName**#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)))
++#if( !$oneYear )
++(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList  )#if ($velocityCount > 1)  |  #end[[$year>>||anchor="$year"]]#end)))
++###elseif( $oneUser && !$oneCycle )
++#elseif( !$oneCycle )
++(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $allThesisCycles  )#if ($velocityCount > 1)  |  #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
  #end{{id name='index'/}}
  ## search theses
  #set( $thesisNo = 0 )
--#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}}
++#foreach( $year in $yearList )
++  #if( !$oneYear || $selectedYear == $year )
++    #set( $thesisYearNo = 0 )
++    #if( !$oneYear )
++(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
      #end
--## some selected status or all statuses / now $status
--    #if( $oneUser )
--## 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'))
++## some selected year or year list / now $year
++    #foreach( $cycle in $allThesisCycles )
++      #set( $thesisYearCycleNo = 0 )
++      #if( !$oneCycle || $selectedCycle == $cycle )
++## some selected cycle or all cycles / now $cycle
++        #if( $oneUser)
++          #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty 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 = 'cycle' and prop1.name = 'year' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop0.value = '$cycle' and prop1.value = '$year' and ( prop2.value like '%$selectedUser%' || prop3.value like '%$selectedUser%' || prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
++        #else
++          #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 = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and prop1.value = '$year' order by prop1.value desc" )
++        #end
++        #set( $thesisFound = $xwiki.searchDocuments($sql) )
++        #set( $thesisFoundNo = $thesisFound.size() )
++        #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
++        #if( $thesisFoundNo > 0 && !$oneCycle )
++(% style="border-style:#if( $oneYear )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneYear ){{id name='$cycle'/}}#else{{id name='$year-$cycle'/}}#end{{thesisCycle plural='no' uppercase='yes' short='yes'}}$cycle{{/thesisCycle}}
++        #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"]]
++          #if( $thesisFoundNo > 0 && !$oneCycle )
++(% style="border-style:#if( $oneYear )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( $oneYear ){{id name='$cycle-bottom'/}}#else{{id name='$cycle-$year-bottom'/}}#end($thesisYearCycleNo #if( $thesisYearCycleNo == 1 ){{thesisCycle plural='no' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#else{{thesisCycle plural='yes' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#end {{stringEngIta eng='in' ita='nel'/}} $year  [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]]  [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
            #end
          #end
--        #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
++        #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
        #end
--## no user selected, no role selected
--    #else
--      #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
      #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"]]
++    #if( !$oneYear )
++(% 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" %)|($thesisYearNo #if($thesisYearNo == 1){{stringEngIta eng='thesis in' ita='tesi nel'/}}#else{{stringEngIta eng='theses in' ita='tesi nel'/}}#end$year{{id name='$year-bottom'/}})  [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]]  [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
      #end
    #end
--#end
  {{id name='bottom'/}}
  {{/velocity}}