Commit e16c7375 authored by Marek Veselý's avatar Marek Veselý
Browse files

Merge branch '1003-chore-new-version-of-backend-v4-18-0' into 'main' 

4.18.0 Add optional questionnaire submission feedback for trainees

Closes #1003 and #898

See merge request inject/frontend!857
parents a951d896 e5e4095a

analyst/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "@inject/analyst",

  "version": "4.17.0",

  "version": "4.18.0",

  "description": "Analyst module for Inject Exercise Platform",

  "main": "index.js",

  "license": "MIT",

analyst/src/components/Plots/ClustersScatterPlot/ClustersScatterPlotCluster.tsx

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ export const ClustersScatterPlotCluster: FC< 
        fill={clusterColorLight(clusterId)}

        opacity={0.25}

        stroke={clusterColorLight(clusterId)}

        strokeWidth={2}

        strokeWidth={20}

      />

    )

  }

analyst/src/components/Plots/ClustersScatterPlot/index.tsx

+13 −8
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import { ClustersScatterPlotTeamPoint } from './ClustersScatterPlotTeamPoint' 
const TICKS = 6

const TEAM_CIRCLE_RADIUS = 10

const PLOT_MARGIN = 40 // take into account axis labels

const AXIS_EXTEND_FACTOR = 0.1



interface ClustersScatterPlotProps {

  id: string
@@ -68,20 +69,24 @@ export const ClustersScatterPlot: FC<ClustersScatterPlotProps> = ({ 
  const xVals = clustering.teams.map(team => team.x)

  const minX = Math.min(...xVals)

  const maxX = Math.max(...xVals)

  const rawXMin = minX < 0 ? minX * 1.1 : minX * 0.9

  const rawXMax = maxX > 0 ? maxX * 1.1 : maxX * 0.9

  const xMin = Math.min(rawXMin, 0)

  const xMax = Math.max(rawXMax, 0)

  const xLow = Math.min(minX, 0)

  const xHigh = Math.max(maxX, 0)

  const xSpan = Math.abs(xHigh - xLow)

  const xPadding = xSpan * AXIS_EXTEND_FACTOR

  const xMin = xLow - xPadding

  const xMax = xHigh + xPadding

  const xScale = scaleLinear().domain([xMin, xMax]).range([0, boundsWidth])



  // yScale

  const yVals = clustering.teams.map(team => team.y)

  const minY = Math.min(...yVals)

  const maxY = Math.max(...yVals)

  const rawYMin = minY < 0 ? minY * 1.1 : minY * 0.9

  const rawYMax = maxY > 0 ? maxY * 1.1 : maxY * 0.9

  const yMin = Math.min(rawYMin, 0)

  const yMax = Math.max(rawYMax, 0)

  const yLow = Math.min(minY, 0)

  const yHigh = Math.max(maxY, 0)

  const ySpan = Math.abs(yHigh - yLow)

  const yPadding = ySpan * AXIS_EXTEND_FACTOR

  const yMin = yLow - yPadding

  const yMax = yHigh + yPadding

  const yScale = scaleLinear().domain([yMin, yMax]).range([boundsHeight, 0])



  const xTicks = xScale.ticks(TICKS)

backend @ a123840c

Compare c5942adb to a123840c
Original line number Diff line number Diff line 
Subproject commit c5942adb684df1bd7ffde1a352c10b08ff1524ea
 
Subproject commit a123840c5b7cdd2da428fdecdcb5169fe8dd5de8

codegen/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "@inject/codegen",

  "version": "4.17.0",

  "version": "4.18.0",

  "description": "GraphQL API Codegen Setup for the Inject Backend",

  "main": "index.js",

  "license": "MIT",