Changes for page Per Year
From version 125.1
edited by Andrea Omicini
on 10/03/2022 12:33
on 10/03/2022 12:33
Change comment:
There is no comment for this version
To version 120.15
edited by Andrea Omicini
on 30/10/2021 19:37
on 30/10/2021 19:37
Change comment:
There is no comment for this version
Summary
-
Page properties (3 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,0 +1,1 @@ 1 +#if($xcontext.language=='it')Tesi per anno#{else}Theses per Year#end - Default language
-
... ... @@ -1,0 +1,1 @@ 1 +en - Content
-
... ... @@ -1,6 +1,4 @@ 1 -= {{italiano}}Per anno e livello{{/italiano}}{{english}}Per Year & Cycle{{/english}} = 2 - 3 -{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}} 1 +{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 4 4 #set( $thesisMenu = true ) 5 5 ## get environment variables & derived 6 6 #set( $firstYear = $mathtool.toInteger($firstYearTh) ) ... ... @@ -94,7 +94,7 @@ 94 94 ### END CYCLE 95 95 ## 96 96 ## title 97 ->#if( $oneCycle ){{thesisCycle uppercase='yes' short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / **$userFirstName $userLastName**#end{{id name='top'/}}95 +>#if( $oneCycle ){{thesisCycle uppercase='yes' short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}} 98 98 ## index 99 99 #if( !$oneYear ) 100 100 (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if ($velocityCount > 1) | #end[[$year>>||anchor="$year"]]#end))) ... ... @@ -107,7 +107,7 @@ 107 107 #foreach( $year in $yearList ) 108 108 #set( $thesisYearNo = 0 ) 109 109 #if( !$oneYear ) 110 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc.name||queryString= 'year=$year#if( $oneCycle )&cycle=$selectedCycle#end']]108 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc.name||queryString=$year]] 111 111 #end 112 112 ## some selected year or year list / now $year 113 113 #foreach( $cycle in $allThesisCycles ) ... ... @@ -116,19 +116,22 @@ 116 116 ## some selected cycle or all cycles / now $cycle 117 117 #if( $oneUser) 118 118 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5 119 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' 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 prop5.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and prop2.value = 'Completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" ) 117 + 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 prop5.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and prop2.value = 'Completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" ) 120 120 #else 121 121 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2 122 - where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' 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 = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and prop2.value = 'Completed' order by prop1.value desc" ) 120 + 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 = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and prop2.value = 'Completed' order by prop1.value desc" ) 123 123 #end 124 124 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 125 125 #set( $thesisFoundNo = $thesisFound.size() ) 126 126 #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo ) 127 127 #if( $thesisFoundNo > 0 && !$oneCycle ) 128 -(% 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}}>>$doc.name||queryString='cycle=$cycle&year=$year']]126 +(% 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}} 129 129 #end 130 130 #foreach( $thesis in $thesisFound ) 131 -* {{thesis}}$thesis{{/thesis}} 129 + #set( $thesisDoc = $xwiki.getDocument($thesis) ) 130 + #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') ) 131 +* [[$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 132 + 132 132 #end 133 133 #if( $thesisFoundNo > 0 && !$oneCycle ) 134 134 (% 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"]] ... ... @@ -142,7 +142,7 @@ 142 142 #set( $thesisNo = $thesisNo + $thesisYearNo ) 143 143 #end 144 144 #if( $thesisNo > 0 ) 145 -(% style="text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor ; border-color:$theme.borderColor; border-bottom-style:dotted" %)|($thesisNo #if( $oneCycle )#if($thesisNo == 1){{thesisCycle plural='no' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#else{{thesisCycle plural='yes' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#end#else#if($thesisNo == 1){{stringEngIta eng='thesis' ita='tesi'/}}#else{{stringEngIta eng='theses' ita='tesi'/}}#end#end#if( $oneYear ) {{stringEngIta eng='in' ita='nel'/}} $selectedYear#else {{stringEngIta eng='from' ita='dal'/}} $firstYear {{stringEngIta eng='to' ita='al'/}} $lastYear#end)146 +(% style="text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|($thesisNo #if( $oneCycle )#if($thesisNo == 1){{thesisCycle plural='no' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#else{{thesisCycle plural='yes' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#end#else#if($thesisNo == 1){{stringEngIta eng='thesis' ita='tesi'/}}#else{{stringEngIta eng='theses' ita='tesi'/}}#end#end#if( $oneYear ) {{stringEngIta eng='in' ita='nel'/}} $selectedYear#else {{stringEngIta eng='from' ita='dal'/}} $firstYearTh {{stringEngIta eng='to' ita='al'/}} $lastYearTh#end) 146 146 #end 147 147 {{id name='bottom'/}} 148 148 {{/velocity}}