Changes for page Per Year

From 108.2 to 109.1 From 120.5 to 120.6

From version 109.1

edited by Andrea Omicini
on 30/10/2021 17:27

Change comment: There is no comment for this version

To version 120.5

edited by Andrea Omicini
on 30/10/2021 19:21

Change comment: There is no comment for this version

Raw
Rendered

Summary

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

Details

Page properties

Content

@@ -43,6 +43,7 @@
      #set( $yearList = [$lastYear..$firstYear] )
    #end
  #end
++## $selectedYear, $yearList and $oneYear set properly
  ### END YEAR
  ##
  ### START USER
@@ -72,35 +72,26 @@
      #stop
    #end
  #end
++## $selectedUser and $oneUser set properly
  ### END USER
--##if user selected, existing user page
++##
  ### START CYCLE
  #set( $oneCycle = false )
  #set( $selectedCycle = '' )
++## cycle parameter
  #if( $request.cycle )
    #set( $cyclePar = $request.cycle.trim().toUpperCase() )
--  $cyclePar
  #end
++## set cycle
  #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
    #set( $oneCycle = true )
    #set( $selectedCycle = $cyclePar )
  #end
--## $oneUser and $oneCycle set properly
--$yearList
--#if( $oneYear )
--  $selectedYear
--#end
--#if( $oneUser )
--  $selectedUser
--#end
--#if( $oneCycle )
--  $selectedCycle
--  {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
--#end
--### END USER & CYCLE
++## $selectedCycle and $oneCycle set properly
++### END CYCLE
  ##
  ## title
-->#if( $oneCycle ){{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end  /  #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser )  /  $userFirstName **$userLastName**#end{{id name='top'/}}
++>#if( $oneCycle ){{thesisCycle uppercase='yes' short='no'}}$selectedCycle{{/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( !$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)))
@@ -121,11 +121,11 @@
      #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 year(prop1.value) = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
++        #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
++          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 prop5.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and prop2.value = 'Completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.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 year(prop1.value) = '$year' order by prop1.value desc" )
++        #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty 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 = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and prop2.value = 'Completed' order by prop1.value desc" )
        #end
        #set( $thesisFound = $xwiki.searchDocuments($sql) )
        #set( $thesisFoundNo = $thesisFound.size() )
@@ -146,8 +146,10 @@
      #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
    #end
    #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"]]
++(% 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
++  #set( $thesisNo = $thesisNo + $thesisYearNo )
  #end
++(% style="border-style:hidden hidden hidden hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|($thesisNo #if($thesisNo == 1){{stringEngIta eng='thesis' ita='tesi'/}}#else{{stringEngIta eng='theses' ita='tesi'/}}#end  [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]]  [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
  {{id name='bottom'/}}
  {{/velocity}}