Changes for page Per Year

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

Summary

Details

Page properties
Title
... ... @@ -1,0 +1,1 @@
1 +SelectPerStatus
Content
... ... @@ -1,15 +1,5 @@
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
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}
2 +#### get parameters
13 13  ## who
14 14  #set( $userNamePar = $context.getRequest().getParameter("user") )
15 15  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
... ... @@ -86,31 +86,45 @@
86 86  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
87 87  ## both false means all theses
88 88  
89 -> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // //
79 +
80 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus) ==
81 +
90 90  #if( $roleSelected )
91 91   #if( $userSelected )
92 - #if( $supervisor ) // //
93 -> * {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
84 + #if( $supervisor )
85 +* #stringEnIt("as a supervisor","come relatore")
94 94   #end
95 - #if( $cosupervisor ) // //
96 ->> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
87 + #if( $cosupervisor )
88 +* #stringEnIt("as a co-supervisor","come correlatore")
97 97   #end
98 - #if( $contact ) // //
99 ->> {{stringEngIta eng="as a contact" ita="come contatto"/}}
90 + #if( $contact )
91 +* #stringEnIt("as a contact","come contatto")
100 100   #end
101 101   #else
102 - #if( $supervisorLastName != "" ) // //
103 ->> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
94 + #if( $supervisorLastName != "" )
95 +* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
104 104   #end
105 - #if( $cosupervisorLastName != "" ) // //
106 ->> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
97 + #if( $cosupervisorLastName != "" )
98 +* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
107 107   #end
108 - #if( $contactLastName != "" ) // //
109 ->> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
100 + #if( $contactLastName != "" )
101 +* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
102 +<p/>
110 110   #end
111 111   #end
112 112  #end
113 113  ##
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 +#else
114 + #set ($thesisStatus = "Completed")
115 + #set ($orderingDateFieldName = "endDate")
116 +#end
117 +##
114 114  #if ( $cosupervisor )
115 115   #set ( $roleSelectedFieldName = "coSupervisors" )
116 116  #elseif ( $contact )
... ... @@ -188,9 +188,9 @@
188 188   order by prop1.value desc")
189 189  #end
190 190  #set($thesisFound = $xwiki.searchDocuments($sql))
191 -##
195 +
192 192  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
193 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
197 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))// #end
194 194  
195 195  #end
196 -{{/html}}{{/velocity}}
200 +{{/velocity}}