Changes for page Per Year
From version 131.1
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
To version 165.1
edited by Andrea Omicini
on 06/07/2023 19:27
on 06/07/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,0 +1,1 @@ 1 +$services.localization.render('peryear') - Content
-
... ... @@ -1,156 +1,163 @@ 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 -#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] ) 1 +{{velocity}} 2 +{{html wiki="true" clean="false"}} 3 +#template('apice_macros.vm') 4 +#setobjectspace("Theses") 5 +#template('apice_thesis_macros.vm') 6 +#### SET PARAMETERS / START 7 +#template('apice_user_param.vm') 8 +## years / personal 9 +#if( $isUserSpace ) 10 + #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser 11 + where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${mainSpace}.Personal.Class' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " ) 12 + #set( $personalThesisDocs = $xwiki.searchDocuments($query) ) 13 + #if( $personalThesisDocs.size() > 0 ) 14 + #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) ) 15 + #else 16 + #stop 37 37 #end 38 - #if( $toPar != '' && $toPar > 0 && ($toPar < $lastYear) ) 39 - #set( $lastYear = $toPar ) 40 - #set( $yearList = [$lastYear..$firstYear] ) 18 + #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" ) 19 + #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') ) 41 41 #end 42 - #if( $lastYear <= $firstYear ) 43 - #set( $oneYear = true ) 44 - #set( $lastYear = $firstYear ) 45 - #set( $selectedYear = $firstYear ) 46 - #set( $yearList = [$firstYear] ) 21 + #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" ) 22 + #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') ) 23 + #end 24 +#end 25 +## years / parameters takes precedence 26 +#set( $firstYear = $firstYearThesis ) 27 +#set( $lastYear = $lastYearThesis ) 28 +#template('apice_year_param.vm') 29 +## 30 +## CYCLES / START 31 +## $cycleList gets the list of cycles to be shown 32 +## $oneCycle true if just one cycle to be shown 33 +#if( $request.cycle && $request.cycle.trim() != "" ) 34 + #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 35 + #if( $thesisCycles.contains($cyclePar) ) 36 +## 'cycle' parameter is an admissible thesis cycle value 37 + #set( $cycleList = [$cyclePar]) 38 + #set( $oneCycle = true ) 39 + #set( $cycle = $cyclePar ) 47 47 #else 48 - #set( $yearList = [$lastYear..$firstYear] ) 41 +## 'cycle' parameter is not an admissible thesis cycle value 42 +{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}} 43 + #stop 49 49 #end 45 +#else 46 +## default: all cycles 47 + #set( $cycleList = $showcaseThesisCycles ) 48 + #set( $oneCycle = false ) 49 + #set( $cycle = "" ) 50 50 #end 51 -## $ selectedYear,$yearList and$oneYearsetproperly52 -## #ENDYEAR51 +## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised 52 +## CYCLES / END 53 53 ## 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() ) 54 +#### SET PARAMETERS / END 55 +## 56 +## DATA STRUCTURES / START 57 +#set( $itemMap = {} ) 58 +#set( $itemNo = 0 ) 59 +#foreach( $year in $yearList ) 60 + #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 61 + where objThesis.name = doc.fullName and objThesis.className = '${mainSpace}.Class' and objThesis.name <> '${objectPool}.Template' 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" ) 62 +## do query 63 + #set( $itemFound = $xwiki.searchDocuments($query) ) 64 +## set counters 65 + #set( $itemYearNo = $itemFound.size() ) 66 + #if( $itemYearNo > 0 ) 67 + #set( $itemMap[$year] = $itemFound ) 68 + #set( $itemNo = $itemNo + $itemYearNo ) 69 + #end 63 63 #end 64 -#if( $userName || $userNamePar ) 65 -## try to specify a user 66 - #if( !$userName ) 67 - #set( $selectedUser = "XWiki.$userNamePar" ) 71 +## DATA STRUCTURES / END 72 +## 73 +## DISPLAY / START 74 +## page subtitle 75 +<div class="mainheader"> 76 +$itemNo 77 +#if( $itemNo == 1 ) 78 + #if( $oneCycle ) 79 + {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}} 68 68 #else 69 - #set($selectedUser= $userName81 + $services.localization.render('thesis').toLowerCase() 70 70 #end 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") ) 83 +#{else} 84 + #if( $oneCycle ) 85 + {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}} 76 76 #else 77 -{{warning}} $selectedUser is not an {{apice/}} user{{/warning}} 78 - #stop 87 + $services.localization.render('theses').toLowerCase() 79 79 #end 89 +#{end} 90 +<span class="textsecondary"> / </span> 91 +#if( $oneYear ) 92 + $year 93 +#else 94 + $firstYear–$lastYear 95 +#{end} 96 +#if( $oneUser ) 97 + <span class="textsecondary"> / </span> 98 + $userFirstName $userLastName 80 80 #end 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() ) 100 +</div> 101 +## stop if no thesis is found 102 +#if( $itemNo == 0 || $itemMap.keySet().size() == 0 ) 103 +## redundant double check 104 + #stop 90 90 #end 91 -## set cycle 92 -#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 93 - #set( $oneCycle = true ) 94 - #set( $selectedCycle = $cyclePar ) 106 +## some theses found 107 +## page index 108 +#if( $itemMap.keySet().size() > 1 ) 109 +## found more than one year 110 +<div class="mainselectbar" id="index"> 111 + #foreach( $year in $itemMap.keySet() ) 112 + #if( !$foreach.first ) 113 +  •  114 + #end 115 + [[$year>>||anchor="$year"]] 116 + #end 117 +</div> 95 95 #end 96 -## $selectedCycle and $oneCycle set properly 97 -#if( $showPhDTheses ) 98 - #set( $cycles = $allThesisCycles ) 99 -#else 100 - #set( $cycles = $lowThesisCycles ) 101 -#end 102 -### END CYCLE 119 +## theses displayed per year 120 +#foreach( $year in $itemMap.keySet() ) 121 +## year top / start 122 +<div class="mainselectseparator"> 123 + <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")> 124 + $year 125 + </a> 126 +</div> 127 +## year top / end 103 103 ## 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']] 129 +## year display / start 130 +<div style="font-style: normal"><ul> 131 + #foreach( $item in $itemMap[$year] ) 132 +<li>#thesisyear($item)</li> 119 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 134 +</ul></div> 135 +## year display / end 136 +## 137 +## year bottom / start 138 +<div #if( $foreach.last )id="bottom"#end class="mainselectbottom"> 139 + #set( $itemYearNo = $itemMap[$year].size() ) 140 + $itemYearNo 141 + #if( $oneCycle ) 142 + #if( $itemYearNo == 1 ) 143 + {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}} 144 + #else 145 + {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}} 144 144 #end 145 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo ) 147 + #else 148 + #if( $itemYearNo == 1 ) 149 + $services.localization.render('thesis').toLowerCase() 150 + #else 151 + $services.localization.render('theses').toLowerCase() 152 + #end 146 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 ) 154 + <span class="textsecondary"> / </span> 155 + $year 156 +  •  157 + #anchorlinks() 158 +</div> 159 +## year bottom / end 151 151 #end 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}} 161 +## DISPLAY / END 162 +{{/html}} 163 +{{/velocity}}{{pageDisplay sort="objectservice"/}}