diff --git a/resources/js/components/shared/FilterTable.vue b/resources/js/components/shared/FilterTable.vue index e982e14da5..fcb90c46e5 100644 --- a/resources/js/components/shared/FilterTable.vue +++ b/resources/js/components/shared/FilterTable.vue @@ -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; diff --git a/resources/js/requests/components/RequestsListing.vue b/resources/js/requests/components/RequestsListing.vue index 7285f2f1c9..f55fa164eb 100644 --- a/resources/js/requests/components/RequestsListing.vue +++ b/resources/js/requests/components/RequestsListing.vue @@ -396,7 +396,22 @@ export default { }; }, formatProcessVersionAlternative(value) { - return `Alternative ${value}`; + let color = "primary"; + let badge = "alternative-a"; + + if (value === "B") { + color = "secondary"; + badge = "alternative-b"; + } else if (value === null) { + return "-"; + } + + return ` + + Alternative ${value} + `; }, transform(dataInput) { const data = _.cloneDeep(dataInput); diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue index f9f8b2014a..d08cb7fe6f 100644 --- a/resources/js/tasks/components/TasksList.vue +++ b/resources/js/tasks/components/TasksList.vue @@ -602,9 +602,12 @@ export default { if (props.status === "ACTIVE" && isSelfService) { color = "danger"; label = "Self Service"; - } else if (props.status === "ACTIVE") { + } else if (props.status === "ACTIVE" && props.advanceStatus === "open") { color = "success"; label = "In Progress"; + } else if (props.status === "ACTIVE" && props.advanceStatus === "overdue") { + color = "danger"; + label = "Overdue"; } else if (props.status === "CLOSED") { color = "primary"; label = "Completed"; diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php index df7e17a3bd..60a255f362 100644 --- a/resources/views/tasks/edit.blade.php +++ b/resources/views/tasks/edit.blade.php @@ -254,6 +254,15 @@ class="d-inline-flex pull-left align-items-center"

{{__('Assigned') }} @{{ moment(createdAt).fromNow() }}

@{{ moment(createdAt).format() }} +
  • +

    {{__('Case')}}

    + {{ $task->process->name }} + +
  • {{__('Request')}}

    @@ -880,5 +889,8 @@ class="multiselect__tag-icon"> .card-header:first-child.text-status { border-radius: 6px; } + .launchpad-link { + margin-top: 5px; + } @endsection