Changes for page Per Year

From version 102.2
edited by Andrea Omicini
on 30/10/2021 16:50
Change comment: There is no comment for this version
To version 98.1
edited by Andrea Omicini
on 30/10/2021 16:44
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -34,6 +34,8 @@
34 34   #set( $yearList = [$lastYear..$firstYear] )
35 35   #end
36 36  #end
37 +$oneYear
38 +$yearList
37 37  ### END YEAR
38 38  ##
39 39  ### START USER & CYCLE
... ... @@ -68,15 +68,8 @@
68 68   #end
69 69  #end
70 70  ## $oneUser and $oneCycle set properly
71 -#if( $oneYear )
72 - $selectedYear
73 -#end
74 -#if( $oneUser )
75 - $selectedUser
76 -#end
77 -#if( $oneCycle )
78 - $selectedCycle
79 -#end
73 +$oneUser
74 +$oneCycle
80 80  ### END USER & CYCLE
81 81  ##
82 82  ## title
... ... @@ -103,10 +103,10 @@
103 103  ## some selected cycle or all cycles / now $cycle
104 104   #if( $oneUser)
105 105   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
106 - 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 prop1.value = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
101 + 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 prop1.value = '$year' and ( prop2.value like '%$selectedUser%' || prop3.value like '%$selectedUser%' || prop4.value like '%$selectedUser%' ) order by prop2.value desc" )
107 107   #else
108 108   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
109 - 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 prop1.value = '$year' order by prop1.value desc" )
104 + 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 prop1.value = '$year' order by prop2.value desc" )
110 110   #end
111 111   #set( $thesisFound = $xwiki.searchDocuments($sql) )
112 112   #set( $thesisFoundNo = $thesisFound.size() )
... ... @@ -131,5 +131,6 @@
131 131  (% 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"]]
132 132   #end
133 133   #end
129 +#end
134 134  {{id name='bottom'/}}
135 135  {{/velocity}}