Changes for page Per Year

From 140.1 to 139.1 From 158.1 to 157.1

From version 157.1

edited by Andrea Omicini
on 30/06/2023 21:38

Change comment: There is no comment for this version

To version 140.1

edited by Andrea Omicini
on 30/06/2023 17:02

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,36 +5,67 @@
--
--1. List item
--1. List item
--1. List item
  {{velocity}}
--{{html wiki="true" clean="false"}}
--#template('apice_boolean.vm')
--#### SET PARAMETERS / START
  #template('apice_theses.vm')
--#template('apice_user_param.vm')
--## years / personal
--#if( $isUserSpace )
--  #set( $query = ", BaseObject as objPersonalThesis,  LargeStringProperty as propUser
--  where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${objectSpace}.Personal.${objectClass}' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
--  #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
--  #if( $personalThesisDocs.size() > 0 )
--    #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
--  #else
++#### HANDLE PARAMETERS / START
++##
++## inline display
++#set( $inlinePar = $request.inline.trim() )
++## who
++#set( $userNamePar = $request.user.trim() )
++#set( $firstNamePar = $request.name.trim() )
++#set( $lastNamePar = $request.surname.trim() )
++#### handle who
++#if( $userName )
++## from a personal page, "XWiki.$userName" $userName form
++  #if( !$xwiki.exists( $userName ) )
++{{warning}}User $userName does not exist{{/warning}}
      #stop
    #end
--  #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
--    #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
++  #set( $apiceUser = true )
++  #set( $oneUser = true )
++  #set( $userdoc = $xwiki.getDocument($userName) )
++  #set( $userFirstName = $userdoc.display("first_name") )
++  #set( $userLastName = $userdoc.display("last_name") )
++#elseif( $userNamePar )
++## from the URL, "user=$userNamePar" parameter
++  #if( $userNamePar.contains('XWiki.') )
++    #set( $userName = "$userNamePar" )
++  #else
++    #set( $userName = "XWiki.$userNamePar" )
    #end
--  #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
--    #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
++  #if( !$xwiki.exists( $userName ) )
++    #if( $services.localization.currentLocale == 'it' )
++{{warning}}L'utente “$userNamePar” non esiste{{/warning}}
++    #else
++{{warning}}User “$userNamePar” does not exist{{/warning}}
++    #end
++    #stop
    #end
++  #set( $apiceUser = true )
++  #set( $oneUser = true)
++  #set( $userdoc = $xwiki.getDocument($userName) )
++  #set( $userFirstName = $userdoc.display("first_name") )
++  #set( $userLastName = $userdoc.display("last_name") )
++#elseif( $firstNamePar && $lastNamePar )
++## from the URL, "name=Firstname&surname=Lastname" parameter
++  #set( $apiceUser = false )
++  #set( $oneUser = true )
++  #set( $userFirstName = $firstNamePar )
++  #set( $userLastName = $lastNamePar )
++#else
++  #set( $apiceUser = false )
++  #set( $oneUser = false )
++  #set( $userFirstName = "" )
++  #set( $userLastName = "" )
  #end
--## years / parameters takes precedence
--#set( $firstYear = $firstYearThesis )
--#set( $lastYear = $lastYearThesis )
--#template('apice_year_param.vm')
--##
--## CYCLES / START
++#if( $oneUser )
++  #if( $apiceUser )
++     #set( $userString = "%$userName%" )
++  #else
++     #set( $userString = "%$userFirstName $userLastName%" )
++  #end
++#else
++     #set( $userString = "%%" )
++#end
++#### handle cycle
  ## $cycleList gets the list of cycles to be shown
  ## $oneCycle true if just one cycle to be shown
  #if( $request.cycle && $request.cycle.trim() != "" )
@@ -52,16 +52,66 @@
    #set( $cycle = "" )
  #end
  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
--## CYCLES / END
  ##
--#### SET PARAMETERS / END
++## when
++#set( $yearPar = $request.year.trim() )
++#set( $firstYearPar = $request.from.trim() )
++#set( $lastYearPar = $request.to.trim() )
++#### handle when
++#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
++#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
++#if( $lastYear < $firstYear )
++  #set( $lastYear = $firstYear )
++#end
++## parameters takes precedence
++#if( $yearPar )
++  #set( $yearInt = $mathtool.toInteger($yearPar) )
++  #if( $yearInt > 0 )
++    #set( $firstYear = $yearInt )
++    #set( $lastYear = $yearInt )
++  #end
++#end
++#if( $firstYearPar )
++  #set( $yearInt = $mathtool.toInteger($firstYearPar) )
++  #if( $yearInt > 0 )
++    #set( $firstYear = $yearInt )
++  #end
++#end
++#if( $lastYearPar )
++  #set( $yearInt = $mathtool.toInteger($lastYearPar) )
++  #if( $yearInt > 0 )
++    #set( $lastYear = $yearInt )
++  #end
++#end
++#if( $lastYear < $firstYear )
++## swap
++  #set( $yearTemp = $lastYear )
++  #set( $lastYear = $firstYear )
++  #set( $firstYear = $yearTemp )
++#end
++## invariant: $lastYear >= $firstYear
++#if( $lastYear > $firstYear )
++  #set( $year =  -1 )
++  #set( $yearList = [$lastYear..$firstYear] )
++  #set( $oneYear = false )
++#else
++## $lastYear = $firstYear
++  #set( $year = $lastYear )
++  #set( $yearList = [$year] )
++  #set( $oneYear = true )
++#end
++## handle when / end
  ##
--## DATA STRUCTURES / START
++## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
++##
++#### HANDLE PARAMETERS / END
++##
++## query to structures
  #set( $itemMap = {} )
  #set( $itemNo = 0 )
  #foreach( $year in $yearList )
--  #set( $query = ", BaseObject as objThesis #if( $oneCycle ), StringProperty as propCycle #end, DateProperty as propEnddate, StringProperty as propStatus, LargeStringProperty as propSupervisor, LargeStringProperty as propCosupervisor, LargeStringProperty as propContact
--    where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propEnddate.id.id = objThesis.id and propStatus.id.id = objThesis.id and propSupervisor.id.id = objThesis.id and propCosupervisor.id.id = objThesis.id and propContact.id.id = objThesis.id and propEnddate.name = 'end' and propStatus.name = 'status' and propSupervisor.name = 'supervisors' and propCosupervisor.name = 'cosupervisors' and propContact.name = 'contacts' #if( $oneCycle ) and propCycle.id.id = objThesis.id and propCycle.name = 'cycle' and propCycle.value = '$cycle' #end and year(propEnddate.value) = $year and lower(propStatus.value) = 'completed' #if( $oneUser )and ( propSupervisor.value like '%$userString%' or propCosupervisor.value like '%$userString%' or propContact.value like '%$userString%' )#end order by propEnddate.value desc" )
++  #set( $query = ", 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 = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' 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 = 'end' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' #if( $oneCycle ) and prop0.value = '$cycle'#end and year(prop1.value) = $year and lower(prop2.value) = 'completed' #if( $oneUser )and ( prop3.value like '%$userString%' or prop4.value like '%$userString%' or prop5.value like '%$userString%' )#end order by prop1.value desc" )
  ## do query
    #set( $itemFound = $xwiki.searchDocuments($query) )
  ## set counters
@@ -71,36 +71,12 @@
      #set( $itemNo = $itemNo + $itemYearNo )
    #end
  #end
--## DATA STRUCTURES / END
  ##
--## DISPLAY / START
++## output results
  ## page subtitle
--<div class="mainheader">
--$itemNo
--#if( $itemNo == 1 )
--  #if( $oneCycle )
--    {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
--  #else
--    $services.localization.render('thesis').toLowerCase()
--  #end
--#{else}
--  #if( $oneCycle )
--    {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
--  #else
--    $services.localization.render('theses').toLowerCase()
--  #end
--#{end}
--<span class="textsecondary">&ensp;/&ensp;</span>
--#if( $oneYear )
--  $year
--#else
--  $firstYear–$lastYear
--#{end}
--#if( $oneUser )
--  <span class="textsecondary">&ensp;/&ensp;</span>
--  $userFirstName $userLastName
--#end
--</div>
++{{id name="top"/}}
++>(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('thesis').toLowerCase()#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('theses').toLowerCase()#end#{end}  /  #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser )  /  $userFirstName $userLastName#{end}(%%)
++
  ## stop if no thesis is found
  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
  ## redundant double check
@@ -110,14 +110,8 @@
  ## page index
  #if( $itemMap.keySet().size() > 1 )
  ## found more than one year
--<div class="mainselectbar" id="index">
--  #foreach( $year in $itemMap.keySet() )
--    #if( !$foreach.first )
--      &ensp;&bull;&ensp;
--    #end
--    [[$year>>||anchor="$year"]]
--  #end
--</div>
++{{id name="index"/}}
++(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $itemMap.keySet() )#if( !$foreach.first )  |  #end[[$year>>$doc||anchor=$year]]#end)))
  #end
  ## theses displayed per year
  ##
@@ -124,23 +124,14 @@
  #template('apice_thesis_macros.vm')
  ##
  #foreach( $year in $itemMap.keySet() )
--## year top / start
--<div class="mainselectseparator">
--  <a class="mainselectseparatorlink" id="$year" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end#if( $oneCycle )&cycle=$cycle#end")>
--  $year
--  </a>
--</div>
--## year top / end
--##
--## year display / start
--<div style="font-style: normal"><ul>
++(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc||style="text-decoration:none; color:$theme.textPrimaryColor" queryString='year=$year#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end#if( $oneCycle )&cycle=$cycle#end']]
++{{html wiki="true" clean="false"}}
  #foreach( $item in $itemMap[$year] )
--<li>#thesislinked($item)</li>
++* #thesislinked($item)
  #end
--</ul></div>
--## year display / end
--##
--#end
--## DISPLAY / END
  {{/html}}
--{{/velocity}}{{pageDisplay sort="objectservice"/}}
++  #set( $itemYearNo = $itemMap[$year].size() )
++(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year)  [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]]  [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
++#end
++{{/velocity}}
++{{id name="bottom"/}}