Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions resources/js/components/shared/FilterTable.vue
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
17 changes: 16 additions & 1 deletion resources/js/requests/components/RequestsListing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 `
<span
class="badge badge-${color} status-${badge}"
>
Alternative ${value}
</span>`;
},
transform(dataInput) {
const data = _.cloneDeep(dataInput);
Expand Down
5 changes: 4 additions & 1 deletion resources/js/tasks/components/TasksList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
12 changes: 12 additions & 0 deletions resources/views/tasks/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,15 @@ class="d-inline-flex pull-left align-items-center"
<p class="section-title"> {{__('Assigned') }} @{{ moment(createdAt).fromNow() }}</p>
@{{ moment(createdAt).format() }}
</li>
<li class="list-group-item">
<p class="section-title">{{__('Case')}}</p>
{{ $task->process->name }}
<p class="launchpad-link">
<a href="{{route('process.browser.index', [$task->process->id])}}">
{{ __('Open Process Launchpad') }}
</a>
</p>
</li>
<li class="list-group-item">
<p class="section-title">{{__('Request')}}</p>
<a href="{{route('requests.show', [$task->process_request_id, 'skipInterstitial' => '1'])}}">
Expand Down Expand Up @@ -880,5 +889,8 @@ class="multiselect__tag-icon"></i>
.card-header:first-child.text-status {
border-radius: 6px;
}
.launchpad-link {
margin-top: 5px;
}
</style>
@endsection