Skip to content

Feature/four 16107 #6972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 14 commits into from
Jun 25, 2024
Merged

Feature/four 16107 #6972

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c3d325f
Added badges for Alternatives column in the request lists
gustavobascope Jun 13, 2024
cfa2a2c
Added an overdue tag in the tasks list
gustavobascope Jun 14, 2024
643dec3
remove unused library
gustavobascope Jun 14, 2024
44c959f
SonarQube fixes
gustavobascope Jun 14, 2024
c706df7
SonarQube fixes
gustavobascope Jun 14, 2024
36094c1
Merge branch 'next2-improvements' of github.com:ProcessMaker/processm…
gustavobascope Jun 17, 2024
0adeb1e
Merge branch 'next2-improvements' of github.com:ProcessMaker/processm…
gustavobascope Jun 17, 2024
eaceba0
Start on launchpad search refactoring
nolanpro Jun 17, 2024
eefdb62
Merge pull request #6954 from ProcessMaker/observation/FOUR-16525
ryancooley Jun 18, 2024
b0ab1e3
Merge pull request #6953 from ProcessMaker/observation/FOUR-16526
ryancooley Jun 18, 2024
d726fb2
FOUR-14245 Container behavior was updated in the process catalog.
gproly Jun 19, 2024
82658de
FOUR-16107 Process Catalog updates in searches (UI Changes)
gproly Jun 19, 2024
38e8805
Merge branch 'next2-improvements' into feature/FOUR-16107
gproly Jun 19, 2024
15b407f
Merge branch 'next' into feature/FOUR-16107
nolanpro Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added badges for Alternatives column in the request lists
  • Loading branch information
@gustavobascope
gustavobascope committed Jun 13, 2024
commit c3d325f1737e5a1efd66290ef74aa3119c05eaec
12 changes: 12 additions & 0 deletions resources/js/components/shared/FilterTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,18 @@ export default {
border-radius: 5px;
padding: 7px;
}
.status-alternative-a {
background: rgba(224, 229, 232, 1);
color: rgba(0, 0, 0, 0.75);
border-radius: 5px;
padding: 7px;
}
.status-alternative-b {
background: rgba(249, 232, 195, 1);
color: rgba(0, 0, 0, 0.75);
border-radius: 5px;
padding: 7px;
}
@-moz-document url-prefix() {
.pm-table-truncate {
overflow: hidden;
Expand Down
21 changes: 20 additions & 1 deletion resources/js/requests/components/RequestsListing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ import paginationTable from "../../components/shared/PaginationTable.vue";
import PMColumnFilterIconAsc from "../../components/PMColumnFilterPopover/PMColumnFilterIconAsc.vue";
import PMColumnFilterIconDesc from "../../components/PMColumnFilterPopover/PMColumnFilterIconDesc.vue";
import FilterTableBodyMixin from "../../components/shared/FilterTableBodyMixin";
import { BadgePlugin } from "bootstrap-vue";

const uniqIdsMixin = createUniqIdsMixin();

Expand Down Expand Up @@ -397,7 +398,25 @@ export default {
};
},
formatProcessVersionAlternative(value) {
return `Alternative ${value}`;
let color = "primary";
let badge = "alternative-a";

if (value === "A") {
color = "primary";
badge = "alternative-a";
} else if (value === "B") {
color = "secondary";
badge = "alternative-b";
} else if (value === null) {
return "-";
}

return `
<span
class="badge badge-${color} status-${badge}"
>
Alternative ${value}
</span>`;
},
transform(dataInput) {
const data = _.cloneDeep(dataInput);
Expand Down