Upload 3 files

app.js

@@ -183,8 +183,20 @@ function latestRecordsBySample(records) {
   return map;
 }
 
+function latestRecordsByCommercialRecord(records) {
+  const map = new Map();
+  records.forEach((record) => {
+    if (!record.commercialRecord || map.has(record.commercialRecord)) return;
+    map.set(record.commercialRecord, record);
+  });
+  return map;
+}
+
 function documentationRecord(row) {
-  return latestRecordsBySample(documentationRecords).get(row.sampleKey);
+  return (
+    latestRecordsBySample(documentationRecords).get(row.sampleKey) ||
+    latestRecordsByCommercialRecord(documentationRecords).get(row.commercialRecord)
+  );
 }
 
 function hydrateRecordKeys(records) {
@@ -211,11 +223,14 @@ function hydrateRecordKeys(records) {
 function preserveDocumentedRows(records) {
   if (!payload?.rows?.length || !Array.isArray(records) || !records.length) return;
   const existingKeys = new Set(payload.rows.map((row) => row.sampleKey));
+  const existingCommercialRecords = new Set(payload.rows.map((row) => row.commercialRecord).filter(Boolean));
   const extraRows = [];
 
   records.forEach((record) => {
     if (!record.sampleKey || existingKeys.has(record.sampleKey) || !record.establishmentName) return;
+    if (record.commercialRecord && existingCommercialRecords.has(record.commercialRecord)) return;
     existingKeys.add(record.sampleKey);
+    if (record.commercialRecord) existingCommercialRecords.add(record.commercialRecord);
     extraRows.push({
       researcher: record.researcher || "غير محدد",
       establishmentName: record.establishmentName,
@@ -277,15 +292,20 @@ function dateOffset(dateValue, offset) {
 function adminSnapshot() {
   const records = [...latestRecordsBySample(adminRecords).values()];
   const recordMap = new Map(records.map((record) => [record.sampleKey, record]));
+  const commercialRecordMap = latestRecordsByCommercialRecord(records);
   const today = riyadhToday();
   const yesterday = dateOffset(today, -1);
-  const documented = payload.rows.filter((row) => recordMap.has(row.sampleKey));
+  const documented = payload.rows.filter((row) =>
+    recordMap.has(row.sampleKey) ||
+    Boolean(row.commercialRecord && commercialRecordMap.has(row.commercialRecord)),
+  );
   const todayRecords = records.filter((record) => record.documentedDate === today);
   const yesterdayRecords = records.filter((record) => record.documentedDate === yesterday);
   const activeToday = new Set(todayRecords.map((record) => record.researcher).filter(Boolean));
   return {
     records,
     recordMap,
+    commercialRecordMap,
     today,
     yesterday,
     documented,
@@ -857,7 +877,11 @@ function createStat(value, label, className) {
 
 function renderSummary() {
   const records = latestRecordsBySample(documentationRecords);
-  const documented = researcherRows.filter((row) => records.has(row.sampleKey)).length;
+  const commercialRecords = latestRecordsByCommercialRecord(documentationRecords);
+  const documented = researcherRows.filter((row) =>
+    records.has(row.sampleKey) ||
+    Boolean(row.commercialRecord && commercialRecords.has(row.commercialRecord)),
+  ).length;
   const total = researcherRows.length;
   const remaining = Math.max(total - documented, 0);
   const percentage = total ? Math.round((documented / total) * 100) : 0;
@@ -868,7 +892,7 @@ function renderSummary() {
     day: "2-digit",
   }).format(new Date());
   const documentedToday = researcherRows.filter(
-    (row) => records.get(row.sampleKey)?.documentedDate === today,
+    (row) => (records.get(row.sampleKey) || commercialRecords.get(row.commercialRecord))?.documentedDate === today,
   ).length;
   const progress = document.createElement("div");
   progress.className = "researcher-progress";
@@ -1479,19 +1503,22 @@ function completedDocumentationMap() {
 }
 
 function isDocumentationCompleted(rowId) {
+  const row = researcherRows.find((item) => item.rowId === rowId || item.sampleKey === rowId);
   return Boolean(
     latestRecordsBySample(documentationRecords).has(rowId) ||
+    (row?.commercialRecord && latestRecordsByCommercialRecord(documentationRecords).has(row.commercialRecord)) ||
     completedDocumentationMap()[rowId],
   );
 }
 
 function documentedRowsFirst(rows) {
   const records = latestRecordsBySample(documentationRecords);
+  const commercialRecords = latestRecordsByCommercialRecord(documentationRecords);
   const locallyCompleted = completedDocumentationMap();
 
   return [...rows].sort((a, b) => {
-    const aRecord = records.get(a.sampleKey);
-    const bRecord = records.get(b.sampleKey);
+    const aRecord = records.get(a.sampleKey) || commercialRecords.get(a.commercialRecord);
+    const bRecord = records.get(b.sampleKey) || commercialRecords.get(b.commercialRecord);
     const aCompleted = Boolean(aRecord || locallyCompleted[a.rowId]);
     const bCompleted = Boolean(bRecord || locallyCompleted[b.rowId]);
 
@@ -1923,7 +1950,11 @@ elements.documentationForm.addEventListener("submit", async (event) => {
     closeDocumentationDialog();
     applyFilters();
     const records = latestRecordsBySample(documentationRecords);
-    const completedCount = researcherRows.filter((row) => records.has(row.sampleKey)).length;
+    const commercialRecords = latestRecordsByCommercialRecord(documentationRecords);
+    const completedCount = researcherRows.filter((row) =>
+      records.has(row.sampleKey) ||
+      Boolean(row.commercialRecord && commercialRecords.has(row.commercialRecord)),
+    ).length;
     const remainingCount = Math.max(researcherRows.length - completedCount, 0);
     showToast(
       remainingCount === 0

generate-data.mjs

@@ -5,32 +5,32 @@ import { FileBlob, SpreadsheetFile } from "@oai/artifact-tool";
 const [inputPath, outputPath, password = "20302030", supervisorPassword = "1448"] = process.argv.slice(2);
 
 const MAP_URLS = [
-  ["صالح عبدالله صالح الدخيل", "https://stat2025-map.static.hf.space/Rahn/01.html"],
-  ["عبدالرحمن عبدالله سعد الحماد", "https://stat2025-map.static.hf.space/Rahn/02.html"],
-  ["نوار عوض مقبل العنزى", "https://stat2025-map.static.hf.space/Rahn/03.html"],
-  ["ناصر منصور علي الرويس", "https://stat2025-map.static.hf.space/Rahn/04.html"],
-  ["عبدالعزيز فهد عبدالعزيز العبلان", "https://stat2025-map.static.hf.space/Rahn/05.html"],
-  ["فاطمة حميدي هيف القحطاني", "https://stat2025-map.static.hf.space/Rahn/06.html"],
-  ["أماني مصطفى عبدالله الطيب", "https://stat2025-map.static.hf.space/Rahn/07.html"],
-  ["فوز عائد نومان المطيري", "https://stat2025-map.static.hf.space/Rahn/08.html"],
-  ["ماجد سعد ناصر السبيعي", "https://stat2025-map.static.hf.space/Rahn/09.html"],
-  ["نوف سعود بن سالم الخثعمي", "https://stat2025-map.static.hf.space/Rahn/10.html"],
-  ["ريم بنت محمد بن عبدالعزيز الملحم", "https://stat2025-map.static.hf.space/Rahn/11.html"],
-  ["ساره خالد سليمان المحيسن", "https://stat2025-map.static.hf.space/Rahn/12.html"],
-  ["هبه عبدالعزيز", "https://stat2025-map.static.hf.space/Rahn/13.html"],
-  ["نيللي حسين عبدالله الجعص", "https://stat2025-map.static.hf.space/Rahn/14.html"],
-  ["عماد بن عيسى بن", "https://stat2025-map.static.hf.space/Rahn/15.html"],
-  ["قنوت محمد بن عبدالله آل حماد", "https://stat2025-map.static.hf.space/Rahn/16.html"],
-  ["غادة سعد عبدالرحمن الراحله", "https://stat2025-map.static.hf.space/Rahn/17.html"],
+  ["أماني مصطفى عبدالله الطيب", "https://stat2025-map.static.hf.space/Rahn/01.html"],
+  ["اسعد بن ماجد بن", "https://stat2025-map.static.hf.space/Rahn/02.html"],
+  ["ريم بنت محمد بن عبدالعزيز الملحم", "https://stat2025-map.static.hf.space/Rahn/03.html"],
+  ["زكي بن عيسى بن", "https://stat2025-map.static.hf.space/Rahn/04.html"],
+  ["ساره حسين بن عبدالهادي بوخمسين", "https://stat2025-map.static.hf.space/Rahn/05.html"],
+  ["ساره خالد سليمان المحيسن", "https://stat2025-map.static.hf.space/Rahn/06.html"],
+  ["صالح عبدالله صالح الدخيل", "https://stat2025-map.static.hf.space/Rahn/07.html"],
+  ["طيبه فالح بن عبدالله الرويشد", "https://stat2025-map.static.hf.space/Rahn/08.html"],
+  ["عبدالرحمن عبدالله سعد الحماد", "https://stat2025-map.static.hf.space/Rahn/09.html"],
+  ["عبدالعزيز فهد عبدالعزيز العبلان", "https://stat2025-map.static.hf.space/Rahn/10.html"],
+  ["علي جابر بن علي", "https://stat2025-map.static.hf.space/Rahn/11.html"],
+  ["عماد بن عيسى بن", "https://stat2025-map.static.hf.space/Rahn/12.html"],
+  ["غادة سعد عبدالرحمن الراحله", "https://stat2025-map.static.hf.space/Rahn/13.html"],
+  ["فارس سمير سليماني", "https://stat2025-map.static.hf.space/Rahn/14.html"],
+  ["فاطمة حميدي هيف القحطاني", "https://stat2025-map.static.hf.space/Rahn/15.html"],
+  ["فوز عائد نومان المطيري", "https://stat2025-map.static.hf.space/Rahn/16.html"],
+  ["قنوت محمد بن عبدالله آل حماد", "https://stat2025-map.static.hf.space/Rahn/17.html"],
   ["لين أحمد بن عبدالعزيز القصير", "https://stat2025-map.static.hf.space/Rahn/18.html"],
-  ["زكي بن عيسى بن", "https://stat2025-map.static.hf.space/Rahn/19.html"],
-  ["علي جابر بن علي", "https://stat2025-map.static.hf.space/Rahn/20.html"],
-  ["نبأ عادل بن عبدالكريم", "https://stat2025-map.static.hf.space/Rahn/21.html"],
-  ["اسعد بن ماجد بن", "https://stat2025-map.static.hf.space/Rahn/22.html"],
-  ["مرتضى عبدالجليل بن عيسى", "https://stat2025-map.static.hf.space/Rahn/23.html"],
-  ["ساره حسين بن عبدالهادي بوخمسين", "https://stat2025-map.static.hf.space/Rahn/24.html"],
-  ["طيبه فالح بن عبدالله الرويشد", "https://stat2025-map.static.hf.space/Rahn/25.html"],
-  ["فارس سمير سليماني", "https://stat2025-map.static.hf.space/Rahn/26.html"],
+  ["ماجد سعد ناصر السبيعي", "https://stat2025-map.static.hf.space/Rahn/19.html"],
+  ["مرتضى عبدالجليل بن عيسى", "https://stat2025-map.static.hf.space/Rahn/20.html"],
+  ["ناصر منصور علي الرويس", "https://stat2025-map.static.hf.space/Rahn/21.html"],
+  ["نبأ عادل بن عبدالكريم", "https://stat2025-map.static.hf.space/Rahn/22.html"],
+  ["نوار عوض مقبل العنزى", "https://stat2025-map.static.hf.space/Rahn/23.html"],
+  ["نوف سعود بن سالم الخثعمي", "https://stat2025-map.static.hf.space/Rahn/24.html"],
+  ["نيللي حسين عبدالله الجعص", "https://stat2025-map.static.hf.space/Rahn/25.html"],
+  ["هيه عبدالعزيز المزيني", "https://stat2025-map.static.hf.space/Rahn/26.html"],
 ];
 
 function clean(value) {
@@ -87,6 +87,12 @@ function mapUrlFor(researcher) {
   return partial?.[1] || "";
 }
 
+function columnIndex(headers, names, fallback) {
+  const targets = names.map(normalize);
+  const index = headers.findIndex((header) => targets.includes(normalize(header)));
+  return index >= 0 ? index : fallback;
+}
+
 function sampleKey(row) {
   const parts = [
     row.commercialRecord,
@@ -128,18 +134,36 @@ if (!inputPath || !outputPath) {
   const workbook = await SpreadsheetFile.importXlsx(await FileBlob.load(inputPath));
   const sheet = workbook.worksheets.getItemAt(0);
   const values = sheet.getUsedRange(true).values;
+  const headers = (values[0] || []).map(clean);
+  const columns = {
+    commercialRecord: columnIndex(headers, ["السجل التجاري"], 11),
+    researcher: columnIndex(headers, ["اسم الباحث/ة", "اسم الباحث", "الباحث"], 0),
+    establishmentName: columnIndex(headers, ["إسم المنشأة", "اسم المنشأة", "المنشأة"], 1),
+    alternateName: 2,
+    contractNumber: columnIndex(headers, ["رقم العقد"], 3),
+    city: columnIndex(headers, ["المدينة الصناعية", "توضيح المدينة"], 5),
+    fallbackCity: 4,
+    status: columnIndex(headers, ["حالة الاستيفاء"], 6),
+    madonStatement: columnIndex(headers, ["افادة مدن", "إفادة مدن"], 7),
+    madonNote: columnIndex(headers, ["ملاحظة مدن", "ملاحظات مدن"], 8),
+    x: columnIndex(headers, ["اكس", "x"], 9),
+    y: columnIndex(headers, ["واي", "y"], 10),
+    unifiedNumber: columnIndex(headers, ["الرقم الموحد"], 12),
+    activityCode: columnIndex(headers, ["ترميز النشاط"], 13),
+    activity: columnIndex(headers, ["النشاط"], 14),
+  };
   const rows = [];
 
   for (const source of values.slice(1)) {
-    const researcher = clean(source[0]);
-    const establishmentName = clean(source[1]) || clean(source[2]);
+    const researcher = clean(source[columns.researcher]);
+    const establishmentName = clean(source[columns.establishmentName]) || clean(source[columns.alternateName]);
     if (!researcher || !establishmentName) continue;
 
-    const madonStatement = clean(source[7]);
-    const madonNote = clean(source[8]);
+    const madonStatement = clean(source[columns.madonStatement]);
+    const madonNote = clean(source[columns.madonNote]);
     const madonCoordinates = coordinateFromText(madonNote);
-    const x = numeric(source[9]);
-    const y = numeric(source[10]);
+    const x = numeric(source[columns.x]);
+    const y = numeric(source[columns.y]);
     const baseCoordinates =
       x !== null && y !== null && x >= 35 && x <= 60 && y >= 15 && y <= 35 ? `${y}, ${x}` : "";
     const coordinates = madonCoordinates || baseCoordinates;
@@ -154,19 +178,19 @@ if (!inputPath || !outputPath) {
     const row = {
       researcher,
       establishmentName,
-      contractNumber: clean(source[3]),
-      city: canonicalCity(source[5], source[4]),
-      sourceCity: clean(source[5]) || clean(source[4]),
-      representativeCity: canonicalCity("", source[4]),
-      status: clean(source[6]),
+      contractNumber: clean(source[columns.contractNumber]),
+      city: canonicalCity(source[columns.city], source[columns.fallbackCity]),
+      sourceCity: clean(source[columns.city]) || clean(source[columns.fallbackCity]),
+      representativeCity: canonicalCity("", source[columns.fallbackCity] || source[columns.city]),
+      status: clean(source[columns.status]),
       madonStatement,
       madonNoteText: madonCoordinates ? "" : madonNote,
       coordinates,
       locationType,
-      commercialRecord: clean(source[11]),
-      unifiedNumber: clean(source[12]),
-      activityCode: clean(source[13]),
-      activity: clean(source[14]),
+      commercialRecord: clean(source[columns.commercialRecord]),
+      unifiedNumber: clean(source[columns.unifiedNumber]),
+      activityCode: clean(source[columns.activityCode]),
+      activity: clean(source[columns.activity]),
     };
     row.sampleKey = sampleKey(row);
     rows.push(row);