Changes for page Per Year

From version 142.1
edited by Andrea Omicini
on 30/06/2023 17:05
Change comment: There is no comment for this version
To version 145.1
edited by Andrea Omicini
on 30/06/2023 17:11
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,102 +1,34 @@
1 1  {{velocity}}
2 -#template('apice_theses.vm')
2 +#template('apice_boolean.vm')
3 3  #### HANDLE PARAMETERS / START
4 -##
5 -## inline display
6 -#set( $inlinePar = $request.inline.trim() )
7 -## who
8 -#set( $userNamePar = $request.user.trim() )
9 -#set( $firstNamePar = $request.name.trim() )
10 -#set( $lastNamePar = $request.surname.trim() )
11 -#### handle who
12 -#if( $userName )
13 -## from a personal page, "XWiki.$userName" $userName form
14 - #if( !$xwiki.exists( $userName ) )
15 -{{warning}}User $userName does not exist{{/warning}}
16 - #stop
17 - #end
18 - #set( $apiceUser = true )
19 - #set( $oneUser = true )
20 - #set( $userdoc = $xwiki.getDocument($userName) )
21 - #set( $userFirstName = $userdoc.display("first_name") )
22 - #set( $userLastName = $userdoc.display("last_name") )
23 -#elseif( $userNamePar )
24 -## from the URL, "user=$userNamePar" parameter
25 - #if( $userNamePar.contains('XWiki.') )
26 - #set( $userName = "$userNamePar" )
4 +#template('apice_theses.vm')
5 +#template('apice_user_param.vm')
6 +## YEARS / START
7 +#set( $yearPar = $request.year.trim() )
8 +#set( $firstYearPar = $request.from.trim() )
9 +#set( $lastYearPar = $request.to.trim() )
10 +## years / personal
11 +#if( $isUserSpace )
12 + #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
13 + where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${objectSpace}.Personal.${objectClass}' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
14 + #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
15 + #if( $personalThesisDocs.size() > 0 )
16 + #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
27 27   #else
28 - #set( $userName = "XWiki.$userNamePar" )
29 - #end
30 - #if( !$xwiki.exists( $userName ) )
31 - #if( $services.localization.currentLocale == 'it' )
32 -{{warning}}L'utente “$userNamePar” non esiste{{/warning}}
33 - #else
34 -{{warning}}User “$userNamePar” does not exist{{/warning}}
35 - #end
36 36   #stop
37 37   #end
38 - #set( $apiceUser = true )
39 - #set( $oneUser = true)
40 - #set( $userdoc = $xwiki.getDocument($userName) )
41 - #set( $userFirstName = $userdoc.display("first_name") )
42 - #set( $userLastName = $userdoc.display("last_name") )
43 -#elseif( $firstNamePar && $lastNamePar )
44 -## from the URL, "name=Firstname&surname=Lastname" parameter
45 - #set( $apiceUser = false )
46 - #set( $oneUser = true )
47 - #set( $userFirstName = $firstNamePar )
48 - #set( $userLastName = $lastNamePar )
49 -#else
50 - #set( $apiceUser = false )
51 - #set( $oneUser = false )
52 - #set( $userFirstName = "" )
53 - #set( $userLastName = "" )
54 -#end
55 -#if( $oneUser )
56 - #if( $apiceUser )
57 - #set( $userString = "%$userName%" )
58 - #else
59 - #set( $userString = "%$userFirstName $userLastName%" )
20 + #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
21 + #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
60 60   #end
61 -#else
62 - #set( $userString = "%%" )
63 -#end
64 -#### handle cycle
65 -## $cycleList gets the list of cycles to be shown
66 -## $oneCycle true if just one cycle to be shown
67 -#if( $request.cycle && $request.cycle.trim() != "" )
68 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
69 - #if( $thesisCycles.contains($cyclePar) )
70 -## 'cycle' parameter is an admissible thesis cycle value
71 - #set( $cycleList = [$cyclePar])
72 - #set( $oneCycle = true )
73 - #set( $cycle = $cyclePar )
74 - #else
75 -## 'cycle' parameter is not an admissible thesis cycle value
76 -{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
77 - #stop
23 + #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
24 + #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
78 78   #end
79 -#else
80 -## default: all cycles
81 - #set( $cycleList = $showcaseThesisCycles )
82 - #set( $oneCycle = false )
83 - #set( $cycle = "" )
84 84  #end
85 -## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
86 -##
87 -## when
88 -#set( $yearPar = $request.year.trim() )
89 -#set( $firstYearPar = $request.from.trim() )
90 -#set( $lastYearPar = $request.to.trim() )
91 -#### handle when
92 -#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
93 -#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
94 -#if( $lastYear < $firstYear )
95 - #set( $lastYear = $firstYear )
96 -#end
97 -## parameters takes precedence
27 +## years / parameters takes precedence
28 +#set( $firstYear = $firstYearThesis )
29 +#set( $lastYear = $lastYearThesis )
98 98  #if( $yearPar )
99 - #set( $yearInt = $mathtool.toInteger($yearPar) )
31 + #set( $yearInt = $numbertool.toNumber($yearPar) )
100 100   #if( $yearInt > 0 )
101 101   #set( $firstYear = $yearInt )
102 102   #set( $lastYear = $yearInt )
... ... @@ -103,13 +103,13 @@
103 103   #end
104 104  #end
105 105  #if( $firstYearPar )
106 - #set( $yearInt = $mathtool.toInteger($firstYearPar) )
38 + #set( $yearInt = $numbertool.toNumber($firstYearPar) )
107 107   #if( $yearInt > 0 )
108 108   #set( $firstYear = $yearInt )
109 109   #end
110 110  #end
111 111  #if( $lastYearPar )
112 - #set( $yearInt = $mathtool.toInteger($lastYearPar) )
44 + #set( $yearInt = $numbertool.toNumber($lastYearPar) )
113 113   #if( $yearInt > 0 )
114 114   #set( $lastYear = $yearInt )
115 115   #end
... ... @@ -131,10 +131,29 @@
131 131   #set( $yearList = [$year] )
132 132   #set( $oneYear = true )
133 133  #end
134 -## handle when / end
135 -##
136 -## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
137 -##
66 +## YEARS / END
67 +#### handle cycle
68 +## $cycleList gets the list of cycles to be shown
69 +## $oneCycle true if just one cycle to be shown
70 +#if( $request.cycle && $request.cycle.trim() != "" )
71 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
72 + #if( $thesisCycles.contains($cyclePar) )
73 +## 'cycle' parameter is an admissible thesis cycle value
74 + #set( $cycleList = [$cyclePar])
75 + #set( $oneCycle = true )
76 + #set( $cycle = $cyclePar )
77 + #else
78 +## 'cycle' parameter is not an admissible thesis cycle value
79 +{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
80 + #stop
81 + #end
82 +#else
83 +## default: all cycles
84 + #set( $cycleList = $showcaseThesisCycles )
85 + #set( $oneCycle = false )
86 + #set( $cycle = "" )
87 +#end
88 +## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
138 138  #### HANDLE PARAMETERS / END
139 139  ##
140 140  ## query to structures