Changes for page Per Year

From version 7.2
edited by Andrea Omicini
on 18/06/2021 00:21
Change comment: There is no comment for this version
To version 12.20
edited by Andrea Omicini
on 23/06/2021 01:55
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -SelectPerStatus
Content
... ... @@ -1,5 +1,15 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}
2 -#### get parameters
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters
2 +## hypothesis: $thesisStatus set, default "Completed"
3 +## to do: get from parameter
4 +#if( $thesisStatus == "Available" )
5 + #set( $orderingDateFieldName = "availabilityDate" )
6 +#elseif( $thesisStatus == "Ongoing" )
7 + #set( $orderingDateFieldName = "startDate" )
8 +#else
9 + #set( $thesisStatus = "Completed" )
10 + #set( $orderingDateFieldName = "endDate" )
11 +#end
12 +## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
3 3  ## who
4 4  #set( $userNamePar = $context.getRequest().getParameter("user") )
5 5  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
... ... @@ -71,50 +71,24 @@
71 71   #set( $contactLastName = $contactdoc.display("last_name") )
72 72  #end
73 73  ##
74 -## $userSelected true means one user for all roles
84 +## $userSelected true and $roleSelected false means one user for all roles
75 75  ## $userSelected true and $roleSelected true for one user with one specific role
76 76  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
77 77  ## both false means all theses
78 -
79 -
80 -== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus) ==
81 -
82 -#if( $roleSelected )
83 - #if( $userSelected )
84 - #if( $supervisor )
85 -* #stringEnIt("as a supervisor","come relatore")
86 - #end
87 - #if( $cosupervisor )
88 -* #stringEnIt("as a co-supervisor","come correlatore")
89 - #end
90 - #if( $contact )
91 -* #stringEnIt("as a contact","come contatto")
92 - #end
93 - #else
94 - #if( $supervisorLastName != "" )
95 -* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
96 - #end
97 - #if( $cosupervisorLastName != "" )
98 -* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
99 - #end
100 - #if( $contactLastName != "" )
101 -* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
102 -<p/>
103 - #end
88 +#if( $userSelected )
89 + #if( $roleSelected ) // //
90 +> #FullThesisStatusesString($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
91 + #else // //
92 +> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName
104 104   #end
105 -#end
106 -##
107 -## hypothesis: $thesisStatus set, default "Completed"
108 -## to do: get from parameter
109 -#if ($thesisStatus == "Available")
110 - #set ($orderingDateFieldName = "availabilityDate")
111 -#elseif ($thesisStatus == "Ongoing")
112 - #set ($orderingDateFieldName = "startDate")
113 113  #else
114 - #set ($thesisStatus = "Completed")
115 - #set ($orderingDateFieldName = "endDate")
95 + #if( $roleSelected ) // //
96 +> #FullThesisStatusesString($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
97 + #else // //
98 +> #FullThesisStatusesString($thesisStatus)
99 + #end
116 116  #end
117 -##
101 +##
118 118  #if ( $cosupervisor )
119 119   #set ( $roleSelectedFieldName = "coSupervisors" )
120 120  #elseif ( $contact )
... ... @@ -192,9 +192,9 @@
192 192   order by prop1.value desc")
193 193  #end
194 194  #set($thesisFound = $xwiki.searchDocuments($sql))
195 -
179 +##
196 196  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
197 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))// #end
181 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
198 198  
199 199  #end
200 -{{/velocity}}
184 +{{/html}}{{/velocity}}