Changes for page Per A.Y.
From version 11.1
edited by Andrea Omicini
on 19/09/2021 16:39
on 19/09/2021 16:39
Change comment:
There is no comment for this version
To version 45.7
edited by Andrea Omicini
on 08/02/2023 00:37
on 08/02/2023 00:37
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 -#set($title='Per anno')#if($xcontext.language == 'en')#set($title='Per Year')#end$title - Parent
-
... ... @@ -1,0 +1,1 @@ 1 +Courses.WebHome - Content
-
... ... @@ -1,4 +1,7 @@ 1 -{{include reference="Courses.MacroSheet"/}}{{include reference="Courses.GlobalVars"/}}{{velocity}} 1 += {{italiano}}Per A.A.{{/italiano}}{{english}}Per A.Y.{{/english}} = 2 + 3 +{{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{velocity}} 4 +#set( $courseMenu = true ) 2 2 #set( $currentCourseDoc = "" ) 3 3 #### get parameters 4 4 ## when ... ... @@ -17,7 +17,11 @@ 17 17 #set( $userLastName = $userdoc.display("last_name") ) 18 18 #elseif ( $userNamePar ) 19 19 ## from the URL, "user=UserName" parameter 20 - #set( $userName = "XWiki.$userNamePar" ) 23 + #if( $userNamePar.contains("XWiki.") ) 24 + #set( $userName = $userNamePar ) 25 + #else 26 + #set( $userName = "XWiki.$userNamePar" ) 27 + #end 21 21 #set( $userdoc = $xwiki.getDocument($userName) ) 22 22 #set( $userFirstName = $userdoc.display("first_name") ) 23 23 #set( $userLastName = $userdoc.display("last_name") ) ... ... @@ -33,7 +33,11 @@ 33 33 #set( $professorLastName = $professordoc.display("last_name") ) 34 34 #elseif ( $professorNamePar ) 35 35 ## from the URL, "professor=UserName" parameter 36 - #set( $professorName = "XWiki.$professorNamePar" ) 43 + #if( $professorNamePar.contains("XWiki.") ) 44 + #set( $professorName = $professorNamePar ) 45 + #else 46 + #set( $professorName = "XWiki.$professorNamePar" ) 47 + #end 37 37 #set( $professordoc = $xwiki.getDocument($professorName) ) 38 38 #set( $professorFirstName = $professordoc.display("first_name") ) 39 39 #set( $professorLastName = $professordoc.display("last_name") ) ... ... @@ -49,6 +49,11 @@ 49 49 #set( $tutorLastName = $tutordoc.display("last_name") ) 50 50 #elseif ( $tutorNamePar ) 51 51 ## from the URL, "tutor=UserName" parameter 63 + #if( $tutorNamePar.contains("XWiki.") ) 64 + #set( $tutorName = $tutorNamePar ) 65 + #else 66 + #set( $tutorName = "XWiki.$tutorNamePar" ) 67 + #end 52 52 #set( $tutorName = "XWiki.$tutorNamePar" ) 53 53 #set( $tutordoc = $xwiki.getDocument($tutorName) ) 54 54 #set( $tutorFirstName = $tutordoc.display("first_name") ) ... ... @@ -58,10 +58,32 @@ 58 58 #set( $tutorFirstName = "" ) 59 59 #set( $tutorLastName = "" ) 60 60 #end 61 -#if( $userName != "" )#set( $professorName = $userName )#set( $tutorName = $userName )#end 77 +## who, in the end 78 +#set( $oneUser = false ) 79 +#set( $oneProfessor = false ) 80 +#set( $oneTutor = false ) 62 62 ## 82 +#if( $userName != "" ) 83 +## user takes precedence over both professor and tutor and gets them all 84 + #set( $professorName = $userName ) 85 + #set( $tutorName = $userName ) 86 + #set( $oneUser = true ) 87 +#elseif( $professorName != "" ) 88 +## professor takes precedence over tutor 89 + #set( $tutorName = "@@" ) 90 + #set( $userName = "@@" ) 91 + #set( $oneProfessor = true ) 92 +#elseif( $tutorName != "" ) 93 +## just tutor 94 + #set( $professorName = "@@" ) 95 + #set( $userName = "@@" ) 96 + #set( $oneTutor = true ) 97 +#end 98 +## 63 63 #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end 64 64 #if( $lastYearCou )#set( $lastYear = $lastYearCou )#end 101 +#if( $firstYearCourse )#set( $firstYear = $firstYearCourse )#end 102 +#if( $lastYearCourse )#set( $lastYear = $lastYearCourse )#end 65 65 #set( $firstYear1 = $firstYear + 1 )#set( $firstAYear = $firstYear + "/" + $firstYear1 ) 66 66 #set( $lastYear1 = $lastYear + 1 )#set( $lastAYear = $lastYear + "/" + $lastYear1 ) 67 67 #set( $yearRange = [$lastYear..$firstYear] ) ... ... @@ -98,42 +98,52 @@ 98 98 #set($aYear = $year + "/" + $year1 ) 99 99 #end 100 100 #end 101 - 102 ->{{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 103 -{{id name="top"/}} 104 - 105 -#if( !$oneYear ) 106 -(% style="font-size: smaller" %)(((#foreach ($yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = "$yearr/$yearr1")#if( $velocityCount > 1 ) | #end[[$ayearr>>$doc||anchor=$ayearr]]#end)))(%%) 107 -#end 139 +#### HANDLE PARAMETERS / END 108 108 ## 141 +### query to structures 142 +## map & counter initialisation 143 +#set( $courseMap = {} ) 144 +#set( $courseNo = 0 ) 145 +#if( $services.localization.currentLocale == "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end 146 +## 147 +## 109 109 #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 ) 110 -#set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3 111 - where 112 - obj.name = doc.fullName and 113 - obj.className = 'Courses.CourseClass' and 114 - obj.name <> 'Courses.CourseClassTemplate' and 115 - obj.name <> 'Courses.CourseTemplate' and 116 - prop.id.id = obj.id and 117 - prop1.id.id = obj.id and 118 - prop2.id.id = obj.id and 119 - prop3.id.id = obj.id and 120 - prop.name = 'aY' and 121 - prop1.name = 'professor' and 122 - prop2.name = 'otherProfessors' and 123 - prop3.name = 'tutors' and 124 - prop.value like '%$yearr%' and 125 - (prop1.value like '%$professorName%' or 126 - prop2.value like '%$professorName%' or 127 - prop3.value like '%$tutorName%') 128 - order by prop.value desc 129 -") 130 -#set( $courseFound = $xwiki.searchDocuments($sql) ) 131 -#if( $courseFound.size()>0 )#if(!$oneYear) 132 -=== $ayearr === 133 -{{id name="$ayearr"/}} 134 -#end#foreach ($courseDoc in $courseFound) 135 -* [[#displayName($courseDoc)>>$courseDoc]] 149 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4 150 + 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 '%$professorName%' or prop2.value like '%$professorName%' or prop3.value like '%$tutorName%' )#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 ") 151 + #set( $courseFound = $xwiki.searchDocuments($sql) ) 152 + #set( $courseYearNo = $courseFound.size() ) 153 + #if( $$courseYearNo >0 ) 154 + #set( $courseMap[$yearr] = $courseFound ) 155 + #set( $courseNo = $courseNo + $courseYearNo ) 156 + #end 136 136 #end 137 -(% style='font-style:oblique;font-size:smaller;text-align:right;color:gray;margin-top:-0.5em;margin-bottom:0em' %)((( ($courseFound.size() #if( $courseFound.size() > 1 ){{stringEngIta ita="corsi" eng="courses"/}}#else{{stringEngIta ita="corso" eng="course"/}}#end / $ayearr) [[[top]>>||anchor="top"]] )))(%%) 138 -#end#end 158 +### output results 159 +## page subtitle 160 +{{id name="top"/}} 161 +>(%%)$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( $oneUser ) / $userFirstName $userLastName#elseif( $oneProfessor ) / $professorFirstName $professorLastName#elseif( $oneTutor ) / $tutorFirstName $tutorLastName (tutor)#{end}(%%) 162 +## 163 +## stop if no course are found 164 +#if( $courseNo == 0 || $courseMap.keySet().size() == 0 ) 165 +## redundant double check 166 + #stop 167 +#end 168 +## some course found 169 +## page index 170 +#if( $courseMap.keySet().size() > 1 ) 171 +## found more than one year 172 +{{id name="index"/}} 173 +(% 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))) 174 +#end 175 +## courses displayed per academic year 176 +#foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 ) 177 +(% 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']] 178 +(% style="border-style:hidden hidden hidden hidden; font-style:normal" %) 179 +#foreach( $course in $courseMap[$yearr] ) 180 +* {{courseName}}$course{{/courseName}} 181 + #end 182 +(%%) 183 + #set( $courseYearNo = $courseMap[$yearr].size() ) 184 +(% 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"]] 185 +#end 139 139 {{/velocity}} 187 +{{id name="bottom"/}}