Changes for page Per Year
From version 126.2
edited by Andrea Omicini
on 10/03/2022 13:41
on 10/03/2022 13:41
Change comment:
There is no comment for this version
To version 152.1
edited by Andrea Omicini
on 30/06/2023 21:20
on 30/06/2023 21:20
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,0 +1,1 @@ 1 +$services.localization.render('peryear') - Content
-
... ... @@ -1,148 +1,125 @@ 1 -= {{italiano}}Per anno e livello{{/italiano}}{{english}}Per Year & Cycle{{/english}} = 2 - 3 -{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}} 4 -#set( $thesisMenu = true ) 5 -## get environment variables & derived 6 -#set( $firstYear = $mathtool.toInteger($firstYearThesis) ) 7 -#set( $lastYear = $mathtool.toInteger($lastYearThesis) ) 8 -#set( $yearList = [$lastYear..$firstYear] ) 9 -### START YEAR 10 -## defaults 11 -#set( $oneYear = false ) 12 -#set( $selectedYear = '' ) 13 -## year parameters 14 -#if( $request.year ) 15 - #set( $yearPar = $mathtool.toInteger($request.year) ) 16 -#end 17 -#if( $request.from ) 18 - #set( $fromPar = $mathtool.toInteger($request.from) ) 19 -#end 20 -#if( $request.to ) 21 - #set( $toPar = $mathtool.toInteger($request.to) ) 22 -#end 23 -##set years 24 -#if( $yearPar > 0 ) 25 - #set( $oneYear = true ) 26 - #set( $firstYear = $yearPar ) 27 - #set( $lastYear = $yearPar ) 28 - #set( $selectedYear = $yearPar ) 29 - #set( $yearList = [$yearPar] ) 30 -#else 31 - #if( $fromPar != '' && ($fromPar > $firstYear) ) 32 - #set( $firstYear = $fromPar ) 33 - #set( $yearList = [$lastYear..$firstYear] ) 1 +{{velocity}} 2 +{{html wiki="true" clean="false"}} 3 +#template('apice_boolean.vm') 4 +#### HANDLE PARAMETERS / START 5 +#template('apice_theses.vm') 6 +#template('apice_user_param.vm') 7 +## years / personal 8 +#if( $isUserSpace ) 9 + #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser 10 + where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${objectSpace}.Personal.${objectClass}' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " ) 11 + #set( $personalThesisDocs = $xwiki.searchDocuments($query) ) 12 + #if( $personalThesisDocs.size() > 0 ) 13 + #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) ) 14 + #else 15 + #stop 34 34 #end 35 - #if( $toPar != '' && ($toPar < $lastYear) ) 36 - #set( $lastYear = $toPar ) 37 - #set( $yearList = [$lastYear..$firstYear] ) 17 + #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" ) 18 + #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') ) 38 38 #end 39 - #if( $lastYear <= $firstYear ) 40 - #set( $oneYear = true ) 41 - #set( $lastYear = $firstYear ) 42 - #set( $selectedYear = $firstYear ) 43 - #set( $yearList = [$firstYear] ) 20 + #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" ) 21 + #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') ) 22 + #end 23 +#end 24 +## years / parameters takes precedence 25 +#set( $firstYear = $firstYearThesis ) 26 +#set( $lastYear = $lastYearThesis ) 27 +#template('apice_year_param.vm') 28 +#### handle cycle 29 +## $cycleList gets the list of cycles to be shown 30 +## $oneCycle true if just one cycle to be shown 31 +#if( $request.cycle && $request.cycle.trim() != "" ) 32 + #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 33 + #if( $thesisCycles.contains($cyclePar) ) 34 +## 'cycle' parameter is an admissible thesis cycle value 35 + #set( $cycleList = [$cyclePar]) 36 + #set( $oneCycle = true ) 37 + #set( $cycle = $cyclePar ) 44 44 #else 45 - #set( $yearList = [$lastYear..$firstYear] ) 39 +## 'cycle' parameter is not an admissible thesis cycle value 40 +{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}} 41 + #stop 46 46 #end 43 +#else 44 +## default: all cycles 45 + #set( $cycleList = $showcaseThesisCycles ) 46 + #set( $oneCycle = false ) 47 + #set( $cycle = "" ) 47 47 #end 48 -## $ selectedYear,$yearList and$oneYearsetproperly49 -### ENDYEAR49 +## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised 50 +#### HANDLE PARAMETERS / END 50 50 ## 51 -### START USER 52 -## default values 53 -#set( $oneUser = false ) 54 -#set( $selectedUser = '' ) 55 -#set( $userFirstName = "" ) 56 -#set( $userLastName = "" ) 57 -## user parameter 58 -#if( $request.user ) 59 - #set( $userNamePar = $request.user.trim() ) 52 +## DATA STRUCTURES / START 53 +#set( $itemMap = {} ) 54 +#set( $itemNo = 0 ) 55 +#foreach( $year in $yearList ) 56 + #set( $query = ", BaseObject as objThesis #if( $oneCycle ), StringProperty as propCycle #end, DateProperty as propEnddate, StringProperty as propStatus, LargeStringProperty as propSupervisor, LargeStringProperty as propCosupervisor, LargeStringProperty as propContact 57 + where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propEnddate.id.id = objThesis.id and propStatus.id.id = objThesis.id and propSupervisor.id.id = objThesis.id and propCosupervisor.id.id = objThesis.id and propContact.id.id = objThesis.id and propEnddate.name = 'end' and propStatus.name = 'status' and propSupervisor.name = 'supervisors' and propCosupervisor.name = 'cosupervisors' and propContact.name = 'contacts' #if( $oneCycle ) and propCycle.id.id = objThesis.id and propCycle.name = 'cycle' and propCycle.value = '$cycle' #end and year(propEnddate.value) = $year and lower(propStatus.value) = 'completed' #if( $oneUser )and ( propSupervisor.value like '%$userString%' or propCosupervisor.value like '%$userString%' or propContact.value like '%$userString%' )#end order by propEnddate.value desc" ) 58 +## do query 59 + #set( $itemFound = $xwiki.searchDocuments($query) ) 60 +## set counters 61 + #set( $itemYearNo = $itemFound.size() ) 62 + #if( $itemYearNo > 0 ) 63 + #set( $itemMap[$year] = $itemFound ) 64 + #set( $itemNo = $itemNo + $itemYearNo ) 65 + #end 60 60 #end 61 -#if( $userName || $userNamePar ) 62 -## try to specify a user 63 - #if( !$userName ) 64 - #set( $selectedUser = "XWiki.$userNamePar" ) 67 +## DATA STRUCTURES / END 68 +## 69 +## DISPLAY / START 70 +## page subtitle 71 +<div class="mainheader"> 72 +$itemNo 73 +#if( $itemNo == 1 ) 74 + #if( $oneCycle ) 75 + {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}} 65 65 #else 66 - #set($selectedUser= $userName77 + $services.localization.render('thesis').toLowerCase() 67 67 #end 68 - #if( $xwiki.exists($selectedUser) ) 69 - #set( $oneUser = true ) 70 - #set( $userdoc = $xwiki.getDocument($selectedUser) ) 71 - #set( $userFirstName = $userdoc.display("first_name") ) 72 - #set( $userLastName = $userdoc.display("last_name") ) 79 +#{else} 80 + #if( $oneCycle ) 81 + {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}} 73 73 #else 74 -{{warning}} $selectedUser is not an {{apice/}} user{{/warning}} 75 - #stop 83 + $services.localization.render('theses').toLowerCase() 76 76 #end 85 +#{end} 86 +<span class="textsecondary"> / </span> 87 +#if( $oneYear ) 88 + $year 89 +#else 90 + $firstYear–$lastYear 91 +#{end} 92 +#if( $oneUser ) 93 + <span class="textsecondary"> / </span> 94 + $userFirstName $userLastName 77 77 #end 78 -## $selectedUser and $oneUser set properly 79 -### END USER 80 -## 81 -### START CYCLE 82 -#set( $oneCycle = false ) 83 -#set( $selectedCycle = '' ) 84 -## cycle parameter 85 -#if( $request.cycle ) 86 - #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 96 +</div> 97 +## stop if no thesis is found 98 +#if( $itemNo == 0 || $itemMap.keySet().size() == 0 ) 99 +## redundant double check 100 + #stop 87 87 #end 88 -## set cycle 89 -#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 90 - #set( $oneCycle = true ) 91 - #set( $selectedCycle = $cyclePar ) 102 +## some theses found 103 +## page index 104 +#if( $itemMap.keySet().size() > 1 ) 105 +## found more than one year 106 +{{id name="index"/}} 107 +(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $itemMap.keySet() )#if( !$foreach.first ) | #end[[$year>>$doc||anchor=$year]]#end))) 92 92 #end 93 -## $selectedCycle and $oneCycle set properly 94 -### END CYCLE 109 +## theses displayed per year 95 95 ## 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'/}} 98 -## index 99 -#if( !$oneYear ) 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))) 101 -###elseif( $oneUser && !$oneCycle ) 102 -#elseif( !$oneCycle ) 103 -(% 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))) 104 -#end{{id name='index'/}} 105 -## search theses 106 -#set( $thesisNo = 0 ) 107 -#foreach( $year in $yearList ) 108 - #set( $thesisYearNo = 0 ) 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']] 111 - #end 112 -## some selected year or year list / now $year 113 - #foreach( $cycle in $allThesisCycles ) 114 - #set( $thesisYearCycleNo = 0 ) 115 - #if( !$oneCycle || $selectedCycle == $cycle ) 116 -## some selected cycle or all cycles / now $cycle 117 - #if( $oneUser) 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" ) 120 - #else 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" ) 123 - #end 124 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 125 - #set( $thesisFoundNo = $thesisFound.size() ) 126 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo ) 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']] 129 - #end 130 - #foreach( $thesis in $thesisFound ) 131 -* {{thesis}}$thesis{{/thesis}} 132 - #end 133 - #if( $thesisFoundNo > 0 && !$oneCycle ) 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"]] 135 - #end 136 - #end 137 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo ) 138 - #end 139 - #if( !$oneYear ) 140 -(% 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"]] 141 - #end 142 - #set( $thesisNo = $thesisNo + $thesisYearNo ) 111 +#template('apice_thesis_macros.vm') 112 +## 113 +#foreach( $year in $itemMap.keySet() ) 114 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc||style="text-decoration:none; color:$theme.textPrimaryColor" queryString='year=$year#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end#if( $oneCycle )&cycle=$cycle#end']] 115 +<div style="font-style: normal"><ul> 116 +#foreach( $item in $itemMap[$year] ) 117 +<li>#thesislinked($item)</li> 143 143 #end 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) 119 +</ul></div> 120 + #set( $itemYearNo = $itemMap[$year].size() ) 121 +(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 146 146 #end 147 -{{ id name='bottom'/}}123 +{{/html}} 148 148 {{/velocity}} 125 +{{id name="bottom"/}}