Merge pull request #1005 from pateljannat/minor-ui-fix
fix: member-list ui
This commit is contained in:
Jannat Patel
@@ -1,13 +1,13 @@
|
||||
<template>
|
||||
<div class="text-base p-4">
|
||||
<div class="flex min-h-0 flex-col text-base">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<div class="font-semibold mb-1">
|
||||
<div class="text-xl font-semibold mb-1">
|
||||
{{ __(label) }}
|
||||
</div>
|
||||
<div class="text-xs text-gray-600">
|
||||
<!-- <div class="text-xs text-gray-600">
|
||||
{{ __(description) }}
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="flex item-center space-x-2">
|
||||
<FormControl
|
||||
@@ -16,74 +16,93 @@
|
||||
type="text"
|
||||
:debounce="300"
|
||||
/>
|
||||
<Button @click="() => (showForm = true)">
|
||||
<Button @click="() => (showForm = !showForm)">
|
||||
<template #icon>
|
||||
<Plus class="h-3 w-3 stroke-1.5" />
|
||||
<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
|
||||
<X v-else class="h-3 w-3 stroke-1.5" />
|
||||
</template>
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="my-4">
|
||||
<!-- Form to add new member -->
|
||||
<div v-if="showForm" class="flex items-center space-x-2 mb-4">
|
||||
<FormControl
|
||||
v-model="member.email"
|
||||
:placeholder="__('Email')"
|
||||
type="email"
|
||||
class="w-full"
|
||||
/>
|
||||
<FormControl
|
||||
v-model="member.first_name"
|
||||
:placeholder="__('First Name')"
|
||||
type="test"
|
||||
class="w-full"
|
||||
/>
|
||||
<Button @click="addMember()" variant="subtle">
|
||||
{{ __('Add') }}
|
||||
|
||||
<!-- Form to add new member -->
|
||||
<div v-if="showForm" class="flex items-center space-x-2 my-4">
|
||||
<FormControl
|
||||
v-model="member.email"
|
||||
:placeholder="__('Email')"
|
||||
type="email"
|
||||
class="w-full"
|
||||
/>
|
||||
<FormControl
|
||||
v-model="member.first_name"
|
||||
:placeholder="__('First Name')"
|
||||
type="test"
|
||||
class="w-full"
|
||||
/>
|
||||
<Button @click="addMember()" variant="subtle">
|
||||
{{ __('Add') }}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div class="mt-2 pb-10 overflow-auto">
|
||||
<!-- Member list -->
|
||||
<div class="overflow-y-scroll">
|
||||
<ul class="divide-y">
|
||||
<li
|
||||
v-for="member in memberList"
|
||||
class="grid grid-cols-3 gap-10 py-2 cursor-pointer"
|
||||
>
|
||||
<div
|
||||
@click="openProfile(member.username)"
|
||||
class="flex items-center space-x-3 col-span-2"
|
||||
>
|
||||
<Avatar
|
||||
:image="member.user_image"
|
||||
:label="member.full_name"
|
||||
size="lg"
|
||||
/>
|
||||
<div class="space-y-1">
|
||||
<div class="flex">
|
||||
<div class="text-gray-900">
|
||||
{{ member.full_name }}
|
||||
</div>
|
||||
<div v-if="getRole(member)">
|
||||
{{ getRole(member) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-sm text-gray-700">
|
||||
{{ member.name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center justify-center text-gray-700 text-sm">
|
||||
<div v-if="member.last_active">
|
||||
{{ dayjs(member.last_active).format('DD MMM, YYYY HH:mm a') }}
|
||||
</div>
|
||||
<div v-else>-</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div
|
||||
v-if="memberList.length && hasNextPage"
|
||||
class="flex justify-center mt-4"
|
||||
>
|
||||
<Button @click="members.reload()">
|
||||
<template #prefix>
|
||||
<RefreshCw class="h-3 w-3 stroke-1.5" />
|
||||
</template>
|
||||
{{ __('Load More') }}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<!-- Member list -->
|
||||
<div
|
||||
v-for="member in memberList"
|
||||
class="grid grid-cols-5 grid-flow-row py-2 cursor-pointer"
|
||||
>
|
||||
<div
|
||||
@click="openProfile(member.username)"
|
||||
class="flex items-center space-x-2 col-span-2"
|
||||
>
|
||||
<Avatar
|
||||
:image="member.user_image"
|
||||
:label="member.full_name"
|
||||
size="sm"
|
||||
/>
|
||||
<div>
|
||||
{{ member.full_name }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-sm text-gray-700 col-span-2">
|
||||
{{ member.name }}
|
||||
</div>
|
||||
<div class="text-sm text-gray-700 justify-self-end">
|
||||
{{ getRole(member.role) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="hasNextPage" class="flex justify-center">
|
||||
<Button variant="solid" @click="members.reload()">
|
||||
<template #prefix>
|
||||
<RefreshCw class="h-3 w-3 stroke-1.5" />
|
||||
</template>
|
||||
{{ __('Load More') }}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { createResource, Avatar, Button, FormControl } from 'frappe-ui'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { ref, watch, reactive } from 'vue'
|
||||
import { RefreshCw, Plus } from 'lucide-vue-next'
|
||||
import { ref, watch, reactive, inject } from 'vue'
|
||||
import { RefreshCw, Plus, X } from 'lucide-vue-next'
|
||||
|
||||
const router = useRouter()
|
||||
const show = defineModel('show')
|
||||
@@ -92,6 +111,7 @@ const start = ref(0)
|
||||
const memberList = ref([])
|
||||
const hasNextPage = ref(false)
|
||||
const showForm = ref(false)
|
||||
const dayjs = inject('$dayjs')
|
||||
|
||||
const member = reactive({
|
||||
email: '',
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<Dialog v-model="show" :options="{ size: '3xl' }">
|
||||
<Dialog v-model="show" :options="{ size: '4xl' }">
|
||||
<template #body>
|
||||
<div class="flex h-[calc(100vh_-_8rem)]">
|
||||
<div class="flex w-52 shrink-0 flex-col bg-gray-50 p-2">
|
||||
@@ -30,7 +30,7 @@
|
||||
</div>
|
||||
<div
|
||||
v-if="activeTab && data.doc"
|
||||
class="flex flex-1 flex-col overflow-y-auto"
|
||||
class="flex flex-1 flex-col px-10 pt-8"
|
||||
>
|
||||
<Members
|
||||
v-if="activeTab.label === 'Members'"
|
||||
@@ -131,7 +131,7 @@ const tabs = computed(() => {
|
||||
{
|
||||
label: 'Sidebar',
|
||||
icon: 'PanelLeftIcon',
|
||||
description: 'Customize the sidebar as per your needs',
|
||||
description: 'Choose the items you want to show in the sidebar',
|
||||
fields: [
|
||||
{
|
||||
label: 'Courses',
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="flex flex-col justify-between h-full p-4">
|
||||
<div class="flex flex-col justify-between h-full">
|
||||
<div>
|
||||
<div class="font-semibold mb-1">
|
||||
{{ __(label) }}
|
||||
@@ -8,9 +8,9 @@
|
||||
{{ __(description) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex space-x-8 my-5">
|
||||
<div class="flex justify-between my-5">
|
||||
<div v-for="(column, index) in columns" :key="index">
|
||||
<div class="flex flex-col space-y-4 w-60">
|
||||
<div class="flex flex-col space-y-5 w-72">
|
||||
<div v-for="field in column">
|
||||
<Link
|
||||
v-if="field.type == 'Link'"
|
||||
|
||||
@@ -580,7 +580,7 @@ def get_members(start=0, search=""):
|
||||
members = frappe.get_all(
|
||||
"User",
|
||||
filters=filters,
|
||||
fields=["name", "full_name", "user_image", "username"],
|
||||
fields=["name", "full_name", "user_image", "username", "last_active"],
|
||||
page_length=20,
|
||||
start=start,
|
||||
)
|
||||
|
||||
@@ -7,11 +7,16 @@
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"course",
|
||||
"evaluator",
|
||||
"batch_name",
|
||||
"course_title",
|
||||
"column_break_4",
|
||||
"member",
|
||||
"member_name",
|
||||
"section_break_ikne",
|
||||
"evaluator",
|
||||
"evaluator_name",
|
||||
"column_break_sjco",
|
||||
"batch_name",
|
||||
"timezone",
|
||||
"section_break_lifi",
|
||||
"date",
|
||||
"day",
|
||||
@@ -103,11 +108,40 @@
|
||||
"in_standard_filter": 1,
|
||||
"label": "Batch",
|
||||
"options": "LMS Batch"
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_ikne",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_sjco",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fetch_from": "course.title",
|
||||
"fieldname": "course_title",
|
||||
"fieldtype": "Data",
|
||||
"label": "Course Title",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "evaluator.full_name",
|
||||
"fieldname": "evaluator_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Evaluator Name",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "batch_name.timezone",
|
||||
"fieldname": "timezone",
|
||||
"fieldtype": "Data",
|
||||
"label": "Timezone",
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"index_web_pages_for_search": 1,
|
||||
"links": [],
|
||||
"modified": "2024-04-16 11:01:28.336807",
|
||||
"modified": "2024-09-05 16:28:54.043488",
|
||||
"modified_by": "Administrator",
|
||||
"module": "LMS",
|
||||
"name": "LMS Certificate Request",
|
||||
|
||||
@@ -34,23 +34,27 @@ class LMSCertificateRequest(Document):
|
||||
self.evaluator = get_evaluator(self.course, self.batch_name)
|
||||
|
||||
def validate_unavailability(self):
|
||||
unavailable = frappe.db.get_value(
|
||||
"Course Evaluator", self.evaluator, ["unavailable_from", "unavailable_to"], as_dict=1
|
||||
)
|
||||
if (
|
||||
unavailable.unavailable_from
|
||||
and unavailable.unavailable_to
|
||||
and getdate(self.date) >= unavailable.unavailable_from
|
||||
and getdate(self.date) <= unavailable.unavailable_to
|
||||
):
|
||||
frappe.throw(
|
||||
_(
|
||||
"The evaluator of this course is unavailable from {0} to {1}. Please select a date after {1}"
|
||||
).format(
|
||||
format_date(unavailable.unavailable_from, "medium"),
|
||||
format_date(unavailable.unavailable_to, "medium"),
|
||||
)
|
||||
if self.evaluator:
|
||||
unavailable = frappe.db.get_value(
|
||||
"Course Evaluator",
|
||||
self.evaluator,
|
||||
["unavailable_from", "unavailable_to"],
|
||||
as_dict=1,
|
||||
)
|
||||
if (
|
||||
unavailable.unavailable_from
|
||||
and unavailable.unavailable_to
|
||||
and getdate(self.date) >= unavailable.unavailable_from
|
||||
and getdate(self.date) <= unavailable.unavailable_to
|
||||
):
|
||||
frappe.throw(
|
||||
_(
|
||||
"The evaluator of this course is unavailable from {0} to {1}. Please select a date after {1}"
|
||||
).format(
|
||||
format_date(unavailable.unavailable_from, "medium"),
|
||||
format_date(unavailable.unavailable_to, "medium"),
|
||||
)
|
||||
)
|
||||
|
||||
def validate_slot(self):
|
||||
if frappe.db.exists(
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
{% set title = frappe.db.get_value("LMS Course", doc.course, "title") %}
|
||||
{% set timezone = frappe.db.get_value("LMS Batch", doc.batch, "timezone") %}
|
||||
{% set timezone = timezone if timezone else '' %}
|
||||
{% set evaluator_name = frappe.db.get_value("User", doc.evaluator, "full_name") %}
|
||||
|
||||
<p> {{ _("Hey {0}").format(doc.member_name) }} </p>
|
||||
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), timezone) }}</p>
|
||||
<p> {{ _("Your evaluator is {0}").format(evaluator_name) }} </p>
|
||||
<br>
|
||||
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(doc.course_title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), doc.timezone) }}</p>
|
||||
<br>
|
||||
<p> {{ _("{0} is your evaluator").format(doc.evaluator_name) }} </p>
|
||||
<br>
|
||||
<p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
"docstatus": 0,
|
||||
"doctype": "Notification",
|
||||
"document_type": "LMS Certificate Request",
|
||||
"enabled": 0,
|
||||
"enabled": 1,
|
||||
"event": "New",
|
||||
"idx": 0,
|
||||
"is_standard": 1,
|
||||
"message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n{% set timezone = frappe.db.get_value(\"LMS Batch\", doc.batch, \"timezone\") %}\n{% set timezone = timezone if timezone else '' %}\n{% set evaluator_name = frappe.db.get_value(\"User\", doc.evaluator, \"full_name\") %}\n\n<p> {{ _(\"Hey {0}\").format(doc.member_name) }} </p>\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), timezone) }}</p>\n<p> {{ _(\"Your evaluator is {0}\").format(evaluator_name) }} </p>\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
|
||||
"message": "<p> {{ _(\"Hey {0}\").format(doc.member_name) }} </p>\n<br>\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(doc.course_title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), doc.timezone) }}</p>\n<br>\n<p> {{ _(\"{0} is your evaluator\").format(doc.evaluator_name) }} </p>\n<br>\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
|
||||
"message_type": "HTML",
|
||||
"modified": "2024-08-01 12:17:40.647724",
|
||||
"modified_by": "jannat@frappe.io",
|
||||
"modified": "2024-09-05 16:33:01.533349",
|
||||
"modified_by": "Administrator",
|
||||
"module": "LMS",
|
||||
"name": "Certificate Request Creation",
|
||||
"owner": "Administrator",
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{% set title = frappe.db.get_value("LMS Course", doc.course, "title") %}
|
||||
{% set timezone = frappe.db.get_value("LMS Batch", doc.batch, "timezone") %}
|
||||
{% set timezone = timezone if timezone else '' %}
|
||||
{% set evaluator_name = frappe.db.get_value("User", doc.evaluator, "full_name") %}
|
||||
|
||||
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), timezone) }}</p>
|
||||
<p> {{ _("Your evaluator is {0}").format(evaluator_name) }}
|
||||
<p> {{ _("Hey {0}").format(doc.member_name) }} </p>
|
||||
<br>
|
||||
<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(doc.course_title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), doc.timezone) }}</p>
|
||||
<br>
|
||||
<p> {{ _("{0} is your evaluator").format(doc.evaluator_name) }} </p>
|
||||
<br>
|
||||
<p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
"event": "Days Before",
|
||||
"idx": 0,
|
||||
"is_standard": 1,
|
||||
"message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n{% set timezone = frappe.db.get_value(\"LMS Batch\", doc.batch, \"timezone\") %}\n{% set timezone = timezone if timezone else '' %}\n{% set evaluator_name = frappe.db.get_value(\"User\", doc.evaluator, \"full_name\") %}\n\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), timezone) }}</p>\n<p> {{ _(\"Your evaluator is {0}\").format(evaluator_name) }}\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
|
||||
"message": "<p> {{ _(\"Hey {0}\").format(doc.member_name) }} </p>\n<br>\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(doc.course_title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), doc.timezone) }}</p>\n<br>\n<p> {{ _(\"{0} is your evaluator\").format(doc.evaluator_name) }} </p>\n<br>\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
|
||||
"message_type": "HTML",
|
||||
"modified": "2024-07-10 15:51:33.803704",
|
||||
"modified_by": "sayali@erpnext.com",
|
||||
"modified": "2024-09-05 16:33:42.212842",
|
||||
"modified_by": "Administrator",
|
||||
"module": "LMS",
|
||||
"name": "Certificate Request Reminder",
|
||||
"owner": "Administrator",
|
||||
|
||||
Reference in New Issue
Block a user