Changes for page Per A.Y.
From version 47.1
edited by Andrea Omicini
on 20/07/2023 10:18
on 20/07/2023 10:18
Change comment:
There is no comment for this version
To version 45.4
edited by Andrea Omicini
on 08/02/2023 00:14
on 08/02/2023 00:14
Change comment:
There is no comment for this version
Summary
-
Page properties (3 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,0 @@ 1 -$services.localization.render('peray') - Default language
-
... ... @@ -1,0 +1,1 @@ 1 +en - Content
-
... ... @@ -1,130 +1,157 @@ 1 -{{velocity}} 2 -{{html clean="false" wiki="true"}} 3 -#template('apice_macros.vm') 4 -#setobjectspace("Courses") 5 -#template('apice_course_macros.vm') 6 -#template('apice_user_param.vm') 7 -## years / personal 8 -#if( $isUserSpace ) 9 - #set( $query = ", BaseObject as objPersonalCourse, LargeStringProperty as propUser 10 - where objPersonalCourse.name = doc.fullName and objPersonalCourse.className = '${objectSpace}.Class' and propUser.id.id = objPersonalCourse.id and propUser.name = 'user' and propUser.value = '$userName' " ) 11 - #set( $personalCourseDocs = $xwiki.searchDocuments($query) ) 12 - #if( $personalCourseDocs.size() > 0 ) 13 - #set( $personalCourseDoc = $xwiki.getDocument($personalCourseDocs[0]) ) 14 - #else 15 - #stop 1 += {{italiano}}Per A.A.{{/italiano}}{{english}}Per A.Y.{{/english}} = 2 + 3 +{{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{velocity}} 4 +#set( $courseMenu = true ) 5 +#set( $currentCourseDoc = "" ) 6 +#### get parameters 7 +## when 8 +#set( $yearPar = $context.getRequest().getParameter("year") ) 9 +#set( $firstYearPar = $context.getRequest().getParameter("from") ) 10 +#set( $lastYearPar = $context.getRequest().getParameter("to") ) 11 +## who 12 +#set( $userNamePar = $context.getRequest().getParameter("user") ) 13 +#set( $professorNamePar = $context.getRequest().getParameter("professor") ) 14 +#set( $tutorNamePar = $context.getRequest().getParameter("tutor") ) 15 +#### handle who 16 +#if ( $userName ) 17 +## from a personal page, "XWiki.UserName" $userName form 18 + #set( $userdoc = $xwiki.getDocument($userName) ) 19 + #set( $userFirstName = $userdoc.display("first_name") ) 20 + #set( $userLastName = $userdoc.display("last_name") ) 21 +#elseif ( $userNamePar ) 22 +## from the URL, "user=UserName" parameter 23 + #set( $userName = "XWiki.$userNamePar" ) 24 + #set( $userdoc = $xwiki.getDocument($userName) ) 25 + #set( $userFirstName = $userdoc.display("first_name") ) 26 + #set( $userLastName = $userdoc.display("last_name") ) 27 +#else 28 + #set( $userName = "" ) 29 + #set( $userFirstName = "" ) 30 + #set( $userLastName = "" ) 31 +#end 32 +#if ( $professorName ) 33 +## from a personal page, "XWiki.UserName" $professorName form 34 + #set( $professordoc = $xwiki.getDocument($professorName) ) 35 + #set( $professorFirstName = $professordoc.display("first_name") ) 36 + #set( $professorLastName = $professordoc.display("last_name") ) 37 +#elseif ( $professorNamePar ) 38 +## from the URL, "professor=UserName" parameter 39 + #set( $professorName = "XWiki.$professorNamePar" ) 40 + #set( $professordoc = $xwiki.getDocument($professorName) ) 41 + #set( $professorFirstName = $professordoc.display("first_name") ) 42 + #set( $professorLastName = $professordoc.display("last_name") ) 43 +#else 44 + #set( $professorName = "" ) 45 + #set( $professorFirstName = "" ) 46 + #set( $professorLastName = "" ) 47 +#end 48 +#if ( $tutorName ) 49 +## from a personal page, "XWiki.UserName" $tutorName form 50 + #set( $tutordoc = $xwiki.getDocument($tutorName) ) 51 + #set( $tutorFirstName = $tutordoc.display("first_name") ) 52 + #set( $tutorLastName = $tutordoc.display("last_name") ) 53 +#elseif ( $tutorNamePar ) 54 +## from the URL, "tutor=UserName" parameter 55 + #set( $tutorName = "XWiki.$tutorNamePar" ) 56 + #set( $tutordoc = $xwiki.getDocument($tutorName) ) 57 + #set( $tutorFirstName = $tutordoc.display("first_name") ) 58 + #set( $tutorLastName = $tutordoc.display("last_name") ) 59 +#else 60 + #set( $tutorName = "" ) 61 + #set( $tutorFirstName = "" ) 62 + #set( $tutorLastName = "" ) 63 +#end 64 +## professor takes precedence over tutor 65 +#if( $professorName != "" )#set( $tutorName = "" )#end 66 +## user takes precedence over both professor and tutor and gets them all 67 +#if( $userName != "" )#set( $professorName = $userName )#set( $tutorName = $userName )#end 68 +## 69 +#if( $firstYearCou )#set( $firstYear = $firstYearCou )#end 70 +#if( $lastYearCou )#set( $lastYear = $lastYearCou )#end 71 +#if( $firstYearCourse )#set( $firstYear = $firstYearCourse )#end 72 +#if( $lastYearCourse )#set( $lastYear = $lastYearCourse )#end 73 +#set( $firstYear1 = $firstYear + 1 )#set( $firstAYear = $firstYear + "/" + $firstYear1 ) 74 +#set( $lastYear1 = $lastYear + 1 )#set( $lastAYear = $lastYear + "/" + $lastYear1 ) 75 +#set( $yearRange = [$lastYear..$firstYear] ) 76 +#if(!$oneYear)#set( $oneYear = false )#end 77 +## 78 +#set( $yearPar = $context.getRequest().getParameter("year") ) 79 +#set( $firstYearPar = $context.getRequest().getParameter("from") ) 80 +#set( $lastYearPar = $context.getRequest().getParameter("to") ) 81 +#if($firstYearPar) 82 + #set( $yearFirst = $util.parseInt($firstYearPar) ) 83 + #if ( $yearRange.contains($yearFirst) ) 84 + #set( $firstYear = $yearFirst ) 85 + #set( $yearRange = [$lastYear..$firstYear] ) 86 + #set( $firstYear1 = $firstYear + 1 ) 87 + #set( $firstAYear = $firstYear + "/" + $firstYear1 ) 16 16 #end 17 - #if( $personalCourseDoc.maxYears && $personalCourseDoc.maxYears != "" ) 18 - #set( $maxCourseYears = $personalCourseDoc.display('maxYears','view') ) 89 +#end 90 +#if($lastYearPar) 91 + #set( $yearLast = $util.parseInt($lastYearPar) ) 92 + #if ( $yearRange.contains($yearLast) ) 93 + #set( $lastYear = $yearLast ) 94 + #set( $yearRange = [$lastYear..$firstYear] ) 95 + #set( $lastYear1 = $lastYear + 1 ) 96 + #set( $lastAYear = $lastYear + "/" + $lastYear1 ) 19 19 #end 20 - #if( $personalCourseDoc.firstYear && $personalCourseDoc.firstYear != "" ) 21 - #set( $firstYearCourse = $personalCourseDoc.display('firstYear','view') ) 98 +#end 99 +#set($yearList = $yearRange) 100 +#if($yearPar) 101 + #set($year = $util.parseInt($yearPar)) 102 + #if ($yearRange.contains($year) ) 103 + #set($yearList = [$year]) 104 + #set($oneYear = true) 105 + #set($year1 = $year + 1 ) 106 + #set($aYear = $year + "/" + $year1 ) 22 22 #end 23 - #if( $personalCourseDoc.lastYear && $personalCourseDoc.lastYear != "" ) 24 - #set( $lastYearCourse = $personalCourseDoc.display('lastYear','view') ) 25 - #end 26 26 #end 27 -## years / parameters takes precedence 28 -#set( $firstYear = $firstYearCourse ) 29 -#set( $lastYear = $lastYearCourse ) 30 -#template('apice_year_param.vm') 109 +#### HANDLE PARAMETERS / END 31 31 ## 32 -## DATA STRUCTURES / START 33 -#set( $itemMap = {} ) 34 -#set( $itemNo = 0 ) 35 -## cycle over years 36 -#foreach( $year in $yearList) 37 - #set( $year1 = $year + 1 ) 38 - #set( $ayear = $year + "/" + $year1 ) 39 - #set( $query = ", BaseObject as objCourse, StringProperty as propYear, LargeStringProperty as propProfessor, LargeStringProperty as propOtherprofessors, LargeStringProperty as propTutors 40 - where objCourse.name = doc.fullName and objCourse.className = '${objectSpace}.${objectClass}' and objCourse.name <> '${objectSpace}.${objectTemplate}' 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 ") 41 -## execute query 42 - #set( $itemFound = $xwiki.searchDocuments($query) ) 43 -## set counters 44 - #set( $itemYearNo = $itemFound.size() ) 45 - #if( $itemYearNo > 0 ) 46 - #set( $itemMap[$year] = $itemFound ) 47 - #set( $itemNo = $itemNo + $itemYearNo ) 111 +### query to structures 112 +## map & counter initialisation 113 +#set( $courseMap = {} ) 114 +#set( $courseNo = 0 ) 115 +#if( $services.localization.currentLocale == "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end 116 +## 117 +## 118 +#foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 ) 119 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4 120 + 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' and ( prop1.value like '%$professorName%' or prop2.value like '%$professorName%' or prop3.value like '%$tutorName%' ) order by prop4.value asc ") 121 + #set( $courseFound = $xwiki.searchDocuments($sql) ) 122 + #set( $courseYearNo = $courseFound.size() ) 123 + #if( $$courseYearNo >0 ) 124 + #set( $courseMap[$yearr] = $courseFound ) 125 + #set( $courseNo = $courseNo + $courseYearNo ) 48 48 #end 49 49 #end 50 -## DATA STRUCTURES / END 51 -## 52 -## DISPLAY / START 128 +### output results 53 53 ## page subtitle 54 -<div class="mainheader"> 55 -$itemNo 56 -#if( $itemNo == 1 ) 57 - $services.localization.render('course').toLowerCase() 58 -#else 59 - $services.localization.render('courses').toLowerCase() 60 -#end 61 -<span class="textsecondary"> / </span> 62 -#if( $oneYear ) 63 - $year 64 -#else 65 - $firstYear–$lastYear 66 -#end 67 -#if( $oneUser ) 68 - <span class="textsecondary"> / </span> 69 - $userFirstName $userLastName 70 -#end 71 -</div> 72 -## stop if no courses are found 73 -#if( $itemNo == 0 || $itemMap.keySet().size() == 0 ) 130 +{{id name="top"/}} 131 +>(%%)$courseNo #if( $courseNo == 1 ){{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#{else}{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#{end} / #if( $oneYear )$aYear#else$lastAYear–$firstAYear#end#if( $userName != "" ) / $userFirstName $userLastName#elseif( $professorName != "" ) / $professorFirstName $professorLastName#elseif( $tutorName != "" ) / $tutorFirstName $tutorLastName (tutor)#{end}(%%) 132 +## 133 +## stop if no course are found 134 +#if( $courseNo == 0 || $courseMap.keySet().size() == 0 ) 74 74 ## redundant double check 75 75 #stop 76 76 #end 77 -## some course sfound138 +## some course found 78 78 ## page index 79 -#if( $ itemMap.keySet().size() > 1 )140 +#if( $courseMap.keySet().size() > 1 ) 80 80 ## found more than one year 81 -<div class="mainselectbar" id="index"> 82 - #foreach( $year in $itemMap.keySet() ) 83 - #set( $year1 = $year + 1 ) 84 - #set( $ayear = $year + "/" + $year1 ) 85 - #if( !$foreach.first ) 86 -  •  87 - #end 88 - [[$ayear>>||anchor="$ayear"]] 89 - #end 90 -</div> 142 +{{id name="index"/}} 143 +(% 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))) 91 91 #end 92 -## courses displayed per year 93 -#foreach( $year in $itemMap.keySet() ) 94 - #set( $year1 = $year + 1 ) 95 - #set( $ayear = $year + "/" + $year1 ) 96 -## year top / start 97 -<div class="mainselectseparator"> 98 - <a class="mainselectseparatorlink" id="$ayear" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")> 99 - $ayear 100 - </a> 101 -</div> 102 -## year top / end 103 -## 104 -## year display / start 105 -<div style="font-style: normal"><ul> 106 - #foreach( $item in $itemMap[$year] ) 107 -<li>{{course}}$item{{/course}}</li> 145 +## courses displayed per academic year 146 +#foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 ) 147 +(% 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( $userName != "" )&user=$userName#elseif( $professorName != "" )&professor=$professorName#elseif( $tutorName != "" )&tutor=$tutorName#end']] 148 +(% style="border-style:hidden hidden hidden hidden; font-style:normal" %) 149 +#foreach( $course in $courseMap[$yearr] ) 150 +* {{courseName}}$course{{/courseName}} 108 108 #end 109 -</ul></div> 110 -## year display / end 111 -## 112 -## year bottom / start 113 -<div #if( $foreach.last )id="bottom"#end class="mainselectbottom"> 114 - #set( $itemYearNo = $itemMap[$year].size() ) 115 - $itemYearNo 116 - #if( $itemYearNo == 1 ) 117 - $services.localization.render('course').toLowerCase() 118 - #else 119 - $services.localization.render('courses').toLowerCase() 120 - #end 121 - <span class="textsecondary"> / </span> 122 - $year 123 -  •  124 - #anchorlinks() 125 -</div> 126 -## year bottom / end 152 +(%%) 153 + #set( $courseYearNo = $courseMap[$yearr].size() ) 154 +(% 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 $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 127 127 #end 128 -## DISPLAY / END 129 -{{/html}} 130 -{{/velocity}}{{pageDisplay sort="objectservice"/}} 156 +{{/velocity}} 157 +{{id name="bottom"/}}