Changes for page Per Year

From 131.3 to 131.4 From 150.1 to 151.1

From version 131.4

edited by Andrea Omicini
on 30/01/2023 13:13

Change comment: There is no comment for this version

To version 150.1

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

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,0 +1,1 @@
	1	+$services.localization.render('peryear')

Content

@@ -1,72 +1,40 @@
--= {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
--
--{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
--#set( $thesisMenu = true )
++{{velocity}}
++{{html wiki="true" clean="false"}}
++#template('apice_boolean.vm')
  #### HANDLE PARAMETERS / START
--##
--## 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}}
++#template('apice_theses.vm')
++#template('apice_user_param.vm')
++## YEARS / START
++#set( $yearPar = $request.year.trim() )
++#set( $firstYearPar = $request.from.trim() )
++#set( $lastYearPar = $request.to.trim() )
++## 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
      #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( $userNamePar )
--## from the URL, "user=$userNamePar" parameter
--  #if( $userNamePar.contains('XWiki.') )
--    #set( $userName = "$userNamePar" )
--  #else
--    #set( $userName = "XWiki.$userNamePar" )
++  #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
++    #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
    #end
--  #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
++  #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
++    #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
    #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
--#if( $oneUser )
--  #if( $apiceUser )
--     #set( $userString = "%$userName%" )
--  #else
--     #set( $userString = "%$userFirstName $userLastName%" )
--  #end
--#else
--     #set( $userString = "%%" )
--#end
++## years / parameters takes precedence
++#set( $firstYear = $firstYearThesis )
++#set( $lastYear = $lastYearThesis )
++#template('apice_years_param.vm')
  #### 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() != "" )
    #set( $cyclePar = $request.cycle.trim().toUpperCase() )
--  #if( $allThesisCycles.contains($cyclePar) )
++  #if( $thesisCycles.contains($cyclePar) )
  ## 'cycle' parameter is an admissible thesis cycle value
      #set( $cycleList = [$cyclePar])
      #set( $oneCycle = true )
@@ -78,75 +78,19 @@
    #end
  #else
  ## default: all cycles
--  #if( $showPhDTheses )
--    #set( $cycleList = $allThesisCycles )
--  #else
--    #set( $cycleList = $lowThesisCycles )
--  #end
++  #set( $cycleList = $showcaseThesisCycles )
    #set( $oneCycle = false )
    #set( $cycle = "" )
  #end
  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
--##
--## 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
--##
--## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
--##
  #### HANDLE PARAMETERS / END
  ##
--## query to structures
++## DATA STRUCTURES / START
  #set( $itemMap = {} )
  #set( $itemNo = 0 )
  #foreach( $year in $yearList )
--  #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" )
++  #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" )
  ## do query
    #set( $itemFound = $xwiki.searchDocuments($query) )
  ## set counters
@@ -156,12 +156,36 @@
      #set( $itemNo = $itemNo + $itemYearNo )
    #end
  #end
++## DATA STRUCTURES / END
  ##
--## output results
++## DISPLAY / START
  ## page subtitle
--{{id name="top"/}}
-->(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end#{end}  /  #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser )  /  $userFirstName $userLastName#{end}(%%)
--
++<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>
  ## stop if no thesis is found
  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
  ## redundant double check
@@ -172,16 +172,22 @@
  #if( $itemMap.keySet().size() > 1 )
  ## found more than one year
  {{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>>||anchor=$year]]#end)))
++(% 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
++##
++#template('apice_thesis_macros.vm')
++##
  #foreach( $year in $itemMap.keySet() )
  (% 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']]
--(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)#foreach( $item in $itemMap[$year] )
--|{{thesis inline='false' linked='title'}}$item{{/thesis}}
++<div style="font-style: normal"><ul>
++#foreach( $item in $itemMap[$year] )
++<li>#thesislinked($item)</li>
  #end
++</ul></div>
    #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 ){{stringEngIta eng=$objectEngSingular.toLowerCase() ita=$objectItaSingular.toLowerCase()/}}#else{{stringEngIta eng=$objectEngPlural.toLowerCase() ita=$objectItaPlural.toLowerCase()/}}#end#end / $year)  [[[{{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-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
++{{/html}}
  {{/velocity}}
  {{id name="bottom"/}}