diff --git a/background.js b/background.js
index a571f9c..5ff62a3 100644
--- a/background.js
+++ b/background.js
@@ -966,9 +966,14 @@ async function executeComcipFetch(tabId, requestUrl, method, payload, headers, r
         headers: requestHeaders,
       };
 
-      if (normalizedMethod !== "GET" && normalizedMethod !== "HEAD") {
+      if (
+        normalizedMethod !== "GET" &&
+        normalizedMethod !== "HEAD" &&
+        requestPayload !== undefined &&
+        requestPayload !== null
+      ) {
         requestHeaders["content-type"] = "application/json";
-        fetchOptions.body = JSON.stringify(requestPayload || {});
+        fetchOptions.body = JSON.stringify(requestPayload);
       }
 
       const response = await fetch(requestUrl, {
@@ -1130,9 +1135,14 @@ async function executeComcipFetchFromFrame(
         headers: requestHeaders,
       };
 
-      if (normalizedMethod !== "GET" && normalizedMethod !== "HEAD") {
+      if (
+        normalizedMethod !== "GET" &&
+        normalizedMethod !== "HEAD" &&
+        requestPayload !== undefined &&
+        requestPayload !== null
+      ) {
         requestHeaders["content-type"] = "application/json";
-        fetchOptions.body = JSON.stringify(requestPayload || {});
+        fetchOptions.body = JSON.stringify(requestPayload);
       }
 
       const response = await fetch(requestUrl, fetchOptions);
@@ -1264,9 +1274,14 @@ async function executeComcipDirectFetch(
     headers: requestHeaders,
   };
 
-  if (normalizedMethod !== "GET" && normalizedMethod !== "HEAD") {
+  if (
+    normalizedMethod !== "GET" &&
+    normalizedMethod !== "HEAD" &&
+    payload !== undefined &&
+    payload !== null
+  ) {
     requestHeaders["content-type"] = "application/json";
-    fetchOptions.body = JSON.stringify(payload || {});
+    fetchOptions.body = JSON.stringify(payload);
   }
 
   const response = await fetch(requestUrl, fetchOptions);
diff --git a/content-script.js b/content-script.js
index f27c296..99538d2 100644
--- a/content-script.js
+++ b/content-script.js
@@ -39,6 +39,7 @@
     theme: "arch-panel-extension-theme",
     sidebarCollapsed: "arch-panel-extension-sidebar-collapsed",
     calendarView: "arch-panel-extension-calendar-view",
+    timeManagementSelectedDate: "arch-panel-extension-time-management-selected-date",
   };
 
   const CACHE = {
@@ -222,6 +223,8 @@
     taskTypeCache: {
       promise: null,
     },
+    timeManagementActivityCache: new Map(),
+    pendingTimeManagementHighlightRowId: "",
     timeManagementDatePicker: {
       isOpen: false,
       year: new Date().getFullYear(),
@@ -725,6 +728,11 @@
       return;
     }
 
+    if (action === "time-management-save") {
+      void saveTimeManagementChanges();
+      return;
+    }
+
     if (action === "time-management-remove-row") {
       removeTimeManagementEntryRow(actionElement.getAttribute("data-row-id"));
       return;
@@ -1061,9 +1069,31 @@
       }
 
       appState.pendingFocusSelector = "";
+      scrollPendingTimeManagementHighlightIntoView(overlay);
     });
   }
 
+  function scrollPendingTimeManagementHighlightIntoView(overlay) {
+    const rowId = cleanString(appState.pendingTimeManagementHighlightRowId);
+
+    if (!rowId) {
+      return;
+    }
+
+    appState.pendingTimeManagementHighlightRowId = "";
+    const row = overlay.querySelector(
+      `.arch-panel-extension-time-management-entry-row[data-row-id="${cssEscape(rowId)}"]`
+    );
+
+    if (row instanceof HTMLElement) {
+      row.scrollIntoView({
+        behavior: "smooth",
+        block: "center",
+        inline: "nearest",
+      });
+    }
+  }
+
   function captureModalScrollState(overlay) {
     const mainShell = overlay.querySelector(".arch-panel-extension-main-shell");
     const shellBody = overlay.querySelector(".arch-panel-extension-shell-body");
@@ -2396,6 +2426,9 @@
     }
 
     const selectedDate = modal.selectedDate || getDateInputValue(new Date());
+    const selectedDateLabel = formatDateInputDisplay(selectedDate);
+    const canSaveTimeManagement = isTimeManagementSaveEnabled(modal);
+    const isSavingTimeManagement = Boolean(modal.isSaving);
 
     return `
       <div class="arch-panel-extension-detail-overlay">
@@ -2434,7 +2467,7 @@
                   </button>
                   <input
                     type="text"
-                    value="${escapeHtml(selectedDate)}"
+                    value="${escapeHtml(selectedDateLabel)}"
                     aria-label="Selected date"
                     readonly
                   >
@@ -2452,6 +2485,7 @@
                 </button>
               </span>
             </label>
+            ${renderTimeManagementHourIndicators(modal)}
           </div>
 
           ${renderTimeManagementBody(modal)}
@@ -2472,7 +2506,20 @@
               >
                 Add (Non-service)
               </button>
+              <button
+                type="button"
+                class="arch-panel-extension-utility-button is-outline"
+                data-action="time-management-save"
+                ${canSaveTimeManagement && !isSavingTimeManagement ? "" : "disabled"}
+              >
+                ${isSavingTimeManagement ? "Gravando..." : "Gravar"}
+              </button>
             </div>
+            ${
+              modal.saveErrorMessage
+                ? `<p class="arch-panel-extension-time-management-save-error">${escapeHtml(modal.saveErrorMessage)}</p>`
+                : ""
+            }
             <button
               type="button"
               class="arch-panel-extension-close"
@@ -2509,7 +2556,13 @@
       <div class="arch-panel-extension-time-management-card">
         ${renderTimeManagementHeaderRow(modal.weekDays || [])}
         <div class="arch-panel-extension-time-management-rows">
-          ${rows.map((row, index) => renderTimeManagementEntryRow(modal, row, index)).join("")}
+          ${
+            rows.length
+              ? rows.map((row, index) => renderTimeManagementEntryRow(modal, row, index)).join("")
+              : `<div class="arch-panel-extension-empty-state arch-panel-extension-time-management-empty">
+                  Nenhum apontamento de hora neste período
+                </div>`
+          }
         </div>
       </div>
     `;
@@ -2538,6 +2591,9 @@
 
   function renderTimeManagementEntryRow(modal, row, index) {
     const rowId = cleanString(row?.id) || `row-${index}`;
+    const isHighlighted =
+      cleanString(modal?.highlightRowId) &&
+      cleanString(modal?.highlightRowId) === rowId;
     const selectedSr = cleanString(row?.selectedSrNumber);
     const activityOptions = getTimeManagementActivityOptions(modal, selectedSr);
     const selectedSrOption = findTimeManagementServiceRequestByNumber(
@@ -2564,7 +2620,8 @@
       findOptionLabel(taskTypeOptions, selectedTaskTypeValue) || selectedTaskTypeValue;
 
     return `
-      <div class="arch-panel-extension-time-management-entry-row is-compact" data-row-id="${escapeHtml(rowId)}">
+      <div class="arch-panel-extension-time-management-entry-row is-compact${isHighlighted ? " is-duplicate-highlight" : ""}" data-row-id="${escapeHtml(rowId)}">
+        <input type="hidden" name="timeEntryId" value="${escapeHtml(row?.timeEntryId || "")}">
         <label class="arch-panel-extension-form-field">
           ${renderSearchableCombobox({
             field: "sr",
@@ -2831,6 +2888,110 @@
     `;
   }
 
+  function renderTimeManagementHourIndicators(modal) {
+    if (modal?.status === "loading") {
+      return `
+        <div class="arch-panel-extension-time-management-hour-indicators" aria-label="Resumo de horas apontadas" aria-busy="true">
+          ${Array.from({ length: 4 }, () => `
+            <span class="arch-panel-extension-time-management-hour-indicator">
+              <span class="arch-panel-extension-skeleton arch-panel-extension-skeleton-text"></span>
+              <strong class="arch-panel-extension-skeleton arch-panel-extension-skeleton-title"></strong>
+            </span>
+          `).join("")}
+        </div>
+      `;
+    }
+
+    return `
+      <div class="arch-panel-extension-time-management-hour-indicators" aria-label="Resumo de horas apontadas">
+        ${buildTimeManagementHourIndicators(modal)
+          .map(
+            (indicator) => `
+              <span class="arch-panel-extension-time-management-hour-indicator">
+                <span>${escapeHtml(indicator.label)}</span>
+                <strong>${escapeHtml(formatHours(indicator.value))}</strong>
+              </span>
+            `
+          )
+          .join("")}
+      </div>
+    `;
+  }
+
+  function buildTimeManagementHourIndicators(modal) {
+    const totals = getTimeManagementRows(modal).reduce(
+      (accumulator, row) => {
+        const rowTotal = getTimeManagementRowTotalHours(row);
+        const category = getTimeManagementHourCategory(modal, row);
+
+        accumulator[category] += rowTotal;
+        accumulator.total += rowTotal;
+
+        return accumulator;
+      },
+      {
+        service: 0,
+        nonService: 0,
+        timeOff: 0,
+        total: 0,
+      }
+    );
+
+    return [
+      { label: "Service", value: totals.service },
+      { label: "Non Service", value: totals.nonService },
+      { label: "Time Off", value: totals.timeOff },
+      { label: "Total hours", value: totals.total },
+    ];
+  }
+
+  function getTimeManagementRowTotalHours(row) {
+    return Object.values(row?.dayHours || {}).reduce(
+      (sum, value) => sum + formatTimeManagementHourPayloadValue(value),
+      0
+    );
+  }
+
+  function getTimeManagementHourCategory(modal, row) {
+    if (isTimeManagementTimeOffRow(modal, row)) {
+      return "timeOff";
+    }
+
+    return isNonServiceRequestSrNumber(row?.selectedSrNumber)
+      ? "nonService"
+      : "service";
+  }
+
+  function isTimeManagementTimeOffRow(modal, row) {
+    const taskTypeValue = cleanString(row?.selectedTaskTypeValue);
+    const taskType = findTimeManagementTaskTypeByValue(modal, taskTypeValue);
+    const candidates = [
+      taskTypeValue,
+      taskType?.label,
+      taskType?.tags,
+    ].map((value) => normalizeString(value));
+
+    return candidates.some(
+      (value) =>
+        value === "TIME_OFF" ||
+        value === "TIMEOFF" ||
+        value.includes("TIME_OFF") ||
+        value.includes("TIME OFF")
+    );
+  }
+
+  function findTimeManagementTaskTypeByValue(modal, value) {
+    const normalizedValue = normalizeString(value);
+
+    if (!normalizedValue) {
+      return null;
+    }
+
+    return (modal?.taskTypes || []).find(
+      (item) => normalizeString(item?.value) === normalizedValue
+    ) || null;
+  }
+
   function renderTimeManagementDayInput(
     day,
     rowId = "",
@@ -5513,7 +5674,7 @@
   }
 
   async function openTimeManagementModal() {
-    const selectedDate = getDateInputValue(new Date());
+    const selectedDate = getStoredTimeManagementSelectedDate();
 
     appState.timeManagementModal = createTimeManagementLoadingState(selectedDate);
     renderModal();
@@ -5524,6 +5685,7 @@
     const normalizedDate = cleanString(selectedDate) || getDateInputValue(new Date());
     const requestId = `${Date.now()}-${++requestCounter}`;
 
+    setStoredTimeManagementSelectedDate(normalizedDate);
     appState.timeManagementDatePicker = {
       ...appState.timeManagementDatePicker,
       isOpen: false,
@@ -5539,6 +5701,7 @@
 
     try {
       const resourcePartyId = getCurrentUserResourcePartyId();
+      const taskTypePromise = fetchTaskTypeRequest();
 
       if (!resourcePartyId) {
         throw new Error("resourceCurrentUser.resourcePartyId não está disponível.");
@@ -5555,7 +5718,7 @@
       const timeEntryWeekUrl = buildTimeEntryWeekUrl(resourcePartyId, weekId);
       const [srPayload, taskTypePayload, timeEntryWeekPayload] = await Promise.all([
         fetchActiveServiceRequests(resourcePartyId, weekId),
-        fetchTaskTypeRequest(),
+        taskTypePromise,
         fetchTimeEntryWeek(timeEntryWeekUrl),
       ]);
       const timeEntryRows = normalizeTimeManagementEntryRows(
@@ -5567,31 +5730,16 @@
         timeEntryRows
       );
       const activitySrNumbers = getActivityRequestSrNumbers(srPayload, serviceRequests);
-      let activityRequestUrl = activitySrNumbers.length
-        ? buildActivityRequestUrl(activitySrNumbers)
-        : "";
-      let activityPayload = activityRequestUrl
-        ? await fetchComcipPayload(activityRequestUrl, "activityRequest")
-        : null;
-
-      if (activityRequestUrl && !hasActivityRequestItems(activityPayload)) {
-        activityRequestUrl = buildActivityRequestUrl(
-          ACTIVITY_REQUEST_REFERENCE_SR_NUMBERS
-        );
-        activityPayload = await fetchComcipPayload(
-          activityRequestUrl,
-          "activityRequest"
-        );
-      }
+      const activityRequest = await fetchCachedActivityRequest(activitySrNumbers);
+      const activityRequestUrl = activityRequest.url;
+      const activityPayload = activityRequest.payload;
 
       const activityOptionsBySr = normalizeActivityRequest(
         activityPayload,
         serviceRequests
       );
       const taskTypes = normalizeTaskTypeRequest(taskTypePayload);
-      const rows = timeEntryRows.length
-        ? timeEntryRows
-        : [createBlankTimeManagementEntryRow()];
+      const rows = timeEntryRows;
       const selectedSrNumber = rows[0]?.selectedSrNumber || "";
       const normalizedRows = rows.map((row, index) =>
         normalizeTimeManagementEntryRowSelection(
@@ -5623,6 +5771,10 @@
           normalizedRows[0]?.selectedActivityValue || "",
         taskTypes,
         selectedTaskTypeValue: normalizedRows[0]?.selectedTaskTypeValue || "",
+        highlightRowId: "",
+        deletedTimeEntryIds: [],
+        isSaving: false,
+        saveErrorMessage: "",
       };
       renderModal();
     } catch (error) {
@@ -5658,23 +5810,80 @@
       taskTypes: [],
       selectedTaskTypeValue: "",
       timeEntryRows: [],
+      highlightRowId: "",
+      deletedTimeEntryIds: [],
+      isSaving: false,
+      saveErrorMessage: "",
     };
   }
 
   function getTimeManagementRows(modal) {
-    return modal.timeEntryRows?.length
-      ? modal.timeEntryRows
-      : [createBlankTimeManagementEntryRow()];
+    return modal.timeEntryRows || [];
   }
 
-  function createBlankTimeManagementEntryRow(srNumber = "") {
+  function isTimeManagementSaveEnabled(modal) {
+    const pendingChanges = getTimeManagementPendingChanges(modal);
+    const changedRows = [
+      ...pendingChanges.newRows,
+      ...pendingChanges.updatedRows,
+    ];
+
+    if (
+      !pendingChanges.newRows.length &&
+      !pendingChanges.updatedRows.length &&
+      !pendingChanges.deletedIds.length
+    ) {
+      return false;
+    }
+
+    return changedRows.every((row) => isTimeManagementRowReadyToSave(row));
+  }
+
+  function isTimeManagementRowReadyToSave(row) {
+    const selectedSrNumber = cleanString(row?.selectedSrNumber);
+
+    if (!selectedSrNumber) {
+      return false;
+    }
+
+    if (!hasPositiveTimeManagementHours(row)) {
+      return false;
+    }
+
+    if (isNonServiceRequestSrNumber(selectedSrNumber)) {
+      return Boolean(cleanString(row?.selectedTaskTypeValue));
+    }
+
+    return Boolean(
+      cleanString(row?.selectedActivityValue) &&
+      cleanString(row?.selectedTaskTypeValue)
+    );
+  }
+
+  function hasPositiveTimeManagementHours(row) {
+    return Object.values(row?.dayHours || {}).some((value) => {
+      const normalizedValue = cleanString(value);
+
+      if (!normalizedValue) {
+        return false;
+      }
+
+      const numericValue = Number(normalizedValue.replace(",", "."));
+
+      return Number.isFinite(numericValue) && numericValue > 0;
+    });
+  }
+
+  function createBlankTimeManagementEntryRow(srNumber = "", source = "blank") {
     return {
       id: `row-${Date.now()}-${Math.random().toString(16).slice(2)}`,
+      timeEntryId: "",
       selectedSrNumber: cleanString(srNumber),
       selectedActivityValue: "",
       selectedTaskTypeValue: "",
       dayHours: {},
-      source: "blank",
+      source,
+      originalSignature: "",
     };
   }
 
@@ -5683,15 +5892,27 @@
       return;
     }
 
+    const existingDuplicateRow = findExistingTimeManagementDuplicateRow(
+      appState.timeManagementModal,
+      type
+    );
+
+    if (existingDuplicateRow) {
+      highlightTimeManagementDuplicateRow(existingDuplicateRow.id);
+      return;
+    }
+
     const srNumber = type === "non-service" ? "non-service-sr" : "";
     const nextRows = [
       ...getTimeManagementRows(appState.timeManagementModal),
-      createBlankTimeManagementEntryRow(srNumber),
+      createBlankTimeManagementEntryRow(srNumber, "manual"),
     ];
 
     appState.timeManagementModal = {
       ...appState.timeManagementModal,
       timeEntryRows: nextRows,
+      highlightRowId: "",
+      saveErrorMessage: "",
     };
     renderModal();
   }
@@ -5702,12 +5923,21 @@
     }
 
     const normalizedRowId = cleanString(rowId);
-    const remainingRows = getTimeManagementRows(appState.timeManagementModal).filter(
+    const rows = getTimeManagementRows(appState.timeManagementModal);
+    const removedRow = rows.find((row) => cleanString(row?.id) === normalizedRowId);
+    const removedTimeEntryId = cleanString(removedRow?.timeEntryId);
+    const remainingRows = rows.filter(
       (row) => cleanString(row?.id) !== normalizedRowId
     );
-    const nextRows = remainingRows.length
-      ? remainingRows
-      : [createBlankTimeManagementEntryRow()];
+    const nextRows = remainingRows;
+    const deletedTimeEntryIds = removedTimeEntryId
+      ? Array.from(
+          new Set([
+            ...(appState.timeManagementModal.deletedTimeEntryIds || []),
+            removedTimeEntryId,
+          ])
+        )
+      : appState.timeManagementModal.deletedTimeEntryIds || [];
 
     appState.timeManagementModal = {
       ...appState.timeManagementModal,
@@ -5715,6 +5945,9 @@
       selectedSrNumber: nextRows[0]?.selectedSrNumber || "",
       selectedActivityValue: nextRows[0]?.selectedActivityValue || "",
       selectedTaskTypeValue: nextRows[0]?.selectedTaskTypeValue || "",
+      highlightRowId: "",
+      deletedTimeEntryIds,
+      saveErrorMessage: "",
     };
     renderModal();
   }
@@ -5760,6 +5993,16 @@
       srNumber
     );
     const selectedSrNumber = selectedServiceRequest?.srNumber || cleanString(srNumber);
+    const duplicateRow = findDuplicateTimeManagementSrRow(
+      appState.timeManagementModal,
+      selectedSrNumber,
+      rowId
+    );
+
+    if (duplicateRow) {
+      highlightTimeManagementDuplicateRow(duplicateRow.id);
+      return;
+    }
 
     const nextRow = {
       ...(targetRow || createBlankTimeManagementEntryRow()),
@@ -5779,6 +6022,8 @@
       selectedSrNumber: nextRows[0]?.selectedSrNumber || selectedSrNumber,
       selectedActivityValue: nextRows[0]?.selectedActivityValue || "",
       selectedTaskTypeValue: nextRows[0]?.selectedTaskTypeValue || "",
+      highlightRowId: "",
+      saveErrorMessage: "",
     };
     renderModal();
   }
@@ -5807,6 +6052,17 @@
       );
       value =
         findOptionValue(options, normalizedInput) || normalizedInput;
+
+      const duplicateRow = findDuplicateTimeManagementNonServiceTaskTypeRow(
+        appState.timeManagementModal,
+        value,
+        rowId
+      );
+
+      if (duplicateRow) {
+        highlightTimeManagementDuplicateRow(duplicateRow.id);
+        return;
+      }
     }
 
     const nextRows = updateTimeManagementRows(appState.timeManagementModal, rowId, {
@@ -5818,9 +6074,106 @@
       ...appState.timeManagementModal,
       timeEntryRows: nextRows,
       [fieldName]: value,
+      highlightRowId: "",
+      saveErrorMessage: "",
     };
   }
 
+  function findDuplicateTimeManagementSrRow(modal, srNumber, currentRowId = "") {
+    const normalizedSrNumber = normalizeString(srNumber);
+    const normalizedCurrentRowId = cleanString(currentRowId);
+
+    if (!normalizedSrNumber || isNonServiceRequestSrNumber(srNumber)) {
+      return null;
+    }
+
+    return getTimeManagementRows(modal).find((row) => {
+      return (
+        cleanString(row?.id) !== normalizedCurrentRowId &&
+        normalizeString(row?.selectedSrNumber) === normalizedSrNumber
+      );
+    }) || null;
+  }
+
+  function findExistingTimeManagementDuplicateRow(modal, type) {
+    const seen = new Map();
+
+    for (const row of getTimeManagementRows(modal)) {
+      const rowId = cleanString(row?.id);
+      let key = "";
+
+      if (type === "non-service") {
+        if (!isNonServiceRequestSrNumber(row?.selectedSrNumber)) {
+          continue;
+        }
+
+        key = normalizeString(row?.selectedTaskTypeValue);
+      } else {
+        if (isNonServiceRequestSrNumber(row?.selectedSrNumber)) {
+          continue;
+        }
+
+        key = normalizeString(row?.selectedSrNumber);
+      }
+
+      if (!key) {
+        continue;
+      }
+
+      if (seen.has(key)) {
+        return getTimeManagementRows(modal).find(
+          (candidate) => cleanString(candidate?.id) === seen.get(key)
+        ) || row;
+      }
+
+      seen.set(key, rowId);
+    }
+
+    return null;
+  }
+
+  function findDuplicateTimeManagementNonServiceTaskTypeRow(
+    modal,
+    taskTypeValue,
+    currentRowId = ""
+  ) {
+    const normalizedTaskTypeValue = normalizeString(taskTypeValue);
+    const normalizedCurrentRowId = cleanString(currentRowId);
+
+    if (!normalizedTaskTypeValue) {
+      return null;
+    }
+
+    const currentRow = getTimeManagementRowById(modal, currentRowId);
+
+    if (!isNonServiceRequestSrNumber(currentRow?.selectedSrNumber)) {
+      return null;
+    }
+
+    return getTimeManagementRows(modal).find((row) => {
+      return (
+        cleanString(row?.id) !== normalizedCurrentRowId &&
+        isNonServiceRequestSrNumber(row?.selectedSrNumber) &&
+        normalizeString(row?.selectedTaskTypeValue) === normalizedTaskTypeValue
+      );
+    }) || null;
+  }
+
+  function highlightTimeManagementDuplicateRow(rowId) {
+    const normalizedRowId = cleanString(rowId);
+
+    if (!appState.timeManagementModal || !normalizedRowId) {
+      return;
+    }
+
+    appState.pendingTimeManagementHighlightRowId = normalizedRowId;
+    appState.timeManagementModal = {
+      ...appState.timeManagementModal,
+      highlightRowId: normalizedRowId,
+    };
+    renderModal();
+  }
+
   function updateTimeManagementDayHours(rowId, dateKey, inputValue) {
     if (!appState.timeManagementModal) {
       return;
@@ -5842,7 +6195,188 @@
         rowId,
         nextRow
       ),
+      highlightRowId: "",
+      saveErrorMessage: "",
     };
+    renderModal();
+  }
+
+  async function saveTimeManagementChanges() {
+    const modal = appState.timeManagementModal;
+
+    if (!modal || modal.isSaving || !isTimeManagementSaveEnabled(modal)) {
+      return;
+    }
+
+    appState.timeManagementModal = {
+      ...modal,
+      isSaving: true,
+      saveErrorMessage: "",
+    };
+    renderModal();
+
+    try {
+      const resourceId = getCurrentUserResourcePartyId();
+      const weekId = cleanString(modal.weekId);
+
+      if (!resourceId) {
+        throw new Error("resourceCurrentUser.resourcePartyId não está disponível.");
+      }
+
+      if (!weekId) {
+        throw new Error("WeekId não encontrado para gravação do apontamento.");
+      }
+
+      const changes = getTimeManagementPendingChanges(modal);
+      const baseUrl = COMCIP_REQUEST.timeEntriesUrl;
+      const deletedIds = changes.deletedIds;
+      const updatedPayload = changes.updatedRows.map((row) =>
+        createTimeManagementSavePayload(row, modal.weekDays, weekId, resourceId, {
+          includeId: true,
+        })
+      );
+      const newPayload = changes.newRows.map((row) =>
+        createTimeManagementSavePayload(row, modal.weekDays, weekId, resourceId)
+      );
+
+      for (const timeEntryId of deletedIds) {
+        await mutateComcipPayload(
+          "DELETE",
+          `${baseUrl}/${encodeURIComponent(timeEntryId)}`,
+          null,
+          "timeEntryDelete"
+        );
+      }
+
+      if (updatedPayload.length) {
+        await mutateComcipPayload(
+          "PUT",
+          baseUrl,
+          updatedPayload,
+          "timeEntryUpdate"
+        );
+      }
+
+      if (newPayload.length) {
+        await mutateComcipPayload("POST", baseUrl, newPayload, "timeEntryCreate");
+      }
+
+      await loadTimeManagementData(modal.selectedDate || getDateInputValue(new Date()));
+    } catch (error) {
+      appState.timeManagementModal = {
+        ...(appState.timeManagementModal || modal),
+        isSaving: false,
+        saveErrorMessage: getErrorMessage(error),
+      };
+      renderModal();
+    }
+  }
+
+  function getTimeManagementPendingChanges(modal) {
+    const rows = getTimeManagementRows(modal);
+
+    return {
+      newRows: rows.filter((row) => isNewTimeManagementRow(row)),
+      updatedRows: rows.filter((row) => isUpdatedTimeManagementRow(row)),
+      deletedIds: (modal?.deletedTimeEntryIds || [])
+        .map((id) => cleanString(id))
+        .filter(Boolean),
+    };
+  }
+
+  function isNewTimeManagementRow(row) {
+    return cleanString(row?.source) === "manual" && !cleanString(row?.timeEntryId);
+  }
+
+  function isUpdatedTimeManagementRow(row) {
+    const timeEntryId = cleanString(row?.timeEntryId);
+    const originalSignature = cleanString(row?.originalSignature);
+
+    return Boolean(
+      timeEntryId &&
+      originalSignature &&
+      originalSignature !== createTimeManagementRowSignature(row)
+    );
+  }
+
+  function createTimeManagementRowSignature(row) {
+    return JSON.stringify({
+      srNumber: cleanString(row?.selectedSrNumber),
+      activityCode: cleanString(row?.selectedActivityValue),
+      taskType: cleanString(row?.selectedTaskTypeValue),
+      dayHours: normalizeTimeManagementDayHours(row?.dayHours || {}),
+    });
+  }
+
+  function normalizeTimeManagementDayHours(dayHours) {
+    return Object.keys(dayHours || {})
+      .sort()
+      .reduce((normalized, key) => {
+        normalized[key] = formatTimeManagementHourPayloadValue(dayHours[key]);
+        return normalized;
+      }, {});
+  }
+
+  function createTimeManagementSavePayload(
+    row,
+    weekDays,
+    weekId,
+    resourceId,
+    options = {}
+  ) {
+    const selectedSrNumber = cleanString(row?.selectedSrNumber);
+    const payload = {
+      srNumber: selectedSrNumber,
+      activityCode: isNonServiceRequestSrNumber(selectedSrNumber)
+        ? ""
+        : cleanString(row?.selectedActivityValue),
+      taskType: cleanString(row?.selectedTaskTypeValue),
+      deliveryType: "",
+      saturdayTaskHours: 0,
+      sundayTaskHours: 0,
+      mondayTaskHours: 0,
+      tuesdayTaskHours: 0,
+      wednesdayTaskHours: 0,
+      thursdayTaskHours: 0,
+      fridayTaskHours: 0,
+      notes: "",
+      weekId: toNumber(weekId) || weekId,
+      resourceId: cleanString(resourceId),
+      tag: isNonServiceRequestSrNumber(selectedSrNumber)
+        ? "NON_SERVICE"
+        : "SERVICE",
+    };
+
+    if (options.includeId) {
+      const id = cleanString(row?.timeEntryId);
+      payload.id = toNumber(id) || id;
+    }
+
+    for (const day of weekDays || []) {
+      const weekdayName = getTimeManagementWeekdayName(day);
+      const dateKey = getTimeManagementDayKey(day);
+      const payloadKey = `${weekdayName}TaskHours`;
+
+      if (payloadKey in payload) {
+        payload[payloadKey] = formatTimeManagementHourPayloadValue(
+          row?.dayHours?.[dateKey]
+        );
+      }
+    }
+
+    return payload;
+  }
+
+  function formatTimeManagementHourPayloadValue(value) {
+    const normalizedValue = cleanString(value);
+
+    if (!normalizedValue) {
+      return 0;
+    }
+
+    const numericValue = Number(normalizedValue.replace(",", "."));
+
+    return Number.isFinite(numericValue) ? numericValue : 0;
   }
 
   function selectTimeManagementComboboxOption(field, value, rowId = "") {
@@ -6005,6 +6539,77 @@
     return fetchComcipPayload(buildActivityRequestUrl(srNumbers), "activityRequest");
   }
 
+  async function fetchCachedActivityRequest(srNumbers) {
+    const cacheKey = getActivityRequestCacheKey(srNumbers);
+
+    if (!cacheKey) {
+      return {
+        url: "",
+        payload: null,
+      };
+    }
+
+    const cachedRequest = appState.timeManagementActivityCache.get(cacheKey);
+
+    if (cachedRequest?.payload) {
+      return cachedRequest;
+    }
+
+    if (cachedRequest?.promise) {
+      return cachedRequest.promise;
+    }
+
+    const requestPromise = fetchActivityRequestWithFallback(srNumbers).then((result) => {
+      appState.timeManagementActivityCache.set(cacheKey, {
+        url: result.url,
+        payload: result.payload,
+      });
+
+      return result;
+    }).catch((error) => {
+      appState.timeManagementActivityCache.delete(cacheKey);
+      throw error;
+    });
+
+    appState.timeManagementActivityCache.set(cacheKey, {
+      promise: requestPromise,
+    });
+
+    return requestPromise;
+  }
+
+  async function fetchActivityRequestWithFallback(srNumbers) {
+    let activityRequestUrl = buildActivityRequestUrl(srNumbers);
+    let activityPayload = await fetchComcipPayload(
+      activityRequestUrl,
+      "activityRequest"
+    );
+
+    if (activityRequestUrl && !hasActivityRequestItems(activityPayload)) {
+      activityRequestUrl = buildActivityRequestUrl(
+        ACTIVITY_REQUEST_REFERENCE_SR_NUMBERS
+      );
+      activityPayload = await fetchComcipPayload(
+        activityRequestUrl,
+        "activityRequest"
+      );
+    }
+
+    return {
+      url: activityRequestUrl,
+      payload: activityPayload,
+    };
+  }
+
+  function getActivityRequestCacheKey(srNumbers) {
+    const normalizedSrNumbers = (srNumbers || [])
+      .map((srNumber) => cleanString(srNumber).toUpperCase())
+      .filter((srNumber) => /^SR\d+$/i.test(srNumber))
+      .sort();
+
+    return normalizedSrNumbers.join("|");
+  }
+
   function buildActivityRequestUrl(srNumbers) {
     const query = buildServiceRequestActivityQuery(srNumbers);
     const fields =
@@ -6077,6 +6682,37 @@
     return response.payload;
   }
 
+  async function mutateComcipPayload(method, url, payload, requestName) {
+    const response = await sendComcipRequestMessage({
+      method,
+      url,
+      payload,
+      timeoutMessage: `Timed out while executing ${requestName}.`,
+    });
+
+    if (!response?.ok) {
+      const payloadMessage =
+        typeof response?.payload === "string"
+          ? cleanString(response.payload)
+          : firstNonEmptyString([
+              response?.payload?.message,
+              response?.payload?.error,
+              response?.payload?.title,
+              response?.payload?.detail,
+            ]);
+
+      throw new Error(
+        `${requestName}: ${
+          payloadMessage ||
+          response?.error ||
+          `COMCIP request failed (${response?.status || 0}).`
+        }`
+      );
+    }
+
+    return response.payload;
+  }
+
   function hasActivityRequestItems(payload) {
     const count = Number(payload?.count);
 
@@ -6215,17 +6851,20 @@
   function normalizeTimeManagementEntryRows(payload, weekDays) {
     return extractArray(payload, ["items", "data", "results", "content"]).map(
       (item, index) => {
+        const timeEntryId = getTimeEntryId(item);
         const srNumber = getTimeEntrySrNumber(item) || "non-service-sr";
         const activityValue = getTimeEntryActivity(item);
         const taskTypeValue = getTimeEntryTaskType(item);
 
         return {
           id: `entry-${index + 1}`,
+          timeEntryId,
           selectedSrNumber: srNumber,
           selectedActivityValue: activityValue,
           selectedTaskTypeValue: taskTypeValue,
           dayHours: getTimeEntryWeekDayHours(item, weekDays),
           source: "timeEntryWeek",
+          originalSignature: "",
         };
       }
     );
@@ -6322,6 +6961,7 @@
     return {
       ...row,
       id: cleanString(row?.id) || `entry-${index + 1}`,
+      timeEntryId: cleanString(row?.timeEntryId),
       selectedSrNumber: srNumber,
       selectedActivityValue:
         findOptionValue(activityOptions, row?.selectedActivityValue) ||
@@ -6332,6 +6972,23 @@
         cleanString(row?.selectedTaskTypeValue) ||
         "",
       dayHours: row?.dayHours || {},
+      originalSignature:
+        cleanString(row?.originalSignature) ||
+        (cleanString(row?.source) === "timeEntryWeek"
+          ? createTimeManagementRowSignature({
+              ...row,
+              selectedSrNumber: srNumber,
+              selectedActivityValue:
+                findOptionValue(activityOptions, row?.selectedActivityValue) ||
+                cleanString(row?.selectedActivityValue) ||
+                "",
+              selectedTaskTypeValue:
+                findOptionValue(taskTypeOptions, row?.selectedTaskTypeValue) ||
+                cleanString(row?.selectedTaskTypeValue) ||
+                "",
+              dayHours: row?.dayHours || {},
+            })
+          : ""),
     };
   }
 
@@ -8062,6 +8719,24 @@
         cursor: not-allowed;
       }
 
+      .arch-panel-extension-utility-button.is-outline {
+        border-color: #0b5cab;
+        background: transparent;
+        color: #0b5cab;
+      }
+
+      .arch-panel-extension-utility-button.is-outline:hover:not(:disabled) {
+        background: rgba(11, 92, 171, 0.08);
+      }
+
+      .arch-panel-extension-utility-button.is-outline:disabled {
+        border-color: var(--wb-border);
+        background: transparent;
+        color: var(--wb-text-muted);
+        cursor: not-allowed;
+        opacity: 0.62;
+      }
+
       .arch-panel-extension-shell-body {
         display: grid;
         grid-template-columns: 260px minmax(0, 1fr);
@@ -9361,6 +10036,55 @@
         border-color: rgba(217, 79, 43, 0.42);
       }
 
+      .arch-panel-extension-time-management-toolbar {
+        display: flex;
+        align-items: end;
+        gap: 14px;
+        flex-wrap: wrap;
+      }
+
+      .arch-panel-extension-time-management-hour-indicators {
+        display: grid;
+        grid-template-columns: repeat(4, minmax(92px, 1fr));
+        gap: 8px;
+        flex: 1 1 520px;
+      }
+
+      .arch-panel-extension-time-management-hour-indicator {
+        display: grid;
+        gap: 3px;
+        min-height: 48px;
+        align-content: center;
+        border: 1px solid var(--wb-border);
+        border-radius: 8px;
+        background: var(--wb-panel);
+        padding: 7px 10px;
+      }
+
+      .arch-panel-extension-time-management-hour-indicator span {
+        color: var(--wb-text-muted);
+        font-size: 10px;
+        font-weight: 800;
+        letter-spacing: 0.06em;
+        text-transform: uppercase;
+      }
+
+      .arch-panel-extension-time-management-hour-indicator strong {
+        color: var(--wb-text);
+        font-size: 16px;
+        font-weight: 800;
+        line-height: 1.1;
+      }
+
+      .arch-panel-extension-time-management-hour-indicator .arch-panel-extension-skeleton-text {
+        width: 72%;
+      }
+
+      .arch-panel-extension-time-management-hour-indicator .arch-panel-extension-skeleton-title {
+        width: 42%;
+        height: 16px;
+      }
+
       .arch-panel-extension-date-picker {
         position: relative;
         display: inline-flex;
@@ -9557,6 +10281,11 @@
         overflow: visible;
       }
 
+      .arch-panel-extension-time-management-empty {
+        grid-column: 1 / -1;
+        text-align: center;
+      }
+
       .arch-panel-extension-time-management-header-row {
         display: grid;
         grid-template-columns:
@@ -9593,10 +10322,32 @@
         align-items: center;
       }
 
+      .arch-panel-extension-time-management-entry-row.is-duplicate-highlight {
+        border-radius: 10px;
+        animation: arch-panel-extension-duplicate-pulse 1100ms ease-in-out 2;
+        outline: 3px solid rgba(217, 79, 43, 0.88);
+        outline-offset: 3px;
+      }
+
       .arch-panel-extension-time-management-entry-row.is-compact .arch-panel-extension-form-field {
         gap: 0;
       }
 
+      @keyframes arch-panel-extension-duplicate-pulse {
+        0% {
+          outline-color: rgba(217, 79, 43, 0.25);
+          box-shadow: 0 0 0 0 rgba(217, 79, 43, 0.22);
+        }
+        45% {
+          outline-color: rgba(217, 79, 43, 0.95);
+          box-shadow: 0 0 0 8px rgba(217, 79, 43, 0.14);
+        }
+        100% {
+          outline-color: rgba(217, 79, 43, 0.62);
+          box-shadow: 0 0 0 0 rgba(217, 79, 43, 0);
+        }
+      }
+
       .arch-panel-extension-combobox {
         position: relative;
         display: block;
@@ -10005,6 +10756,13 @@
         margin-right: auto;
       }
 
+      .arch-panel-extension-time-management-save-error {
+        margin: 0 auto 0 0;
+        color: var(--wb-warning);
+        font-size: 12px;
+        font-weight: 700;
+      }
+
       .arch-panel-extension-form-grid {
         display: grid;
         grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -10547,6 +11305,45 @@
     }
   }
 
+  function getStoredTimeManagementSelectedDate() {
+    try {
+      const storedDate = window.localStorage.getItem(
+        STORAGE_KEYS.timeManagementSelectedDate
+      );
+
+      return isValidDateInputValue(storedDate)
+        ? storedDate
+        : getDateInputValue(new Date());
+    } catch {
+      return getDateInputValue(new Date());
+    }
+  }
+
+  function setStoredTimeManagementSelectedDate(value) {
+    if (!isValidDateInputValue(value)) {
+      return;
+    }
+
+    try {
+      window.localStorage.setItem(
+        STORAGE_KEYS.timeManagementSelectedDate,
+        value
+      );
+    } catch {
+      // Ignore storage issues and keep the in-memory selected date.
+    }
+  }
+
+  function isValidDateInputValue(value) {
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(String(value || ""))) {
+      return false;
+    }
+
+    const parsedDate = parseDatePreservingDateOnly(value);
+
+    return !Number.isNaN(parsedDate.getTime());
+  }
+
   function normalizeText(value) {
     return String(value || "").replace(/\s+/g, " ").trim();
   }
@@ -10817,6 +11614,20 @@
     return `${year}-${month}-${day}`;
   }
 
+  function formatDateInputDisplay(value) {
+    const date = parseDatePreservingDateOnly(value);
+
+    if (Number.isNaN(date.getTime())) {
+      return cleanString(value);
+    }
+
+    const day = String(date.getDate()).padStart(2, "0");
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const year = date.getFullYear();
+
+    return `${day}/${month}/${year}`;
+  }
+
   function formatDateForTimeEntryRequest(value) {
     const date = parseDatePreservingDateOnly(value);
 
@@ -11035,6 +11846,20 @@
     );
   }
 
+  function getTimeEntryId(item) {
+    return cleanString(
+      getTimeEntryField(item, [
+        "id",
+        "Id",
+        "ID",
+        "timeEntryId",
+        "TimeEntryId",
+        "timeEntryID",
+        "TimeEntryID",
+      ])
+    );
+  }
+
   function getTimeEntryActivity(item) {
     return cleanString(
       getTimeEntryField(item, [
@@ -11193,6 +12018,14 @@
       .replace(/'/g, "&#39;");
   }
 
+  function cssEscape(value) {
+    if (window.CSS?.escape) {
+      return window.CSS.escape(String(value || ""));
+    }
+
+    return String(value || "").replace(/["\\]/g, "\\$&");
+  }
+
   function lockScroll() {
     document.documentElement.classList.add(CLASSES.modalOpen);
     document.body.classList.add(CLASSES.modalOpen);
diff --git a/manifest.json b/manifest.json
index a023ff8..6856932 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Arch Panel Injector",
-  "version": "1.0.109",
+  "version": "1.0.119",
   "description": "Insere o botao Arch panel no header do Oracle Workload Workbench.",
   "permissions": [
     "cookies",
@@ -153,6 +153,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+