Changes for page Per Year
From version 100.2
edited by Andrea Omicini
on 30/10/2021 16:46
on 30/10/2021 16:46
Change comment:
There is no comment for this version
To version 96.3
edited by Andrea Omicini
on 30/10/2021 16:14
on 30/10/2021 16:14
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -83,6 +83,9 @@ 83 83 #elseif( !$oneCycle ) 84 84 (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $allThesisCycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end))) 85 85 #end{{id name='index'/}} 86 + 87 +#stop 88 + 86 86 ## search theses 87 87 #set( $thesisNo = 0 ) 88 88 #foreach( $year in $yearList ) ... ... @@ -95,36 +95,52 @@ 95 95 #foreach( $cycle in $allThesisCycles ) 96 96 #set( $thesisYearCycleNo = 0 ) 97 97 #if( !$oneCycle || $selectedCycle == $cycle ) 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 ) 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') ) 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 117 + #foreach( $thesis in $thesisFound ) 118 + #set($thesisDoc = $xwiki.getDocument($thesis)) 119 + #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 117 #end 118 - #if( $thesisFoundNo > 0 && !$one Cycle )119 -(% style="border-style:#if( $one Year)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 ){{thesisCycleplural='no' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#else{{thesisCycleplural='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"]]123 + #if( $thesisFoundNo > 0 && !$oneRole ) 124 +(% 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"]] 120 120 #end 121 121 #end 122 - #set( $thesis YearNo = $thesisYearNo + $thesisYearCycleNo )127 + #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo ) 123 123 #end 129 +## no user selected, no role selected 130 + #else 131 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 132 + 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 = 'status' and prop1.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' order by prop1.value desc" ) 133 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 134 + #set( $thesisFoundNo = $thesisFound.size() ) 135 + #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo ) 136 + #foreach( $thesis in $thesisFound ) 137 + #set($thesisDoc = $xwiki.getDocument($thesis)) 138 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 139 +* [[$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 140 + 141 + #end 124 124 #end 125 - #if( !$one Year)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" %)|($thesis YearNo #if($thesisYearNo == 1){{stringEngItaeng='thesisin'ita='tesinel'/}}#else{{stringEngItaeng='thesesin'ita='tesinel'/}}#end$year{{id name='$year-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]143 + #if( !$oneStatus ) 144 +(% 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" %)|($thesisStatusNo #if($thesisStatusNo == 1){{thesisStatus plural='false' uppercase='false' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='true' uppercase='false' short='no'}}$status{{/thesisStatus}}#end{{id name='$status-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 127 127 #end 128 128 #end 147 +#end 129 129 {{id name='bottom'/}} 130 130 {{/velocity}}