Changes for page Per Year
From version 101.1
edited by Andrea Omicini
on 30/10/2021 16:49
on 30/10/2021 16:49
Change comment:
There is no comment for this version
To version 103.1
edited by Andrea Omicini
on 30/10/2021 17:07
on 30/10/2021 17:07
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -34,8 +34,6 @@ 34 34 #set( $yearList = [$lastYear..$firstYear] ) 35 35 #end 36 36 #end 37 -$oneYear 38 -$yearList 39 39 ### END YEAR 40 40 ## 41 41 ### START USER & CYCLE ... ... @@ -70,9 +70,15 @@ 70 70 #end 71 71 #end 72 72 ## $oneUser and $oneCycle set properly 73 -#if( $oneYear )$selectedYear#end 74 -#if( $oneUser )$selectedUser#end 75 -#if( $oneCycle )$selectedCycle#end 71 +#if( $oneYear ) 72 + $selectedYear 73 +#end 74 +#if( $oneUser ) 75 + $selectedUser 76 +#end 77 +#if( $oneCycle ) 78 + $selectedCycle 79 +#end 76 76 ### END USER & CYCLE 77 77 ## 78 78 ## title ... ... @@ -87,45 +87,43 @@ 87 87 ## search theses 88 88 #set( $thesisNo = 0 ) 89 89 #foreach( $year in $yearList ) 90 - #if( !$oneYear || $selectedYear == $year ) 91 - #set( $thesisYearNo = 0 ) 92 - #if( !$oneYear ) 94 + #set( $thesisYearNo = 0 ) 95 + #if( !$oneYear ) 93 93 (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year 94 - 97 + #end 95 95 ## some selected year or year list / now $year 96 - 97 - 98 - 99 + #foreach( $cycle in $allThesisCycles ) 100 + #set( $thesisYearCycleNo = 0 ) 101 + #if( !$oneCycle || $selectedCycle == $cycle ) 99 99 ## some selected cycle or all cycles / now $cycle 100 - 101 - 102 - 103 - 104 - 105 - 106 - 107 - 108 - 109 - 110 - 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 ) 111 111 (% 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}} 112 - 113 - 114 - 115 - 115 + #end 116 + #foreach( $thesis in $thesisFound ) 117 + #set( $thesisDoc = $xwiki.getDocument($thesis) ) 118 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') ) 116 116 * [[$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 117 117 118 - 119 - 121 + #end 122 + #if( $thesisFoundNo > 0 && !$oneCycle ) 120 120 (% 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"]] 121 - #end 122 - #end 123 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo ) 124 124 #end 125 125 #end 126 - #if( !$oneYear ) 126 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo ) 127 + #end 128 + #if( !$oneYear ) 127 127 (% 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"]] 128 - #end 129 129 #end 131 +#end 130 130 {{id name='bottom'/}} 131 131 {{/velocity}}