feat: adding realized hours per month in the members efficiency table

TallerWebSolutions · Dec 4, 2023 · 91c87d8 · 91c87d8
1 parent 1a16ad8
commit 91c87d8
Show file tree

Hide file tree

Showing 11 changed files with 165 additions and 117 deletions.
diff --git a/app/graphql/types/teams/membership_type.rb b/app/graphql/types/teams/membership_type.rb
@@ -6,6 +6,7 @@ class MembershipType < Types::BaseObject
       field :created_at, GraphQL::Types::ISO8601DateTime, null: false
       field :effort_percentage, Float
       field :end_date, GraphQL::Types::ISO8601Date
+      field :expected_hour_value, Float
       field :hours_per_month, Integer
       field :id, ID, null: false
       field :member_role, Integer, null: false

diff --git a/app/models/membership.rb b/app/models/membership.rb
@@ -98,6 +98,12 @@ def stages_to_work_on
     stages_to_work_on
   end
 
+  def expected_hour_value
+    return 0 if hours_per_month.zero?
+
+    monthly_payment / hours_per_month
+  end
+
   def monthly_payment
     return 0 if team_member.monthly_payment.blank?
 

diff --git a/app/spa/src/components/ProjectDemandsCharts.tsx b/app/spa/src/components/ProjectDemandsCharts.tsx
@@ -164,15 +164,15 @@ const ProjectDemandsCharts = ({
     t("charts_tab.project_charts.demands_burn_up_label_ideal"),
     t("charts_tab.project_charts.demands_burn_up_label_delivered"),
     project.demandsBurnup
-  )  
+  )
 
   const projectHoursBurnupChartData = buildBurnupData(
     t("charts_tab.project_charts.hours_burn_up_label_scope"),
     t("charts_tab.project_charts.hours_burn_up_label_ideal"),
     t("charts_tab.project_charts.hours_burn_up_label_delivered"),
     project.hoursBurnup
   )
-  
+
   const leadTimeP80ChartData = [
     {
       id: project.name,

diff --git a/app/spa/src/components/TeamMemberDashboardCharts.tsx b/app/spa/src/components/TeamMemberDashboardCharts.tsx
@@ -85,15 +85,16 @@ const TeamMemberDashboardCharts = ({
   const lineChartData = [
     {
       id: teamMember.name,
-      data: teamMember.teamMemberConsolidationList? teamMember.teamMemberConsolidationList.map(
-        ({ valuePerHourPerformed, consolidationDate }) => {
-
-          return {
-            x: String(consolidationDate || ''),
-            y: Number(valuePerHourPerformed || 0),
-          }
-        }
-      ) : [],
+      data: teamMember.teamMemberConsolidationList
+        ? teamMember.teamMemberConsolidationList.map(
+            ({ valuePerHourPerformed, consolidationDate }) => {
+              return {
+                x: String(consolidationDate || ""),
+                y: Number(valuePerHourPerformed || 0),
+              }
+            }
+          )
+        : [],
     },
   ]
 
@@ -158,22 +159,20 @@ const TeamMemberDashboardCharts = ({
           />
         </ChartGridItem>
       )}
-       {projectHoursData && (
+      {projectHoursData && (
         <ChartGridItem title={t("charts.valuePerHour")}>
-        <LineChart
-         data={lineChartData}
-         axisLeftLegend={t("charts.valuePerHour")}
-          axisBottomLegend={t(
-            "charts.memberEffort_x_label"
-          )}
-          props={{
-            enableSlices: "x",
-            sliceTooltip: ({ slice }: SliceTooltipProps) => (
-              <LineChartTooltip slice={slice} />
-            ),
-          }}
-        />
-      </ChartGridItem>
+          <LineChart
+            data={lineChartData}
+            axisLeftLegend={t("charts.valuePerHour")}
+            axisBottomLegend={t("charts.memberEffort_x_label")}
+            props={{
+              enableSlices: "x",
+              sliceTooltip: ({ slice }: SliceTooltipProps) => (
+                <LineChartTooltip slice={slice} />
+              ),
+            }}
+          />
+        </ChartGridItem>
       )}
     </Grid>
   )

diff --git a/app/spa/src/components/TeamMemberDashboardTables.tsx b/app/spa/src/components/TeamMemberDashboardTables.tsx
@@ -24,13 +24,13 @@ const TeamMemberDashboardTables = ({
   const [searchParams, setSearchParams] = useSearchParams()
 
   const normalizeQueryStringFilters = (filters: FieldValues) =>
-  Object.keys(filters)
-    .filter((key) => {
-      return String(filters[key]).length > 0 && filters[key] !== "null"
-    })
-    .reduce<Record<string, string>>((acc, el) => {
-      return { ...acc, [el]: filters[el] }
-    }, {})
+    Object.keys(filters)
+      .filter((key) => {
+        return String(filters[key]).length > 0 && filters[key] !== "null"
+      })
+      .reduce<Record<string, string>>((acc, el) => {
+        return { ...acc, [el]: filters[el] }
+      }, {})
 
   const demandShortestLeadTime =
     teamMember.demandShortestLeadTime?.leadtime || 0
@@ -130,23 +130,25 @@ const TeamMemberDashboardTables = ({
     t("dashboard.latestEfforts.effortValue"),
   ]
 
-  const latestEffortsRows = teamMember?.demandEffortsList?.demandEfforts?.map((effort) => [
-    <Link
-      component={RouterLink}
-      to={`/companies/taller/teams/${effort.team?.id}`}
-    >
-      {effort.team?.name}
-    </Link>,
-    <DateLocale time date={String(effort.startTimeToComputation)} />,
-    <DateLocale time date={String(effort.finishTimeToComputation)} />,
-    <Link
-      component={RouterLink}
-      to={`/companies/taller/demands/${effort.demandExternalId}`}
-    >
-      {effort.demandExternalId}
-    </Link>,
-    `${(effort.effortValue || 0).toFixed(2)}`,
-  ])
+  const latestEffortsRows = teamMember?.demandEffortsList?.demandEfforts?.map(
+    (effort) => [
+      <Link
+        component={RouterLink}
+        to={`/companies/taller/teams/${effort.team?.id}`}
+      >
+        {effort.team?.name}
+      </Link>,
+      <DateLocale time date={String(effort.startTimeToComputation)} />,
+      <DateLocale time date={String(effort.finishTimeToComputation)} />,
+      <Link
+        component={RouterLink}
+        to={`/companies/taller/demands/${effort.demandExternalId}`}
+      >
+        {effort.demandExternalId}
+      </Link>,
+      `${(effort.effortValue || 0).toFixed(2)}`,
+    ]
+  )
 
   const latestProjectsRows =
     teamMember.projectsList?.projects?.map((project) => [
@@ -230,21 +232,23 @@ const TeamMemberDashboardTables = ({
         </form>
         {searchParams && (
           <Table
-          title={t("dashboard.latestEfforts.title")}
-          subtitle={`${t("dashboard.latestEfforts.effortsValueSum")} ${teamMember?.demandEffortsList?.effortsValueSum || 0}`}
-          headerCells={latestEffortsHeader}
-          rows={latestEffortsRows || []}
-          pagination={{
-            count: (teamMember?.demandEffortsList?.demandEffortsCount|| 0),
-            rowsPerPage: (10),
-            page: effortsFilters.pageNumber - 1,
-            onPageChange: (_, newPage: number) =>
-              setSearchParams({
-                ...normalizeQueryStringFilters(effortsFilters || {}),
-                pageNumber: String(newPage + 1),
-              }),
-          }}
-        />
+            title={t("dashboard.latestEfforts.title")}
+            subtitle={`${t("dashboard.latestEfforts.effortsValueSum")} ${
+              teamMember?.demandEffortsList?.effortsValueSum || 0
+            }`}
+            headerCells={latestEffortsHeader}
+            rows={latestEffortsRows || []}
+            pagination={{
+              count: teamMember?.demandEffortsList?.demandEffortsCount || 0,
+              rowsPerPage: 10,
+              page: effortsFilters.pageNumber - 1,
+              onPageChange: (_, newPage: number) =>
+                setSearchParams({
+                  ...normalizeQueryStringFilters(effortsFilters || {}),
+                  pageNumber: String(newPage + 1),
+                }),
+            }}
+          />
         )}
       </Grid>
     </Grid>

diff --git a/app/spa/src/components/ui/DateLocale.tsx b/app/spa/src/components/ui/DateLocale.tsx
@@ -8,7 +8,7 @@ type DateLocaleProps = {
   isPtBr?: boolean
 }
 
-const DateLocale = ({ date, time, isPtBr = true}: DateLocaleProps) => {
+const DateLocale = ({ date, time, isPtBr = true }: DateLocaleProps) => {
   const dateFormat = isPtBr ? "dd/MM/yyyy" : "MM/dd/yyyy"
   const format = time ? `${dateFormat} HH:mm` : dateFormat
 

diff --git a/app/spa/src/modules/team/team.types.ts b/app/spa/src/modules/team/team.types.ts
@@ -9,7 +9,6 @@ import { Demand } from "../demand/demand.types"
 import { ProjectConsolidation } from "../project/projectConsolidation.types"
 import { ReplenishingConsolidation } from "../replenishing/replenishingConsolidation.types"
 
-
 export type TeamMembersHourlyRate = {
   periodDate?: string
   valuePerHourPerformed?: number
@@ -66,6 +65,8 @@ export type MembershipEfficiencyData = {
   realizedMoneyInMonth?: number
   avgHoursPerDemand?: number
   cardsCount?: number
+  expectedHourValue?: number
+  realizedHourValue?: number
 }
 
 export type Membership = {
@@ -75,10 +76,10 @@ export type Membership = {
   teamMemberName?: string
   hoursPerMonth?: number
   effortPercentage?: number
+  expectedHourValue?: number
   startDate?: string
   endDate?: string
   memberRole?: number
   memberRoleDescription?: string
   teamMembersHourlyRateList?: TeamMembersHourlyRate[]
-
 }
diff --git a/app/spa/src/modules/teamMember/teamMember.types.ts b/app/spa/src/modules/teamMember/teamMember.types.ts
@@ -47,10 +47,12 @@ export type TeamMember = {
     yAxisProjectsNames: string[]
   }
   demandEfforts?: DemandEffort[]
-  demandEffortsList?: {
-    demandEfforts?: DemandEffort[]
-    demandEffortsCount?: number
-    effortsValueSum?: number
-  }
+  demandEffortsList?: DemandEffortsList
   teamMemberConsolidationList?: TeamMemberConsolidation[]
 }
+
+type DemandEffortsList = {
+  demandEfforts?: DemandEffort[]
+  demandEffortsCount?: number
+  effortsValueSum?: number
+}
diff --git a/app/spa/src/pages/TeamMembers/TeamMemberDashboard.tsx b/app/spa/src/pages/TeamMembers/TeamMemberDashboard.tsx
@@ -11,7 +11,12 @@ import TeamMemberDashboardCharts from "../../components/TeamMemberDashboardChart
 import { FieldValues } from "react-hook-form"
 
 const TEAM_MEMBER_QUERY = gql`
-  query TeamMember($id: ID!, $fromDate: ISO8601Date, $untilDate: ISO8601Date, $pageNumber: Int) {
+  query TeamMember(
+    $id: ID!
+    $fromDate: ISO8601Date
+    $untilDate: ISO8601Date
+    $pageNumber: Int
+  ) {
     teamMember(id: $id) {
       id
       name
@@ -116,7 +121,11 @@ const TEAM_MEMBER_QUERY = gql`
           slug
         }
       }
-      demandEfforts(fromDate: $fromDate, untilDate: $untilDate, pageNumber: $pageNumber) {
+      demandEfforts(
+        fromDate: $fromDate
+        untilDate: $untilDate
+        pageNumber: $pageNumber
+      ) {
         id
         effortValue
         effortMoney
@@ -141,35 +150,39 @@ const TEAM_MEMBER_QUERY = gql`
         automaticUpdate
         membershipEffortPercentage
       }
-      teamMemberConsolidationList{
+      teamMemberConsolidationList {
         consolidationDate
         valuePerHourPerformed
       }
-      demandEffortsList(fromDate: $fromDate, untilDate: $untilDate, pageNumber: $pageNumber) {
-        demandEfforts{
-          id
-        effortValue
-        effortMoney
-        startTimeToComputation
-        finishTimeToComputation
-        stagePercentage
-        pairingPercentage
-        managementPercentage
-        totalBlocked
-        mainEffortInTransition
-        stage
-        who
-        team {
+      demandEffortsList(
+        fromDate: $fromDate
+        untilDate: $untilDate
+        pageNumber: $pageNumber
+      ) {
+        demandEfforts {
           id
-          name
-        }
-        createdAt
-        updatedAt
-        demandId
-        demandExternalId
-        memberRole
-        automaticUpdate
-        membershipEffortPercentage
+          effortValue
+          effortMoney
+          startTimeToComputation
+          finishTimeToComputation
+          stagePercentage
+          pairingPercentage
+          managementPercentage
+          totalBlocked
+          mainEffortInTransition
+          stage
+          who
+          team {
+            id
+            name
+          }
+          createdAt
+          updatedAt
+          demandId
+          demandExternalId
+          memberRole
+          automaticUpdate
+          membershipEffortPercentage
         }
         demandEffortsCount
         effortsValueSum
@@ -207,7 +220,7 @@ const TeamMemberDashboard = () => {
       id: Number(teamMemberId),
       fromDate: effortsQueryFilters.fromDate,
       untilDate: effortsQueryFilters.untilDate,
-      pageNumber: (effortsQueryFilters.pageNumber || 1),
+      pageNumber: effortsQueryFilters.pageNumber || 1,
     },
   })
   const companySlug = me?.currentCompany?.slug