Skip to content

FOUR-15529: Participant (Home) Welcome Screens V2 #1594

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.

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
merged 45 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
9679a65
FOUR-15762:Update the list component (like Request)
fagubla May 22, 2024
db35e1b
Merge pull request #1588 from ProcessMaker/feature/FOUR-15762
pmPaulis May 23, 2024
e2ffc20
FOUR-15761:[20:My Cases - Update the columns to show cases
fagubla May 23, 2024
825cc3d
FOUR-15760:Rename My Request to My Cases
fagubla May 23, 2024
ee14180
Merge pull request #1591 from ProcessMaker/feature/FOUR-15760
pmPaulis May 23, 2024
b31dbd7
Merge pull request #1590 from ProcessMaker/feature/FOUR-15761
pmPaulis May 23, 2024
1358b75
FOUR-15533: Update STart new Request Section
fagubla May 24, 2024
4e5e08c
Solve Configuration
fagubla May 24, 2024
828bb8c
Merge pull request #1593 from ProcessMaker/feature/FOUR-15533
pmPaulis May 24, 2024
d0b17ac
FOUR-15763:My Cases - Implement the Open Case
fagubla May 27, 2024
4981c61
Merge branch 'next' into feature/FOUR-15529
pmPaulis May 27, 2024
b2d256e
FOUT-15764:My Cases - Implement the scroll in this section
fagubla May 27, 2024
ab772ef
FOUR-16235:Implement the new UI counters
fagubla May 27, 2024
2158439
Merge remote-tracking branch 'origin/feature/FOUR-15529' into feature…
fagubla May 28, 2024
22935a5
Merge pull request #1595 from ProcessMaker/feature/FOUR-15763
pmPaulis May 28, 2024
efc9d1d
Merge pull request #1597 from ProcessMaker/feature/FOUR-16235
pmPaulis May 28, 2024
d2fd84b
feature/FOUR-15768
luNunezProcessmaker May 28, 2024
8f5a8d0
feature/FOUR-15768
luNunezProcessmaker May 28, 2024
9016d99
feature/FOUR-15768
luNunezProcessmaker May 28, 2024
af40321
Merge remote-tracking branch 'origin/feature/FOUR-15529' into feature…
fagubla May 28, 2024
45c2761
some corrections
fagubla May 28, 2024
990d428
Merge pull request #1599 from ProcessMaker/feature/FOUR-15768
pmPaulis May 29, 2024
5684a5b
Merge pull request #1596 from ProcessMaker/feature/FOUR-15764
pmPaulis May 29, 2024
b712263
feature/FOUR-15535
luNunezProcessmaker May 28, 2024
140eee7
FOUR-15775:Add Tag Draft when the request has defined the draft
fagubla May 29, 2024
d0e8b06
FOUR-15769:My Task - Implement the scroll in this list
fagubla May 29, 2024
391083e
feature/FOUR-15535
luNunezProcessmaker May 29, 2024
4a254af
feature/FOUR-15535
luNunezProcessmaker May 29, 2024
493160d
Merge branch 'feature/FOUR-15529' of github.com:ProcessMaker/screen-b…
luNunezProcessmaker May 29, 2024
0b5dfb9
Merge pull request #1603 from ProcessMaker/feature/FOUR-15769
pmPaulis May 29, 2024
809be90
Merge pull request #1602 from ProcessMaker/feature/FOUR-15775
pmPaulis May 29, 2024
1becc7f
Merge pull request #1601 from ProcessMaker/feature/FOUR-15535
pmPaulis May 29, 2024
27ef1ef
FOUR-15771:Add the functionality to Priority column
fagubla May 29, 2024
1129a67
Merge pull request #1604 from ProcessMaker/feature/FOUR-15771
pmPaulis May 29, 2024
46e61ad
feature/FOUR-15535
luNunezProcessmaker May 31, 2024
45553c3
feature/FOUR-16316
luNunezProcessmaker May 31, 2024
13c2554
Merge pull request #1606 from ProcessMaker/feature/FOUR-16316
pmPaulis May 31, 2024
e8d5d91
FOUR-16315: Cards in Start a new Case are very close in dashboard list
fagubla Jun 3, 2024
0946d63
feature/FOUR-15535
luNunezProcessmaker Jun 3, 2024
f7cd7c1
feature/FOUR-15535
luNunezProcessmaker Jun 3, 2024
718f34e
Merge pull request #1605 from ProcessMaker/feature/FOUR-15535
pmPaulis Jun 3, 2024
5845050
Merge pull request #1607 from ProcessMaker/bugfix/FOUR-16315
pmPaulis Jun 3, 2024
83093e2
FOUR-15537:Review the Hover action preview buton Tasks
fagubla Jun 4, 2024
965d548
Merge pull request #1608 from ProcessMaker/feature/FOUR-15779
pmPaulis Jun 4, 2024
dd13d0f
Merge remote-tracking branch 'origin/next' into feature/FOUR-15529
pmPaulis Jun 10, 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
3 changes: 3 additions & 0 deletions src/assets/priority-header.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
206 changes: 98 additions & 108 deletions src/components/renderer/form-list-table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
<div class="card" :style="customStyle">
<div class="card-header d-flex justify-content-between align-items-center">
<template v-if="dataControl.showControl">
<div class="mb-1 mt-1">
<b-avatar
v-if="dataControl.showAvatar"
size="2em"
:variant="dataControl.variant"
:text="dataControl.count"
class="avatar-text"
></b-avatar>
<div class="head-filter">
<b-badge class="badge-custom" pill :variant="dataControl.variant">
{{ dataControl.count }}
</b-badge>
<p class="control-text mb-0" :style="dataControl.colorText">
{{ $t(title) }}
</p>
<template v-if="dataControl.dropdownShow === 'requests'">
<b-dropdown
variant="outline-secondary"
right
offset="-70"
no-caret
>
<template #button-content>
Expand Down Expand Up @@ -48,44 +44,21 @@
<div class="mr-4">
<b-dropdown
variant="outline-secondary"
offset="-50"
size="sm"
>
<template #button-content>
<span class="text-capitalize">
<b-icon
v-if="showBadge"
icon="circle-fill"
class="mr-2"
:variant="badgeVariant"
/>
{{ $t(titleDropdown) }}
</span>
</template>
<b-dropdown-item
@click="handleDropdownSelection('requests_dropdown', 'all')"
v-for="option in requestFilterDropdown"
:key="option"
@click="handleDropdownSelection('requests_dropdown', option)"
>
<span class="item-text">
{{ $t("View All") }}
</span>
</b-dropdown-item>
<b-dropdown-item
@click="handleDropdownSelection('requests_dropdown', 'Completed')"
>
<span class="item-text">
<i
class="fas fa-circle mr-2 text-primary"
/>
{{ $t("Completed") }}
</span>
</b-dropdown-item>
<b-dropdown-item
@click="handleDropdownSelection('requests_dropdown', 'In Progress')"
>
<span class="item-text">
<i
class="fas fa-circle mr-2 text-success"
/>
{{ $t("In Progress") }}
{{ $t(option) }}
</span>
</b-dropdown-item>
</b-dropdown>
Expand All @@ -95,42 +68,21 @@
<div class="mr-4">
<b-dropdown
variant="outline-secondary"
offset="-50"
size="sm"
>
<template #button-content>
<span class="text-capitalize">
<b-icon
v-if="showBadge"
icon="circle-fill"
class="mr-2"
:variant="badgeVariant"
/>
{{ $t(titleDropdown) }}
</span>
</template>
<b-dropdown-item @click="handleDropdownSelection('tasks', 'all')">
<span class="item-text">
{{ $t("View All") }}
</span>
</b-dropdown-item>
<b-dropdown-item
@click="handleDropdownSelection('tasks', 'Overdue')"
v-for="option in taskFilterDropdown"
:key="option"
@click="handleDropdownSelection('tasks', option)"
>
<span class="item-text">
<i
class="fas fa-circle mr-2 text-danger"
/>
{{ $t("Overdue") }}
</span>
</b-dropdown-item>
<b-dropdown-item
@click="handleDropdownSelection('tasks', 'In Progress')"
>
<span class="item-text">
<i
class="fas fa-circle mr-2 text-warning"
/>
{{ $t("In Progress") }}
{{ $t(option) }}
</span>
</b-dropdown-item>
</b-dropdown>
Expand Down Expand Up @@ -172,10 +124,10 @@
<template v-if="listOption === 'My Tasks'">
<FormTasks @tasksCount="getData"></FormTasks>
</template>
<template v-if="listOption === 'My Requests'">
<template v-if="verifyListCase()">
<FormRequests @requestsCount="getData"></FormRequests>
</template>
<template v-if="listOption === 'Start New Request'">
<template v-if="verifyNewCase()">
<FormNewRequest @startControl="getData"></FormNewRequest>
</template>
</div>
Expand All @@ -202,24 +154,46 @@ export default {
searchCriteria: "",
showInput: false,
pmql: "",
badgeVariant: "",
typeSelected: "",
showBadge: false,
customStyle: {
"border-radius": "8px"
}
},
taskFilterDropdown: [
"Self-service",
"In Progress",
"Overdue",
"View All"
],
requestFilterDropdown: [
"View All",
"Completed",
"In Progress",
]
};
},
watch: {
listOption() {
this.title = this.listOption;
this.title = this.checkTitle(this.listOption);
this.dataControl = {};
}
},
mounted() {
this.title = this.listOption;
this.title = this.checkTitle(this.listOption);
},
methods: {
/**
* Backward compatibility beacuse value is used as title
*/
checkTitle(option) {
if (option === "Start New Request") {
return "Start New Case";
}
if (option === "My Requests") {
return "My Cases";
}
return option;
},
getData(data) {
this.dataControl = data.dataControls;
},
Expand All @@ -231,23 +205,19 @@ export default {
this.typeSelected = listType;
if (listType === "tasks") {
this.$root.$emit("dropdownSelectionTask", valueSelected);
this.titleDropdown =
valueSelected === "all" ? this.viewAll : valueSelected;
this.colorBadge();
this.titleDropdown = valueSelected;
} else {
if (listType === "requests_filter") {
this.optionRequest = valueSelected;
if (valueSelected === "by_me") {
this.title = "Request Started By Me";
this.title = "Cases Started By Me";
}
if (valueSelected === "as_participant") {
this.title = "With Me as Participant";
}
}
if (listType === "requests_dropdown") {
this.titleDropdown =
valueSelected === "all" ? this.viewAll : valueSelected;
this.colorBadge();
this.titleDropdown = valueSelected;
this.dropdownRequest = valueSelected;
}
combinedFilter.push(this.optionRequest);
Expand Down Expand Up @@ -285,34 +255,21 @@ export default {
this.showInput = !this.showInput;
},
/**
* Set the badge's color of the filter selected
* Verify backward compatibility for Start New Case
*/
colorBadge() {
if (this.titleDropdown === "In Progress") {
if (this.typeSelected === "tasks") {
this.badgeVariant = "warning";
}
if (this.typeSelected === "requests_dropdown") {
this.badgeVariant = "success";
}
this.showBadge = true;
}
if (this.titleDropdown === "Overdue") {
this.badgeVariant = "danger";
this.showBadge = true;
}
if (this.titleDropdown === "Overdue") {
this.badgeVariant = "danger";
this.showBadge = true;
}
if (this.titleDropdown === "Completed") {
this.badgeVariant = "primary";
this.showBadge = true;
}
if (this.titleDropdown === "View All" || this.titleDropdown === "all") {
this.badgeVariant = "";
this.showBadge = false;
}
verifyNewCase() {
return (
this.listOption === "Start New Case" ||
this.listOption === "Start New Request"
);
},
/**
* Verify backward compatibility for List Cases
*/
verifyListCase() {
return (
this.listOption === "My Cases" || this.listOption === "My Requests"
);
}
}
};
Expand Down Expand Up @@ -355,10 +312,13 @@ export default {
height: 300px;
overflow: auto;
background-color: #f9f9f9;
padding: 0;
}

.btn-outline-secondary {
.btn-outline-secondary,
.btn-outline-secondary:focus {
border: none;
box-shadow: none;
}

.item-text {
Expand All @@ -372,12 +332,42 @@ export default {
}

.dropdown-menu {
padding: 10px;
width: 211px;
box-shadow: 0px 10px 20px 4px #00000021;
padding: 0px;
width: 180px;
box-shadow: 0px 4px 8px 0px #0000001A;
border-radius: 4px;
}

.dropdown-item {
padding: 10px 8px;
padding: 13px 12px;
font-family: 'Open Sans', sans-serif;
font-size: 16px;
font-weight: 400;
line-height: 21.79px;
letter-spacing: -0.02em;
text-align: left;
}

.btn-outline-secondary:hover,
.btn-outline-secondary:not(:disabled):not(.disabled):active,
.btn-outline-secondary:not(:disabled):not(.disabled).active,
.show > .btn-outline-secondary.dropdown-toggle {
background: none;
color: #228fed;
border: none;
box-shadow: none;
}

.head-filter {
display: flex;
align-items: baseline;
gap: 8px;
}

.badge {
display: inline-flex;
padding: 8px;
height: 24px;
align-items: center;
}
</style>
19 changes: 11 additions & 8 deletions src/components/renderer/form-new-request.vue
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<template>
<div>
<div v-if="Object.keys(processes).length && !loading" class="process-list">
<div
v-if="Object.keys(processes).length && !loading"
class="process-list p-4"
>
<div class="row">
<template v-for="(process, index) in processes">
<div v-for="(event, indexE) in emptyStartEvents(process)" :key="`process-${index}-${indexE}`" class="col-sm-6">
<ProcessCard
:filter="filter"
:process="process"
:event="event"
/>
<div
v-for="(event, indexE) in emptyStartEvents(process)"
:key="`process-${index}-${indexE}`"
class="col-sm-6"
>
<ProcessCard :filter="filter" :process="process" :event="event" />
</div>
</template>
</div>
</div>
<div v-else>
<formEmpty link="" title="No Request to Start" url="" />
<formEmpty link="" title="No Case to Start" url="" />
</div>
</div>
</template>
Expand Down
Loading
Loading