Changes for page Per A.Y.

From version 45.22
edited by Andrea Omicini
on 08/02/2023 04:37
Change comment: There is no comment for this version
To version 48.7
edited by Andrea Omicini
on 20/07/2023 10:34
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,0 +1,1 @@
1 +$services.localization.render('peray')
Default language
... ... @@ -1,1 +1,0 @@
1 -en
Content
... ... @@ -1,180 +1,136 @@
1 -= {{italiano}}Per A.A.{{/italiano}}{{english}}Per A.Y.{{/english}} =
2 -
3 -{{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 -#set( $courseMenu = true )
5 -#set( $currentCourseDoc = "" )
6 -#### get parameters
7 -## when
8 -#set( $yearPar = $context.getRequest().getParameter("year") )
9 -#set( $firstYearPar = $context.getRequest().getParameter("from") )
10 -#set( $lastYearPar = $context.getRequest().getParameter("to") )
11 -## who
12 -#set( $oneUser = false )
13 -#set( $oneProfessor = false )
14 -#set( $oneTutor = false )
15 -##
16 -#set( $userNamePar = $context.getRequest().getParameter("user") )
17 -#set( $professorNamePar = $context.getRequest().getParameter("professor") )
18 -#set( $tutorNamePar = $context.getRequest().getParameter("tutor") )
19 -#### handle who
20 -#if ( $userName )
21 -## from a personal page, "XWiki.UserName" $userName form
22 - #set( $userdoc = $xwiki.getDocument($userName) )
23 - #set( $userFirstName = $userdoc.display("first_name") )
24 - #set( $userLastName = $userdoc.display("last_name") )
25 - #set( $oneUser = true )
26 -#elseif ( $userNamePar )
27 -## from the URL, "user=UserName" parameter
28 - #if( $userNamePar.contains("XWiki.") )
29 - #set( $userName = $userNamePar )
1 +{{velocity}}
2 +{{html clean="false" wiki="true"}}
3 +#template('apice_macros.vm')
4 +#setobjectspace("Courses")
5 +#template('apice_course_macros.vm')
6 +#template('apice_user_param.vm')
7 +## years / personal
8 +#if( $isUserSpace )
9 + #set( $query = ", BaseObject as objPersonalCourse, LargeStringProperty as propUser
10 + where objPersonalCourse.name = doc.fullName and objPersonalCourse.className = '${mainSpace}.Personal.Class' and propUser.id.id = objPersonalCourse.id and propUser.name = 'user' and propUser.value = '$userName' " )
11 + #set( $personalCourseDocs = $xwiki.searchDocuments($query) )
12 + #if( $personalCourseDocs.size() > 0 )
13 + #set( $personalCourseDoc = $xwiki.getDocument($personalCourseDocs[0]) )
30 30   #else
31 - #set( $userName = "XWiki.$userNamePar" )
15 + #stop
32 32   #end
33 - #set( $userdoc = $xwiki.getDocument($userName) )
34 - #set( $userFirstName = $userdoc.display("first_name") )
35 - #set( $userLastName = $userdoc.display("last_name") )
36 - #set( $oneUser = true )
37 -#end
38 -#if ( $professorName )
39 -## from a personal page, "XWiki.UserName" $professorName form
40 - #set( $professordoc = $xwiki.getDocument($professorName) )
41 - #set( $professorFirstName = $professordoc.display("first_name") )
42 - #set( $professorLastName = $professordoc.display("last_name") )
43 - #set( $oneProfessor = true )
44 -#elseif ( $professorNamePar )
45 -## from the URL, "professor=UserName" parameter
46 - #if( $professorNamePar.contains("XWiki.") )
47 - #set( $professorName = $professorNamePar )
48 - #else
49 - #set( $professorName = "XWiki.$professorNamePar" )
17 + #if( $personalCourseDoc.maxYears && $personalCourseDoc.maxYears != "" )
18 + #set( $maxCourseYears = $numbertool.toNumber($personalCourseDoc.display('maxYears','view')) )
50 50   #end
51 - #set( $professordoc = $xwiki.getDocument($professorName) )
52 - #set( $professorFirstName = $professordoc.display("first_name") )
53 - #set( $professorLastName = $professordoc.display("last_name") )
54 - #set( $oneProfessor = true )
55 -#end
56 -#if ( $tutorName )
57 -## from a personal page, "XWiki.UserName" $tutorName form
58 - #set( $tutordoc = $xwiki.getDocument($tutorName) )
59 - #set( $tutorFirstName = $tutordoc.display("first_name") )
60 - #set( $tutorLastName = $tutordoc.display("last_name") )
61 -#elseif ( $tutorNamePar )
62 -## from the URL, "tutor=UserName" parameter
63 - #if( $tutorNamePar.contains("XWiki.") )
64 - #set( $tutorName = $tutorNamePar )
65 - #else
66 - #set( $tutorName = "XWiki.$tutorNamePar" )
20 + #if( $personalCourseDoc.firstYear && $personalCourseDoc.firstYear != "" )
21 + #set( $firstYearCourse = $numbertool.toNumber($personalCourseDoc.display('firstYear','view')) )
67 67   #end
68 - #set( $tutordoc = $xwiki.getDocument($tutorName) )
69 - #set( $tutorFirstName = $tutordoc.display("first_name") )
70 - #set( $tutorLastName = $tutordoc.display("last_name") )
71 - #set( $oneTutor = true )
23 + #if( $personalCourseDoc.lastYear && $personalCourseDoc.lastYear != "" )
24 + #set( $lastYearCourse = $numbertool.toNumber($personalCourseDoc.display('lastYear','view')) )
25 + #end
72 72  #end
73 -## who, in the end
74 -#if( $oneUser )
75 -## user takes precedence over both professor and tutor and gets them all
76 - #set( $oneProfessor = false )
77 - #set( $oneTutor = false )
78 -#elseif( $oneProfessor )
79 -## professor takes precedence over tutor
80 - #set( $oneUser = false )
81 - #set( $oneTutor = false )
82 -#elseif( $oneTutor )
83 -## just tutor
84 - #set( $oneUser = false )
85 - #set( $oneProfessor = false )
86 -#end
27 +## years / parameters takes precedence
28 +#set( $firstYear = $numbertool.toNumber($firstYearCourse) )
29 +#set( $lastYear = $numbertool.toNumber($lastYearCourse) )
30 +#template('apice_year_param.vm')
87 87  ##
88 -#if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
89 -#if( $lastYearCou )#set( $lastYear = $lastYearCou )#end
90 -#if( $firstYearCourse )#set( $firstYear = $firstYearCourse )#end
91 -#if( $lastYearCourse )#set( $lastYear = $lastYearCourse )#end
92 -#set( $firstYear1 = $firstYear + 1 )#set( $firstAYear = $firstYear + "/" + $firstYear1 )
93 -#set( $lastYear1 = $lastYear + 1 )#set( $lastAYear = $lastYear + "/" + $lastYear1 )
94 -#set( $yearRange = [$lastYear..$firstYear] )
95 -#if(!$oneYear)#set( $oneYear = false )#end
96 -##
97 -#set( $yearPar = $context.getRequest().getParameter("year") )
98 -#set( $firstYearPar = $context.getRequest().getParameter("from") )
99 -#set( $lastYearPar = $context.getRequest().getParameter("to") )
100 -#if($firstYearPar)
101 - #set( $yearFirst = $util.parseInt($firstYearPar) )
102 - #if ( $yearRange.contains($yearFirst) )
103 - #set( $firstYear = $yearFirst )
104 - #set( $yearRange = [$lastYear..$firstYear] )
105 - #set( $firstYear1 = $firstYear + 1 )
106 - #set( $firstAYear = $firstYear + "/" + $firstYear1 )
32 +## DATA STRUCTURES / START
33 +#set( $itemMap = {} )
34 +#set( $itemNo = 0 )
35 +## cycle over years
36 +#foreach( $year in $yearList)
37 + #set( $year1 = $year + 1 )
38 + #set( $ayear = $year + "/" + $year1 )
39 + #set( $query = ", BaseObject as objCourse, StringProperty as propYear, LargeStringProperty as propProfessor, LargeStringProperty as propOtherprofessors, LargeStringProperty as propTutors
40 + where objCourse.name = doc.fullName and objCourse.className = '${mainSpace}.Class' and objCourse.name <> '${objectPool}.Template' and propYear.id.id = objCourse.id and propProfessor.id.id = objCourse.id and propOtherprofessors.id.id = objCourse.id and propTutors.id.id = objCourse.id and propYear.name = 'ay' and propProfessor.name = 'professor' and propOtherprofessors.name = 'otherProfessors' and propTutors.name = 'tutors' and propYear.value = '$ayear' #if( $oneUser )and ( propProfessor.value like '%$userName%' or propOtherprofessors.value like '%$userName%' or propTutors.value like '%$userName%' )#end ")
41 +## execute query
42 + #set( $itemFound = $xwiki.searchDocuments($query) )
43 +## set counters
44 + #set( $itemYearNo = $itemFound.size() )
45 + #if( $itemYearNo > 0 )
46 + #set( $itemMap[$year] = $itemFound )
47 + #set( $itemNo = $itemNo + $itemYearNo )
107 107   #end
108 108  #end
109 -#if($lastYearPar)
110 - #set( $yearLast = $util.parseInt($lastYearPar) )
111 - #if ( $yearRange.contains($yearLast) )
112 - #set( $lastYear = $yearLast )
113 - #set( $yearRange = [$lastYear..$firstYear] )
114 - #set( $lastYear1 = $lastYear + 1 )
115 - #set( $lastAYear = $lastYear + "/" + $lastYear1 )
116 - #end
50 +## DATA STRUCTURES / END
51 +##
52 +## DISPLAY / START
53 +## page subtitle
54 +<div class="mainheader">
55 +$itemNo
56 +#if( $itemNo == 1 )
57 + $services.localization.render('course').toLowerCase()
58 +#else
59 + $services.localization.render('courses').toLowerCase()
117 117  #end
118 -#set($yearList = $yearRange)
119 -#if($yearPar)
120 - #set($year = $util.parseInt($yearPar))
121 - #if ($yearRange.contains($year) )
122 - #set($yearList = [$year])
123 - #set($oneYear = true)
124 - #set($year1 = $year + 1 )
125 - #set($aYear = $year + "/" + $year1 )
126 - #end
61 +<span class="textsecondary">&ensp;/&ensp;</span>
62 +#if( $oneYear )
63 + #set( $year1 = $year + 1 )
64 + #set( $ayear = $year + "/" + $year1 )
65 + $ayear
66 +#else
67 + #set( $firstYear1 = $firstYear + 1 )
68 + #set( $lastYear1 = $lastYear + 1 )
69 + #set( $aFirstYear = $firstYear + "/" + $firstYear1 )
70 + #set( $aLastYear = $lastYear + "/" + $lastYear1 )
71 + $aFirstYear<span class="textsecondary">&ensp;&mdash;&ensp;</span>$aLastYear
127 127  #end
128 -#### HANDLE PARAMETERS / END
129 -##
130 -### query to structures
131 -## map & counter initialisation
132 -#set( $courseMap = {} )
133 -#set( $courseNo = 0 )
134 -#if( $services.localization.currentLocale == "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end
135 -##
136 -##
137 -#foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
138 - #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4
139 - 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 ")
140 - #set( $courseFound = $xwiki.searchDocuments($sql) )
141 - #set( $courseYearNo = $courseFound.size() )
142 - #if( $$courseYearNo >0 )
143 - #set( $courseMap[$yearr] = $courseFound )
144 - #set( $courseNo = $courseNo + $courseYearNo )
145 - #end
73 +#if( $oneUser )
74 + <span class="textsecondary">&ensp;/&ensp;</span>
75 + $userFirstName $userLastName
146 146  #end
147 -### output results
148 -## page subtitle
149 -{{id name="top"/}}
150 ->(%%)$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}(%%)
151 -##
152 -## stop if no course are found
153 -#if( $courseNo == 0 || $courseMap.keySet().size() == 0 )
77 +</div>
78 +## stop if no courses are found
79 +#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
154 154  ## redundant double check
155 155   #stop
156 156  #end
157 -## some course found
83 +## some courses found
158 158  ## page index
159 -#if( $courseMap.keySet().size() > 1 )
85 +#if( $itemMap.keySet().size() > 1 )
160 160  ## found more than one year
161 -{{id name="index"/}}
162 -(% 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)))
163 -#end
164 -## courses displayed per academic year
165 -#foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
166 -(% 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']]
167 -(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)
168 - #foreach( $course in $courseMap[$yearr] )
169 - #if( $oneUser || $oneProfessor || $oneTutor )
170 -* {{courseName}}$course{{/courseName}} (% style="font-style:normal; font-size:normal; color:$theme.textSecondaryColor" %)({{courseCycle}}$course{{/courseCycle}})(%%)
171 - #else
172 -* {{course linked="title"}}$course{{/course}}
87 +<div class="mainselectbar" id="index">
88 + #foreach( $year in $itemMap.keySet() )
89 + #set( $year1 = $year + 1 )
90 + #set( $ayear = $year + "/" + $year1 )
91 + #if( !$foreach.first )
92 + &ensp;&bull;&ensp;
173 173   #end
94 + [[$ayear>>||anchor="$ayear"]]
174 174   #end
175 -(%%)
176 - #set( $courseYearNo = $courseMap[$yearr].size() )
177 -(% 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"]]
96 +</div>
178 178  #end
179 -{{/velocity}}
180 -{{id name="bottom"/}}
98 +## courses displayed per year
99 +#foreach( $year in $itemMap.keySet() )
100 + #set( $year1 = $year + 1 )
101 + #set( $ayear = $year + "/" + $year1 )
102 +## year top / start
103 +<div class="mainselectseparator">
104 + <a class="mainselectseparatorlink" id="$ayear" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end")>
105 + $ayear
106 + </a>
107 +</div>
108 +## year top / end
109 +##
110 +## year display / start
111 +<div style="font-style: normal"><ul>
112 + #foreach( $item in $itemMap[$year] )
113 +<li>{{course}}$item{{/course}}</li>
114 + #end
115 +</ul></div>
116 +## year display / end
117 +##
118 +## year bottom / start
119 +<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
120 + #set( $itemYearNo = $itemMap[$year].size() )
121 + $itemYearNo
122 + #if( $itemYearNo == 1 )
123 + $services.localization.render('course').toLowerCase()
124 + #else
125 + $services.localization.render('courses').toLowerCase()
126 + #end
127 + <span class="textsecondary">&ensp;/&ensp;</span>
128 + $year
129 + &ensp;&bull;&ensp;
130 + #anchorlinks()
131 +</div>
132 +## year bottom / end
133 +#end
134 +## DISPLAY / END
135 +{{/html}}
136 +{{/velocity}}{{pageDisplay sort="objectservice"/}}