Upload Code.gs

apps-script/Code.gs

@@ -21,6 +21,7 @@ const HEADERS = [
   "رابط مجلد المنشأة",
   "عدد الصور",
   "مفتاح العينة",
+  "آخر تعديل",
 ];
 
 function doGet(event) {
@@ -28,7 +29,7 @@ function doGet(event) {
     const params = (event && event.parameter) || {};
     const action = String(params.action || "health");
     if (action === "health") {
-      return jsonResponse({ ok: true, service: "ICS2 Documentation", version: 2 });
+      return jsonResponse({ ok: true, service: "ICS2 Documentation", version: 4 });
     }
 
     if (action === "status") {
@@ -36,7 +37,7 @@ function doGet(event) {
       return jsonResponse({
         ok: true,
         generatedAt: new Date().toISOString(),
-        records: getDocumentationRecords(false),
+        records: getDocumentationRecords(true),
       });
     }
 
@@ -72,40 +73,11 @@ function doPost(event) {
 
     const sheet = getSheet();
     ensureHeaders(sheet);
-    const existingIds = sheet
-      .getRange(1, 1, Math.max(sheet.getLastRow(), 1), 1)
-      .getDisplayValues()
-      .flat();
-    if (existingIds.includes(request.documentationId)) {
-      return jsonResponse({ ok: true, duplicate: true, documentationId: request.documentationId });
+    if (request.action === "updateEvidence") {
+      return jsonResponse(updateEvidence(sheet, request));
     }
 
-    const folder = getEvidenceFolder(request);
-    const photoUrls = request.photos.map((photo, index) => savePhoto(folder, photo, request, index));
-    sheet.appendRow([
-      request.documentationId,
-      new Date(),
-      safeText(request.researcher),
-      safeText(request.establishmentName),
-      safeText(request.commercialRecord),
-      safeText(request.contractNumber) || "لا يوجد رقم عقد",
-      safeText(request.city),
-      safeText(request.fieldStatus),
-      safeText(request.statement),
-      photoUrls.join("\n"),
-      folder.getUrl(),
-      photoUrls.length,
-      safeText(request.sampleKey),
-    ]);
-
-    return jsonResponse({
-      ok: true,
-      documentationId: request.documentationId,
-      sampleKey: safeText(request.sampleKey),
-      documentedAt: new Date().toISOString(),
-      folderUrl: folder.getUrl(),
-      photoUrls,
-    });
+    return jsonResponse(createEvidence(sheet, request));
   } catch (error) {
     return jsonResponse({ ok: false, error: String(error.message || error) });
   } finally {
@@ -115,6 +87,132 @@ function doPost(event) {
   }
 }
 
+function createEvidence(sheet, request) {
+  const existingIds = sheet
+    .getRange(1, 1, Math.max(sheet.getLastRow(), 1), 1)
+    .getDisplayValues()
+    .flat();
+  if (existingIds.includes(request.documentationId)) {
+    return { ok: true, duplicate: true, documentationId: request.documentationId };
+  }
+
+  const now = new Date();
+  const folder = getEvidenceFolder(request);
+  const photoUrls = request.photos.map((photo, index) => savePhoto(folder, photo, request, index));
+  sheet.appendRow([
+    request.documentationId,
+    now,
+    safeText(request.researcher),
+    safeText(request.establishmentName),
+    safeText(request.commercialRecord),
+    safeText(request.contractNumber) || "لا يوجد رقم عقد",
+    safeText(request.city),
+    safeText(request.fieldStatus),
+    safeText(request.statement),
+    photoUrls.join("\n"),
+    folder.getUrl(),
+    photoUrls.length,
+    safeText(request.sampleKey),
+    now,
+  ]);
+
+  return evidenceResponse(request, folder.getUrl(), photoUrls, now, now);
+}
+
+function updateEvidence(sheet, request) {
+  const rowNumber = findDocumentationRow(sheet, request.documentationId);
+  if (!rowNumber) throw new Error("تعذر العثور على التوثيق المطلوب تعديله.");
+
+  const row = sheet.getRange(rowNumber, 1, 1, HEADERS.length).getValues()[0];
+  if (safeText(row[12]) && safeText(row[12]) !== safeText(request.sampleKey)) {
+    throw new Error("لا يمكن تعديل توثيق عينة أخرى.");
+  }
+  if (safeText(row[2]) && safeText(row[2]) !== safeText(request.researcher)) {
+    throw new Error("لا يمكن تعديل توثيق باحث آخر.");
+  }
+
+  const oldPhotoUrls = splitUrls(row[9]);
+  const keptPhotoUrls = Array.isArray(request.keptPhotoUrls)
+    ? request.keptPhotoUrls.map(safeText).filter((url) => oldPhotoUrls.includes(url))
+    : oldPhotoUrls;
+  if (keptPhotoUrls.length + request.photos.length > CONFIG.maxPhotos) {
+    throw new Error("الحد الأعلى 3 صور.");
+  }
+
+  const folder = row[10] ? getFolderByUrl(row[10], request) : getEvidenceFolder(request);
+  const newPhotoUrls = request.photos.map((photo, index) =>
+    savePhoto(folder, photo, request, keptPhotoUrls.length + index),
+  );
+  const updatedAt = new Date();
+  const photoUrls = [...keptPhotoUrls, ...newPhotoUrls];
+  sheet.getRange(rowNumber, 8, 1, 7).setValues([[
+    safeText(request.fieldStatus),
+    safeText(request.statement),
+    photoUrls.join("\n"),
+    folder.getUrl(),
+    photoUrls.length,
+    safeText(request.sampleKey),
+    updatedAt,
+  ]]);
+  oldPhotoUrls
+    .filter((url) => !keptPhotoUrls.includes(url))
+    .forEach(trashDriveFileByUrl);
+
+  const documentedAt = row[1] instanceof Date ? row[1] : updatedAt;
+  return evidenceResponse(request, folder.getUrl(), photoUrls, documentedAt, updatedAt, true);
+}
+
+function evidenceResponse(request, folderUrl, photoUrls, documentedAt, updatedAt, updated) {
+  return {
+    ok: true,
+    updated: Boolean(updated),
+    documentationId: request.documentationId,
+    sampleKey: safeText(request.sampleKey),
+    researcher: safeText(request.researcher),
+    establishmentName: safeText(request.establishmentName),
+    commercialRecord: safeText(request.commercialRecord),
+    contractNumber: safeText(request.contractNumber),
+    city: safeText(request.city),
+    fieldStatus: safeText(request.fieldStatus),
+    statement: safeText(request.statement),
+    documentedAt: documentedAt.toISOString(),
+    documentedDate: Utilities.formatDate(documentedAt, CONFIG.timezone, "yyyy-MM-dd"),
+    updatedAt: updatedAt.toISOString(),
+    folderUrl,
+    photoUrls,
+    photoCount: photoUrls.length,
+  };
+}
+
+function findDocumentationRow(sheet, documentationId) {
+  if (sheet.getLastRow() < 2) return 0;
+  const ids = sheet.getRange(2, 1, sheet.getLastRow() - 1, 1).getDisplayValues().flat();
+  const index = ids.indexOf(String(documentationId));
+  return index < 0 ? 0 : index + 2;
+}
+
+function getFolderByUrl(url, request) {
+  const id = driveIdFromUrl(url);
+  return id ? DriveApp.getFolderById(id) : getEvidenceFolder(request);
+}
+
+function trashDriveFileByUrl(url) {
+  const id = driveIdFromUrl(url);
+  if (!id) return;
+  try {
+    DriveApp.getFileById(id).setTrashed(true);
+  } catch (_) {}
+}
+
+function driveIdFromUrl(url) {
+  const value = String(url || "");
+  const match =
+    value.match(/\/folders\/([a-zA-Z0-9_-]+)/) ||
+    value.match(/\/d\/([a-zA-Z0-9_-]+)/) ||
+    value.match(/[?&]id=([a-zA-Z0-9_-]+)/);
+  return match ? match[1] : "";
+}
+
 function validateResearcherAccess(accessCode) {
   const expected = PropertiesService.getScriptProperties().getProperty("ACCESS_CODE") || "20302030";
   if (String(accessCode || "") !== expected) throw new Error("غير مصرح بالوصول.");
@@ -160,6 +258,7 @@ function getDocumentationRecords(includeDetails) {
         fieldStatus: safeText(row[7]),
         photoCount: Number(row[11]) || splitUrls(row[9]).length,
         sampleKey: safeText(row[12]),
+        updatedAt: row[13] instanceof Date ? row[13].toISOString() : "",
       };
       if (!includeDetails) return base;
       return Object.assign(base, {
@@ -168,7 +267,9 @@ function getDocumentationRecords(includeDetails) {
         folderUrl: safeText(row[10]),
       });
     })
-    .sort((a, b) => String(b.documentedAt).localeCompare(String(a.documentedAt)));
+    .sort((a, b) =>
+      String(b.updatedAt || b.documentedAt).localeCompare(String(a.updatedAt || a.documentedAt)),
+    );
 }
 
 function splitUrls(value) {
@@ -193,6 +294,7 @@ function ensureHeaders(sheet) {
     return;
   }
   if (!current[12]) sheet.getRange(1, 13).setValue(HEADERS[12]);
+  if (!current[13]) sheet.getRange(1, 14).setValue(HEADERS[13]);
 }
 
 function getEvidenceFolder(request) {