Changes for page Per A.Y.

From version 48.8
edited by Andrea Omicini
on 20/07/2023 10:35
Change comment: There is no comment for this version
To version 51.14
edited by Andrea Omicini
on 27/08/2023 18:43
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,6 +1,8 @@
1 1  {{velocity}}
2 2  {{html clean="false" wiki="true"}}
3 3  #template('apice_macros.vm')
4 +#nodoclang()
5 +#nolangpar()
4 4  #setobjectspace("Courses")
5 5  #template('apice_course_macros.vm')
6 6  #template('apice_user_param.vm')
... ... @@ -36,8 +36,8 @@
36 36  #foreach( $year in $yearList )
37 37   #set( $year1 = $year + 1 )
38 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 + #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")
41 41  ## execute query
42 42   #set( $itemFound = $xwiki.searchDocuments($query) )
43 43  ## set counters
... ... @@ -108,11 +108,22 @@
108 108  ## year top / end
109 109  ##
110 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
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
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
115 115  </ul></div>
128 + #end
116 116  ## year display / end
117 117  ##
118 118  ## year bottom / start