Changes for page Per Year

From 131.1 to 130.2 From 136.1 to 135.1

From version 135.1

edited by Andrea Omicini
on 24/04/2023 13:17

Change comment: There is no comment for this version

To version 131.1

edited by Andrea Omicini
on 27/01/2023 19:27

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,203 +1,156 @@
--= {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
++= {{italiano}}Per anno e livello{{/italiano}}{{english}}Per Year & Cycle{{/english}} =
--{{include reference="Classes.Environment" excludeFirstHeading="true"/}}{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
++{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
  #set( $thesisMenu = true )
--#### 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
++## get environment variables & derived
++#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
++#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
++#set( $yearList = [$lastYear..$firstYear] )
++#set( $yearPar = 0 )
++#set( $fromPar = 0 )
++#set( $toPar = 0 )
++### START YEAR
++## defaults
++#set( $oneYear = false )
++#set( $selectedYear = '' )
++## year parameters
++#if( $request.year )
++  #set( $yearPar = $mathtool.toInteger($request.year) )
++#end
++#if( $request.from )
++  #set( $fromPar = $mathtool.toInteger($request.from) )
++#end
++#if( $request.to )
++  #set( $toPar = $mathtool.toInteger($request.to) )
++#end
++##set years
++#if( $yearPar > 0 )
++  #set( $oneYear = true )
++  #set( $firstYear = $yearPar )
++  #set( $lastYear = $yearPar )
++  #set( $selectedYear = $yearPar )
++  #set( $yearList = [$yearPar] )
++#else
++  #if( $fromPar != '' && $fromPar > 0 && ($fromPar > $firstYear)  )
++    #set( $firstYear = $fromPar )
++    #set( $yearList = [$lastYear..$firstYear] )
    #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" )
++  #if( $toPar != '' && $toPar > 0 && ($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( $userName = "XWiki.$userNamePar" )
++    #set( $yearList = [$lastYear..$firstYear] )
    #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
--  #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%" )
++## $selectedYear, $yearList and $oneYear set properly
++### END YEAR
++##
++### START USER
++## default values
++#set( $oneUser = false )
++#set( $selectedUser = '' )
++#set( $userFirstName = "" )
++#set( $userLastName = "" )
++## user parameter
++#if( $request.user )
++  #set( $userNamePar = $request.user.trim() )
++#end
++#if( $userName || $userNamePar )
++## try to specify a user
++  #if( !$userName )
++    #set( $selectedUser = "XWiki.$userNamePar" )
    #else
--     #set( $userString = "%$userFirstName $userLastName%" )
++    #set( $selectedUser = $userName )
    #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() != "" )
--  #set( $cyclePar = $request.cycle.trim().toUpperCase() )
--  #if( $allThesisCycles.contains($cyclePar) )
--## 'cycle' parameter is an admissible thesis cycle value
--    #set( $cycleList = [$cyclePar])
--    #set( $oneCycle = true )
--    #set( $cycle = $cyclePar )
++  #if( $xwiki.exists($selectedUser) )
++    #set( $oneUser = true )
++    #set( $userdoc = $xwiki.getDocument($selectedUser) )
++    #set( $userFirstName = $userdoc.display("first_name") )
++    #set( $userLastName = $userdoc.display("last_name") )
    #else
--## 'cycle' parameter is not an admissible thesis cycle value
--{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
++{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
      #stop
    #end
--#else
--## default: all cycles
--  #if( $showPhDTheses )
--    #set( $cycleList = $allThesisCycles )
--  #else
--    #set( $cycleList = $lowThesisCycles )
--  #end
--  #set( $oneCycle = false )
--  #set( $cycle = "" )
  #end
--## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
++## $selectedUser and $oneUser set properly
++### END USER
  ##
--## 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 )
++### START CYCLE
++#set( $oneCycle = false )
++#set( $selectedCycle = '' )
++## cycle parameter
++#if( $request.cycle )
++  #set( $cyclePar = $request.cycle.trim().toUpperCase() )
  #end
--## parameters takes precedence
--#if( $yearPar )
--  #set( $yearInt = $mathtool.toInteger($yearPar) )
--  #if( $yearInt > 0 )
--    #set( $firstYear = $yearInt )
--    #set( $lastYear = $yearInt )
--  #end
++## set cycle
++#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
++  #set( $oneCycle = true )
++  #set( $selectedCycle = $cyclePar )
  #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 )
++## $selectedCycle and $oneCycle set properly
++#if( $showPhDTheses )
++  #set( $cycles = $allThesisCycles )
  #else
--## $lastYear = $firstYear
--  #set( $year = $lastYear )
--  #set( $yearList = [$year] )
--  #set( $oneYear = true )
++  #set( $cycles = $lowThesisCycles )
  #end
--## handle when / end
++### END CYCLE
  ##
--## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
--##
--## handle inline / start
--##
--## default: false
--#set( $showInline = false )
--## check $inlinePar
--#if( $inlinePar != "" && $trueStringList.contains($inlinePar.toLowerCase()) )
--  #set( $showInline = true )
--#end
--##
--## handle inline / end
--##
--#### HANDLE PARAMETERS / END
--##
--## query to structures
--#set( $itemMap = {} )
--#set( $itemNo = 0 )
++## title
++>#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( $foreach.index > 0 )  |  #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 $cycles  )#if( $foreach.index > 0 )  |  #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
++#end{{id name='index'/}}
++## search theses
++#set( $thesisNo = 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" )
--## do query
--  #set( $itemFound = $xwiki.searchDocuments($query) )
--## set counters
--  #set( $itemYearNo = $itemFound.size() )
--  #if( $itemYearNo > 0 )
--    #set( $itemMap[$year] = $itemFound )
--    #set( $itemNo = $itemNo + $itemYearNo )
++  #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>>$doc.name||queryString='year=$year#if( $oneCycle )&cycle=$selectedCycle#end']]
    #end
--#end
--##
--## output results
--## 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}(%%)
--
--## stop if no thesis is found
--#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
--## redundant double check
--  #stop
--#end
--## some theses found
--## page index
--#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>>$doc||anchor=$year]]#end)))
--#end
--## theses displayed per year
--#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#if( $showInline )&inline=true#end']]
--#foreach( $item in $itemMap[$year] )
--    #if( $showInline )
--      #if( $foreach.first )
++## some selected year or year list / now $year
++  #foreach( $cycle in $cycles )
++    #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, 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' and prop0.value = '$cycle' and year(prop1.value) = '$year' and lower(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, StringProperty as prop2
++          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 prop0.name = 'cycle' and prop1.name = 'end' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and lower(prop2.value) = 'completed' order by prop1.value desc" )
        #end
--* #else(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)|#end{{thesis inline=$showInline linked='title'}}$item{{/thesis}}
++      #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}}>>$doc.name||queryString='cycle=$cycle&year=$year']]
++      #end
++      #foreach( $thesis in $thesisFound )
++* {{thesis}}$thesis{{/thesis}}
++      #end
++      #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( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
    #end
--  #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"]]
++  #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
++  #set( $thesisNo = $thesisNo + $thesisYearNo )
  #end
++#if( $thesisNo > 0 )
++(% style="text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor; border-color:$theme.borderColor; border-bottom-style:dotted" %)|($thesisNo #if( $oneCycle )#if($thesisNo == 1){{thesisCycle plural='no' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#else{{thesisCycle plural='yes' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#end#else#if($thesisNo == 1){{stringEngIta eng='thesis' ita='tesi'/}}#else{{stringEngIta eng='theses' ita='tesi'/}}#end#end#if( $oneYear ) {{stringEngIta eng='in' ita='nel'/}} $selectedYear#else {{stringEngIta eng='from' ita='dal'/}} $firstYear {{stringEngIta eng='to' ita='al'/}} $lastYear#end)
++#end
++{{id name='bottom'/}}
  {{/velocity}}
--{{id name="bottom"/}}