Changes for page Per Year

From version 47.1
edited by Andrea Omicini
on 25/10/2021 21:16
Change comment: There is no comment for this version
To version 43.2
edited by Andrea Omicini
on 25/10/2021 20:52
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -72,18 +72,16 @@
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 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 81   #end
82 82  ## some selected status or all statuses / now $status
83 83   #if( $oneUser )
82 +== $selectedUser ==
84 84  ## some user selected
85 85   #foreach( $role in $allThesisRoles )
86 - #set( $thesisStatusRoleNo = 0 )
87 87   #if( !$oneRole || $selectedRole == $role )
88 88   #if( $role == "contact" )
89 89   #set( $selectedRoleFieldName = "contact" )
... ... @@ -93,19 +93,14 @@
93 93   #set( $selectedRoleFieldName = "supervisor" )
94 94   #end
95 95  ## some selected role or all roles / now $role
96 - #if( !$oneRole )
97 -(% style="border-style:hidden hidden hidden dotted; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|{{id name='$status-$role'/}}$role
98 - #end
94 +=== $role ===
99 99   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
100 100   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" )
101 101   #set( $thesisFound = $xwiki.searchDocuments($sql) )
102 - #set( $thesisFoundNo = $thesisFound.size() )
103 - #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
104 104   #foreach( $thesis in $thesisFound )
105 105  * $thesis
106 106   #end
107 107   #end
108 - #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
109 109   #end
110 110  ## no user selected, no role selected
111 111   #else
... ... @@ -112,18 +112,14 @@
112 112   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
113 113   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" )
114 114   #set( $thesisFound = $xwiki.searchDocuments($sql) )
115 - #set( $thesisFoundNo = $thesisFound.size() )
116 - #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
117 117   #foreach( $thesis in $thesisFound )
118 118  * $thesis
119 119   #end
120 120   #end
121 - #if( !$oneStatus )
122 -(% 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" %)|$thesisStatusNo #if($thesisStatusNo == 1){{thesisStatus plural='false' uppercase='false' short='true'}}$status{{/thesisStatus}}#else{{thesisStatus plural='true' uppercase='false' short='true'}}$status{{/thesisStatus}}#end{{id name='$status'/}}
123 - #end
124 124   #end
125 125  ##
126 126  ## #set( $thesisFound = $xwiki.searchDocuments($sql) )
115 +## #set( $thesisFoundNo = $thesisFound.size() )
127 127  ## #set($thesisDoc = $xwiki.getDocument($thesis))
128 128  ## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
129 129  ##* [[$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