fix: fixed demand efforts filter

TallerWebSolutions · Sep 30, 2023 · af7e801 · af7e801
1 parent 44de4dc
commit af7e801
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 146 deletions.
diff --git a/app/graphql/types/teams/team_member_type.rb b/app/graphql/types/teams/team_member_type.rb
@@ -59,7 +59,7 @@ class TeamMemberType < Types::BaseObject
       field :project_hours_data, Types::Charts::ProjectHoursChartDataType, null: true
 
       def demand_efforts(from_date: nil, until_date: nil)
-        object.demand_efforts.to_dates(from_date, until_date)
+        object.demand_efforts.to_dates(from_date, until_date).order(start_time_to_computation: :desc)
       end
 
       def demands(status: 'ALL', type: 'ALL', limit: nil)

diff --git a/app/spa/package.json b/app/spa/package.json
@@ -75,7 +75,7 @@
       "__tests__"
     ],
     "rules": {
-      "no-console": "error",
+      "no-console": "warn",
       "max-len": [
         "error",
         {

diff --git a/app/spa/src/components/TeamMemberDashboardTables.tsx b/app/spa/src/components/TeamMemberDashboardTables.tsx
@@ -125,29 +125,30 @@ const TeamMemberDashboardTables = ({
   const latestEffortsHeader = [
     t("dashboard.latestEfforts.name"),
     t("dashboard.latestEfforts.team"),
-    t("dashboard.latestEfforts.effortDate"),
+    t("dashboard.latestEfforts.start"),
+    t("dashboard.latestEfforts.end"),
     t("dashboard.latestEfforts.demands"),
     t("dashboard.latestEfforts.effortValue"),
   ]
 
-  const latestEffortsRows =
-    teamMember?.demandEfforts?.map((effort) => [
-      `${effort.who || ""}`,
-      <Link
-        component={RouterLink}
-        to={`/companies/taller/teams/${effort.team?.id}`}
-      >
-        {effort.team?.name}
-      </Link>,
-      <DateLocale date={String(effort.updatedAt)} />,
-      <Link
-        component={RouterLink}
-        to={`/companies/taller/demands/${effort.demandExternalId}`}
-      >
-        {effort.demandExternalId}
-      </Link>,
-      `${effort.effortValue || ""}`,
-    ]) || []
+  const latestEffortsRows = teamMember?.demandEfforts?.map((effort) => [
+    `${effort.who || ""}`,
+    <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) => [
@@ -232,7 +233,7 @@ const TeamMemberDashboardTables = ({
         <Table
           title={t("dashboard.latestEfforts.title")}
           headerCells={latestEffortsHeader}
-          rows={latestEffortsRows}
+          rows={latestEffortsRows || []}
         />
       </Grid>
     </Grid>

diff --git a/app/spa/src/locales/coca/teamMembers.json b/app/spa/src/locales/coca/teamMembers.json
@@ -81,7 +81,8 @@
       "title": "Latest Efforts",
       "name": "Name",
       "team": "Team",
-      "effortDate": "Effort date",
+      "start": "Start",
+      "end": "End",
       "demands": "Demands",
       "effortValue": "Effort Value",
       "untilDate": "End Date",

diff --git a/app/spa/src/locales/en/teamMembers.json b/app/spa/src/locales/en/teamMembers.json
@@ -81,7 +81,8 @@
       "title": "Latest Efforts",
       "name": "Name",
       "team": "Team",
-      "effortDate": "Effort date",
+      "start": "Start",
+      "end": "End",
       "demands": "Demands",
       "effortValue": "Effort Value",
       "untilDate": "End Date",

diff --git a/app/spa/src/locales/pt/teamMembers.json b/app/spa/src/locales/pt/teamMembers.json
@@ -81,7 +81,8 @@
       "title": "Últimos Esforços",
       "name": "Nome",
       "team": "Time",
-      "effortDate": "Data do esforço",
+      "start": "Início",
+      "end": "Fim",
       "demands": "Demandas",
       "effortValue": "Valor do esforço",
       "untilDate": "Data final",