Changes for page Per A.Y.

From version 45.1
edited by Andrea Omicini
on 08/02/2023 00:11
Change comment: There is no comment for this version
To version 45.6
edited by Andrea Omicini
on 08/02/2023 00:33
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -61,10 +61,27 @@
61 61   #set( $tutorFirstName = "" )
62 62   #set( $tutorLastName = "" )
63 63  #end
64 -## professor takes precedence over tutor
65 -#if( $professorName != "" )#set( $tutorName = "" )#end
64 +## who, in the end
65 +#set( $oneUser = false )
66 +#set( $oneProfessor = false )
67 +#set( $oneTutor = false )
68 +##
69 +#if( $userName != "" )
66 66  ## user takes precedence over both professor and tutor and gets them all
67 -#if( $userName != "" )#set( $professorName = $userName )#set( $tutorName = $userName )#end
71 + #set( $professorName = $userName )
72 + #set( $tutorName = $userName )
73 + #set( $oneUser = true )
74 +#elseif( $professorName != "" )
75 +## professor takes precedence over tutor
76 + #set( $tutorName = "@@" )
77 + #set( $userName = "@@" )
78 + #set( $oneProfessor = true )
79 +#elseif( $tutorName != "" )
80 +## just tutor
81 + #set( $professorName = "@@" )
82 + #set( $userName = "@@" )
83 + #set( $oneTutor = true )
84 +#end
68 68  ##
69 69  #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
70 70  #if( $lastYearCou )#set( $lastYear = $lastYearCou )#end
... ... @@ -117,7 +117,7 @@
117 117  ##
118 118  #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
119 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 ")
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 '%$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 ")
121 121   #set( $courseFound = $xwiki.searchDocuments($sql) )
122 122   #set( $courseYearNo = $courseFound.size() )
123 123   #if( $$courseYearNo >0 )
... ... @@ -128,7 +128,8 @@
128 128  ### output results
129 129  ## page subtitle
130 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
148 +>(%%)$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}(%%)
149 +##
132 132  ## stop if no course are found
133 133  #if( $courseNo == 0 || $courseMap.keySet().size() == 0 )
134 134  ## redundant double check
... ... @@ -143,7 +143,7 @@
143 143  #end
144 144  ## courses displayed per academic year
145 145  #foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
146 -(% 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']]
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']]
147 147  (% style="border-style:hidden hidden hidden hidden; font-style:normal" %)
148 148  #foreach( $course in $courseMap[$yearr] )
149 149  * {{courseName}}$course{{/courseName}}
... ... @@ -150,7 +150,7 @@
150 150   #end
151 151  (%%)
152 152   #set( $courseYearNo = $courseMap[$yearr].size() )
153 -(% 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"]]
171 +(% 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"]]
154 154  #end
155 155  {{/velocity}}
156 156  {{id name="bottom"/}}