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

fix: design change for other changes

Browse Source
This commit is contained in:
Shariq Ansari 2023-09-27 20:43:37 +05:30
parent 47ded1a7f1
commit 6a891b10b4
2 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,7 +329,7 @@
<span v-if="activity.value">{{ activity.value }}</span> <span v-if="activity.value">{{ activity.value }}</span>
<span <span
v-if="activity.data.old_value" v-if="activity.data.old_value"
class="max-w-xs truncate font-medium text-gray-800" class="max-w-xs font-medium text-gray-800"
> >
<div <div
class="flex items-center gap-1" class="flex items-center gap-1"
@ -338,14 +338,14 @@
<UserAvatar :user="activity.data.old_value" size="xs" /> <UserAvatar :user="activity.data.old_value" size="xs" />
{{ getUser(activity.data.old_value).full_name }} {{ getUser(activity.data.old_value).full_name }}
</div> </div>
<div v-else> <div class="truncate" v-else>
{{ activity.data.old_value }} {{ activity.data.old_value }}
</div> </div>
</span> </span>
<span v-if="activity.to">to</span> <span v-if="activity.to">to</span>
<span <span
v-if="activity.data.value" v-if="activity.data.value"
class="max-w-xs truncate font-medium text-gray-800" class="max-w-xs font-medium text-gray-800"
> >
<div <div
class="flex items-center gap-1" class="flex items-center gap-1"
@ -354,7 +354,7 @@
<UserAvatar :user="activity.data.value" size="xs" /> <UserAvatar :user="activity.data.value" size="xs" />
{{ getUser(activity.data.value).full_name }} {{ getUser(activity.data.value).full_name }}
</div> </div>
<div v-else> <div class="truncate" v-else>
{{ activity.data.value }} {{ activity.data.value }}
</div> </div>
</span> </span>
@ -374,28 +374,53 @@
v-for="activity in activity.other_versions" v-for="activity in activity.other_versions"
class="flex items-start justify-stretch gap-2 text-base" class="flex items-start justify-stretch gap-2 text-base"
> >
<div class="inline-flex flex-wrap gap-1 text-gray-600"> <div class="flex items-start gap-1 text-gray-600">
<span v-if="activity.type">{{ activity.type }}</span> <div class="flex flex-1 items-center gap-1">
<span <span
v-if="activity.data.field_label" v-if="activity.data.field_label"
class="max-w-xs truncate font-medium text-gray-800" class="max-w-xs truncate text-gray-600"
> >
{{ activity.data.field_label }} {{ activity.data.field_label }}
</span> </span>
<span v-if="activity.value">{{ activity.value }}</span> <FeatherIcon
<span name="arrow-right"
v-if="activity.data.old_value" class="mx-1 h-4 w-4 text-gray-600"
class="max-w-xs truncate font-medium text-gray-800" />
> </div>
{{ activity.data.old_value }} <div class="flex flex-wrap items-center gap-1">
</span> <span v-if="activity.type">{{ startCase(activity.type) }}</span>
<span v-if="activity.to">to</span> <span
<span v-if="activity.data.old_value"
v-if="activity.data.value" class="max-w-xs font-medium text-gray-800"
class="max-w-xs truncate font-medium text-gray-800" >
> <div
{{ activity.data.value }} class="flex items-center gap-1"
</span> v-if="activity.options == 'User'"
>
<UserAvatar :user="activity.data.old_value" size="xs" />
{{ getUser(activity.data.old_value).full_name }}
</div>
<div class="truncate" v-else>
{{ activity.data.old_value }}
</div>
</span>
<span v-if="activity.to">to</span>
<span
v-if="activity.data.value"
class="max-w-xs font-medium text-gray-800"
>
<div
class="flex items-center gap-1"
v-if="activity.options == 'User'"
>
<UserAvatar :user="activity.data.value" size="xs" />
{{ getUser(activity.data.value).full_name }}
</div>
<div class="truncate" v-else>
{{ activity.data.value }}
</div>
</span>
</div>
</div> </div>
<div class="ml-auto whitespace-nowrap"> <div class="ml-auto whitespace-nowrap">
@ -480,6 +505,7 @@ import {
dateFormat, dateFormat,
dateTooltipFormat, dateTooltipFormat,
secondsToDuration, secondsToDuration,
startCase,
} from '@/utils' } from '@/utils'
import { usersStore } from '@/stores/users' import { usersStore } from '@/stores/users'
import { contactsStore } from '@/stores/contacts' import { contactsStore } from '@/stores/contacts'

4
frontend/src/utils.js
View File

@ -124,3 +124,7 @@ export function formatNumberIntoCurrency(value) {
} }
return '' return ''
} }
export function startCase(str) {
return str.charAt(0).toUpperCase() + str.slice(1)
}