Changes for page Per A.Y.
From version 39.1
edited by Andrea Omicini
on 21/01/2022 18:57
on 21/01/2022 18:57
Change comment:
There is no comment for this version
To version 45.23
edited by Andrea Omicini
on 20/07/2023 09:16
on 20/07/2023 09:16
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,1 @@ 1 - #if($xcontext.language=='it')Corsi per A.A.#{else}CoursesperA.Y.#end1 +$services.localization.render('pera') - Content
-
... ... @@ -1,4 +1,4 @@ 1 -{{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{ include reference="Environment" excludeFirstHeading="true"/}}{{velocity}}1 +{{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{velocity}} 2 2 #set( $courseMenu = true ) 3 3 #set( $currentCourseDoc = "" ) 4 4 #### get parameters ... ... @@ -7,6 +7,10 @@ 7 7 #set( $firstYearPar = $context.getRequest().getParameter("from") ) 8 8 #set( $lastYearPar = $context.getRequest().getParameter("to") ) 9 9 ## who 10 +#set( $oneUser = false ) 11 +#set( $oneProfessor = false ) 12 +#set( $oneTutor = false ) 13 +## 10 10 #set( $userNamePar = $context.getRequest().getParameter("user") ) 11 11 #set( $professorNamePar = $context.getRequest().getParameter("professor") ) 12 12 #set( $tutorNamePar = $context.getRequest().getParameter("tutor") ) ... ... @@ -16,16 +16,18 @@ 16 16 #set( $userdoc = $xwiki.getDocument($userName) ) 17 17 #set( $userFirstName = $userdoc.display("first_name") ) 18 18 #set( $userLastName = $userdoc.display("last_name") ) 23 + #set( $oneUser = true ) 19 19 #elseif ( $userNamePar ) 20 20 ## from the URL, "user=UserName" parameter 21 - #set( $userName = "XWiki.$userNamePar" ) 26 + #if( $userNamePar.contains("XWiki.") ) 27 + #set( $userName = $userNamePar ) 28 + #else 29 + #set( $userName = "XWiki.$userNamePar" ) 30 + #end 22 22 #set( $userdoc = $xwiki.getDocument($userName) ) 23 23 #set( $userFirstName = $userdoc.display("first_name") ) 24 24 #set( $userLastName = $userdoc.display("last_name") ) 25 -#else 26 - #set( $userName = "" ) 27 - #set( $userFirstName = "" ) 28 - #set( $userLastName = "" ) 34 + #set( $oneUser = true ) 29 29 #end 30 30 #if ( $professorName ) 31 31 ## from a personal page, "XWiki.UserName" $professorName form ... ... @@ -32,16 +32,18 @@ 32 32 #set( $professordoc = $xwiki.getDocument($professorName) ) 33 33 #set( $professorFirstName = $professordoc.display("first_name") ) 34 34 #set( $professorLastName = $professordoc.display("last_name") ) 41 + #set( $oneProfessor = true ) 35 35 #elseif ( $professorNamePar ) 36 36 ## from the URL, "professor=UserName" parameter 37 - #set( $professorName = "XWiki.$professorNamePar" ) 44 + #if( $professorNamePar.contains("XWiki.") ) 45 + #set( $professorName = $professorNamePar ) 46 + #else 47 + #set( $professorName = "XWiki.$professorNamePar" ) 48 + #end 38 38 #set( $professordoc = $xwiki.getDocument($professorName) ) 39 39 #set( $professorFirstName = $professordoc.display("first_name") ) 40 40 #set( $professorLastName = $professordoc.display("last_name") ) 41 -#else 42 - #set( $professorName = "" ) 43 - #set( $professorFirstName = "" ) 44 - #set( $professorLastName = "" ) 52 + #set( $oneProfessor = true ) 45 45 #end 46 46 #if ( $tutorName ) 47 47 ## from a personal page, "XWiki.UserName" $tutorName form ... ... @@ -50,24 +50,35 @@ 50 50 #set( $tutorLastName = $tutordoc.display("last_name") ) 51 51 #elseif ( $tutorNamePar ) 52 52 ## from the URL, "tutor=UserName" parameter 53 - #set( $tutorName = "XWiki.$tutorNamePar" ) 61 + #if( $tutorNamePar.contains("XWiki.") ) 62 + #set( $tutorName = $tutorNamePar ) 63 + #else 64 + #set( $tutorName = "XWiki.$tutorNamePar" ) 65 + #end 54 54 #set( $tutordoc = $xwiki.getDocument($tutorName) ) 55 55 #set( $tutorFirstName = $tutordoc.display("first_name") ) 56 56 #set( $tutorLastName = $tutordoc.display("last_name") ) 57 -#else 58 - #set( $tutorName = "" ) 59 - #set( $tutorFirstName = "" ) 60 - #set( $tutorLastName = "" ) 69 + #set( $oneTutor = true ) 61 61 #end 62 -## professortakesprecedence over tutor63 -#if( $ professorName!= "" )#set( $tutorName= "")#end71 +## who, in the end 72 +#if( $oneUser ) 64 64 ## user takes precedence over both professor and tutor and gets them all 65 -#if( $userName != "" )#set( $professorName = $userName )#set( $tutorName = $userName )#end 74 + #set( $oneProfessor = false ) 75 + #set( $oneTutor = false ) 76 +#elseif( $oneProfessor ) 77 +## professor takes precedence over tutor 78 + #set( $oneUser = false ) 79 + #set( $oneTutor = false ) 80 +#elseif( $oneTutor ) 81 +## just tutor 82 + #set( $oneUser = false ) 83 + #set( $oneProfessor = false ) 84 +#end 66 66 ## 67 -#if( $firstYearCourse )#set( $firstYear = $firstYearCourse )#end 68 68 #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end 69 -#if( $lastYearCourse )#set( $lastYear = $lastYearCourse )#end 70 70 #if( $lastYearCou )#set( $lastYear = $lastYearCou )#end 88 +#if( $firstYearCourse )#set( $firstYear = $firstYearCourse )#end 89 +#if( $lastYearCourse )#set( $lastYear = $lastYearCourse )#end 71 71 #set( $firstYear1 = $firstYear + 1 )#set( $firstAYear = $firstYear + "/" + $firstYear1 ) 72 72 #set( $lastYear1 = $lastYear + 1 )#set( $lastAYear = $lastYear + "/" + $lastYear1 ) 73 73 #set( $yearRange = [$lastYear..$firstYear] ) ... ... @@ -104,29 +104,56 @@ 104 104 #set($aYear = $year + "/" + $year1 ) 105 105 #end 106 106 #end 107 - >{{stringEngIta eng = "Courses" ita = "Corsi"/}} / **#if( $oneYear )$aYear#else$firstAYear**–**$lastAYear#end**#if($userName != "" ) / $userFirstName $userLastName#elseif($professorName!= "" )/$professorFirstName $professorLastName#elseif( $tutorName != "" ) / $tutorFirstName $tutorLastName (tutor)#end{{id name="top"/}}126 +#### HANDLE PARAMETERS / END 108 108 ## 109 -#if( !$oneYear ) 110 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach ($yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = "$yearr/$yearr1")#if( $velocityCount > 1 ) | #end[[$ayearr>>$doc||anchor=$yearr]]#end))) 111 -#end 112 -## 113 -#if( $xcontext.language== "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end 128 +### query to structures 129 +## map & counter initialisation 130 +#set( $courseMap = {} ) 114 114 #set( $courseNo = 0 ) 132 +#if( $services.localization.currentLocale == "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end 133 +## 134 +## 115 115 #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 ) 116 116 #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4 117 - where obj.name = doc.fullName and obj.className = ' Courses.CourseClass' and obj.name <> 'Courses.CourseTemplate' 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 ")137 + 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 ") 118 118 #set( $courseFound = $xwiki.searchDocuments($sql) ) 119 119 #set( $courseYearNo = $courseFound.size() ) 120 120 #if( $$courseYearNo >0 ) 141 + #set( $courseMap[$yearr] = $courseFound ) 121 121 #set( $courseNo = $courseNo + $courseYearNo ) 122 - #if( !$oneYear ) 123 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$yearr'/}}[[$ayearr>>$doc||queryString='year=$yearr#if( $userName != "" )&user=$userName#elseif( $professorName != "" )&professor=$professorName#elseif( $tutorName != "" )&tutor=$tutorName#end']] 143 + #end 144 +#end 145 +### output results 146 +## page subtitle 147 +{{id name="top"/}} 148 +>(%%)$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}(%%) 149 +## 150 +## stop if no course are found 151 +#if( $courseNo == 0 || $courseMap.keySet().size() == 0 ) 152 +## redundant double check 153 + #stop 154 +#end 155 +## some course found 156 +## page index 157 +#if( $courseMap.keySet().size() > 1 ) 158 +## found more than one year 159 +{{id name="index"/}} 160 +(% 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))) 161 +#end 162 +## courses displayed per academic year 163 +#foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 ) 164 +(% 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']] 165 +(% style="border-style:hidden hidden hidden hidden; font-style:normal" %) 166 + #foreach( $course in $courseMap[$yearr] ) 167 + #if( $oneUser || $oneProfessor || $oneTutor ) 168 +* {{courseName}}$course{{/courseName}} (% style="font-style:normal; font-size:normal; color:$theme.textSecondaryColor" %)({{courseCycle}}$course{{/courseCycle}})(%%) 169 + #else 170 +* {{course linked="title"}}$course{{/course}} 124 124 #end 125 - #foreach( $courseDoc in $courseFound ) 126 -* {{courseName}}$courseDoc{{/courseName}} 127 - #end 128 -(% style="#if( !$oneYear )border-style:hidden solid solid hidden; border-color:$theme.borderColor;#end 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 $ayearr) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 129 129 #end 173 +(%%) 174 + #set( $courseYearNo = $courseMap[$yearr].size() ) 175 +(% 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"]] 130 130 #end 131 -#if( !$oneYear )(% style="text-align:right; font-style:oblique; font-size:smaller; border-bottom-style:dotted; border-color:$theme.borderColor" %)|($courseNo #if( $courseNo == 1 ){{stringEngIta eng='course' ita='corso'/}}#else{{stringEngIta eng='courses' ita='corsi'/}}#end)#end 132 132 {{/velocity}} 178 +{{id name="bottom"/}}