Changes for page Per Year

From version 12.9
edited by Andrea Omicini
on 22/06/2021 15:11
Change comment: There is no comment for this version
To version 15.1
edited by Andrea Omicini
on 25/06/2021 02:06
Change comment: There is no comment for this version

Summary

Details

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