Changes for page Supervisors

From 88.2 to 89.1 From 94.1 to 95.1

From version 89.1

edited by Andrea Omicini
on 29/01/2023 21:16

Change comment: There is no comment for this version

To version 94.1

edited by Andrea Omicini
on 29/01/2023 21:43

Change comment: There is no comment for this version

Raw
Rendered

Summary

Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

@@ -1,91 +1,9 @@
--= {{velocity}}#if( $request.tag )(% style="color:$theme.textSecondaryColor" %)#if( $request.user || $request.name && $request.surname )co-#{end}supervisor : (%%){{namesFromUsers linked='false'}}$request.tag{{/namesFromUsers}}#{else}#if( $request.user || $request.name && $request.surname ){{stringEngIta eng="Co-supervisors" ita= "Co-supervisori"/}}#{else}{{stringEngIta eng="Supervisors" ita= "Supervisori"/}}#{end}#{end}{{/velocity}} =
++= {{velocity}}#if( $request.tag )(% style="color:$theme.textSecondaryColor" %)supervisor : (%%){{namesFromUsers linked='false'}}$request.tag{{/namesFromUsers}}#{else}{{stringEngIta eng="Supervisors" ita= "Supervisori"/}}#{end}{{/velocity}} =
  {{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
  ## thesis page with menus
  #set( $thesisMenu = true )
  ##
--#### get parameters
--## user
--#if( $request.user && $request.user.trim() != "" )
--  #set( $userNamePar = $request.user.trim() )
--  #if( !$userNamePar.contains('XWiki.') )
--    #set( $userNamePar = "XWiki.$userNamePar" )
--  #end
--  #if( !$xwiki.exists( $userNamePar ) )
--{{warning}}{{italiano}}L'utente “$userNamePar” non esiste{{/italiano}}{{english}}User “$userNamePar” does not exist{{/english{{/warning}}
--    #set( $userNamePar = "" )
--  #end
--#else
--  #set( $userNamePar = "" )
--#end
--## $userNamePar is either empty or an XWiki user name
--##
--## name
--#if( $request.name && $request.name.trim() != "" )
--  #set( $firstNamePar = $request.name.trim() )
--#else
--  #set( $firstNamePar = "" )
--#end
--## surname
--#if( $request.surname && $request.surname.trim() != "" )
--  #set( $lastNamePar = $request.surname.trim() )
--#else
--  #set( $lastNamePar = "" )
--#end
--## name and surname should be both instantiated, or none
--#if( $firstNamePar == "" || $lastNamePar == "")
--  #set( $firstNamePar = "" )
--  #set( $lastNamePar = "" )
--#end
--## firstNamePar and lastNamePar are both instantiated, or none
--##
--#### variable defaults
--#set( $oneUser = false )
--#set( $apiceUser = false )
--#set( $userFirstName = "" )
--#set( $userLastName = "" )
--#### handle who
--#if( $userName )
--## from a personal page, "XWiki.$userName" $userName form
--  #if( !$xwiki.exists( $userName ) )
--{{warning}}User $userName does not exist{{/warning}}
--  #else
--## $userName is an XWiki user name
--    #set( $oneUser = true )
--    #set( $apiceUser = true )
--    #set( $userDoc = $xwiki.getDocument($userName) )
--    #set( $userFirstName = $userDoc.display("first_name") )
--    #set( $userLastName = $userDoc.display("last_name") )
--  #end
--#elseif( $userNamePar != "" )
--  #set( $oneUser = true)
--  #set( $apiceUser = true )
--  #set( $userName = $userNamePar )
--  #set( $userdoc = $xwiki.getDocument($userName) )
--  #set( $userFirstName = $userdoc.display("first_name") )
--  #set( $userLastName = $userdoc.display("last_name") )
--#elseif( $firstNamePar != "" && $lastNamePar != "" )
--## from the URL, "name=Firstname&surname=Lastname" parameter
--  #set( $oneUser = true )
--  #set( $apiceUser = false )
--  #set( $userFirstName = $firstNamePar )
--  #set( $userLastName = $lastNamePar )
--#end
--#if( $oneUser )
--  #if( $apiceUser )
--     #set( $userString = "%$userName%" )
--     #set( $parameterString = "user=$userName" )
--  #else
--     #set( $userName = "$userFirstName $userLastName" )
--     #set( $userString = "%$userName%" )
--     #set( $parameterString = "name=$userFirstName&surname=$userLastName" )
--  #end
--#else
--     #set( $userName = "" )
--     #set( $userString = "" )
--     #set( $parameterString = "" )
--#end
--##
  #### tag parameter possibly brings name to be used as tag
  ## no tag parameter --> just the cloud
  ## yes tag parameter --> the item list
@@ -95,8 +95,8 @@
  ## subtitle
  >{{stringEngIta eng="$objectEngPlural" ita= "$objectItaPlural"/}}#if( $oneUser )  /  $userFirstName $userLastName#{end}
  ## set query
--  #set( $query = ", BaseObject as obj, LargeStringProperty as prop0, StringProperty as prop1, DateProperty as prop2
--    where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'supervisors' #if( $oneUser )and prop0.value like '$userString'#end and prop1.name = 'status' and lower(prop1.value) = 'completed' and prop2.name = 'end' order by prop2.value desc" )
++  #set( $query = ", BaseObject as obj, StringProperty as prop1, DateProperty as prop2
++    where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop1.id.id = obj.id and prop2.id.id = obj.id and prop1.name = 'status' and lower(prop1.value) = 'completed' and prop2.name = 'end' order by prop2.value desc" )
  ## execute query
    #set( $itemFound = $xwiki.searchDocuments($query) )
    #set( $itemFoundNo = $itemFound.size() )
@@ -106,21 +106,22 @@
    #foreach( $item in $itemFound )
  ## set $doc & $obj
      #set( $itemDoc = $xwiki.getDocument($item) )
--    #set( $itemObj = $itemDoc.getObject("${objectSpace}.${objectClass}") )
--    #set( $nameList = $itemObj.getValue("supervisors").split(",") )
++    #if( $itemDoc.getValue("supervisors") != "" )
++      #set( $nameList = $itemDoc.getValue("supervisors").split(",") )
  ## set user-item map
--    #foreach( $name in $nameList )
++      #foreach( $name in $nameList )
  #### build name lists
--      #if( $nameMap.keySet().contains($name) )
++        #if( $nameMap.keySet().contains($name) )
  ## nameMap already contains current name
  ## add $item to nameMap for current name
--        #set( $discard = $nameMap[$name].add($item) )
--      #elseif( !$oneUser || $oneUser && $name != $userName )
++          #set( $discard = $nameMap[$name].add($item) )
++        #elseif( !$oneUser || $oneUser && $name != $userName )
  ## nameMap does not contain name or selected user
  ## add name / selected user to nameMap
--        #set( $nameMap[$name] = [] )
++          #set( $nameMap[$name] = [] )
   ## adding $item to nameMap for $name
--        #set( $discard = $nameMap[$name].add($item) )
++          #set( $discard = $nameMap[$name].add($item) )
++        #end
        #end
      #end
  #### END / feed name list from each item
@@ -142,21 +142,17 @@
      #elseif( $nameItemNo == 2 )#set( $tagSize = "100%" )
      #else#set( $tagSize = "90%" )
      #end
--[[(% style='font-size:$tagSize; white-space: nowrap' %){{namesFromUsers linked='false'}}$name{{/namesFromUsers}}(%%)>>$doc||queryString='tag=$name#if( $oneUser )&$parameterString#end']](% style='font-style:normal;color:$theme.textPrimaryColor;font-size:75%' %),,$nameItemNo,, (%%) #end
++[[(% style='font-size:$tagSize; white-space: nowrap' %){{namesFromUsers linked='false'}}$name{{/namesFromUsers}}(%%)>>$doc||queryString='tag=$name']](% style='font-style:normal;color:$theme.textPrimaryColor;font-size:75%' %),,$nameItemNo,, (%%) #end
  )))
  ## cloud bottom
  (% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)(((
--#if( $oneUser )
--[  $nameFoundNo #if( $nameFoundNo == 1 ){{stringEngIta eng="co-supervisor" ita="co-supervisore"/}}#else{{stringEngIta eng="co-supervisors" ita="co-supervisori"/}}#end  /  $itemFoundNo #if( $itemFoundNo == 1 ){{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#else{{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}}#end  ]
--#else
  [  $nameFoundNo #if( $nameFoundNo == 1 ){{stringEngIta eng="supervisor" ita="supervisore"/}}#else{{stringEngIta eng="supervisors" ita="supervisori"/}}#end  /  $itemFoundNo #if( $itemFoundNo == 1 ){{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#else{{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end  ]
--#end
  )))
  #### YES TAG PARAMETER
  #else
  ## set query
    #set( $query = ", BaseObject as obj, LargeStringProperty as prop0, StringProperty as prop1, DateProperty as prop2
--      where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'supervisors' and prop0.value like '%$request.tag%' #if( $request.user )and prop0.value like '%$request.user%'#end #if( $request.name && $request.surname )and prop0.value like '%$request.name $request.surname%'#end and prop1.name = 'status' and lower(prop1.value) = 'completed' and prop2.name = 'end' order by prop2.value desc" )
++      where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'supervisors' and prop0.value like '%$request.tag%' and prop1.name = 'status' and lower(prop1.value) = 'completed' and prop2.name = 'end' order by prop2.value desc" )
  ## execute query
    #set( $itemFound = $xwiki.searchDocuments($query) )
    #set( $itemFoundNo = $itemFound.size() )
@@ -168,23 +168,7 @@
  [[image:icon:book]]  {{thesis}}$item{{/thesis}}
    #end
  )))
--## embodied page?
--  #if( $userName && $userSpace )
--    #set( $embodiedPage = true )
--  #else
--    #set( $embodiedPage = false )
--  #end
--## talk list bottom
--  #if( $embodiedPage )
--(% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)((([  [[{{stringEngIta eng="co-supervisor cloud" ita="nuvola co-supervisori" /}}>>$doc]]  /  {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}}  ])))(%%)
--  #else
--    #if( $request.user )
--(% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)((([  [[{{stringEngIta eng="co-supervisor cloud" ita="nuvola co-supervisori" /}}>>$doc||queryString="user=$request.user"]]  /  {{namesFromUsers linked='false'}}$request.user{{/namesFromUsers}}  /  {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}}  ])))(%%)
--    #elseif( $request.name && $request.surname )
--(% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)((([  [[{{stringEngIta eng="co-supervisor cloud" ita="nuvola co-supervisori" /}}>>$doc||queryString="name=$request.name&surname=$request.surname"]]  /  {{namesFromUsers linked='false'}}$request.name $request.surname{{/namesFromUsers}}  /  {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}}  ])))(%%)
--    #else
++## thesis list bottom
  (% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)((([  [[{{stringEngIta eng="supervisor cloud" ita="nuvola supervisori" /}}>>$doc||]]  /  {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}}  ])))(%%)
--    #end
--  #end
  #end
  {{/velocity}}