diff --git a/content-script.js b/content-script.js index 2398a8c..f27c296 100644 --- a/content-script.js +++ b/content-script.js @@ -2546,7 +2546,9 @@ ); const isNonServiceRequest = isNonServiceRequestSrNumber(selectedSr); const selectedSrLabel = - selectedSrOption?.srTitle || selectedSrOption?.label || selectedSr; + selectedSrOption?.label || + formatTimeManagementServiceRequestLabel(selectedSrOption) || + selectedSr; const selectedActivityValue = findOptionValue(activityOptions, row?.selectedActivityValue) || cleanString(row?.selectedActivityValue) || @@ -2572,9 +2574,8 @@ placeholder: "Search SR", options: modal.serviceRequests || [], valueKey: "srNumber", - labelKey: "srTitle", - fallbackLabelKey: "label", - metaKey: "srNumber", + labelKey: "label", + fallbackLabelKey: "srTitle", disabled: isNonServiceRequest, })} @@ -6158,23 +6159,33 @@ const srTitle = cleanString( getFieldValue(item, ["srTitle", "SrTitle", "SRTitle", "title", "Title"]) ); - const labelParts = [ - srNumber, - srTitle || - cleanString( - getFieldValue(item, ["problemDescription", "ProblemDescription"]) - ), - ].filter(Boolean); + const fallbackTitle = cleanString( + getFieldValue(item, ["problemDescription", "ProblemDescription"]) + ); return { srNumber, srTitle, - label: labelParts.join(" - ") || srNumber, + label: formatTimeManagementServiceRequestLabel({ + srNumber, + srTitle: srTitle || fallbackTitle, + }), }; }) .filter((item) => item.srNumber); } + function formatTimeManagementServiceRequestLabel(serviceRequest) { + const srNumber = cleanString(serviceRequest?.srNumber); + const srTitle = cleanString(serviceRequest?.srTitle || serviceRequest?.label); + + if (srTitle && srNumber) { + return `${srTitle} (${srNumber})`; + } + + return srTitle || srNumber; + } + function mergeTimeManagementServiceRequests(serviceRequests, timeEntryRows) { const merged = [...(serviceRequests || [])]; const seen = new Set(merged.map((item) => normalizeString(item.srNumber))); @@ -6190,7 +6201,10 @@ merged.push({ srNumber, srTitle: srNumber === "non-service-sr" ? "Non-service request" : srNumber, - label: srNumber === "non-service-sr" ? "Non-service request" : srNumber, + label: formatTimeManagementServiceRequestLabel({ + srNumber, + srTitle: srNumber === "non-service-sr" ? "Non-service request" : srNumber, + }), }); seen.add(key); } @@ -9337,7 +9351,8 @@ .arch-panel-extension-time-management-card { display: grid; - gap: 16px; + --arch-time-management-scrollbar-gutter: 16px; + gap: 4px; min-height: 0; overflow: visible; } @@ -9534,7 +9549,7 @@ min-height: 0; overflow-x: hidden; overflow-y: auto; - padding-right: 6px; + padding-right: 0; scrollbar-gutter: stable; } @@ -9550,14 +9565,16 @@ minmax(138px, 0.82fr) repeat(7, minmax(52px, 0.28fr)) 34px; - align-items: end; + align-items: center; gap: 6px; + padding-right: var(--arch-time-management-scrollbar-gutter); } .arch-panel-extension-time-management-column-label { color: var(--wb-text-secondary); font-size: 12px; font-weight: 600; + line-height: 1.2; } .arch-panel-extension-time-management-entry-row { @@ -9781,19 +9798,27 @@ .arch-panel-extension-time-management-day-head { display: grid; + align-content: center; + justify-items: center; gap: 1px; + min-height: 22px; + padding: 0; + color: var(--wb-text-secondary); + line-height: 1.15; + text-align: center; } .arch-panel-extension-time-management-day-head strong { - color: var(--wb-text); - font-size: 11px; + color: var(--wb-text-secondary); + font-size: 12px; + font-weight: 600; } .arch-panel-extension-time-management-day-head span { color: var(--wb-text-muted); - font-size: 10px; - font-weight: 700; - text-transform: uppercase; + font-size: 11px; + font-weight: 600; + text-transform: none; } .arch-panel-extension-time-management-day input { diff --git a/manifest.json b/manifest.json index 9dbcacd..a023ff8 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Arch Panel Injector", - "version": "1.0.105", + "version": "1.0.109", "description": "Insere o botao Arch panel no header do Oracle Workload Workbench.", "permissions": [ "cookies", @@ -154,6 +154,10 @@ + + + +