Changes for page Per Year

From version 154.1
edited by Andrea Omicini
on 30/06/2023 21:30
Change comment: There is no comment for this version
To version 141.1
edited by Andrea Omicini
on 30/06/2023 17:04
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,32 +1,67 @@
1 1  {{velocity}}
2 -{{html wiki="true" clean="false"}}
3 -#template('apice_boolean.vm')
4 -#### SET PARAMETERS / START
5 5  #template('apice_theses.vm')
6 -#template('apice_user_param.vm')
7 -## years / personal
8 -#if( $isUserSpace )
9 - #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
10 - 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' " )
11 - #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
12 - #if( $personalThesisDocs.size() > 0 )
13 - #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
14 - #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}}
15 15   #stop
16 16   #end
17 - #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
18 - #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" )
19 19   #end
20 - #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
21 - #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
22 22   #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 = "" )
23 23  #end
24 -## years / parameters takes precedence
25 -#set( $firstYear = $firstYearThesis )
26 -#set( $lastYear = $lastYearThesis )
27 -#template('apice_year_param.vm')
28 -##
29 -## CYCLES / START
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
64 +#### handle cycle
30 30  ## $cycleList gets the list of cycles to be shown
31 31  ## $oneCycle true if just one cycle to be shown
32 32  #if( $request.cycle && $request.cycle.trim() != "" )
... ... @@ -48,16 +48,66 @@
48 48   #set( $cycle = "" )
49 49  #end
50 50  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
51 -## CYCLES / END
52 52  ##
53 -#### SET PARAMETERS / END
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
54 54  ##
55 -## DATA STRUCTURES / START
136 +## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
137 +##
138 +#### HANDLE PARAMETERS / END
139 +##
140 +## query to structures
56 56  #set( $itemMap = {} )
57 57  #set( $itemNo = 0 )
58 58  #foreach( $year in $yearList )
59 - #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
60 - 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" )
61 61  ## do query
62 62   #set( $itemFound = $xwiki.searchDocuments($query) )
63 63  ## set counters
... ... @@ -67,36 +67,12 @@
67 67   #set( $itemNo = $itemNo + $itemYearNo )
68 68   #end
69 69  #end
70 -## DATA STRUCTURES / END
71 71  ##
72 -## DISPLAY / START
156 +## output results
73 73  ## page subtitle
74 -<div class="mainheader">
75 -$itemNo
76 -#if( $itemNo == 1 )
77 - #if( $oneCycle )
78 - {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
79 - #else
80 - $services.localization.render('thesis').toLowerCase()
81 - #end
82 -#{else}
83 - #if( $oneCycle )
84 - {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
85 - #else
86 - $services.localization.render('theses').toLowerCase()
87 - #end
88 -#{end}
89 -<span class="textsecondary">&ensp;/&ensp;</span>
90 -#if( $oneYear )
91 - $year
92 -#else
93 - $firstYear–$lastYear
94 -#{end}
95 -#if( $oneUser )
96 - <span class="textsecondary">&ensp;/&ensp;</span>
97 - $userFirstName $userLastName
98 -#end
99 -</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 +
100 100  ## stop if no thesis is found
101 101  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
102 102  ## redundant double check
... ... @@ -106,14 +106,8 @@
106 106  ## page index
107 107  #if( $itemMap.keySet().size() > 1 )
108 108  ## found more than one year
109 -<div class="mainselectbar" id="index">
110 - #foreach( $year in $itemMap.keySet() )
111 - #if( !$foreach.first )
112 - &ensp;&bull;&ensp;
113 - #end
114 - [[$year>>||anchor="$year"]]
115 - #end
116 -</div>
170 +{{id name="index"/}}
171 +(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $itemMap.keySet() )#if( !$foreach.first ) | #end[[$year>>$doc||anchor=$year]]#end)))
117 117  #end
118 118  ## theses displayed per year
119 119  ##
... ... @@ -120,23 +120,16 @@
120 120  #template('apice_thesis_macros.vm')
121 121  ##
122 122  #foreach( $year in $itemMap.keySet() )
123 -## year top / start
124 -<div class="mainselectseparator">
125 - <a class="mainselectseparatorlink" id="$year" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end#if( $oneCycle )&cycle=$cycle#end")>
126 - $year
127 - </a>
128 -</div>
129 -## year top / end
130 -##
131 -## year display / start
132 -<div style="font-style: normal"><ul>
178 +(% 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']]
179 +{{html wiki="true" clean="false"}}
180 +<div><ul>
133 133  #foreach( $item in $itemMap[$year] )
134 134  <li>#thesislinked($item)</li>
135 135  #end
136 136  </ul></div>
185 +{{/html}}
137 137   #set( $itemYearNo = $itemMap[$year].size() )
138 138  (% 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"]]
139 139  #end
140 -{{/html}}
141 141  {{/velocity}}
142 142  {{id name="bottom"/}}