Changes for page Per Year
From version 36.1
edited by Andrea Omicini
on 25/10/2021 19:51
on 25/10/2021 19:51
Change comment:
There is no comment for this version
To version 30.1
edited by Andrea Omicini
on 25/10/2021 18:43
on 25/10/2021 18:43
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -28,6 +28,7 @@ 28 28 ## 29 29 ### START USER & ROLE 30 30 #set( $userNamePar = $request.user.trim() ) 31 +#set( $rolePar = $request.role.trim().toLowerCase() ) 31 31 ## default values 32 32 #set( $userSelected = false ) 33 33 #set( $userFirstName = "" ) ... ... @@ -49,7 +49,6 @@ 49 49 #stop 50 50 #end 51 51 ##user selected and existing user page 52 - #set( $rolePar = $request.role.trim().toLowerCase() ) 53 53 #set( $roleSelected = false ) 54 54 #set( $selectedRole = '' ) 55 55 #if( $rolePar != '' && $allThesisRoles.contains($rolePar) ) ... ... @@ -63,10 +63,17 @@ 63 63 ## if $userSelected, $roleSelected true means one specific role for one user selected 64 64 ## if $userSelected is false, $roleSelected means nothing -- so all users, all roles / just status 65 65 ## 66 -## title 67 ->#if( $statusSelected ){{thesisStatus}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end 68 - 69 -## search theses 66 +#set( $roleSelectedFieldName = "" ) 67 +#if( $roleSelected ) 68 + #if( $selectedRole == "contact" ) 69 + #set( $roleSelectedFieldName = "contact" ) 70 + #elseif( $selectedRole == "cosupervisor" ) 71 + #set( $roleSelectedFieldName = "coSupervisors" ) 72 + #else 73 + #set( $roleSelectedFieldName = "supervisor" ) 74 + #end 75 +#end 76 +## 70 70 #foreach( $status in $allThesisStatuses ) 71 71 #if( !$statusSelected || $selectedStatus == $status ) 72 72 = $status = ... ... @@ -74,41 +74,30 @@ 74 74 #if( $userSelected ) 75 75 == $selectedUser == 76 76 ## some user selected 77 - #foreach( $role in $allThesisRoles ) 78 - #if( !$roleSelected || $selectedRole == $role ) 79 - #if( $role == "contact" ) 80 - #set( $roleSelectedFieldName = "contact" ) 81 - #elseif( $role == "cosupervisor" ) 82 - #set( $roleSelectedFieldName = "coSupervisors" ) 83 - #else 84 - #set( $roleSelectedFieldName = "supervisor" ) 85 - #end 86 -## some selected role or all roles / now $role 87 -=== $role === 88 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 84 + #if( $roleSelected ) 85 +## some specific role selected 86 +=== $roleSelected === 87 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 89 89 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 = '$roleSelectedFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" ) 90 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 91 - #foreach( $thesis in $thesisFound ) 92 -* $thesis 93 - #end 94 - #end 89 + #else 90 +## no specific role selected 91 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 92 + 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 = 'status' and prop1.name = 'supervisor' and prop2.name = 'coSupervisors' and prop3.name = 'contact' and prop4.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and ( prop1.value like '%$selectedUser%' or prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' ) order by prop4.value desc" ) 95 95 #end 96 -## no user selected, no role selected 97 97 #else 95 +## no user selected, no role selected 98 98 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 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 prop0.name = 'status' and prop1.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' order by prop1.value desc" ) 100 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 101 - #foreach( $thesis in $thesisFound ) 102 -* $thesis 103 - #end 104 104 #end 105 105 #end 100 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 101 + #set( $thesisFoundNo = $thesisFound.size() ) 106 106 ## 107 - ##set($thesisFound=$xwiki.searchDocuments($sql))108 - ###set(FoundNo= $thesisFound.size()109 - ###set($thesisDoc= $xwiki.getDocument($thesis))110 -# ##set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))111 - ##* [[$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)#end112 - ###end103 + #foreach ($thesis in $thesisFound) 104 + #set($thesisDoc = $xwiki.getDocument($thesis)) 105 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 106 +* [[$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 107 + 108 + #end 113 113 #end 114 114 {{/velocity}}