Changes for page Per A.Y.

From version 45.7
edited by Andrea Omicini
on 08/02/2023 00:37
Change comment: There is no comment for this version
To version 45.5
edited by Andrea Omicini
on 08/02/2023 00:15
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -20,11 +20,7 @@
20 20   #set( $userLastName = $userdoc.display("last_name") )
21 21  #elseif ( $userNamePar )
22 22  ## from the URL, "user=UserName" parameter
23 - #if( $userNamePar.contains("XWiki.") )
24 - #set( $userName = $userNamePar )
25 - #else
26 - #set( $userName = "XWiki.$userNamePar" )
27 - #end
23 + #set( $userName = "XWiki.$userNamePar" )
28 28   #set( $userdoc = $xwiki.getDocument($userName) )
29 29   #set( $userFirstName = $userdoc.display("first_name") )
30 30   #set( $userLastName = $userdoc.display("last_name") )
... ... @@ -40,11 +40,7 @@
40 40   #set( $professorLastName = $professordoc.display("last_name") )
41 41  #elseif ( $professorNamePar )
42 42  ## from the URL, "professor=UserName" parameter
43 - #if( $professorNamePar.contains("XWiki.") )
44 - #set( $professorName = $professorNamePar )
45 - #else
46 - #set( $professorName = "XWiki.$professorNamePar" )
47 - #end
39 + #set( $professorName = "XWiki.$professorNamePar" )
48 48   #set( $professordoc = $xwiki.getDocument($professorName) )
49 49   #set( $professorFirstName = $professordoc.display("first_name") )
50 50   #set( $professorLastName = $professordoc.display("last_name") )
... ... @@ -60,11 +60,6 @@
60 60   #set( $tutorLastName = $tutordoc.display("last_name") )
61 61  #elseif ( $tutorNamePar )
62 62  ## from the URL, "tutor=UserName" parameter
63 - #if( $tutorNamePar.contains("XWiki.") )
64 - #set( $tutorName = $tutorNamePar )
65 - #else
66 - #set( $tutorName = "XWiki.$tutorNamePar" )
67 - #end
68 68   #set( $tutorName = "XWiki.$tutorNamePar" )
69 69   #set( $tutordoc = $xwiki.getDocument($tutorName) )
70 70   #set( $tutorFirstName = $tutordoc.display("first_name") )
... ... @@ -74,27 +74,10 @@
74 74   #set( $tutorFirstName = "" )
75 75   #set( $tutorLastName = "" )
76 76  #end
77 -## who, in the end
78 -#set( $oneUser = false )
79 -#set( $oneProfessor = false )
80 -#set( $oneTutor = false )
81 -##
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 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
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
98 98  ##
99 99  #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
100 100  #if( $lastYearCou )#set( $lastYear = $lastYearCou )#end
... ... @@ -147,7 +147,7 @@
147 147  ##
148 148  #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
149 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 ")
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 ")
151 151   #set( $courseFound = $xwiki.searchDocuments($sql) )
152 152   #set( $courseYearNo = $courseFound.size() )
153 153   #if( $$courseYearNo >0 )
... ... @@ -158,7 +158,7 @@
158 158  ### output results
159 159  ## page subtitle
160 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}(%%)
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}(%%)
162 162  ##
163 163  ## stop if no course are found
164 164  #if( $courseNo == 0 || $courseMap.keySet().size() == 0 )
... ... @@ -174,7 +174,7 @@
174 174  #end
175 175  ## courses displayed per academic year
176 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']]
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']]
178 178  (% style="border-style:hidden hidden hidden hidden; font-style:normal" %)
179 179  #foreach( $course in $courseMap[$yearr] )
180 180  * {{courseName}}$course{{/courseName}}