Changes for page Per Year

From version 96.5
edited by Andrea Omicini
on 30/10/2021 16:36
Change comment: There is no comment for this version
To version 96.3
edited by Andrea Omicini
on 30/10/2021 16:14
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -98,20 +98,22 @@
98 98   #foreach( $cycle in $allThesisCycles )
99 99   #set( $thesisYearCycleNo = 0 )
100 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( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
112 - #if( $thesisFoundNo > 0 && !$oneCycle )
113 -(% 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}}
114 - #end
101 + #if( $role == "contact" )
102 + #set( $selectedRoleFieldName = "contacts" )
103 + #elseif( $role == "cosupervisor" )
104 + #set( $selectedRoleFieldName = "cosupervisors" )
105 + #else
106 + #set( $selectedRoleFieldName = "supervisors" )
107 + #end
108 +## some selected role or all roles / now $role
109 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
110 + 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" )
111 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
112 + #set( $thesisFoundNo = $thesisFound.size() )
113 + #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
114 + #if( $thesisFoundNo > 0 && !$oneRole )
115 +(% 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}}
116 + #end
115 115   #foreach( $thesis in $thesisFound )
116 116   #set($thesisDoc = $xwiki.getDocument($thesis))
117 117   #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
... ... @@ -122,7 +122,7 @@
122 122  (% style="border-style:#if( $oneStatus )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( $oneStatus ){{id name='$role-bottom'/}}#else{{id name='$role-$status-bottom'/}}#end($thesisStatusRoleNo #if( $thesisStatusRoleNo == 1 ){{thesisStatus plural='no' uppercase='no' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='yes' uppercase='no' short='no'}}$status{{/thesisStatus}}#end {{stringEngIta eng='as' ita='come'/}} {{thesisRole short='yes'}}$role{{/thesisRole}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
123 123   #end
124 124   #end
125 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
127 + #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
126 126   #end
127 127  ## no user selected, no role selected
128 128   #else