test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: reverse activity items

Browse Source
This commit is contained in:
Shariq Ansari 2023-12-23 15:02:19 +05:30
parent d3c7866ca9
commit fd354276ae
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,7 +313,11 @@
</Tooltip> </Tooltip>
</div> </div>
<div class="flex gap-0.5"> <div class="flex gap-0.5">
<Button variant="ghost" class="text-gray-700" @click="reply(activity.data.content)"> <Button
variant="ghost"
class="text-gray-700"
@click="reply(activity.data.content)"
>
<ReplyIcon class="h-4 w-4" /> <ReplyIcon class="h-4 w-4" />
</Button> </Button>
</div> </div>
@ -639,7 +643,16 @@ import {
createListResource, createListResource,
call, call,
} from 'frappe-ui' } from 'frappe-ui'
import { ref, computed, h, defineModel, markRaw, watch } from 'vue' import {
ref,
computed,
h,
defineModel,
markRaw,
watch,
onMounted,
nextTick,
} from 'vue'
const { getUser } = usersStore() const { getUser } = usersStore()
const { getContact } = contactsStore() const { getContact } = contactsStore()
@ -756,7 +769,7 @@ function all_activities() {
if (!versions.data) return [] if (!versions.data) return []
if (!calls.data) return versions.data if (!calls.data) return versions.data
return [...versions.data, ...calls.data].sort( return [...versions.data, ...calls.data].sort(
(a, b) => new Date(b.creation) - new Date(a.creation) (a, b) => new Date(a.creation) - new Date(b.creation)
) )
} }
@ -766,15 +779,21 @@ const activities = computed(() => {
activities = all_activities() activities = all_activities()
} else if (props.title == 'Emails') { } else if (props.title == 'Emails') {
if (!versions.data) return [] if (!versions.data) return []
activities = versions.data.filter( activities = versions.data
(activity) => activity.activity_type === 'communication' .filter((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') {
return calls.data return calls.data.sort(
(a, b) => new Date(a.creation) - new Date(b.creation)
)
} else if (props.title == 'Tasks') { } else if (props.title == 'Tasks') {
return tasks.data return tasks.data.sort(
(a, b) => new Date(a.creation) - new Date(b.creation)
)
} else if (props.title == 'Notes') { } else if (props.title == 'Notes') {
return notes.data return notes.data.sort(
(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)