Changes for page Supervisors

From 86.1 to 87.1 From 93.1 to 94.1

From version 87.1

edited by Andrea Omicini
on 29/01/2023 19:57

Change comment: There is no comment for this version

To version 93.1

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

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,92 +1,9 @@
--= {{velocity}}#if( $request.tag )(% style="color:$theme.textSecondaryColor" %)tag : (%%)$request.tag#else{{stringEngIta eng="Tags" ita= "Tag"/}}#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}}##
++{{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
@@ -96,62 +96,76 @@
  ## subtitle
  >{{stringEngIta eng="$objectEngPlural" ita= "$objectItaPlural"/}}#if( $oneUser )  /  $userFirstName $userLastName#{end}
  ## set query
--  #set( $from = ", BaseObject as obj0, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3" )
--  #set( $where = "obj0.name = doc.fullName and obj0.className = '${objectSpace}.${objectClass}' and obj0.name <> '${objectSpace}.${objectTemplate}' and prop0.id.id = obj0.id and prop1.id.id = obj0.id and prop2.id.id = obj0.id and prop3.id.id = obj0.id and prop0.name = 'status' and lower(prop0.value) = 'completed' and prop1.name = 'supervisors' and prop2.name = 'cosupervisors' and prop3.name = 'contacts' #if( $oneUser )and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' )#end" )
++  #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( $tagCount = $xwiki.tag.getTagCountForQuery($from, $where) )
--  #set( $tagInstanceNo = 0 )
--  #set( $tagNo = 0 )
++  #set( $itemFound = $xwiki.searchDocuments($query) )
++  #set( $itemFoundNo = $itemFound.size() )
++## name-item map
++  #set( $nameMap = {} )
++## START EACH ITEM IN MAP
++  #foreach( $item in $itemFound )
++## set $doc & $obj
++    #set( $itemDoc = $xwiki.getDocument($item) )
++    #set( $itemObj = $itemDoc.getObject("${objectSpace}.${objectClass}") )
++    #set( $nameList = $itemDoc.getValue("supervisors").split(",") )
++## set user-item map
++    #foreach( $name in $nameList )
++#### build name lists
++      #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 )
++## nameMap does not contain name or selected user
++## add name / selected user to nameMap
++        #set( $nameMap[$name] = [] )
++ ## adding $item to nameMap for $name
++        #set( $discard = $nameMap[$name].add($item) )
++      #end
++    #end
++#### END / feed name list from each item
++  #end
++## END EACH ITEM IN MAP
++## final values: $nameMap
++  #set( $nameFoundNo = $nameMap.keySet().size() )
  ## tag cloud
  (% style='text-align:center' %)(((
--  #foreach( $itemTag in $tagCount.keySet() )
--    #set( $itemCount = $tagCount.get($itemTag) )
--    #set( $tagInstanceNo = $tagInstanceNo + $itemCount )
--    #set( $tagNo = $tagNo + 1 )
--    #if( $itemCount > 40 )#set( $tagSize = "140%" )
--    #elseif( $itemCount > 30 )#set( $tagSize = "135%" )
--    #elseif( $itemCount > 20 )#set( $tagSize = "130%" )
--    #elseif( $itemCount > 10 )#set( $tagSize = "125%" )
--    #elseif( $itemCount > 5 )#set( $tagSize = "120%" )
--    #elseif( $itemCount > 3 )#set( $tagSize = "110%" )
--    #elseif( $itemCount == 3 )#set( $tagSize = "105%" )
--    #elseif( $itemCount == 2 )#set( $tagSize = "100%" )
++  #foreach( $name in $nameMap.keySet() )
++    #set( $nameItemNo = $nameMap[$name].size() )
++    #if( $nameItemNo > 40 )#set( $tagSize = "140%" )
++    #elseif( $nameItemNo > 30 )#set( $tagSize = "135%" )
++    #elseif( $nameItemNo > 20 )#set( $tagSize = "130%" )
++    #elseif( $nameItemNo > 10 )#set( $tagSize = "125%" )
++    #elseif( $nameItemNo > 5 )#set( $tagSize = "120%" )
++    #elseif( $nameItemNo > 3 )#set( $tagSize = "110%" )
++    #elseif( $nameItemNo == 3 )#set( $tagSize = "105%" )
++    #elseif( $nameItemNo == 2 )#set( $tagSize = "100%" )
      #else#set( $tagSize = "90%" )
      #end
--    #set($urlEscapedTag = $escapetool.url($itemTag))
--(% style='font-size:$tagSize' %)  [[$itemTag>>$doc||queryString="tag=$urlEscapedTag&$parameterString"]](% style='font-style:normal;color:$theme.textPrimaryColor;font-size:75%' %),,$itemCount,,(%%) (%%)#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" %)(((
--[  $tagInstanceNo  /  $tagNo  {{stringEngIta eng = "tags" ita = "tag"/}}  ]
++(% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)(((
++[  $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  ]
  )))
  #### YES TAG PARAMETER
  #else
  ## set query
--  #set( $from = ", BaseObject as obj0, DBStringListProperty as prop0 join prop0.list item, BaseObject as obj1, StringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, DateProperty as prop5" )
--  #set ( $where = "obj0.className = 'XWiki.TagClass' and obj0.name = doc.fullName and obj0.id = prop0.id.id and prop0.id.name = 'tags' and lower(item) = lower('$request.tag') and obj1.name = doc.fullName and obj1.className = '${objectSpace}.${objectClass}' and obj1.name <> '${objectSpace}.${objectTemplate}' and prop1.id.id = obj1.id and prop2.id.id = obj1.id and prop3.id.id = obj1.id and prop4.id.id = obj1.id and prop5.id.id = obj1.id and prop1.name = 'status' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop5.name = 'end' and lower(prop1.value) = 'completed' #if( $oneUser )and ( prop2.value like '$userString' or prop3.value like '$userString' or prop4.value like '$userString' )#end order by prop5.value desc" )
--  #set( $query = $from + " where " + $where )
++  #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%' 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() )
  ## subtitle
-->$itemFoundNo #if( $itemFoundNo == 1 ){{stringEngIta eng = "$objectEngSingular.toLowerCase()" ita = "$objectItaSingular.toLowerCase()" /}}#else{{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()" /}}#end#if( $oneUser )  /  $userFirstName $userLastName#end
--## thesis list
++>$itemFoundNo #if( $itemFoundNo == 1 ){{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#else{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end#if( $request.user )  /  {{namesFromUsers linked='false'}}$request.user{{/namesFromUsers}}#end#if( $request.name && $request.surname )  /  {{namesFromUsers linked='false'}}$request.name $request.surname{{/namesFromUsers}}#end
++## talk list
  (((
    #foreach( $item in $itemFound )
  [[image:icon:book]]  {{thesis}}$item{{/thesis}}
    #end
  )))
--## embodied page?
--  #if( $userName && $userSpace )
--    #set( $embodiedPage = true )
--  #else
--    #set( $embodiedPage = false )
--  #end
  ## thesis list bottom
--#if( $embodiedPage || !$oneUser )
--(% style="font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor" %)((([  [[{{stringEngIta eng="tag cloud" ita="nuvola tag" /}}>>$doc.name]]  /  {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}}  ])))(%%)
--  #else
--(% style="font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor" %)((([  [[{{stringEngIta eng="tag cloud" ita="nuvola tag" /}}>>$doc.name||queryString="$parameterString"]]  /  $userFirstName $userLastName  /  {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}}  ])))(%%)
--  #end
++(% 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
  {{/velocity}}