Changes for page Per A.Y.
From version 17.1
edited by Andrea Omicini
on 22/11/2021 01:06
on 22/11/2021 01:06
Change comment:
There is no comment for this version
To version 20.1
edited by Andrea Omicini
on 22/11/2021 01:15
on 22/11/2021 01:15
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -58,6 +58,8 @@ 58 58 #set( $tutorFirstName = "" ) 59 59 #set( $tutorLastName = "" ) 60 60 #end 61 +## professor takes precedence over tutor 62 +#if( $professorName != "" )#set( $tutorName = "" )#end 61 61 ## user takes precedence over both professor and tutor and gets them all 62 62 #if( $userName != "" )#set( $professorName = $userName )#set( $tutorName = $userName )#end 63 63 ## ... ... @@ -100,7 +100,7 @@ 100 100 #end 101 101 #end 102 102 103 ->{{stringEngIta eng = "Courses" ita = "Corsi"/}} / **#if( $oneYear )$aYear#else$firstAYear–$lastAYear#end**#if( $userName != "" ) / $userFirstName $userLastName#else #if( $professorName != "" ) / $professorFirstName $professorLastName#end#if( $tutorName != "" ) / $tutorFirstName $tutorLastName (tutor)#end#end{{id name="top"/}}105 +>{{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"/}} 104 104 ## 105 105 #if( !$oneYear ) 106 106 (% 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=$ayearr]]#end))) ... ... @@ -112,15 +112,15 @@ 112 112 #set( $courseFound = $xwiki.searchDocuments($sql) ) 113 113 #set( $courseYearNo = $courseFound.size() ) 114 114 #if( $$courseYearNo >0 ) 115 - #if(!$oneYear) 116 - 117 -=== $ayearr === 118 -{{id name="$ayearr"/}} 119 -#end#foreach ($courseDoc in $courseFound) 120 - #set( $name = $xwiki.getDocument($courseDoc).display("courseName")) 121 - #set( $nome = $xwiki.getDocument($courseDoc).display("nomeCorso")) 117 + #if( !$oneYear ) 118 +(% 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']] 119 + #end 120 + #foreach( $courseDoc in $courseFound ) 121 + #set( $name = $xwiki.getDocument($courseDoc).display("courseName")) 122 + #set( $nome = $xwiki.getDocument($courseDoc).display("nomeCorso")) 122 122 * [[#if( $nome == "" )$name#elseif( $name == "" )$nome#elseif( $context.language.contains('it') )$nome#else$name#end>>$courseDoc]] 123 -#end 124 + #end 124 124 (% 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"]] )))(%%) 125 -#end#end 126 + #end 127 +#end 126 126 {{/velocity}}