test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

fix: sort activities in creation order

Browse Source
This commit is contained in:
Shariq Ansari 2024-02-28 14:01:42 +05:30
parent 1622410d74
commit 8e4c8b8143
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/src/components/Activities.vue
View File

@ -847,9 +847,7 @@ function get_activities() {
if (!all_activities.data?.versions) return [] if (!all_activities.data?.versions) return []
if (!all_activities.data?.calls.length) if (!all_activities.data?.calls.length)
return all_activities.data.versions || [] return all_activities.data.versions || []
return [...all_activities.data.versions, ...all_activities.data.calls].sort( return [...all_activities.data.versions, ...all_activities.data.calls]
(a, b) => new Date(a.creation) - new Date(b.creation)
)
} }
const activities = computed(() => { const activities = computed(() => {
@ -858,24 +856,18 @@ const activities = computed(() => {
activities = get_activities() activities = get_activities()
} else if (props.title == 'Emails') { } else if (props.title == 'Emails') {
if (!all_activities.data?.versions) return [] if (!all_activities.data?.versions) return []
activities = all_activities.data.versions activities = all_activities.data.versions.filter(
.filter((activity) => activity.activity_type === 'communication') (activity) => activity.activity_type === 'communication'
.sort((a, b) => new Date(a.creation) - new Date(b.creation)) )
} else if (props.title == 'Calls') { } else if (props.title == 'Calls') {
if (!all_activities.data?.calls) return [] if (!all_activities.data?.calls) return []
return all_activities.data.calls.sort( return sortByCreation(all_activities.data.calls)
(a, b) => new Date(a.creation) - new Date(b.creation)
)
} else if (props.title == 'Tasks') { } else if (props.title == 'Tasks') {
if (!all_activities.data?.tasks) return [] if (!all_activities.data?.tasks) return []
return all_activities.data.tasks.sort( return sortByCreation(all_activities.data.tasks)
(a, b) => new Date(a.creation) - new Date(b.creation)
)
} else if (props.title == 'Notes') { } else if (props.title == 'Notes') {
if (!all_activities.data?.notes) return [] if (!all_activities.data?.notes) return []
return all_activities.data.notes.sort( return sortByCreation(all_activities.data.notes)
(a, b) => new Date(a.creation) - new Date(b.creation)
)
} }
activities.forEach((activity) => { activities.forEach((activity) => {
activity.icon = timelineIcon(activity.activity_type, activity.is_lead) activity.icon = timelineIcon(activity.activity_type, activity.is_lead)
@ -896,9 +888,13 @@ const activities = computed(() => {
}) })
} }
}) })
return activities return sortByCreation(activities)
}) })
function sortByCreation(list) {
return list.sort((a, b) => new Date(a.creation) - new Date(b.creation))
}
function update_activities_details(activity) { function update_activities_details(activity) {
activity.owner_name = getUser(activity.owner).full_name activity.owner_name = getUser(activity.owner).full_name
activity.type = '' activity.type = ''