Changes for page Per A.Y.

Summary

• Page properties (2 modified, 0 added, 0 removed)

Details

Page properties

Title

...	...	@@ -1,1 +1,1 @@
1		-$services.localization.render('peray')
	1	+$services.localization.render('pera')

Content

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