Changes for page Per Year

From version 152.1
edited by Andrea Omicini
on 30/06/2023 21:20
Change comment: There is no comment for this version
To version 135.1
edited by Andrea Omicini
on 24/04/2023 13:17
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -$services.localization.render('peryear')
Content
... ... @@ -1,36 +1,74 @@
1 -{{velocity}}
2 -{{html wiki="true" clean="false"}}
3 -#template('apice_boolean.vm')
1 += {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
2 +
3 +{{include reference="Classes.Environment" excludeFirstHeading="true"/}}{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 +#set( $thesisMenu = true )
4 4  #### HANDLE PARAMETERS / START
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
6 +##
7 +## inline display
8 +#set( $inlinePar = $request.inline.trim() )
9 +## who
10 +#set( $userNamePar = $request.user.trim() )
11 +#set( $firstNamePar = $request.name.trim() )
12 +#set( $lastNamePar = $request.surname.trim() )
13 +#### handle who
14 +#if( $userName )
15 +## from a personal page, "XWiki.$userName" $userName form
16 + #if( !$xwiki.exists( $userName ) )
17 +{{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') )
20 + #set( $apiceUser = true )
21 + #set( $oneUser = true )
22 + #set( $userdoc = $xwiki.getDocument($userName) )
23 + #set( $userFirstName = $userdoc.display("first_name") )
24 + #set( $userLastName = $userdoc.display("last_name") )
25 +#elseif( $userNamePar )
26 +## from the URL, "user=$userNamePar" parameter
27 + #if( $userNamePar.contains('XWiki.') )
28 + #set( $userName = "$userNamePar" )
29 + #else
30 + #set( $userName = "XWiki.$userNamePar" )
19 19   #end
20 - #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
21 - #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
32 + #if( !$xwiki.exists( $userName ) )
33 + #if( $services.localization.currentLocale == 'it' )
34 +{{warning}}L'utente “$userNamePar” non esiste{{/warning}}
35 + #else
36 +{{warning}}User “$userNamePar” does not exist{{/warning}}
37 + #end
38 + #stop
22 22   #end
40 + #set( $apiceUser = true )
41 + #set( $oneUser = true)
42 + #set( $userdoc = $xwiki.getDocument($userName) )
43 + #set( $userFirstName = $userdoc.display("first_name") )
44 + #set( $userLastName = $userdoc.display("last_name") )
45 +#elseif( $firstNamePar && $lastNamePar )
46 +## from the URL, "name=Firstname&surname=Lastname" parameter
47 + #set( $apiceUser = false )
48 + #set( $oneUser = true )
49 + #set( $userFirstName = $firstNamePar )
50 + #set( $userLastName = $lastNamePar )
51 +#else
52 + #set( $apiceUser = false )
53 + #set( $oneUser = false )
54 + #set( $userFirstName = "" )
55 + #set( $userLastName = "" )
23 23  #end
24 -## years / parameters takes precedence
25 -#set( $firstYear = $firstYearThesis )
26 -#set( $lastYear = $lastYearThesis )
27 -#template('apice_year_param.vm')
57 +#if( $oneUser )
58 + #if( $apiceUser )
59 + #set( $userString = "%$userName%" )
60 + #else
61 + #set( $userString = "%$userFirstName $userLastName%" )
62 + #end
63 +#else
64 + #set( $userString = "%%" )
65 +#end
28 28  #### handle cycle
29 29  ## $cycleList gets the list of cycles to be shown
30 30  ## $oneCycle true if just one cycle to be shown
31 31  #if( $request.cycle && $request.cycle.trim() != "" )
32 32   #set( $cyclePar = $request.cycle.trim().toUpperCase() )
33 - #if( $thesisCycles.contains($cyclePar) )
71 + #if( $allThesisCycles.contains($cyclePar) )
34 34  ## 'cycle' parameter is an admissible thesis cycle value
35 35   #set( $cycleList = [$cyclePar])
36 36   #set( $oneCycle = true )
... ... @@ -42,19 +42,86 @@
42 42   #end
43 43  #else
44 44  ## default: all cycles
45 - #set( $cycleList = $showcaseThesisCycles )
83 + #if( $showPhDTheses )
84 + #set( $cycleList = $allThesisCycles )
85 + #else
86 + #set( $cycleList = $lowThesisCycles )
87 + #end
46 46   #set( $oneCycle = false )
47 47   #set( $cycle = "" )
48 48  #end
49 49  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
92 +##
93 +## when
94 +#set( $yearPar = $request.year.trim() )
95 +#set( $firstYearPar = $request.from.trim() )
96 +#set( $lastYearPar = $request.to.trim() )
97 +#### handle when
98 +#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
99 +#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
100 +#if( $lastYear < $firstYear )
101 + #set( $lastYear = $firstYear )
102 +#end
103 +## parameters takes precedence
104 +#if( $yearPar )
105 + #set( $yearInt = $mathtool.toInteger($yearPar) )
106 + #if( $yearInt > 0 )
107 + #set( $firstYear = $yearInt )
108 + #set( $lastYear = $yearInt )
109 + #end
110 +#end
111 +#if( $firstYearPar )
112 + #set( $yearInt = $mathtool.toInteger($firstYearPar) )
113 + #if( $yearInt > 0 )
114 + #set( $firstYear = $yearInt )
115 + #end
116 +#end
117 +#if( $lastYearPar )
118 + #set( $yearInt = $mathtool.toInteger($lastYearPar) )
119 + #if( $yearInt > 0 )
120 + #set( $lastYear = $yearInt )
121 + #end
122 +#end
123 +#if( $lastYear < $firstYear )
124 +## swap
125 + #set( $yearTemp = $lastYear )
126 + #set( $lastYear = $firstYear )
127 + #set( $firstYear = $yearTemp )
128 +#end
129 +## invariant: $lastYear >= $firstYear
130 +#if( $lastYear > $firstYear )
131 + #set( $year = -1 )
132 + #set( $yearList = [$lastYear..$firstYear] )
133 + #set( $oneYear = false )
134 +#else
135 +## $lastYear = $firstYear
136 + #set( $year = $lastYear )
137 + #set( $yearList = [$year] )
138 + #set( $oneYear = true )
139 +#end
140 +## handle when / end
141 +##
142 +## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
143 +##
144 +## handle inline / start
145 +##
146 +## default: false
147 +#set( $showInline = false )
148 +## check $inlinePar
149 +#if( $inlinePar != "" && $trueStringList.contains($inlinePar.toLowerCase()) )
150 + #set( $showInline = true )
151 +#end
152 +##
153 +## handle inline / end
154 +##
50 50  #### HANDLE PARAMETERS / END
51 51  ##
52 -## DATA STRUCTURES / START
157 +## query to structures
53 53  #set( $itemMap = {} )
54 54  #set( $itemNo = 0 )
55 55  #foreach( $year in $yearList )
56 - #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
57 - 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" )
161 + #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
162 + 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" )
58 58  ## do query
59 59   #set( $itemFound = $xwiki.searchDocuments($query) )
60 60  ## set counters
... ... @@ -64,36 +64,12 @@
64 64   #set( $itemNo = $itemNo + $itemYearNo )
65 65   #end
66 66  #end
67 -## DATA STRUCTURES / END
68 68  ##
69 -## DISPLAY / START
173 +## output results
70 70  ## page subtitle
71 -<div class="mainheader">
72 -$itemNo
73 -#if( $itemNo == 1 )
74 - #if( $oneCycle )
75 - {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
76 - #else
77 - $services.localization.render('thesis').toLowerCase()
78 - #end
79 -#{else}
80 - #if( $oneCycle )
81 - {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
82 - #else
83 - $services.localization.render('theses').toLowerCase()
84 - #end
85 -#{end}
86 -<span class="textsecondary">&ensp;/&ensp;</span>
87 -#if( $oneYear )
88 - $year
89 -#else
90 - $firstYear–$lastYear
91 -#{end}
92 -#if( $oneUser )
93 - <span class="textsecondary">&ensp;/&ensp;</span>
94 - $userFirstName $userLastName
95 -#end
96 -</div>
175 +{{id name="top"/}}
176 +>(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
177 +
97 97  ## stop if no thesis is found
98 98  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
99 99  ## redundant double check
... ... @@ -107,19 +107,16 @@
107 107  (% 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)))
108 108  #end
109 109  ## theses displayed per year
110 -##
111 -#template('apice_thesis_macros.vm')
112 -##
113 113  #foreach( $year in $itemMap.keySet() )
114 -(% 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']]
115 -<div style="font-style: normal"><ul>
192 +(% 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#if( $showInline )&inline=true#end']]
116 116  #foreach( $item in $itemMap[$year] )
117 -<li>#thesislinked($item)</li>
118 -#end
119 -</ul></div>
194 + #if( $showInline )
195 + #if( $foreach.first )
196 + #end
197 +* #else(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)|#end{{thesis inline=$showInline linked='title'}}$item{{/thesis}}
198 + #end
120 120   #set( $itemYearNo = $itemMap[$year].size() )
121 -(% 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"]]
200 +(% 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 ){{stringEngIta eng=$objectEngSingular.toLowerCase() ita=$objectItaSingular.toLowerCase()/}}#else{{stringEngIta eng=$objectEngPlural.toLowerCase() ita=$objectItaPlural.toLowerCase()/}}#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
122 122  #end
123 -{{/html}}
124 124  {{/velocity}}
125 125  {{id name="bottom"/}}