Skip to content

feat: More improvements #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maniamartial merged 4 commits into from
Nov 18, 2025
Merged

feat: More improvements #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d82ad3
feat: update teh service list
maniamartial Nov 18, 2025
f7833a8
feat: Update the behaviour
maniamartial Nov 18, 2025
ba91850
feat: update the miscrosfit of appointment button
maniamartial Nov 18, 2025
015b9c0
Merge branch 'develop' into dev11
maniamartial Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 17 additions & 34 deletions schedule/src/components/schedule/schedule-left-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
ServiceOrderSummary,
} from "../../pages/schedule/types";
import { Skeleton } from "../ui/skeleton";
import { AppointmentDetailSheet } from "./appointment-detail-sheet";
import { ServiceOrderDetailSheet } from "./service-order-detail-sheet";
import { MassActionsDropdown } from "./mass-actions-dropdown";
import { Filter, CalendarIcon } from "lucide-react";
Expand Down Expand Up @@ -90,7 +89,6 @@ export function ScheduleLeftPanel({
serviceOrders,
serviceOrdersLoading,
}: ScheduleLeftPanelProps) {
const [selectedAppointment, setSelectedAppointment] = useState<Appointment | null>(null);
const [selectedServiceOrder, setSelectedServiceOrder] = useState<ServiceOrderDetail | null>(null);
const [serviceOrderSheetOpen, setServiceOrderSheetOpen] = useState(false);
const [serviceOrderDetailLoading, setServiceOrderDetailLoading] = useState(false);
Expand Down Expand Up @@ -140,11 +138,6 @@ export function ScheduleLeftPanel({
return "No description";
};

const handleAppointmentClick = (appointment: Appointment) => {
setSelectedAppointment(appointment);
onAppointmentClick(appointment);
};

const formatOrderDate = (dateString?: string) => {
if (!dateString) return null;
try {
Expand Down Expand Up @@ -287,33 +280,31 @@ const getOrderStatusColor = (status?: string) => {
<>
<div className="flex flex-col h-full">
{/* Header */}
<div className="p-4 border-b border-border">
<div className="flex items-center justify-between mb-3 gap-3">
<div>
<div className="p-4 border-b border-border space-y-3">
<div>

<div className="flex items-center justify-between mt-1">
<h2 className="text-lg font-semibold">
{isOrderMode ? "Service Orders" : "Service Appointments"}
</h2>
</div>
<div className="flex items-center gap-2">
<Badge variant="secondary">
{isOrderMode ? serviceOrders.length : appointments.length}
</Badge>
<Button
variant={isOrderMode ? "outline" : "default"}
size="sm"
className={cn(
"text-xs font-semibold transition-colors",
isOrderMode
? "border-primary text-primary hover:bg-primary/10"
: "bg-primary text-primary-foreground"
)}
onClick={onModeToggle}
>
{isOrderMode ? "View Appointments" : "View Service Orders"}
</Button>
</div>
</div>
<Button
variant={isOrderMode ? "outline" : "default"}
size="sm"
className={cn(
"w-full justify-center text-sm font-medium transition-colors",
isOrderMode
? "border-primary text-primary hover:bg-primary/5"
: "bg-primary text-primary-foreground"
)}
onClick={onModeToggle}
>
{isOrderMode ? "View Service Appointments" : "View Service Orders"}
</Button>

{isOrderMode ? (
<div className="mb-3">
Expand Down Expand Up @@ -532,7 +523,7 @@ const getOrderStatusColor = (status?: string) => {
${isSelected ? "bg-primary/5 border-primary" : "hover:bg-muted/50"}
${isCompleted ? "opacity-80" : ""}
`}
onClick={() => handleAppointmentClick(appointment)}
onClick={() => onAppointmentClick(appointment)}
draggable={!isCompleted}
onDragStart={(e) => {
if (isCompleted) {
Expand Down Expand Up @@ -617,14 +608,6 @@ const getOrderStatusColor = (status?: string) => {
</div>

{/* Detail Sheet */}
{selectedAppointment && (
<AppointmentDetailSheet
appointment={selectedAppointment}
open={!!selectedAppointment}
onOpenChange={(open) => !open && setSelectedAppointment(null)}
/>
)}

<ServiceOrderDetailSheet
order={selectedServiceOrder}
open={serviceOrderSheetOpen}
Expand Down
8 changes: 3 additions & 5 deletions schedule/src/store/schedule-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,9 @@ export const useScheduleStore = create<ScheduleState>((set, get) => ({
return saved === "technicians" ? "technicians" : "appointments";
})(),
leftListMode:
(typeof window !== "undefined" && localStorage.getItem("schedule-left-list-mode") === "appointments")
? "appointments"
: (typeof window !== "undefined" && localStorage.getItem("schedule-left-list-mode") === "orders")
? "orders"
: "appointments",
typeof window !== "undefined" && localStorage.getItem("schedule-left-list-mode")
? (localStorage.getItem("schedule-left-list-mode") as "orders" | "appointments")
: "orders",
settingsView:
(typeof window !== "undefined" && localStorage.getItem("schedule-settings-view") === "1") ||
false,
Expand Down