Changes for page Per Year

From version 103.1
edited by Andrea Omicini
on 30/10/2021 17:07
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
... ... @@ -68,15 +68,9 @@
68 68   #end
69 69  #end
70 70  ## $oneUser and $oneCycle set properly
71 -#if( $oneYear )
72 - $selectedYear
73 -#end
74 -#if( $oneUser )
75 - $selectedUser
76 -#end
77 -#if( $oneCycle )
78 - $selectedCycle
79 -#end
71 +#if( $oneYear )$selectedYear#end
72 +#if( $oneUser )$selectedUser#end
73 +#if( $oneCycle )$selectedCycle#end
80 80  ### END USER & CYCLE
81 81  ##
82 82  ## title
... ... @@ -91,43 +91,45 @@
91 91  ## search theses
92 92  #set( $thesisNo = 0 )
93 93  #foreach( $year in $yearList )
94 - #set( $thesisYearNo = 0 )
95 - #if( !$oneYear )
88 + #if( !$oneYear || $selectedYear == $year )
89 + #set( $thesisYearNo = 0 )
90 + #if( !$oneYear )
96 96  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
97 - #end
92 + #end
98 98  ## some selected year or year list / now $year
99 - #foreach( $cycle in $allThesisCycles )
100 - #set( $thesisYearCycleNo = 0 )
101 - #if( !$oneCycle || $selectedCycle == $cycle )
94 + #foreach( $cycle in $allThesisCycles )
95 + #set( $thesisYearCycleNo = 0 )
96 + #if( !$oneCycle || $selectedCycle == $cycle )
102 102  ## some selected cycle or all cycles / now $cycle
103 - #if( $oneUser)
104 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
105 - 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" )
106 - #else
107 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
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 prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and year(prop1.value) = '$year' order by prop1.value desc" )
109 - #end
110 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
111 - #set( $thesisFoundNo = $thesisFound.size() )
112 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
113 - #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 )
114 114  (% 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}}
115 - #end
116 - #foreach( $thesis in $thesisFound )
117 - #set( $thesisDoc = $xwiki.getDocument($thesis) )
118 - #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') )
119 119  * [[$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
120 120  
121 - #end
122 - #if( $thesisFoundNo > 0 && !$oneCycle )
116 + #end
117 + #if( $thesisFoundNo > 0 && !$oneCycle )
123 123  (% 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 )
124 124   #end
125 125   #end
126 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
127 - #end
128 - #if( !$oneYear )
124 + #if( !$oneYear )
129 129  (% 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
130 130   #end
131 -#end
132 132  {{id name='bottom'/}}
133 133  {{/velocity}}