feat(workflow): split job step from location, model back-and-forth between lab and clinic

Real prosthetic production isn't a one-way pipeline — the work moves
between lab and clinic multiple times. After substructure is produced
the lab hands it to the clinic for a fitting, the clinic approves it
back to the lab, the lab builds the superstructure, hands it back for
a second fitting, the clinic approves again, the lab does cila/bitim,
and finally delivers it to the clinic for handover to the patient.

Previously we only had a single 'advance step' action callable by the
lab, which collapsed all of that into a linear forward push and didn't
capture who physically had the work at any given moment.

DB
  - New jobs.location enum (at_clinic | at_lab, default at_clinic).
  - Existing jobs keep working via a 'location ?? at_lab' fallback in
    code; no manual backfill required for the four test rows.

State machine
  - acceptJobAction (lab): pending → in_progress, currentStep=alt_yapi_prova,
    location=at_lab. Skips the implicit 'olcu' production step now that
    accepting the job means the lab has the impression in hand.
  - handToClinicAction (lab, NEW): at_lab → at_clinic, step stays the
    same. If step is cila_bitim, status becomes 'sent' (final delivery)
    and finance sync fires.
  - approveAtClinicAction (clinic, NEW): at_clinic → at_lab, step
    advances to the next stage so the lab knows what to produce next.
  - markDeliveredAction unchanged — clinic confirms the final handoff.
  - advanceStepAction removed; its single forward push doesn't fit the
    new bidirectional flow.

UI
  - JobActionsPanel now picks the right button from the role + status +
    location matrix:
      * Lab + pending          → 'İşleme Al'
      * Lab + in_progress + at_lab + cila_bitim → 'Cila Bitim — Nihai Teslime Gönder'
      * Lab + in_progress + at_lab + other      → '{stage} Provaya Gönder'
      * Clinic + in_progress + at_clinic → '{stage} Provası Tamam'
      * Clinic + sent          → 'Teslim Aldım'
      * Both + pending         → 'İptal Et'
  - Job detail surfaces a new 'Şu An' info row that resolves to a
    human-readable location ('Klinikte', 'Laboratuvarda', 'Hasta'ya
    teslim edildi', ...) so anyone glancing at the page can tell where
    the work physically is.
This commit is contained in:
kovakmedya
2026-05-22 01:31:49 +03:00
parent cdb2a15643
commit 479972e9a9
5 changed files with 270 additions and 70 deletions
+148 -43
View File
@@ -297,9 +297,12 @@ export async function acceptJobAction(
try {
const { tablesDB } = createAdminClient();
// Accepting the job = lab took the impression, started substructure work.
// Step jumps straight to alt_yapi_prova; location flips to at_lab.
await tablesDB.updateRow(DATABASE_ID, TABLES.jobs, jobId, {
status: "in_progress",
currentStep: "olcu",
currentStep: "alt_yapi_prova",
location: "at_lab",
});
await appendJobHistory({ job, step: "olcu", completedBy: ctx.user.id });
void logAudit({
@@ -308,12 +311,16 @@ export async function acceptJobAction(
action: "update",
entityType: "job",
entityId: jobId,
changes: { status: "in_progress", currentStep: "olcu" },
changes: {
status: "in_progress",
currentStep: "alt_yapi_prova",
location: "at_lab",
},
});
void createNotification({
tenantId: job.clinicTenantId,
jobId,
message: `${ctx.settings?.companyName ?? "Lab"} hasta ${job.patientCode} işini işleme aldı.`,
message: `${ctx.settings?.companyName ?? "Lab"} hasta ${job.patientCode} işini işleme aldı, alt yapı üretiminde.`,
});
} catch (e) {
return { ok: false, error: appwriteError(e, "Kabul edilemedi.") };
@@ -325,7 +332,14 @@ export async function acceptJobAction(
return { ok: true };
}
export async function advanceStepAction(
/**
* Lab hands the work back to the clinic for the next physical step
* (prova or final delivery). The current step stays the same — only the
* location flips at_lab → at_clinic. If the lab is finishing the last
* production step (cila_bitim), that's the final delivery and the job
* status becomes "sent".
*/
export async function handToClinicAction(
_prev: JobActionState,
formData: FormData,
): Promise<JobActionState> {
@@ -339,7 +353,7 @@ export async function advanceStepAction(
requireRole(ctx, ["owner", "admin", "member"]);
requireTenantKind(ctx, ["lab"]);
} catch {
return { ok: false, error: "Sadece laboratuvar aşama ilerletebilir." };
return { ok: false, error: "Sadece laboratuvar kliniğe gönderebilir." };
}
const job = await loadJobForTenant(jobId, ctx.tenantId);
@@ -347,36 +361,28 @@ export async function advanceStepAction(
return { ok: false, error: "İş bulunamadı." };
}
if (job.status !== "in_progress") {
return { ok: false, error: "Yalnızca işleme alınmış işler ilerletilebilir." };
return { ok: false, error: "Sadece işlemdeki işler kliniğe gönderilebilir." };
}
if (job.location !== "at_lab") {
return { ok: false, error: "İş zaten kliniğe gönderilmiş." };
}
if (!job.currentStep) {
return { ok: false, error: "Mevcut aşama bilinmiyor." };
}
const currentIdx = job.currentStep ? JOB_STEP_ORDER.indexOf(job.currentStep) : -1;
if (currentIdx < 0) return { ok: false, error: "Mevcut aşama bilinmiyor." };
const nextIdx = currentIdx + 1;
const isFinalStepComplete = currentIdx === JOB_STEP_ORDER.length - 1;
const isFinalStep = job.currentStep === "cila_bitim";
try {
const { tablesDB } = createAdminClient();
if (isFinalStepComplete) {
if (isFinalStep) {
// Final delivery — production is done, status moves to sent.
await tablesDB.updateRow(DATABASE_ID, TABLES.jobs, jobId, {
status: "sent",
});
void logAudit({
tenantId: ctx.tenantId,
userId: ctx.user.id,
action: "update",
entityType: "job",
entityId: jobId,
changes: { status: "sent" },
});
} else {
const nextStep = JOB_STEP_ORDER[nextIdx];
await tablesDB.updateRow(DATABASE_ID, TABLES.jobs, jobId, {
currentStep: nextStep,
location: "at_clinic",
});
await appendJobHistory({
job,
step: job.currentStep!,
step: "cila_bitim",
completedBy: ctx.user.id,
note,
});
@@ -386,27 +392,43 @@ export async function advanceStepAction(
action: "update",
entityType: "job",
entityId: jobId,
changes: { currentStep: nextStep, completedStep: job.currentStep },
changes: { status: "sent", location: "at_clinic" },
});
void syncFinanceForJob({ ...job, status: "sent" });
void createNotification({
tenantId: job.clinicTenantId,
jobId,
message: `Hasta ${job.patientCode} cila/bitim tamamlandı, nihai teslime gönderildi.`,
});
} else {
// Prova için klinike geçici teslim — step aynı, location değişti.
await tablesDB.updateRow(DATABASE_ID, TABLES.jobs, jobId, {
location: "at_clinic",
});
await appendJobHistory({
job,
step: job.currentStep,
completedBy: ctx.user.id,
note,
});
void logAudit({
tenantId: ctx.tenantId,
userId: ctx.user.id,
action: "update",
entityType: "job",
entityId: jobId,
changes: { location: "at_clinic", handedOffStep: job.currentStep },
});
const stepLabel =
job.currentStep === "alt_yapi_prova" ? "alt yapı" : "üst yapı";
void createNotification({
tenantId: job.clinicTenantId,
jobId,
message: `Hasta ${job.patientCode} ${stepLabel} provasına hazır, kliniğe gönderildi.`,
});
}
} catch (e) {
return { ok: false, error: appwriteError(e, "İlerletilemedi.") };
}
if (isFinalStepComplete) {
// Record completion of the last step too, then mark sent.
await appendJobHistory({
job,
step: job.currentStep!,
completedBy: ctx.user.id,
note,
});
void syncFinanceForJob({ ...job, status: "sent" });
void createNotification({
tenantId: job.clinicTenantId,
jobId,
message: `Hasta ${job.patientCode} işi gönderildi. Teslim alındığında onaylayın.`,
});
return { ok: false, error: appwriteError(e, "Gönderilemedi.") };
}
revalidatePath(`/jobs/${jobId}`);
@@ -416,6 +438,89 @@ export async function advanceStepAction(
return { ok: true };
}
/**
* Clinic confirms the prova was successful. Step advances to the next
* production stage and location flips back at_clinic → at_lab so the
* lab can pick the work back up.
*/
export async function approveAtClinicAction(
_prev: JobActionState,
formData: FormData,
): Promise<JobActionState> {
const jobId = String(formData.get("jobId") ?? "").trim();
if (!jobId) return { ok: false, error: "İş bulunamadı." };
const note = String(formData.get("note") ?? "").trim() || undefined;
let ctx;
try {
ctx = await requireTenant();
requireRole(ctx, ["owner", "admin", "member"]);
requireTenantKind(ctx, ["clinic"]);
} catch {
return { ok: false, error: "Sadece klinik provayı onaylayabilir." };
}
const job = await loadJobForTenant(jobId, ctx.tenantId);
if (!job || job.clinicTenantId !== ctx.tenantId) {
return { ok: false, error: "İş bulunamadı." };
}
if (job.status !== "in_progress") {
return { ok: false, error: "Yalnızca işlemdeki provalar onaylanabilir." };
}
if (job.location !== "at_clinic") {
return { ok: false, error: "İş şu an klinikte değil." };
}
if (!job.currentStep) {
return { ok: false, error: "Mevcut aşama bilinmiyor." };
}
const currentIdx = JOB_STEP_ORDER.indexOf(job.currentStep);
const nextStep = JOB_STEP_ORDER[currentIdx + 1];
if (!nextStep) {
return { ok: false, error: "Bu aşamadan ileri gidilemez." };
}
try {
const { tablesDB } = createAdminClient();
await tablesDB.updateRow(DATABASE_ID, TABLES.jobs, jobId, {
currentStep: nextStep,
location: "at_lab",
});
await appendJobHistory({
job,
step: job.currentStep,
completedBy: ctx.user.id,
note,
});
void logAudit({
tenantId: ctx.tenantId,
userId: ctx.user.id,
action: "update",
entityType: "job",
entityId: jobId,
changes: {
currentStep: nextStep,
location: "at_lab",
completedStep: job.currentStep,
},
});
const stepLabel =
job.currentStep === "alt_yapi_prova" ? "alt yapı" : "üst yapı";
void createNotification({
tenantId: job.labTenantId,
jobId,
message: `Hasta ${job.patientCode} ${stepLabel} provası onaylandı, lab tarafına geri döndü.`,
});
} catch (e) {
return { ok: false, error: appwriteError(e, "Onaylanamadı.") };
}
revalidatePath(`/jobs/${jobId}`);
revalidatePath("/jobs/inbound");
revalidatePath("/jobs/outbound");
return { ok: true };
}
export async function markDeliveredAction(
_prev: JobActionState,
formData: FormData,