Changes for page Per A.Y.

From 45.23 to 45.24 From 48.8 to 49.1

From version 45.24

edited by Andrea Omicini
on 20/07/2023 09:16

Change comment: There is no comment for this version

To version 48.8

edited by Andrea Omicini
on 20/07/2023 10:35

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

Content

@@ -1,178 +1,136 @@
--{{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{velocity}}
--#set( $courseMenu = true )
--#set( $currentCourseDoc = "" )
--#### get parameters
--## when
--#set( $yearPar = $context.getRequest().getParameter("year") )
--#set( $firstYearPar = $context.getRequest().getParameter("from") )
--#set( $lastYearPar = $context.getRequest().getParameter("to") )
--## who
--#set( $oneUser = false )
--#set( $oneProfessor = false )
--#set( $oneTutor = false )
--##
--#set( $userNamePar = $context.getRequest().getParameter("user") )
--#set( $professorNamePar = $context.getRequest().getParameter("professor") )
--#set( $tutorNamePar = $context.getRequest().getParameter("tutor") )
--#### handle who
--#if ( $userName )
--## from a personal page, "XWiki.UserName" $userName form
--  #set( $userdoc = $xwiki.getDocument($userName) )
--  #set( $userFirstName = $userdoc.display("first_name") )
--  #set( $userLastName = $userdoc.display("last_name") )
--  #set( $oneUser = true )
--#elseif ( $userNamePar )
--## from the URL, "user=UserName" parameter
--  #if( $userNamePar.contains("XWiki.") )
--    #set( $userName = $userNamePar )
++{{velocity}}
++{{html clean="false" wiki="true"}}
++#template('apice_macros.vm')
++#setobjectspace("Courses")
++#template('apice_course_macros.vm')
++#template('apice_user_param.vm')
++## years / personal
++#if( $isUserSpace )
++  #set( $query = ", BaseObject as objPersonalCourse,  LargeStringProperty as propUser
++  where objPersonalCourse.name = doc.fullName and objPersonalCourse.className = '${mainSpace}.Personal.Class' and propUser.id.id = objPersonalCourse.id and propUser.name = 'user' and propUser.value = '$userName' " )
++  #set( $personalCourseDocs = $xwiki.searchDocuments($query) )
++  #if( $personalCourseDocs.size() > 0 )
++    #set( $personalCourseDoc = $xwiki.getDocument($personalCourseDocs[0]) )
    #else
--    #set( $userName = "XWiki.$userNamePar" )
++    #stop
    #end
--  #set( $userdoc = $xwiki.getDocument($userName) )
--  #set( $userFirstName = $userdoc.display("first_name") )
--  #set( $userLastName = $userdoc.display("last_name") )
--  #set( $oneUser = true )
--#end
--#if ( $professorName )
--## from a personal page, "XWiki.UserName" $professorName form
--  #set( $professordoc = $xwiki.getDocument($professorName) )
--  #set( $professorFirstName = $professordoc.display("first_name") )
--  #set( $professorLastName = $professordoc.display("last_name") )
--  #set( $oneProfessor = true )
--#elseif ( $professorNamePar )
--## from the URL, "professor=UserName" parameter
--  #if( $professorNamePar.contains("XWiki.") )
--    #set( $professorName = $professorNamePar )
--  #else
--    #set( $professorName = "XWiki.$professorNamePar" )
++  #if( $personalCourseDoc.maxYears && $personalCourseDoc.maxYears != "" )
++    #set( $maxCourseYears = $numbertool.toNumber($personalCourseDoc.display('maxYears','view')) )
    #end
--  #set( $professordoc = $xwiki.getDocument($professorName) )
--  #set( $professorFirstName = $professordoc.display("first_name") )
--  #set( $professorLastName = $professordoc.display("last_name") )
--  #set( $oneProfessor = true )
--#end
--#if ( $tutorName )
--## from a personal page, "XWiki.UserName" $tutorName form
--  #set( $tutordoc = $xwiki.getDocument($tutorName) )
--  #set( $tutorFirstName = $tutordoc.display("first_name") )
--  #set( $tutorLastName = $tutordoc.display("last_name") )
--#elseif ( $tutorNamePar )
--## from the URL, "tutor=UserName" parameter
--  #if( $tutorNamePar.contains("XWiki.") )
--    #set( $tutorName = $tutorNamePar )
--  #else
--    #set( $tutorName = "XWiki.$tutorNamePar" )
++  #if( $personalCourseDoc.firstYear && $personalCourseDoc.firstYear != "" )
++    #set( $firstYearCourse = $numbertool.toNumber($personalCourseDoc.display('firstYear','view')) )
    #end
--  #set( $tutordoc = $xwiki.getDocument($tutorName) )
--  #set( $tutorFirstName = $tutordoc.display("first_name") )
--  #set( $tutorLastName = $tutordoc.display("last_name") )
--  #set( $oneTutor = true )
++  #if( $personalCourseDoc.lastYear && $personalCourseDoc.lastYear != "" )
++    #set( $lastYearCourse = $numbertool.toNumber($personalCourseDoc.display('lastYear','view')) )
++  #end
  #end
--## who, in the end
--#if( $oneUser )
--## user takes precedence over both professor and tutor and gets them all
--  #set( $oneProfessor = false )
--  #set( $oneTutor = false )
--#elseif( $oneProfessor )
--## professor takes precedence over tutor
--  #set( $oneUser = false )
--  #set( $oneTutor = false )
--#elseif( $oneTutor )
--## just tutor
--  #set( $oneUser = false )
--  #set( $oneProfessor = false )
--#end
++## years / parameters takes precedence
++#set( $firstYear = $numbertool.toNumber($firstYearCourse) )
++#set( $lastYear = $numbertool.toNumber($lastYearCourse) )
++#template('apice_year_param.vm')
  ##
--#if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
--#if( $lastYearCou )#set( $lastYear = $lastYearCou )#end
--#if( $firstYearCourse )#set( $firstYear = $firstYearCourse )#end
--#if( $lastYearCourse )#set( $lastYear = $lastYearCourse )#end
--#set( $firstYear1 = $firstYear + 1 )#set( $firstAYear = $firstYear + "/" + $firstYear1 )
--#set( $lastYear1 = $lastYear + 1 )#set( $lastAYear = $lastYear + "/" + $lastYear1 )
--#set( $yearRange = [$lastYear..$firstYear] )
--#if(!$oneYear)#set( $oneYear = false )#end
--##
--#set( $yearPar = $context.getRequest().getParameter("year") )
--#set( $firstYearPar = $context.getRequest().getParameter("from") )
--#set( $lastYearPar = $context.getRequest().getParameter("to") )
--#if($firstYearPar)
--  #set( $yearFirst = $util.parseInt($firstYearPar) )
--  #if ( $yearRange.contains($yearFirst) )
--    #set( $firstYear = $yearFirst )
--    #set( $yearRange = [$lastYear..$firstYear] )
--    #set( $firstYear1 = $firstYear + 1 )
--    #set( $firstAYear = $firstYear + "/" + $firstYear1 )
++## DATA STRUCTURES / START
++#set( $itemMap = {} )
++#set( $itemNo = 0 )
++## cycle over years
++#foreach( $year in $yearList )
++  #set( $year1 = $year + 1 )
++  #set( $ayear = $year + "/" + $year1 )
++  #set( $query = ", BaseObject as objCourse, StringProperty as propYear, LargeStringProperty as propProfessor, LargeStringProperty as propOtherprofessors, LargeStringProperty as propTutors
++    where objCourse.name = doc.fullName and objCourse.className = '${mainSpace}.Class' and objCourse.name <> '${objectPool}.Template' and propYear.id.id = objCourse.id and propProfessor.id.id = objCourse.id and propOtherprofessors.id.id = objCourse.id and propTutors.id.id = objCourse.id and propYear.name = 'ay' and propProfessor.name = 'professor' and propOtherprofessors.name = 'otherProfessors' and propTutors.name = 'tutors' and propYear.value = '$ayear' #if( $oneUser )and ( propProfessor.value like '%$userName%' or propOtherprofessors.value like '%$userName%' or propTutors.value like '%$userName%' )#end ")
++## execute query
++  #set( $itemFound = $xwiki.searchDocuments($query) )
++## set counters
++  #set( $itemYearNo = $itemFound.size() )
++  #if( $itemYearNo > 0 )
++    #set( $itemMap[$year] = $itemFound )
++    #set( $itemNo = $itemNo + $itemYearNo )
    #end
  #end
--#if($lastYearPar)
--  #set( $yearLast = $util.parseInt($lastYearPar) )
--  #if ( $yearRange.contains($yearLast) )
--    #set( $lastYear = $yearLast )
--    #set( $yearRange = [$lastYear..$firstYear] )
--    #set( $lastYear1 = $lastYear + 1 )
--    #set( $lastAYear = $lastYear + "/" + $lastYear1 )
--  #end
++## DATA STRUCTURES / END
++##
++## DISPLAY / START
++## page subtitle
++<div class="mainheader">
++$itemNo
++#if( $itemNo == 1 )
++  $services.localization.render('course').toLowerCase()
++#else
++  $services.localization.render('courses').toLowerCase()
  #end
--#set($yearList = $yearRange)
--#if($yearPar)
--  #set($year = $util.parseInt($yearPar))
--  #if ($yearRange.contains($year) )
--    #set($yearList = [$year])
--    #set($oneYear = true)
--    #set($year1 = $year + 1 )
--    #set($aYear = $year + "/" + $year1 )
--  #end
++<span class="textsecondary">&ensp;/&ensp;</span>
++#if( $oneYear )
++  #set( $year1 = $year + 1 )
++  #set( $ayear = $year + "/" + $year1 )
++  $ayear
++#else
++  #set( $firstYear1 = $firstYear + 1 )
++  #set( $lastYear1 = $lastYear + 1 )
++  #set( $aFirstYear = $firstYear + "/" + $firstYear1 )
++  #set( $aLastYear = $lastYear + "/" + $lastYear1 )
++  $aFirstYear<span class="textsecondary">&ensp;&mdash;&ensp;</span>$aLastYear
  #end
--#### HANDLE PARAMETERS / END
--##
--### query to structures
--## map & counter initialisation
--#set( $courseMap = {} )
--#set( $courseNo = 0 )
--#if( $services.localization.currentLocale == "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end
--##
--##
--#foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
--  #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4
--    where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop.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 prop.name = 'ay' and prop1.name = 'professor' and prop2.name = 'otherProfessors' and prop3.name = 'tutors' and prop4.name = '$sortField' and prop.value = '$ayearr' #if( $oneUser )and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' )#end#if( $oneProfessor )and ( prop1.value like '%$professorName%' or prop2.value like '%$professorName%' )#end#if( $oneTutor )and prop3.value like '%$tutorName%'#end order by prop4.value asc ")
--  #set( $courseFound = $xwiki.searchDocuments($sql) )
--  #set( $courseYearNo = $courseFound.size() )
--  #if( $$courseYearNo >0 )
--    #set( $courseMap[$yearr] = $courseFound )
--    #set( $courseNo = $courseNo + $courseYearNo )
--  #end
++#if( $oneUser )
++  <span class="textsecondary">&ensp;/&ensp;</span>
++  $userFirstName $userLastName
  #end
--### output results
--## page subtitle
--{{id name="top"/}}
-->(%%)$courseNo #if( $courseNo == 1 ){{stringEngIta eng=$objectEngSingular.toLowerCase() ita=$objectItaSingular.toLowerCase()/}}#{else}{{stringEngIta eng=$objectEngPlural.toLowerCase() ita=$objectItaPlural.toLowerCase()/}}#{end}  /  #if( $oneYear )$year#{else}${firstYear}–${lastYear}#{end}#if( $oneUser )  /  $userFirstName $userLastName#{elseif}( $oneProfessor )  /  $professorFirstName $professorLastName#{elseif}( $oneTutor )  /  $tutorFirstName $tutorLastName (tutor)#{end}(%%)
--##
--## stop if no course are found
--#if( $courseNo == 0 || $courseMap.keySet().size() == 0 )
++</div>
++## stop if no courses are found
++#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
  ## redundant double check
    #stop
  #end
--## some course found
++## some courses found
  ## page index
--#if( $courseMap.keySet().size() > 1 )
++#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( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )#if( !$foreach.first )  |  #end[[$ayearr>>||anchor="$ayearr"]]#end)))
--#end
--## courses displayed per academic year
--#foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
--(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$ayearr'/}}[[$ayearr>>$doc||style='text-decoration:none; color:$theme.textPrimaryColor' queryString='year=$yearr#if( $oneUser )&user=$userName#elseif( $oneProfessor )&professor=$professorName#elseif( $oneTutor )&tutor=$tutorName#end']]
--(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)
--  #foreach( $course in $courseMap[$yearr] )
--    #if( $oneUser || $oneProfessor || $oneTutor )
--* {{courseName}}$course{{/courseName}} (% style="font-style:normal; font-size:normal; color:$theme.textSecondaryColor" %)({{courseCycle}}$course{{/courseCycle}})(%%)
--    #else
--* {{course linked="title"}}$course{{/course}}
++<div class="mainselectbar" id="index">
++  #foreach( $year in $itemMap.keySet() )
++    #set( $year1 = $year + 1 )
++    #set( $ayear = $year + "/" + $year1 )
++    #if( !$foreach.first )
++      &ensp;&bull;&ensp;
      #end
++    [[$ayear>>||anchor="$ayear"]]
    #end
--(%%)
--  #set( $courseYearNo = $courseMap[$yearr].size() )
--(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($courseYearNo #if( $courseYearNo == 1 ){{stringEngIta eng='course in' ita='corso nel'/}}#{else}{{stringEngIta eng='courses in' ita='corsi nel'/}}#end $yearr)  [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]]  [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
++</div>
  #end
--{{/velocity}}
--{{id name="bottom"/}}
++## courses displayed per year
++#foreach( $year in $itemMap.keySet() )
++  #set( $year1 = $year + 1 )
++  #set( $ayear = $year + "/" + $year1 )
++## year top / start
++<div class="mainselectseparator">
++  <a class="mainselectseparatorlink" id="$ayear" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")>
++  $ayear
++  </a>
++</div>
++## year top / end
++##
++## year display / start
++<div style="font-style: normal"><ul>
++  #foreach( $item in $itemMap[$year] )
++<li>{{course}}$item{{/course}}</li>
++  #end
++</ul></div>
++## year display / end
++##
++## year bottom / start
++<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
++  #set( $itemYearNo = $itemMap[$year].size() )
++  $itemYearNo
++  #if( $itemYearNo == 1 )
++    $services.localization.render('course').toLowerCase()
++  #else
++    $services.localization.render('courses').toLowerCase()
++  #end
++  <span class="textsecondary">&ensp;/&ensp;</span>
++  $year
++  &ensp;&bull;&ensp;
++  #anchorlinks()
++</div>
++## year bottom / end
++#end
++## DISPLAY / END
++{{/html}}
++{{/velocity}}{{pageDisplay sort="objectservice"/}}