Changes for page Per Year

From version 20.15
edited by Andrea Omicini
on 25/10/2021 17:29
Change comment: There is no comment for this version
To version 21.1
edited by Andrea Omicini
on 25/10/2021 17:47
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -94,32 +94,6 @@
94 94   #set( $contactLastName = $contactdoc.display("last_name") )
95 95  #end
96 96  ##
97 -## $userSelected true and $roleSelected false means one user for all roles
98 -## $userSelected true and $roleSelected true for one user with one specific role
99 -## if $userSelected false and $roleSelected true mean at least one role with an assigned user
100 -## both false means all theses
101 -#if( $selectedStatus == 'all' )
102 -ALLL
103 -#else
104 - #if( $userSelected )
105 - #if( $roleSelected )
106 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName / #if( $supervisor ){{stringEngIta eng="Supervisor" ita="Relatore"/}}#end#if( $cosupervisor ){{stringEngIta eng="Co-supervisor" ita="Correlatore"/}}#end#if( $contact ){{stringEngIta eng="Contact" ita="Contatto"/}}#end
107 -
108 - #else
109 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName
110 -
111 - #end
112 - #else
113 - #if( $roleSelected )
114 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#if( $supervisorLastName != "" ) / $supervisorFirstName $supervisorLastName //({{stringEngIta eng="supervisor" ita="relatore"/}})//#end#if( $cosupervisorLastName != "" ) / $cosupervisorFirstName $cosupervisorLastName //({{stringEngIta eng="co-supervisor" ita="correlatore"/}})//#end#if( $contactLastName != "" ) / $contactFirstName $contactLastName //({{stringEngIta eng="Contact" ita="Contatto"/}})//#end
115 -
116 - #else
117 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}
118 -
119 - #end
120 - #end
121 -#end
122 -##
123 123  #if( $cosupervisor )
124 124   #set( $roleSelectedFieldName = "coSupervisors" )
125 125  #elseif( $contact )
... ... @@ -128,14 +128,20 @@
128 128   #set( $roleSelectedFieldName = "supervisor" )
129 129  #end
130 130  ##
131 -#if( $selectedStatus == 'all' )
132 - ALL STATUSES
133 -#else
134 -## some selected status
105 +## $roleSelected has meaning only if $userSelected
106 +## if $userSelected, $roleSelected false means one user for all roles
107 +## if $userSelected, $roleSelected true means one specific role for one user selected
108 +## if $userSelected is false, $roleSelected means nothing -- so all users, all roles / just status
109 +#foreach( $status in $allThesisStatuses )
110 + #if( $selectedStatus == 'all' || $selectedStatus == $status )
111 += $status =
112 +## some selected status or all statuses / now $status
135 135   #if( $userSelected )
114 +== $userName ==
136 136  ## some user selected
137 137   #if( $roleSelected )
138 138  ## some specific role selected
118 +=== $roleSelectedFieldName ===
139 139   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
140 140   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 prop0.value = '$selectedStatus' and prop1.value like '%$userName%' order by prop2.value desc" )
141 141   #else
... ... @@ -143,12 +143,8 @@
143 143   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
144 144   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) = '$selectedStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
145 145   #end
146 - #elseif( $roleSelected )
147 -## no user selected, some role selected
148 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
149 - 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 prop1.value like '%$supervisorName%' and prop2.value like '%$cosupervisorName%' and prop3.value like '%$contactName%' order by prop4.value desc")
150 150   #else
151 -## no user selected, some role selected
127 +## no user selected, no role selected
152 152   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
153 153   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 prop0.value = '$selectedStatus' order by prop1.value desc" )
154 154   #end