Skip to content

FOUR-20544: Review the general status of the process #7823

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
pmPaulis merged 2 commits into from
Dec 13, 2024
Merged

FOUR-20544: Review the general status of the process #7823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcca1c6
FOUR-20544: Review the general status of the process
fagubla Dec 12, 2024
7012868
Merge branch 'epic/FOUR-20336-FOUR-20318' into feature/FOUR-20544
fagubla Dec 12, 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
2 changes: 2 additions & 0 deletions resources/js/requests/show.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import FilesMobile from "./components/FilesMobile.vue";
import RequestHeaderMobile from "./components/RequestHeaderMobile.vue";
import FilterMobile from "../Mobile/FilterMobile.vue";
import FilterMixin from "../Mobile/FilterMixin";
import NewOverview from "../../jscomposition/cases/casesDetail/components/NewOverview.vue";

Vue.component("DataSummary", DataSummary);
Vue.component("RequestDetail", RequestDetail);
Expand All @@ -31,6 +32,7 @@ Vue.component("SummaryMobile", SummaryMobile);
Vue.component("FilesMobile", FilesMobile);
Vue.component("RequestHeaderMobile", RequestHeaderMobile);
Vue.component("FilterMobile", FilterMobile);
Vue.component("NewOverview", NewOverview);
Vue.mixin(FilterMixin);

Vue.use("vue-form-renderer", VueFormRenderer);
Expand Down
44 changes: 44 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/MapLegend.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<template>
<div
id="map-legend"
class="tw-absolute tw-top-12 tw-right-12 tw-rounded-md tw-shadow-md tw-bg-white tw-z-10"
>
<div class="tw-p-4 tw-flex tw-flex-col">
<p
v-for="(status, index) in statusLegend"
:key="index"
class="tw-font-bold tw-mb-2 tw-flex tw-items-center tw-gap-2"
>
<span
:style="{ backgroundColor: status.color }"
class="tw-inline-block tw-w-1 tw-h-8 tw-mr-4 tw-border-r-3 tw-border-r-gray-400 tw-transform tw-rotate-45"
/>
{{ status.name }}
</p>
</div>
</div>
</template>

<script setup>
import { ref } from "vue";

const translate = ProcessMaker.i18n;

const statusLegend = ref(
[
{
name: translate.t("In Progress"),
color: "#3FA6FF",
},
{
name: translate.t("Completed"),
color: "#00BA7C",
},
{
name: translate.t("Pending / Not Executed"),
color: "#CCCCCC",
},
],
);

</script>
2 changes: 2 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/NewOverview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
class="tw-w-full tw-h-full tw-overflow-hidden tw-relative"
data-test="body-container"
>
<MapLegend />
<ProcessMapTooltip
v-show="showTooltip"
ref="tooltipRef"
Expand Down Expand Up @@ -41,6 +42,7 @@ import {
} from "vue";
import { Modeler } from "@processmaker/modeler";
import ProcessMapTooltip from "../../../../js/processes/modeler/components/ProcessMapTooltip.vue";
import MapLegend from "./MapLegend.vue";
import { getInflightData } from "../variables";

const keyModeler = ref(Math.random());
Expand Down