Changes for page Per Year
From version 156.1
edited by Andrea Omicini
on 30/06/2023 21:36
on 30/06/2023 21:36
Change comment:
There is no comment for this version
To version 130.2
edited by Andrea Omicini
on 27/01/2023 19:27
on 27/01/2023 19:27
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,0 @@ 1 -$services.localization.render('peryear') - Content
-
... ... @@ -1,152 +1,156 @@ 1 += {{italiano}}Per anno e livello{{/italiano}}{{english}}Per Year & Cycle{{/english}} = 1 1 2 -1. List item 3 -1. List item 4 -1. List item 5 -{{velocity}} 6 -{{html wiki="true" clean="false"}} 7 -#template('apice_boolean.vm') 8 -#### SET PARAMETERS / START 9 -#template('apice_theses.vm') 10 -#template('apice_user_param.vm') 11 -## years / personal 12 -#if( $isUserSpace ) 13 - #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser 14 - 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' " ) 15 - #set( $personalThesisDocs = $xwiki.searchDocuments($query) ) 16 - #if( $personalThesisDocs.size() > 0 ) 17 - #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) ) 18 - #else 19 - #stop 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 +#set( $yearPar = 0 ) 10 +#set( $fromPar = 0 ) 11 +#set( $toPar = 0 ) 12 +### START YEAR 13 +## defaults 14 +#set( $oneYear = false ) 15 +#set( $selectedYear = '' ) 16 +## year parameters 17 +#if( $request.year ) 18 + #set( $yearPar = $mathtool.toInteger($request.year) ) 19 +#end 20 +#if( $request.from ) 21 + #set( $fromPar = $mathtool.toInteger($request.from) ) 22 +#end 23 +#if( $request.to ) 24 + #set( $toPar = $mathtool.toInteger($request.to) ) 25 +#end 26 +##set years 27 +#if( $yearPar > 0 ) 28 + #set( $oneYear = true ) 29 + #set( $firstYear = $yearPar ) 30 + #set( $lastYear = $yearPar ) 31 + #set( $selectedYear = $yearPar ) 32 + #set( $yearList = [$yearPar] ) 33 +#else 34 + #if( $fromPar != '' && $fromPar > 0 && ($fromPar > $firstYear) ) 35 + #set( $firstYear = $fromPar ) 36 + #set( $yearList = [$lastYear..$firstYear] ) 20 20 #end 21 - #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" ) 22 - #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') ) 38 + #if( $toPar != '' && $toPar > 0 && ($toPar < $lastYear) ) 39 + #set( $lastYear = $toPar ) 40 + #set( $yearList = [$lastYear..$firstYear] ) 23 23 #end 24 - #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" ) 25 - #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') ) 26 - #end 27 -#end 28 -## years / parameters takes precedence 29 -#set( $firstYear = $firstYearThesis ) 30 -#set( $lastYear = $lastYearThesis ) 31 -#template('apice_year_param.vm') 32 -## 33 -## CYCLES / START 34 -## $cycleList gets the list of cycles to be shown 35 -## $oneCycle true if just one cycle to be shown 36 -#if( $request.cycle && $request.cycle.trim() != "" ) 37 - #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 38 - #if( $thesisCycles.contains($cyclePar) ) 39 -## 'cycle' parameter is an admissible thesis cycle value 40 - #set( $cycleList = [$cyclePar]) 41 - #set( $oneCycle = true ) 42 - #set( $cycle = $cyclePar ) 42 + #if( $lastYear <= $firstYear ) 43 + #set( $oneYear = true ) 44 + #set( $lastYear = $firstYear ) 45 + #set( $selectedYear = $firstYear ) 46 + #set( $yearList = [$firstYear] ) 43 43 #else 44 -## 'cycle' parameter is not an admissible thesis cycle value 45 -{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}} 46 - #stop 48 + #set( $yearList = [$lastYear..$firstYear] ) 47 47 #end 48 -#else 49 -## default: all cycles 50 - #set( $cycleList = $showcaseThesisCycles ) 51 - #set( $oneCycle = false ) 52 - #set( $cycle = "" ) 53 53 #end 54 -## INVARIANT:$oneCycleand $cycleList arecorrectlyand coherentlyinitialised55 -## CYCLES / END51 +## $selectedYear, $yearList and $oneYear set properly 52 +### END YEAR 56 56 ## 57 -#### SET PARAMETERS / END 58 -## 59 -## DATA STRUCTURES / START 60 -#set( $itemMap = {} ) 61 -#set( $itemNo = 0 ) 62 -#foreach( $year in $yearList ) 63 - #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 64 - 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" ) 65 -## do query 66 - #set( $itemFound = $xwiki.searchDocuments($query) ) 67 -## set counters 68 - #set( $itemYearNo = $itemFound.size() ) 69 - #if( $itemYearNo > 0 ) 70 - #set( $itemMap[$year] = $itemFound ) 71 - #set( $itemNo = $itemNo + $itemYearNo ) 72 - #end 54 +### START USER 55 +## default values 56 +#set( $oneUser = false ) 57 +#set( $selectedUser = '' ) 58 +#set( $userFirstName = "" ) 59 +#set( $userLastName = "" ) 60 +## user parameter 61 +#if( $request.user ) 62 + #set( $userNamePar = $request.user.trim() ) 73 73 #end 74 -## DATA STRUCTURES / END 75 -## 76 -## DISPLAY / START 77 -## page subtitle 78 -<div class="mainheader"> 79 -$itemNo 80 -#if( $itemNo == 1 ) 81 - #if( $oneCycle ) 82 - {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}} 64 +#if( $userName || $userNamePar ) 65 +## try to specify a user 66 + #if( !$userName ) 67 + #set( $selectedUser = "XWiki.$userNamePar" ) 83 83 #else 84 - $services.localization.render('thesis').toLowerCase()69 + #set( $selectedUser = $userName ) 85 85 #end 86 -#{else} 87 - #if( $oneCycle ) 88 - {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}} 71 + #if( $xwiki.exists($selectedUser) ) 72 + #set( $oneUser = true ) 73 + #set( $userdoc = $xwiki.getDocument($selectedUser) ) 74 + #set( $userFirstName = $userdoc.display("first_name") ) 75 + #set( $userLastName = $userdoc.display("last_name") ) 89 89 #else 90 - $services.localization.render('theses').toLowerCase() 77 +{{warning}} $selectedUser is not an {{apice/}} user{{/warning}} 78 + #stop 91 91 #end 92 -#{end} 93 -<span class="textsecondary"> / </span> 94 -#if( $oneYear ) 95 - $year 96 -#else 97 - $firstYear–$lastYear 98 -#{end} 99 -#if( $oneUser ) 100 - <span class="textsecondary"> / </span> 101 - $userFirstName $userLastName 102 102 #end 103 -</div> 104 -## stop if no thesis is found 105 -#if( $itemNo == 0 || $itemMap.keySet().size() == 0 ) 106 -## redundant double check 107 - #stop 81 +## $selectedUser and $oneUser set properly 82 +### END USER 83 +## 84 +### START CYCLE 85 +#set( $oneCycle = false ) 86 +#set( $selectedCycle = '' ) 87 +## cycle parameter 88 +#if( $request.cycle ) 89 + #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 108 108 #end 109 -## some theses found 110 -## page index 111 -#if( $itemMap.keySet().size() > 1 ) 112 -## found more than one year 113 -<div class="mainselectbar" id="index"> 114 - #foreach( $year in $itemMap.keySet() ) 115 - #if( !$foreach.first ) 116 -  •  117 - #end 118 - [[$year>>||anchor="$year"]] 119 - #end 120 -</div> 91 +## set cycle 92 +#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 93 + #set( $oneCycle = true ) 94 + #set( $selectedCycle = $cyclePar ) 121 121 #end 122 -## theses displayed per year 123 -## 124 -#template('apice_thesis_macros.vm') 125 -## 126 -#foreach( $year in $itemMap.keySet() ) 127 -## year top / start 128 -<div class="mainselectseparator"> 129 - <a class="mainselectseparatorlink" id="$year" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end#if( $oneCycle )&cycle=$cycle#end")> 130 - $year 131 - </a> 132 -</div> 133 -## year top / end 134 -## 135 -## year display / start 136 -<div style="font-style: normal"><ul> 137 -#foreach( $item in $itemMap[$year] ) 138 -<li>#thesislinked($item)</li> 96 +## $selectedCycle and $oneCycle set properly 97 +#if( $showPhDTheses ) 98 + #set( $cycles = $allThesisCycles ) 99 +#else 100 + #set( $cycles = $lowThesisCycles ) 139 139 #end 140 -</ul></div> 141 -## year display / end 102 +### END CYCLE 142 142 ## 143 -## year bottom / start 144 -<div #if( $foreach.last )id="bottom"#end class="mainselectbottom"> 145 - #set( $itemYearNo = $itemMap[$year].size() ) 146 -$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 • #anchorlinks() 147 -## year bottom / end 148 -</div> 104 +## title 105 +>#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'/}} 106 +## index 107 +#if( !$oneYear ) 108 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if( $foreach.index > 0 ) | #end[[$year>>||anchor="$year"]]#end))) 109 +###elseif( $oneUser && !$oneCycle ) 110 +#elseif( !$oneCycle ) 111 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $cycles )#if( $foreach.index > 0 ) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end))) 112 +#end{{id name='index'/}} 113 +## search theses 114 +#set( $thesisNo = 0 ) 115 +#foreach( $year in $yearList ) 116 + #set( $thesisYearNo = 0 ) 117 + #if( !$oneYear ) 118 +(% 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']] 119 + #end 120 +## some selected year or year list / now $year 121 + #foreach( $cycle in $cycles ) 122 + #set( $thesisYearCycleNo = 0 ) 123 + #if( !$oneCycle || $selectedCycle == $cycle ) 124 +## some selected cycle or all cycles / now $cycle 125 + #if( $oneUser) 126 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5 127 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' 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 = 'end' 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 lower(prop2.value) = 'completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" ) 128 + #else 129 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2 130 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' 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 = 'end' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and lower(prop2.value) = 'completed' order by prop1.value desc" ) 131 + #end 132 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 133 + #set( $thesisFoundNo = $thesisFound.size() ) 134 + #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo ) 135 + #if( $thesisFoundNo > 0 && !$oneCycle ) 136 +(% 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']] 137 + #end 138 + #foreach( $thesis in $thesisFound ) 139 +* {{thesis}}$thesis{{/thesis}} 140 + #end 141 + #if( $thesisFoundNo > 0 && !$oneCycle ) 142 +(% 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"]] 143 + #end 144 + #end 145 + #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo ) 146 + #end 147 + #if( !$oneYear ) 148 +(% 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"]] 149 + #end 150 + #set( $thesisNo = $thesisNo + $thesisYearNo ) 149 149 #end 150 -## DISPLAY / END 151 -{{/html}} 152 -{{/velocity}}{{pageDisplay sort="objectservice"/}} 152 +#if( $thesisNo > 0 ) 153 +(% 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) 154 +#end 155 +{{id name='bottom'/}} 156 +{{/velocity}}