Changes for page Per Year

From version 100.2
edited by Andrea Omicini
on 30/10/2021 16:46
Change comment: There is no comment for this version
To version 105.1
edited by Andrea Omicini
on 30/10/2021 17:18
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -34,8 +34,6 @@
34 34   #set( $yearList = [$lastYear..$firstYear] )
35 35   #end
36 36  #end
37 -$oneYear
38 -$yearList
39 39  ### END YEAR
40 40  ##
41 41  ### START USER & CYCLE
... ... @@ -42,10 +42,10 @@
42 42  #set( $userNamePar = $request.user.trim() )
43 43  ## default values
44 44  #set( $oneUser = false )
45 -#set( $oneCycle = false )
43 +#set( $selectedUser = '' )
46 46  #set( $userFirstName = "" )
47 47  #set( $userLastName = "" )
48 -#if( $userName || $userNamePar )
46 +#if( $userName || $userNamePar != '' )
49 49  ## a user is specified for all roles
50 50   #if( !$userName )
51 51   #set( $selectedUser = "XWiki.$userNamePar" )
... ... @@ -61,21 +61,31 @@
61 61  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
62 62   #stop
63 63   #end
64 -##user selected and existing user page
65 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
66 - #set( $selectedCycle = '' )
67 - #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
68 - #set( $oneCycle = true )
69 - #set( $selectedCycle = $cyclePar )
70 - #end
71 71  #end
63 +##if user selected, existing user page
64 +#set( $oneCycle = false )
65 +#set( $selectedCycle = '' )
66 +#set( $cyclePar = $request.cycle.trim().toUpperCase() )
67 +#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
68 + #set( $oneCycle = true )
69 + #set( $selectedCycle = $cyclePar )
70 +#end
72 72  ## $oneUser and $oneCycle set properly
73 -$oneUser
74 -$oneCycle
72 +$yearList
73 +#if( $oneYear )
74 + $selectedYear
75 +#end
76 +#if( $oneUser )
77 + $selectedUser
78 +#end
79 +#if( $oneCycle )
80 + $selectedCycle
81 + {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
82 +#end
75 75  ### END USER & CYCLE
76 76  ##
77 77  ## title
78 ->#if( $oneRole ){{thesisCycle short='no'}}$selecteCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}}
86 +>#if( $oneCycle ){{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}}
79 79  ## index
80 80  #if( !$oneYear )
81 81  (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if ($velocityCount > 1) | #end[[$year>>||anchor="$year"]]#end)))
... ... @@ -86,45 +86,43 @@
86 86  ## search theses
87 87  #set( $thesisNo = 0 )
88 88  #foreach( $year in $yearList )
89 - #if( !$oneYear || $selectedYear == $year )
90 - #set( $thesisYearNo = 0 )
91 - #if( !$oneYear )
97 + #set( $thesisYearNo = 0 )
98 + #if( !$oneYear )
92 92  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
93 - #end
100 + #end
94 94  ## some selected year or year list / now $year
95 - #foreach( $cycle in $allThesisCycles )
96 - #set( $thesisYearCycleNo = 0 )
97 - #if( !$oneCycle || $selectedCycle == $cycle )
102 + #foreach( $cycle in $allThesisCycles )
103 + #set( $thesisYearCycleNo = 0 )
104 + #if( !$oneCycle || $selectedCycle == $cycle )
98 98  ## some selected cycle or all cycles / now $cycle
99 - #if( $oneUser)
100 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
101 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' 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 prop0.name = 'cycle' and prop1.name = 'year' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop0.value = '$cycle' and prop1.value = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
102 - #else
103 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
104 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and prop1.value = '$year' order by prop1.value desc" )
105 - #end
106 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
107 - #set( $thesisFoundNo = $thesisFound.size() )
108 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
109 - #if( $thesisFoundNo > 0 && !$oneCycle )
106 + #if( $oneUser)
107 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
108 + where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' 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 prop0.name = 'cycle' and prop1.name = 'year' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
109 + #else
110 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
111 + where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and year(prop1.value) = '$year' order by prop1.value desc" )
112 + #end
113 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
114 + #set( $thesisFoundNo = $thesisFound.size() )
115 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
116 + #if( $thesisFoundNo > 0 && !$oneCycle )
110 110  (% style="border-style:#if( $oneYear )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneYear ){{id name='$cycle'/}}#else{{id name='$year-$cycle'/}}#end{{thesisCycle plural='no' uppercase='yes' short='yes'}}$cycle{{/thesisCycle}}
111 - #end
112 - #foreach( $thesis in $thesisFound )
113 - #set( $thesisDoc = $xwiki.getDocument($thesis) )
114 - #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
118 + #end
119 + #foreach( $thesis in $thesisFound )
120 + #set( $thesisDoc = $xwiki.getDocument($thesis) )
121 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
115 115  * [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) //($thesisObj.endDate)//#end#if( $thesisDoc.getValue('studentUserName') != "" ) [[$xwiki.getUserName($thesisDoc.getValue('studentUserName'), false)>>$thesisDoc.getValue('studentUserName')]]#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end
116 116  
117 - #end
118 - #if( $thesisFoundNo > 0 && !$oneCycle )
124 + #end
125 + #if( $thesisFoundNo > 0 && !$oneCycle )
119 119  (% style="border-style:#if( $oneYear )hidden solid solid hidden#{else}hidden dotted hidden hidden#end; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|#if( $oneYear ){{id name='$cycle-bottom'/}}#else{{id name='$cycle-$year-bottom'/}}#end($thesisYearCycleNo #if( $thesisYearCycleNo == 1 ){{thesisCycle plural='no' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#else{{thesisCycle plural='yes' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#end {{stringEngIta eng='in' ita='nel'/}} $year [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
120 - #end
121 - #end
122 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
123 123   #end
124 124   #end
125 - #if( !$oneYear )
129 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
130 + #end
131 + #if( !$oneYear )
126 126  (% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|($thesisYearNo #if($thesisYearNo == 1){{stringEngIta eng='thesis in' ita='tesi nel'/}}#else{{stringEngIta eng='theses in' ita='tesi nel'/}}#end$year{{id name='$year-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
127 - #end
128 128   #end
134 +#end
129 129  {{id name='bottom'/}}
130 130  {{/velocity}}