Changes for page Per Year

From version 150.1
edited by Andrea Omicini
on 30/06/2023 21:14
Change comment: There is no comment for this version
To version 138.1
edited by Andrea Omicini
on 30/06/2023 17:01
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,34 +1,66 @@
1 1  {{velocity}}
2 -{{html wiki="true" clean="false"}}
3 -#template('apice_boolean.vm')
4 -#### HANDLE PARAMETERS / START
5 5  #template('apice_theses.vm')
6 -#template('apice_user_param.vm')
7 -## YEARS / START
8 -#set( $yearPar = $request.year.trim() )
9 -#set( $firstYearPar = $request.from.trim() )
10 -#set( $lastYearPar = $request.to.trim() )
11 -## years / personal
12 -#if( $isUserSpace )
13 - #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
14 - 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' " )
15 - #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
16 - #if( $personalThesisDocs.size() > 0 )
17 - #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
18 - #else
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}}
19 19   #stop
20 20   #end
21 - #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
22 - #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
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" )
27 + #else
28 + #set( $userName = "XWiki.$userNamePar" )
23 23   #end
24 - #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
25 - #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
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 + #stop
26 26   #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 = "" )
27 27  #end
28 -## years / parameters takes precedence
29 -#set( $firstYear = $firstYearThesis )
30 -#set( $lastYear = $lastYearThesis )
31 -#template('apice_years_param.vm')
55 +#if( $oneUser )
56 + #if( $apiceUser )
57 + #set( $userString = "%$userName%" )
58 + #else
59 + #set( $userString = "%$userFirstName $userLastName%" )
60 + #end
61 +#else
62 + #set( $userString = "%%" )
63 +#end
32 32  #### handle cycle
33 33  ## $cycleList gets the list of cycles to be shown
34 34  ## $oneCycle true if just one cycle to be shown
... ... @@ -51,14 +51,66 @@
51 51   #set( $cycle = "" )
52 52  #end
53 53  ## 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
98 +#if( $yearPar )
99 + #set( $yearInt = $mathtool.toInteger($yearPar) )
100 + #if( $yearInt > 0 )
101 + #set( $firstYear = $yearInt )
102 + #set( $lastYear = $yearInt )
103 + #end
104 +#end
105 +#if( $firstYearPar )
106 + #set( $yearInt = $mathtool.toInteger($firstYearPar) )
107 + #if( $yearInt > 0 )
108 + #set( $firstYear = $yearInt )
109 + #end
110 +#end
111 +#if( $lastYearPar )
112 + #set( $yearInt = $mathtool.toInteger($lastYearPar) )
113 + #if( $yearInt > 0 )
114 + #set( $lastYear = $yearInt )
115 + #end
116 +#end
117 +#if( $lastYear < $firstYear )
118 +## swap
119 + #set( $yearTemp = $lastYear )
120 + #set( $lastYear = $firstYear )
121 + #set( $firstYear = $yearTemp )
122 +#end
123 +## invariant: $lastYear >= $firstYear
124 +#if( $lastYear > $firstYear )
125 + #set( $year = -1 )
126 + #set( $yearList = [$lastYear..$firstYear] )
127 + #set( $oneYear = false )
128 +#else
129 +## $lastYear = $firstYear
130 + #set( $year = $lastYear )
131 + #set( $yearList = [$year] )
132 + #set( $oneYear = true )
133 +#end
134 +## handle when / end
135 +##
136 +## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
137 +##
54 54  #### HANDLE PARAMETERS / END
55 55  ##
56 -## DATA STRUCTURES / START
140 +## query to structures
57 57  #set( $itemMap = {} )
58 58  #set( $itemNo = 0 )
59 59  #foreach( $year in $yearList )
60 - #set( $query = ", BaseObject as objThesis #if( $oneCycle ), StringProperty as propCycle #end, DateProperty as propEnddate, StringProperty as propStatus, LargeStringProperty as propSupervisor, LargeStringProperty as propCosupervisor, LargeStringProperty as propContact
61 - where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propEnddate.id.id = objThesis.id and propStatus.id.id = objThesis.id and propSupervisor.id.id = objThesis.id and propCosupervisor.id.id = objThesis.id and propContact.id.id = objThesis.id and propEnddate.name = 'end' and propStatus.name = 'status' and propSupervisor.name = 'supervisors' and propCosupervisor.name = 'cosupervisors' and propContact.name = 'contacts' #if( $oneCycle ) and propCycle.id.id = objThesis.id and propCycle.name = 'cycle' and propCycle.value = '$cycle' #end and year(propEnddate.value) = $year and lower(propStatus.value) = 'completed' #if( $oneUser )and ( propSupervisor.value like '%$userString%' or propCosupervisor.value like '%$userString%' or propContact.value like '%$userString%' )#end order by propEnddate.value desc" )
144 + #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
145 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop0.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 prop5.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'end' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' #if( $oneCycle ) and prop0.value = '$cycle'#end and year(prop1.value) = $year and lower(prop2.value) = 'completed' #if( $oneUser )and ( prop3.value like '%$userString%' or prop4.value like '%$userString%' or prop5.value like '%$userString%' )#end order by prop1.value desc" )
62 62  ## do query
63 63   #set( $itemFound = $xwiki.searchDocuments($query) )
64 64  ## set counters
... ... @@ -68,36 +68,12 @@
68 68   #set( $itemNo = $itemNo + $itemYearNo )
69 69   #end
70 70  #end
71 -## DATA STRUCTURES / END
72 72  ##
73 -## DISPLAY / START
156 +## output results
74 74  ## page subtitle
75 -<div class="mainheader">
76 -$itemNo
77 -#if( $itemNo == 1 )
78 - #if( $oneCycle )
79 - {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
80 - #else
81 - $services.localization.render('thesis').toLowerCase()
82 - #end
83 -#{else}
84 - #if( $oneCycle )
85 - {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
86 - #else
87 - $services.localization.render('theses').toLowerCase()
88 - #end
89 -#{end}
90 -<span class="textsecondary">&ensp;/&ensp;</span>
91 -#if( $oneYear )
92 - $year
93 -#else
94 - $firstYear–$lastYear
95 -#{end}
96 -#if( $oneUser )
97 - <span class="textsecondary">&ensp;/&ensp;</span>
98 - $userFirstName $userLastName
99 -#end
100 -</div>
158 +{{id name="top"/}}
159 +>(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('thesis').toLowerCase()#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('theses').toLowerCase()#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
160 +
101 101  ## stop if no thesis is found
102 102  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
103 103  ## redundant double check
... ... @@ -116,14 +116,11 @@
116 116  ##
117 117  #foreach( $year in $itemMap.keySet() )
118 118  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc||style="text-decoration:none; color:$theme.textPrimaryColor" queryString='year=$year#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end#if( $oneCycle )&cycle=$cycle#end']]
119 -<div style="font-style: normal"><ul>
120 120  #foreach( $item in $itemMap[$year] )
121 -<li>#thesislinked($item)</li>
180 +* thesislinked($item)
122 122  #end
123 -</ul></div>
124 124   #set( $itemYearNo = $itemMap[$year].size() )
125 125  (% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
126 126  #end
127 -{{/html}}
128 128  {{/velocity}}
129 129  {{id name="bottom"/}}