Skip to content
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

FOUR-10340: Designer: The list needs to updated according to the filter applied #1463

Merged
merged 4 commits into from
Oct 13, 2023
Merged

FOUR-10340: Designer: The list needs to updated according to the filter applied #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6122bcf
Ready to PR
CarliPinell Oct 13, 2023
4649436
Merge branch 'feature/FOUR-9486' of github.com:ProcessMaker/screen-bu…
CarliPinell Oct 13, 2023
ef520ad
Making adjustments
CarliPinell Oct 13, 2023
c3089bd
Refactoring combined filters
CarliPinell Oct 13, 2023
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
95 changes: 71 additions & 24 deletions src/components/renderer/form-list-table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,24 @@
<p class="control-text" :style="dataControl.colorText">
{{ title }}
</p>
</div>
</template>
<template v-else>
<span class="control-text">{{ $t(title) }}</span>
<b-dropdown variant="custom" no-caret>
<template v-if="dataControl.dropdownShow === 'requests'">
<b-dropdown variant="custom" no-caret>
<template #button-content>
<i class="fas fa-caret-down"></i>
</template>
<b-dropdown-item @click="handleOption('me')"
>{{ $t('Request Started By Me') }}</b-dropdown-item
>
<b-dropdown-item @click="handleOption('participant')"
>{{ $t('With Me as Participant') }}
<b-dropdown-item @click="handleDropdownSelection('requests_filter', 'by_me')">{{
$t("Request Started By Me")
}}</b-dropdown-item>
<b-dropdown-item
@click="handleDropdownSelection('requests_filter', 'as_participant')"
>{{ $t("With Me as Participant") }}
</b-dropdown-item>
</b-dropdown>
</template>
</div>
</template>
<template v-else>
<span class="control-text">{{ $t(title) }}</span>
</template>
<div class="ml-auto d-flex align-items-center">
<template v-if="dataControl.dropdownShow === 'requests'">
Expand All @@ -36,13 +39,22 @@
<template #button-content>
<span>{{ $t(titleDropdown) }}</span>
</template>
<b-dropdown-item variant="warning">
<b-dropdown-item
variant="success"
@click="handleDropdownSelection('requests_dropdown', 'In Progress')"
>
<i class="fas fa-circle mr-2"></i>{{ $t("In Progress") }}
</b-dropdown-item>
<b-dropdown-item variant="success">
<b-dropdown-item
variant="primary"
@click="handleDropdownSelection('requests_dropdown', 'Completed')"
>
<i class="fas fa-circle mr-2"></i>{{ $t("Completed") }}
</b-dropdown-item>
<b-dropdown-item>{{ $t(titleDropdown) }}</b-dropdown-item>
<b-dropdown-item
@click="handleDropdownSelection('requests_dropdown', 'all')"
>{{ $t(titleDropdown) }}</b-dropdown-item
>
</b-dropdown>
</div>
</template>
Expand All @@ -52,17 +64,28 @@
<template #button-content>
<span>{{ $t(titleDropdown) }}</span>
</template>
<AvatarDropdown
:variant="'warning'"
:text="countInProgress"
:label="'In Progress'"
></AvatarDropdown>
<AvatarDropdown
:variant="'danger'"
:text="countOverdue"
:label="'Overdue'"
></AvatarDropdown>
<b-dropdown-item>{{ $t(titleDropdown) }}</b-dropdown-item>
<b-dropdown-item
@click="handleDropdownSelection('tasks', 'In Progress')"
>
<AvatarDropdown
:variant="'warning'"
:text="countInProgress"
:label="'In Progress'"
></AvatarDropdown>
</b-dropdown-item>
<b-dropdown-item
@click="handleDropdownSelection('tasks', 'Overdue')"
>
<AvatarDropdown
:variant="'danger'"
:text="countOverdue"
:label="'Overdue'"
></AvatarDropdown>
</b-dropdown-item>
<b-dropdown-item
@click="handleDropdownSelection('tasks', 'all')"
>{{ $t(titleDropdown) }}</b-dropdown-item
>
</b-dropdown>
</div>
</template>
Expand Down Expand Up @@ -102,6 +125,8 @@ export default {
props: ["listOption"],
data() {
return {
optionRequest: "by_me",
dropdownRequest: "In Progress",
titleDropdown: "View All",
countInProgress: "0",
countOverdue: "0",
Expand All @@ -126,6 +151,28 @@ export default {
},
openExternalLink() {
window.open(this.dataControl.url, "_blank");
},
handleDropdownSelection(listType, valueSelected) {
let combinedFilter = [];
if (listType === "tasks") {
this.$root.$emit("dropdownSelectionTask", valueSelected);
} else {
if (listType === "requests_filter") {
this.optionRequest = valueSelected;
if (valueSelected === 'by_me') {
this.title = 'Request Started By Me';
}
if (valueSelected === 'as_participant') {
this.title = 'With Me as Participant';
}
}
if (listType === "requests_dropdown") {
this.dropdownRequest = valueSelected;
}
combinedFilter.push(this.optionRequest);
combinedFilter.push(this.dropdownRequest);
this.$root.$emit("dropdownSelectionRequest", combinedFilter);
}
}
}
};
Expand Down
1 change: 0 additions & 1 deletion src/components/renderer/form-new-request.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export default {
},
fetch() {
// Now call our api

window.ProcessMaker.apiClient
.get(
`start_processes?page=${this.page}&per_page=${this.perPage}&filter=${this.filter}&order_by=category.name,name` +
Expand Down
18 changes: 17 additions & 1 deletion src/components/renderer/form-requests.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export default {
this.setFields();
this.pmql = `(status = "In Progress") AND (requester = "${Processmaker.user.username}")`;
this.fetch();
this.$root.$on("dropdownSelectionRequest", this.fetchData);
},
methods: {
fetch() {
Expand Down Expand Up @@ -143,7 +144,7 @@ export default {
url: "/requests",
dropdownShow: "requests"
};
let tasksDropdown = [];
const tasksDropdown = [];
this.$emit("requestsCount", { dataControls, tasksDropdown });
})
.catch(() => {
Expand Down Expand Up @@ -222,6 +223,21 @@ export default {
: diff <= 1
? "text-warning"
: "text-dark";
},
fetchData(selectedOptions) {
if (selectedOptions[0] === "by_me" && selectedOptions[1] !== "all") {
this.pmql = `(user_id = ${ProcessMaker.user.id}) AND (status = "${selectedOptions[1]}")`;
}
if (
selectedOptions[0] === "as_participant" &&
selectedOptions[1] !== "all"
) {
this.pmql = `(status = "${selectedOptions[1]}") AND (participant = "${Processmaker.user.username}")`;
}
if (selectedOptions[1] === "all") {
this.pmql = `(user_id = ${ProcessMaker.user.id}) AND ((status = "In Progress") OR (status = "Completed"))`;
}
this.fetch();
}
}
};
Expand Down
19 changes: 17 additions & 2 deletions src/components/renderer/form-tasks.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export default {
this.setFields();
this.pmql = `(user_id = ${ProcessMaker.user.id}) AND (status = "In Progress")`;
this.fetch();
this.$root.$on("dropdownSelectionTask", this.fetchData);
},
methods: {
getSortParam() {
Expand All @@ -95,11 +96,16 @@ export default {
fetch() {
Vue.nextTick(() => {
let pmql = "";
let filterDropdowns = "";

if (this.pmql !== undefined) {
pmql = this.pmql;
}

if (this.filterDropdowns !== undefined) {
filterDropdowns = this.filterDropdowns;
}

let { filter } = this;
let filterParams = "";

Expand All @@ -124,15 +130,15 @@ export default {

this.previousPmql = pmql;

let tasksDropdown = [];
const tasksDropdown = [];

// Load from our api client
ProcessMaker.apiClient
.get(
`tasks?page=${this.page}&include=process,processRequest,processRequest.user,user,data` +
`&pmql=${encodeURIComponent(pmql)}&per_page=${
this.perPage
}${filterParams}${this.getSortParam()}&non_system=true`
}${filterParams}${this.getSortParam()}&non_system=true&${filterDropdowns}`
)
.then((response) => {
this.showTable = response.data.data.length !== 0;
Expand Down Expand Up @@ -274,6 +280,15 @@ export default {
: diff <= 1
? "text-warning"
: "text-dark";
},
fetchData(selectedOption) {
if (selectedOption === "In Progress" || selectedOption === "all") {
this.filterDropdowns = "";
}
if (selectedOption === "Overdue") {
this.filterDropdowns = "overdue=true";
}
this.fetch();
}
}
};
Expand Down