Changes for page Per Year

From version 96.2
edited by Andrea Omicini
on 30/10/2021 16:11
Change comment: There is no comment for this version
To version 96.4
edited by Andrea Omicini
on 30/10/2021 16:33
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -89,30 +89,26 @@
89 89  ## search theses
90 90  #set( $thesisNo = 0 )
91 91  #foreach( $year in $yearList )
92 - #if( !$oneStatus || $selectedStatus == $status )
93 - #set( $thesisStatusNo = 0 )
94 - #if( !$oneStatus )
95 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}{{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}
92 + #if( !$oneYear || $selectedYear == $year )
93 + #set( $thesisYearNo = 0 )
94 + #if( !$oneYear )
95 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
96 96   #end
97 -## some selected status or all statuses / now $status
98 - #if( $oneUser )
99 -## some user selected
100 - #foreach( $role in $allThesisRoles )
101 - #set( $thesisStatusRoleNo = 0 )
102 - #if( !$oneRole || $selectedRole == $role )
103 - #if( $role == "contact" )
104 - #set( $selectedRoleFieldName = "contacts" )
105 - #elseif( $role == "cosupervisor" )
106 - #set( $selectedRoleFieldName = "cosupervisors" )
107 - #else
108 - #set( $selectedRoleFieldName = "supervisors" )
109 - #end
110 -## some selected role or all roles / now $role
111 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
112 - 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 prop0.name = 'status' and prop1.name = '$selectedRoleFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )
113 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
114 - #set( $thesisFoundNo = $thesisFound.size() )
115 - #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
97 +## some selected year or year list / now $year
98 + #foreach( $cycle in $allThesisCycles )
99 + #set( $thesisYearCycleNo = 0 )
100 + #if( !$oneCycle || $selectedCycle == $cycle )
101 +## some selected cycle or all cycles / now $cycle
102 + #if( $oneUser)
103 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
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 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%' || prop3.value like '%$selectedUser%' || prop4.value like '%$selectedUser%' ) order by prop2.value desc" )
105 + #else
106 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
107 + 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 prop2.value desc" )
108 + #end
109 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
110 + #set( $thesisFoundNo = $thesisFound.size() )
111 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
116 116   #if( $thesisFoundNo > 0 && !$oneRole )
117 117  (% style="border-style:#if( $oneStatus )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneStatus ){{id name='$role'/}}#else{{id name='$status-$role'/}}#end{{thesisRole plural='no' uppercase='yes' short='yes'}}$role{{/thesisRole}}
118 118   #end