Changes for page Showcase
From version 50.11
edited by Andrea Omicini
on 20/07/2023 01:16
on 20/07/2023 01:16
Change comment:
There is no comment for this version
To version 54.2
edited by Andrea Omicini
on 31/08/2023 14:32
on 31/08/2023 14:32
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -10,28 +10,42 @@ 10 10 #set( $query = ", BaseObject as objPersonalCourse, LargeStringProperty as propUser 11 11 where objPersonalCourse.name = doc.fullName and objPersonalCourse.className = '${objectSpace}.Class' and propUser.id.id = objPersonalCourse.id and propUser.name = 'user' and propUser.value = '$userName' " ) 12 12 #set( $personalCourseDocs = $xwiki.searchDocuments($query) ) 13 - #includeInContext("${userSpace}.Environment") 14 -## #if( $personalCourseDocs.size() > 0 ) 15 -## #set( $personalCourseDoc = $xwiki.getDocument($personalCourseDocs[0]) ) 16 -## #else 17 -## #stop 18 -## #end 19 -## #if( $personalCourseDoc.maxYears && $personalCourseDoc.maxYears != "" ) 20 -## #set( $maxCourseYears = $personalCourseDoc.display('maxYears','view') ) 21 -## #end 22 -## #if( $personalCourseDoc.firstYear && $personalCourseDoc.firstYear != "" ) 23 -## #set( $firstYearCourse = $personalCourseDoc.display('firstYear','view') ) 24 -## #end 25 -## #if( $personalCourseDoc.lastYear && $personalCourseDoc.lastYear != "" ) 26 -## #set( $lastYearCourse = $personalCourseDoc.display('lastYear','view') ) 27 -## #end 13 + #if( $personalCourseDocs.size() > 0 ) 14 + #set( $personalCourseDoc = $xwiki.getDocument($personalCourseDocs[0]) ) 15 + #else 16 + #stop 17 + #end 18 + #if( $personalCourseDoc.maxYears && $personalCourseDoc.maxYears != "" ) 19 + #set( $maxCourseYears = $numbertool.toNumber($personalCourseDoc.display('maxYears','view')).intValue() ) 20 + #end 21 + #if( $personalCourseDoc.firstYear && $personalCourseDoc.firstYear != "" ) 22 + #set( $firstYearCourse = $numbertool.toNumber($personalCourseDoc.display('firstYear','view')).intValue() ) 23 + #end 24 + #if( $personalCourseDoc.lastYear && $personalCourseDoc.lastYear != "" ) 25 + #set( $lastYearCourse = $numbertool.toNumber($personalCourseDoc.display('lastYear','view')).intValue() ) 26 + #end 27 + #if( $personalCourseDoc.cycles && $personalCourseDoc.cycles != "" ) 28 + #set( $courseCycles = $personalCourseDoc.getValue('cycles') ) 29 + #end 28 28 #### USER SHOWCASE / START 31 +<ul> 29 29 ## PER YEAR / START 30 30 #set( $firstYearCourse1 = $firstYearCourse + 1 ) 31 31 #if( $xwiki.exists("${userSpace}.${mainSpace}.PerYear") ) 32 -* $services.localization.render('courses').toLowerCase() [[$services.localization.render('peryear').toLowerCase()>>${userSpace}.${mainSpace}.PerYear||queryString="from=$firstYearCourse&to=$lastYearCourse"]] 33 -** <span>#foreach( $year in [$lastYearCourse..$firstYearCourse] )#set( $year1 = $year + 1 )#if( $foreach.count < $maxCourseYears || ($foreach.count == $maxCourseYears && $year == $firstYearCourse) )#if( !$foreach.first ), #end[[$year/$year1>>${userSpace}.${mainSpace}.PerYear||queryString="year=$year"]]#elseif( $foreach.count == $maxCourseYears ), [[$year/$year1–$firstYearCourse/$firstYearCourse1>>${userSpace}.${mainSpace}.PerYear||queryString="from=$firstYearCourse&to=$year"]]#end#end</span> 35 +<li>$services.localization.render('courses').toLowerCase() [[$services.localization.render('peryear').toLowerCase()>>${userSpace}.${mainSpace}.PerYear||queryString="from=$firstYearCourse&to=$lastYearCourse"]]</li> 36 +<ul><li> 37 + #foreach( $year in [$lastYearCourse..$firstYearCourse] ) 38 + #set( $year1 = $year + 1 ) 39 + #if( $foreach.count < $maxCourseYears || ($foreach.count == $maxCourseYears && $year == $firstYearCourse) ) 40 + [[$year/$year1>>${userSpace}.${mainSpace}.PerYear||queryString="year=$year"]]#if( !$foreach.last), #end 41 + #elseif( $foreach.count == $maxCourseYears ) 42 + [[$year/$year1–$firstYearCourse/$firstYearCourse1>>${userSpace}.${mainSpace}.PerYear||queryString="from=$firstYearCourse&to=$year"]] 43 + #else 44 + #break 45 + #end 46 + #end 34 34 #end 48 +</li></ul> 35 35 ## PER YEAR / END 36 36 ## 37 37 ## CLOUDS / START ... ... @@ -42,7 +42,7 @@ 42 42 #end 43 43 #end 44 44 ## CLOUDS / END 45 - ##59 +</ul> 46 46 #### USER SHOWCASE / END 47 47 #else 48 48 #### GENERAL SHOWCASE / START ... ... @@ -54,7 +54,7 @@ 54 54 #foreach( $year in [$lastYearCourse..$firstYearCourse] ) 55 55 #set( $year1 = $year + 1 ) 56 56 #if( $foreach.count < $maxCourseYears || ( $foreach.count == $maxCourseYears && $year == $firstYearCourse) ) 57 - [[$year/$year1>>${mainSpace}.PerYear||queryString="year=$year"]]#if( !$foreach.last) ,#end71 + [[$year/$year1>>${mainSpace}.PerYear||queryString="year=$year"]]#if( !$foreach.last ) • #end 58 58 #elseif( $foreach.count == $maxCourseYears ) 59 59 [[$year/$year1–$firstYearCourse/$firstYearCourse1>>${mainSpace}.PerYear||queryString="from=$firstYearCourse&to=$year"]] 60 60 #else