Merge pull request #3140 from ever-co/develop

Release

apps/web/app/[locale]/settings/team/page.tsx

@@ -39,7 +39,7 @@ const Team = () => {
  <>
  <Link href={'/settings/personal'} className="w-full">
  <button className="w-full lg:hidden hover:bg-white rounded-xl border border-dark text-dark p-4 mt-2">
- Go to Personnal settings
+ {t("pages.settingsTeam.GO_TO_PERSONAL_SETTINGS")}
  </button>
  </Link>
  {/* General Settings */}

apps/web/app/helpers/date.ts

@@ -151,7 +151,6 @@ export const formatIntegerToHour = (number: number) => {
  return formattedHour;
 };
 
-
 export const isTestDateRange = (itemDate: Date, from?: Date, to?: Date) => {
  if (from && to) {
  return itemDate >= from && itemDate <= to;
@@ -162,9 +161,40 @@ export const isTestDateRange = (itemDate: Date, from?: Date, to?: Date) => {
  } else {
  return true; // or false, depending on your default logic
  }
-}
-
+};
 
 export function convertHourToSeconds(hours: number) {
  return hours * 60 * 60;
 }
+
+/**
+ * A helper function to parse a time string
+ *
+ * @param timeString - The time string to be formated.
+ *
+ * @returns {string} The formated time string
+ */
+export function formatTimeString(timeString: string): string {
+ // Extract hours and minutes using regex
+ const matches = timeString.match(/(\d+)h\s*(\d+)m|\b(\d+)m\b|\b(\d+)h\b/);
+
+ let result = '';
+
+ if (matches) {
+ const hours = matches[1] || matches[4]; // Group 1 for hours when both exist, Group 4 for hours only
+ const minutes = matches[2] || matches[3]; // Group 2 for minutes when both exist, Group 3 for minutes only
+
+ if (parseInt(hours) > 0) {
+ result += `${hours}h`;
+ }
+
+ if (parseInt(minutes) > 0) {
+ if (result) {
+ result += ' '; // Add space if hours were included
+ }
+ result += `${minutes}m`;
+ }
+ }
+
+ return result.length ? result : '0h 00m';
+}

apps/web/app/hooks/features/useStartStopTimerHandler.ts

@@ -7,6 +7,7 @@ import {
  TASKS_ESTIMATE_HOURS_MODAL_DATE,
  DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE
 } from '@app/constants';
+import { estimatedTotalTime } from 'lib/features/task/daily-plan';
 
 export function useStartStopTimerHandler() {
  const {
@@ -60,6 +61,11 @@ export function useStartStopTimerHandler() {
  [activeTeamTask?.id, hasPlan?.tasks]
  );
 
+ const tasksEstimationTimes = useMemo(
+ () => (hasPlan && hasPlan.tasks ? estimatedTotalTime(hasPlan.tasks).timesEstimated / 3600 : 0),
+ [hasPlan]
+ );
+
  const enforceTaskSoftCloseModal = () => {
  _enforceTaskSoftCloseModal();
  openAddTasksEstimationHoursModal();
@@ -82,13 +88,13 @@ export function useStartStopTimerHandler() {
  if (tasksEstimateHoursModalDate != currentDate) {
  openAddTasksEstimationHoursModal();
  } else {
- startTimer();
+ handleWarnings();
  }
  } else {
  openEnforcePlannedTaskSoftModal();
  }
  } else {
- startTimer();
+ handleWarnings();
  }
  };
 
@@ -100,10 +106,10 @@ export function useStartStopTimerHandler() {
  if (!hasWorkedHours) {
  openAddDailyPlanWorkHoursModal();
  } else {
- startTimer();
+ handleWarnings();
  }
  } else {
- startTimer();
+ handleWarnings();
  }
  };
 
@@ -118,15 +124,32 @@ export function useStartStopTimerHandler() {
  if (dailyPlanEstimateHoursModalDate != currentDate) {
  handleMissingDailyPlanWorkHour();
  } else {
- startTimer();
+ handleWarnings();
  }
  } else {
  if (tasksEstimateHoursModalDate != currentDate) {
  openAddTasksEstimationHoursModal();
  } else {
- startTimer();
+ handleWarnings();
  }
  }
+ } else {
+ handleWarnings();
+ }
+ };
+
+ /**
+ * Check if there is warning for 'enforce' mode. If not,
+ * start tracking
+ */
+ const handleWarnings = () => {
+ if (
+ requirePlan &&
+ (!areAllTasksEstimated ||
+ !hasWorkedHours ||
+ Math.abs(Number(hasPlan?.workTimePlanned) - tasksEstimationTimes) > 1)
+ ) {
+ openAddTasksEstimationHoursModal();
  } else {
  startTimer();
  }
@@ -147,7 +170,7 @@ export function useStartStopTimerHandler() {
  tasksEstimateHoursModalDate == currentDate &&
  dailyPlanEstimateHoursModalDate == currentDate
  ) {
- startTimer();
+ handleWarnings();
  } else {
  if (dailyPlanSuggestionModalDate != currentDate) {
  if (!hasPlan) {
@@ -162,14 +185,13 @@ export function useStartStopTimerHandler() {
  if (areAllTasksEstimated) {
  handleMissingDailyPlanWorkHour();
  } else {
- startTimer();
+ handleWarnings();
  }
  } else {
- startTimer();
+ handleWarnings();
  }
  } else {
- // Default action to start the timer
- startTimer();
+ handleWarnings();
  }
  }
  }
@@ -187,6 +209,7 @@ export function useStartStopTimerHandler() {
  requirePlan,
  startTimer,
  stopTimer,
+ tasksEstimationTimes,
  timerStatus?.running,
  timerStatusFetching
  ]);