Changes for page Per Year

From version 106.1
edited by Andrea Omicini
on 30/10/2021 17:19
Change comment: There is no comment for this version
To version 102.1
edited by Andrea Omicini
on 30/10/2021 16:49
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -40,10 +40,10 @@
40 40  #set( $userNamePar = $request.user.trim() )
41 41  ## default values
42 42  #set( $oneUser = false )
43 -#set( $selectedUser = '' )
43 +#set( $oneCycle = false )
44 44  #set( $userFirstName = "" )
45 45  #set( $userLastName = "" )
46 -#if( $userName || $userNamePar || $userNamePar != '' )
46 +#if( $userName || $userNamePar )
47 47  ## a user is specified for all roles
48 48   #if( !$userName )
49 49   #set( $selectedUser = "XWiki.$userNamePar" )
... ... @@ -59,31 +59,22 @@
59 59  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
60 60   #stop
61 61   #end
62 +##user selected and existing user page
63 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
64 + #set( $selectedCycle = '' )
65 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
66 + #set( $oneCycle = true )
67 + #set( $selectedCycle = $cyclePar )
68 + #end
62 62  #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
71 71  ## $oneUser and $oneCycle set properly
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
71 +#if( $oneYear )$selectedYear#end
72 +#if( $oneUser )$selectedUser#end
73 +#if( $oneCycle )$selectedCycle#end
83 83  ### END USER & CYCLE
84 84  ##
85 85  ## title
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'/}}
77 +>#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'/}}
87 87  ## index
88 88  #if( !$oneYear )
89 89  (% 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)))
... ... @@ -94,43 +94,45 @@
94 94  ## search theses
95 95  #set( $thesisNo = 0 )
96 96  #foreach( $year in $yearList )
97 - #set( $thesisYearNo = 0 )
98 - #if( !$oneYear )
88 + #if( !$oneYear || $selectedYear == $year )
89 + #set( $thesisYearNo = 0 )
90 + #if( !$oneYear )
99 99  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
100 - #end
92 + #end
101 101  ## some selected year or year list / now $year
102 - #foreach( $cycle in $allThesisCycles )
103 - #set( $thesisYearCycleNo = 0 )
104 - #if( !$oneCycle || $selectedCycle == $cycle )
94 + #foreach( $cycle in $allThesisCycles )
95 + #set( $thesisYearCycleNo = 0 )
96 + #if( !$oneCycle || $selectedCycle == $cycle )
105 105  ## some selected cycle or all cycles / now $cycle
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 )
98 + #if( $oneUser)
99 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
100 + 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" )
101 + #else
102 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
103 + 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" )
104 + #end
105 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
106 + #set( $thesisFoundNo = $thesisFound.size() )
107 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
108 + #if( $thesisFoundNo > 0 && !$oneCycle )
117 117  (% 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}}
118 - #end
119 - #foreach( $thesis in $thesisFound )
120 - #set( $thesisDoc = $xwiki.getDocument($thesis) )
121 - #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
110 + #end
111 + #foreach( $thesis in $thesisFound )
112 + #set( $thesisDoc = $xwiki.getDocument($thesis) )
113 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
122 122  * [[$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
123 123  
124 - #end
125 - #if( $thesisFoundNo > 0 && !$oneCycle )
116 + #end
117 + #if( $thesisFoundNo > 0 && !$oneCycle )
126 126  (% 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"]]
119 + #end
120 + #end
121 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
127 127   #end
128 128   #end
129 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
130 - #end
131 - #if( !$oneYear )
124 + #if( !$oneYear )
132 132  (% 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"]]
126 + #end
133 133   #end
134 -#end
135 135  {{id name='bottom'/}}
136 136  {{/velocity}}