Changes for page Per Year

From version 44.1
edited by Andrea Omicini
on 25/10/2021 21:09
Change comment: There is no comment for this version
To version 43.1
edited by Andrea Omicini
on 25/10/2021 20:51
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -72,19 +72,14 @@
72 72  (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[$role>>||anchor="$role"]]#end)))
73 73  #end{{id name='index'/}}
74 74  ## search theses
75 -#set( $thesisNo = 0 )
76 76  #foreach( $status in $allThesisStatuses )
77 77   #if( !$oneStatus || $selectedStatus == $status )
78 - #set( $thesisStatusNo = 0 )
79 - #if( !$oneStatus )
80 80  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}{{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}
81 - #end
82 82  ## some selected status or all statuses / now $status
83 83   #if( $oneUser )
84 84  == $selectedUser ==
85 85  ## some user selected
86 86   #foreach( $role in $allThesisRoles )
87 - #set( $thesisStatusRoleNo = 0 )
88 88   #if( !$oneRole || $selectedRole == $role )
89 89   #if( $role == "contact" )
90 90   #set( $selectedRoleFieldName = "contact" )
... ... @@ -98,13 +98,10 @@
98 98   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
99 99   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 = 'status' and prop1.name = '$selectedRoleFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )
100 100   #set( $thesisFound = $xwiki.searchDocuments($sql) )
101 - #set( $thesisFoundNo = $thesisFound.size() )
102 - #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
103 103   #foreach( $thesis in $thesisFound )
104 104  * $thesis
105 105   #end
106 106   #end
107 - #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
108 108   #end
109 109  ## no user selected, no role selected
110 110   #else
... ... @@ -111,18 +111,14 @@
111 111   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
112 112   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 = 'status' and prop1.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' order by prop1.value desc" )
113 113   #set( $thesisFound = $xwiki.searchDocuments($sql) )
114 - #set( $thesisFoundNo = $thesisFound.size() )
115 - #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
116 116   #foreach( $thesis in $thesisFound )
117 117  * $thesis
118 118   #end
119 119   #end
120 - #if( !$oneStatus )
121 -(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}$thesisStatusNo {{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}
122 - #end
123 123   #end
124 124  ##
125 125  ## #set( $thesisFound = $xwiki.searchDocuments($sql) )
113 +## #set( $thesisFoundNo = $thesisFound.size() )
126 126  ## #set($thesisDoc = $xwiki.getDocument($thesis))
127 127  ## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
128 128  ##* [[$thesisObj.title>>$thesisDoc]] #if( $thesisDoc.getValue('studentUserName') != "" )//$thesisDoc.getValue('studentUserName')//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end