diff --git a/dist/chromium/content.js b/dist/chromium/content.js index b30303f..cec9b0b 100644 --- a/dist/chromium/content.js +++ b/dist/chromium/content.js @@ -1442,7 +1442,7 @@ const normalizedSearch = tableSearch.trim().toLocaleLowerCase(); const items = opportunitiesTableState.items.filter((item) => { return selectedStages.has(item.ForecastGroup_c) - && selectedStatuses.has(item.StatusCode) + && matchesSelectedStatus(item.StatusCode) && selectedCustomerKeys.has(getCustomerKey(item)) && selectedOwnerKeys.has(getOwnerKey(item)) && matchesTableSearch(item, normalizedSearch); @@ -1495,6 +1495,14 @@ }); } + function matchesSelectedStatus(statusCode) { + if (statusCode === "WON_PENDING") { + return selectedStatuses.has("WON"); + } + + return selectedStatuses.has(statusCode); + } + function stringifySearchValue(value) { if (value === null || value === undefined) { return ""; @@ -2939,11 +2947,11 @@ } .opportunities-extension-table th:nth-child(7) { - width: 6%; + width: 7%; } .opportunities-extension-table th:nth-child(8) { - width: 7%; + width: 6%; } .opportunities-extension-table th:nth-child(9) { @@ -2957,8 +2965,6 @@ .opportunities-extension-table td:nth-child(2), .opportunities-extension-table td:nth-child(5), .opportunities-extension-table td:nth-child(6), - .opportunities-extension-table td:nth-child(7), - .opportunities-extension-table td:nth-child(8), .opportunities-extension-table td:nth-child(8) { white-space: nowrap; overflow: hidden; @@ -2972,6 +2978,13 @@ overflow: visible; } + .opportunities-extension-table td:nth-child(7) { + padding-right: 6px; + padding-left: 6px; + white-space: nowrap; + overflow: visible; + } + .opportunities-extension-table td:nth-child(10) { padding-right: 6px; padding-left: 6px; @@ -3607,6 +3620,14 @@ width: 12%; } + .opportunities-extension-table th:nth-child(6) { + width: 7%; + } + + .opportunities-extension-table th:nth-child(7) { + width: 8%; + } + .opportunities-extension-table th:nth-child(10) { width: 10%; } @@ -3629,6 +3650,14 @@ width: 13%; } + .opportunities-extension-table th:nth-child(6) { + width: 6%; + } + + .opportunities-extension-table th:nth-child(7) { + width: 9%; + } + .opportunities-extension-table th:nth-child(10) { width: 11%; } diff --git a/dist/firefox/content.js b/dist/firefox/content.js index b30303f..cec9b0b 100644 --- a/dist/firefox/content.js +++ b/dist/firefox/content.js @@ -1442,7 +1442,7 @@ const normalizedSearch = tableSearch.trim().toLocaleLowerCase(); const items = opportunitiesTableState.items.filter((item) => { return selectedStages.has(item.ForecastGroup_c) - && selectedStatuses.has(item.StatusCode) + && matchesSelectedStatus(item.StatusCode) && selectedCustomerKeys.has(getCustomerKey(item)) && selectedOwnerKeys.has(getOwnerKey(item)) && matchesTableSearch(item, normalizedSearch); @@ -1495,6 +1495,14 @@ }); } + function matchesSelectedStatus(statusCode) { + if (statusCode === "WON_PENDING") { + return selectedStatuses.has("WON"); + } + + return selectedStatuses.has(statusCode); + } + function stringifySearchValue(value) { if (value === null || value === undefined) { return ""; @@ -2939,11 +2947,11 @@ } .opportunities-extension-table th:nth-child(7) { - width: 6%; + width: 7%; } .opportunities-extension-table th:nth-child(8) { - width: 7%; + width: 6%; } .opportunities-extension-table th:nth-child(9) { @@ -2957,8 +2965,6 @@ .opportunities-extension-table td:nth-child(2), .opportunities-extension-table td:nth-child(5), .opportunities-extension-table td:nth-child(6), - .opportunities-extension-table td:nth-child(7), - .opportunities-extension-table td:nth-child(8), .opportunities-extension-table td:nth-child(8) { white-space: nowrap; overflow: hidden; @@ -2972,6 +2978,13 @@ overflow: visible; } + .opportunities-extension-table td:nth-child(7) { + padding-right: 6px; + padding-left: 6px; + white-space: nowrap; + overflow: visible; + } + .opportunities-extension-table td:nth-child(10) { padding-right: 6px; padding-left: 6px; @@ -3607,6 +3620,14 @@ width: 12%; } + .opportunities-extension-table th:nth-child(6) { + width: 7%; + } + + .opportunities-extension-table th:nth-child(7) { + width: 8%; + } + .opportunities-extension-table th:nth-child(10) { width: 10%; } @@ -3629,6 +3650,14 @@ width: 13%; } + .opportunities-extension-table th:nth-child(6) { + width: 6%; + } + + .opportunities-extension-table th:nth-child(7) { + width: 9%; + } + .opportunities-extension-table th:nth-child(10) { width: 11%; } diff --git a/src/content.js b/src/content.js index b30303f..cec9b0b 100644 --- a/src/content.js +++ b/src/content.js @@ -1442,7 +1442,7 @@ const normalizedSearch = tableSearch.trim().toLocaleLowerCase(); const items = opportunitiesTableState.items.filter((item) => { return selectedStages.has(item.ForecastGroup_c) - && selectedStatuses.has(item.StatusCode) + && matchesSelectedStatus(item.StatusCode) && selectedCustomerKeys.has(getCustomerKey(item)) && selectedOwnerKeys.has(getOwnerKey(item)) && matchesTableSearch(item, normalizedSearch); @@ -1495,6 +1495,14 @@ }); } + function matchesSelectedStatus(statusCode) { + if (statusCode === "WON_PENDING") { + return selectedStatuses.has("WON"); + } + + return selectedStatuses.has(statusCode); + } + function stringifySearchValue(value) { if (value === null || value === undefined) { return ""; @@ -2939,11 +2947,11 @@ } .opportunities-extension-table th:nth-child(7) { - width: 6%; + width: 7%; } .opportunities-extension-table th:nth-child(8) { - width: 7%; + width: 6%; } .opportunities-extension-table th:nth-child(9) { @@ -2957,8 +2965,6 @@ .opportunities-extension-table td:nth-child(2), .opportunities-extension-table td:nth-child(5), .opportunities-extension-table td:nth-child(6), - .opportunities-extension-table td:nth-child(7), - .opportunities-extension-table td:nth-child(8), .opportunities-extension-table td:nth-child(8) { white-space: nowrap; overflow: hidden; @@ -2972,6 +2978,13 @@ overflow: visible; } + .opportunities-extension-table td:nth-child(7) { + padding-right: 6px; + padding-left: 6px; + white-space: nowrap; + overflow: visible; + } + .opportunities-extension-table td:nth-child(10) { padding-right: 6px; padding-left: 6px; @@ -3607,6 +3620,14 @@ width: 12%; } + .opportunities-extension-table th:nth-child(6) { + width: 7%; + } + + .opportunities-extension-table th:nth-child(7) { + width: 8%; + } + .opportunities-extension-table th:nth-child(10) { width: 10%; } @@ -3629,6 +3650,14 @@ width: 13%; } + .opportunities-extension-table th:nth-child(6) { + width: 6%; + } + + .opportunities-extension-table th:nth-child(7) { + width: 9%; + } + .opportunities-extension-table th:nth-child(10) { width: 11%; }