big update
This commit is contained in:
parent
73d235b7bc
commit
0380dd10d8
18 changed files with 951 additions and 490 deletions
|
|
@ -173,21 +173,26 @@
|
|||
draggable="true"
|
||||
@dragstart="handleDragStart($event, meeting)"
|
||||
@dragend="handleDragEnd($event)"
|
||||
@click="showMeetingDetails(meeting)"
|
||||
>
|
||||
<v-card-text class="pa-3">
|
||||
<div class="meeting-title">{{ meeting.address }}</div>
|
||||
<div class="meeting-status">
|
||||
<v-card-text class="pa-2">
|
||||
<div class="unscheduled-address">
|
||||
<v-icon size="x-small" class="mr-1">mdi-map-marker</v-icon>
|
||||
{{ meeting.address?.fullAddress || meeting.address }}
|
||||
</div>
|
||||
<div v-if="meeting.contact?.name" class="unscheduled-contact">
|
||||
<v-icon size="x-small" class="mr-1">mdi-account</v-icon>
|
||||
{{ meeting.contact.name }}
|
||||
</div>
|
||||
<div v-if="meeting.projectTemplate" class="unscheduled-project">
|
||||
<v-icon size="x-small" class="mr-1">mdi-file-document</v-icon>
|
||||
{{ meeting.projectTemplate }}
|
||||
</div>
|
||||
<div class="unscheduled-status">
|
||||
<v-chip size="x-small" :color="getStatusColor(meeting.status)">
|
||||
{{ meeting.status }}
|
||||
</v-chip>
|
||||
</div>
|
||||
<div v-if="meeting.notes" class="meeting-notes">
|
||||
{{ meeting.notes }}
|
||||
</div>
|
||||
<div v-if="meeting.assigned_employee" class="meeting-employee">
|
||||
<v-icon size="x-small" class="mr-1">mdi-account</v-icon>
|
||||
{{ meeting.assigned_employee }}
|
||||
</div>
|
||||
</v-card-text>
|
||||
</v-card>
|
||||
</div>
|
||||
|
|
@ -876,17 +881,12 @@ const loadWeekMeetings = async () => {
|
|||
? `${startDateTime.getHours().toString().padStart(2, "0")}:${startDateTime.getMinutes().toString().padStart(2, "0")}`
|
||||
: null;
|
||||
|
||||
// Return the full meeting object with calendar-specific fields added
|
||||
return {
|
||||
...meeting, // Keep all original fields
|
||||
id: meeting.name,
|
||||
name: meeting.name,
|
||||
date: date,
|
||||
scheduledTime: time,
|
||||
address: meeting.address,
|
||||
notes: meeting.notes,
|
||||
assigned_employee: meeting.assignedEmployee,
|
||||
status: meeting.status,
|
||||
startTime: meeting.startTime,
|
||||
endTime: meeting.endTime,
|
||||
};
|
||||
})
|
||||
.filter((meeting) => meeting.date && meeting.scheduledTime); // Only include meetings with valid date/time
|
||||
|
|
@ -1274,6 +1274,30 @@ watch(
|
|||
align-items: center;
|
||||
}
|
||||
|
||||
.unscheduled-address,
|
||||
.unscheduled-contact,
|
||||
.unscheduled-project {
|
||||
font-size: 0.8em;
|
||||
color: #666;
|
||||
margin-bottom: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.unscheduled-address {
|
||||
font-weight: 600;
|
||||
color: #1976d2;
|
||||
}
|
||||
|
||||
.unscheduled-status {
|
||||
margin-top: 6px;
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
.calendar-section {
|
||||
flex: 1;
|
||||
overflow: auto;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue