@tekkare/romulus 0.1.132 → 0.1.134

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.16.0"
   },
-  "version": "0.1.131",
+  "version": "0.1.133",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/runtime/components/AlertForm.vue

@@ -110,7 +110,7 @@ const FR = {
   kindView: 'Une vue',
   kindViewHint: 'Un écran filtré, aussi fin que vous voulez, mais limité à cette page.',
   kindProduct: 'Une marque',
-  kindProductHint: 'Une à {max} marques, suivies partout : prix, avis HAS, indications, ANSM, PUT, MITM, Journal officiel.',
+  kindProductHint: 'Une à {max} marques, suivies partout : prix, avis HAS, indications, ANSM, PUT, MITM, Journal officiel, ventes ville et hospitalières.',
   brands: 'Marques surveillées',
   brandsSearch: 'Rechercher',
   brandsHint: 'Cherchez par marque, molécule, classe ATC ou laboratoire. L’alerte couvre tout le hub pour chaque marque retenue.',
@@ -163,7 +163,7 @@ const EN = {
   kindView: 'A view',
   kindViewHint: 'A filtered screen, as precise as you like, but tied to that page.',
   kindProduct: 'A brand',
-  kindProductHint: 'One to {max} brands, watched everywhere: prices, HAS opinions, indications, ANSM, PUT, MITM, official journal.',
+  kindProductHint: 'One to {max} brands, watched everywhere: prices, HAS opinions, indications, ANSM, PUT, MITM, official journal, retail and hospital sales.',
   brands: 'Watched brands',
   brandsSearch: 'Search',
   brandsHint: 'Search by brand, molecule, ATC class or company. The alert covers the whole hub for each brand kept.',

package/dist/runtime/composables/useRmExport.js

@@ -2,6 +2,8 @@ import { RM_EXPORT_EXTENSIONS } from "../utils/export.js";
 const BRAND_TITLE = "OIP Healthcare";
 const BRAND_LINE = "By Tekkare \u{1F49C}";
 const COVER_SHEET = "Tekkare";
+const CARD_PAGES_MAX = 10;
+const CARD_COUNT_MAX = 2e3;
 function longDate(lang) {
   return (/* @__PURE__ */ new Date()).toLocaleDateString(lang === "en" ? "en-US" : "fr-FR", {
     year: "numeric",
@@ -105,7 +107,7 @@ function printable(text) {
   return substituted.replace(/[^\u0000-\u00ff]/g, "").replace(/\s{2,}/g, " ").trim();
 }
 function cardsOf(payload, config, lang) {
-  if (payload.cards?.length) return payload.cards.slice(0, payload.cardLimit ?? 100);
+  if (payload.cards?.length) return payload.cards.slice(0, payload.cardLimit ?? CARD_COUNT_MAX);
   const sheet = payload.sheets[0];
   if (!sheet) return [];
   const pick = (name) => name ? sheet.schema.find((column) => column.column === name) : void 0;
@@ -115,7 +117,7 @@ function cardsOf(payload, config, lang) {
   const head = title ?? columns[0];
   if (!head) return [];
   const fields = columns.filter((column) => column !== head && column !== subtitle);
-  return rowsOf(sheet, payload.cardLimit ?? 100).map((row) => ({
+  return rowsOf(sheet, payload.cardLimit ?? CARD_COUNT_MAX).map((row) => ({
     title: cellText(head.value(row), lang) || "\u2014",
     subtitle: subtitle ? cellText(subtitle.value(row), lang) : void 0,
     fields: fields.map((column) => ({ label: column.column, value: cellText(column.value(row), lang) })).filter((field) => field.value !== "")
@@ -405,40 +407,100 @@ export function useRmExport() {
     let rowCount = 0;
     if (config.sections.includes("cards")) {
       const cards = cardsOf(payload, config, lang);
-      rowCount = cards.length;
-      const labelWidth = Math.min(46, inner * 0.34);
-      const valueWidth = inner - labelWidth - 8;
       const pageHeight = doc.internal.pageSize.getHeight();
-      cards.forEach((card) => {
-        const titleLines = doc.splitTextToSize(printable(card.title), inner - 8);
-        const subtitleLines = card.subtitle ? doc.splitTextToSize(printable(card.subtitle), inner - 8) : [];
-        const fields = card.fields.map((field) => ({
-          label: doc.splitTextToSize(printable(field.label), labelWidth),
-          value: doc.splitTextToSize(printable(field.value), valueWidth)
-        }));
-        const height = 6 + titleLines.length * 5 + (subtitleLines.length ? subtitleLines.length * 4 + 1 : 0) + (card.badges?.length ? 6 : 0) + fields.reduce((total2, field) => total2 + Math.max(field.label.length, field.value.length) * 4.2, 0) + 5;
+      const PAD = 6;
+      const COUNT_WIDTH = 32;
+      const COUNT_GAP = 6;
+      const LABEL_WIDTH = 26;
+      const firstCardPage = doc.getNumberOfPages();
+      let drawn = 0;
+      for (const card of cards) {
+        const hasCount = !!card.count?.value;
+        const bodyX = margin + PAD + (hasCount ? COUNT_WIDTH + COUNT_GAP : 0);
+        const bodyWidth = inner - PAD * 2 - (hasCount ? COUNT_WIDTH + COUNT_GAP : 0);
+        doc.setFont("helvetica", "bold");
+        doc.setFontSize(12);
+        const titleLines = doc.splitTextToSize(printable(card.title), inner - PAD * 2);
+        doc.setFont("helvetica", "normal");
+        doc.setFontSize(9);
+        const subtitleLines = card.subtitle ? doc.splitTextToSize(printable(card.subtitle), inner - PAD * 2) : [];
+        const TYPO = {
+          meta: { size: 7, bold: true, grey: true, lh: 4, caps: true },
+          // Monospace comme a l'ecran : une reference (CT-20451, un code CIP)
+          // se lit caractere par caractere, et se recopie.
+          ref: { size: 7.5, bold: false, grey: true, lh: 4, pill: true, mono: true },
+          lead: { size: 10, bold: true, grey: false, lh: 4.8 },
+          text: { size: 9, bold: false, grey: false, lh: 4.4 },
+          desc: { size: 8.5, bold: false, grey: true, lh: 4.2 }
+        };
+        const free = card.fields.filter((field) => !printable(field.label));
+        const rows = card.fields.filter((field) => printable(field.label));
+        const inline = [];
+        let taken = 0;
+        for (const field of free) {
+          const kind = field.kind ?? "text";
+          if (kind !== "meta" && kind !== "ref") break;
+          const typo = TYPO[kind];
+          const text = kind === "meta" ? printable(field.value).toUpperCase() : printable(field.value);
+          doc.setFont(typo.mono ? "courier" : "helvetica", typo.bold ? "bold" : "normal");
+          doc.setFontSize(typo.size);
+          const width = doc.getTextWidth(text) + (typo.pill ? 3 : 0);
+          const line = inline[inline.length - 1];
+          const used = line ? line.reduce((total2, item) => total2 + item.width + 3, 0) : 0;
+          if (line && used + width <= bodyWidth) line.push({ text, pill: !!typo.pill, width });
+          else inline.push([{ text, pill: !!typo.pill, width }]);
+          taken += 1;
+        }
+        const stacked = free.slice(taken).map((field) => {
+          const typo = TYPO[field.kind ?? "text"] ?? TYPO.text;
+          doc.setFont(typo.mono ? "courier" : "helvetica", typo.bold ? "bold" : "normal");
+          doc.setFontSize(typo.size);
+          return {
+            typo,
+            lines: doc.splitTextToSize(
+              typo.caps ? printable(field.value).toUpperCase() : printable(field.value),
+              bodyWidth
+            )
+          };
+        });
+        const fields = rows.map((field) => {
+          doc.setFont("helvetica", "bold");
+          doc.setFontSize(6.5);
+          const label = doc.splitTextToSize(printable(field.label).toUpperCase(), LABEL_WIDTH);
+          doc.setFont("helvetica", "normal");
+          doc.setFontSize(9);
+          return {
+            label,
+            value: doc.splitTextToSize(printable(field.value), bodyWidth - LABEL_WIDTH - 4)
+          };
+        });
+        const headHeight = titleLines.length * 5.2 + (subtitleLines.length ? subtitleLines.length * 4.2 + 1 : 0) + (card.badges?.length ? 6 : 0);
+        const bodyHeight = inline.length * 4.8 + stacked.reduce((total2, block) => total2 + block.lines.length * block.typo.lh + 1, 0) + fields.reduce((total2, field) => total2 + Math.max(field.label.length, field.value.length) * 4.4, 0);
+        const countHeight = hasCount ? 9 + (card.count?.label ? 4 : 0) + (card.count?.extra ? 4.5 : 0) : 0;
+        const height = PAD + headHeight + 3 + Math.max(bodyHeight, countHeight) + PAD;
         if (y + height > pageHeight - margin) {
+          if (doc.getNumberOfPages() - firstCardPage + 1 >= CARD_PAGES_MAX) break;
           doc.addPage();
           y = margin;
         }
         doc.setDrawColor(232, 232, 240);
-        doc.setFillColor(252, 252, 254);
-        doc.roundedRect(margin, y, inner, height, 2, 2, "FD");
-        let cursor = y + 6;
+        doc.setFillColor(255, 255, 255);
+        doc.roundedRect(margin, y, inner, height, 3, 3, "FD");
+        let cursor = y + PAD + 3;
         doc.setTextColor(...ink);
         doc.setFont("helvetica", "bold");
-        doc.setFontSize(11);
-        doc.text(titleLines, margin + 4, cursor);
-        cursor += titleLines.length * 5;
+        doc.setFontSize(12);
+        doc.text(titleLines, margin + PAD, cursor);
+        cursor += titleLines.length * 5.2;
         if (subtitleLines.length) {
           doc.setTextColor(...grey);
           doc.setFont("helvetica", "normal");
           doc.setFontSize(9);
-          doc.text(subtitleLines, margin + 4, cursor + 1);
-          cursor += subtitleLines.length * 4 + 1;
+          doc.text(subtitleLines, margin + PAD, cursor + 1);
+          cursor += subtitleLines.length * 4.2 + 1;
         }
         if (card.badges?.length) {
-          let badgeX = margin + 4;
+          let badgeX = margin + PAD;
           doc.setFontSize(7);
           card.badges.forEach((badge) => {
             const text = printable(badge);
@@ -451,28 +513,91 @@ export function useRmExport() {
           });
           cursor += 6;
         }
+        const bodyTop = cursor + 3;
+        if (hasCount) {
+          const centre = margin + PAD + COUNT_WIDTH / 2;
+          doc.setTextColor(...violet);
+          doc.setFont("helvetica", "bold");
+          doc.setFontSize(20);
+          doc.text(printable(String(card.count.value)), centre, bodyTop + 7, { align: "center" });
+          let countCursor = bodyTop + 11;
+          if (card.count.label) {
+            doc.setTextColor(...grey);
+            doc.setFont("helvetica", "bold");
+            doc.setFontSize(6.5);
+            doc.text(printable(card.count.label).toUpperCase(), centre, countCursor, { align: "center" });
+            countCursor += 4;
+          }
+          if (card.count.extra) {
+            doc.setTextColor(...violet);
+            doc.setFont("helvetica", "normal");
+            doc.setFontSize(8);
+            doc.text(
+              doc.splitTextToSize(printable(card.count.extra), COUNT_WIDTH),
+              centre,
+              countCursor + 0.5,
+              { align: "center" }
+            );
+          }
+          doc.setDrawColor(232, 232, 240);
+          doc.line(
+            margin + PAD + COUNT_WIDTH + COUNT_GAP / 2,
+            bodyTop,
+            margin + PAD + COUNT_WIDTH + COUNT_GAP / 2,
+            y + height - PAD
+          );
+        }
+        cursor = bodyTop;
+        inline.forEach((line) => {
+          let itemX = bodyX;
+          line.forEach((item) => {
+            if (item.pill) {
+              doc.setFillColor(244, 244, 248);
+              doc.roundedRect(itemX, cursor - 2.6, item.width, 4.6, 1, 1, "F");
+              doc.setFont("courier", "normal");
+              doc.setFontSize(7.5);
+              doc.setTextColor(...grey);
+              doc.text(item.text, itemX + 1.5, cursor + 0.5);
+            } else {
+              doc.setFont("helvetica", "bold");
+              doc.setFontSize(7);
+              doc.setTextColor(...grey);
+              doc.text(item.text, itemX, cursor + 0.5);
+            }
+            itemX += item.width + 3;
+          });
+          cursor += 4.8;
+        });
+        stacked.forEach((block) => {
+          doc.setFont(block.typo.mono ? "courier" : "helvetica", block.typo.bold ? "bold" : "normal");
+          doc.setFontSize(block.typo.size);
+          doc.setTextColor(...block.typo.grey ? grey : ink);
+          doc.text(block.lines, bodyX, cursor + 1);
+          cursor += block.lines.length * block.typo.lh + 1;
+        });
         fields.forEach((field) => {
-          const lines = Math.max(field.label.length, field.value.length);
           doc.setTextColor(...grey);
           doc.setFont("helvetica", "bold");
-          doc.setFontSize(7);
-          doc.text(field.label, margin + 4, cursor + 1);
+          doc.setFontSize(6.5);
+          doc.text(field.label, bodyX, cursor + 1);
           doc.setTextColor(...ink);
           doc.setFont("helvetica", "normal");
           doc.setFontSize(9);
-          doc.text(field.value, margin + 4 + labelWidth, cursor + 1);
-          cursor += lines * 4.2;
+          doc.text(field.value, bodyX + LABEL_WIDTH + 4, cursor + 1);
+          cursor += Math.max(field.label.length, field.value.length) * 4.4;
         });
         y += height + 4;
-      });
-      const total = payload.sheets[0]?.data.length ?? 0;
-      if (total > cards.length) {
+        drawn += 1;
+      }
+      rowCount = drawn;
+      const total = payload.cards?.length || (payload.sheets[0]?.data.length ?? 0);
+      if (total > drawn) {
         doc.setTextColor(...grey);
         doc.setFont("helvetica", "italic");
         doc.setFontSize(8);
         doc.text(
           printable(
-            lang === "en" ? `${cards.length} of ${total} records shown. Export to Excel for the full set.` : `${cards.length} fiches sur ${total}. Passez par l'export Excel pour la totalit\xE9.`
+            lang === "en" ? `${drawn} of ${total} records shown. Export to Excel for the full set.` : `${drawn} fiches sur ${total}. Passez par l'export Excel pour la totalit\xE9.`
           ),
           margin,
           y + 2

package/dist/runtime/utils/export.d.ts

@@ -53,6 +53,13 @@ export interface RmExportFilter {
     label: string;
     value: string;
 }
+/**
+ * Role d'une ligne de fiche, calque sur ce que `RmResultCard` projette :
+ * `meta` l'entete de ligne en petites capitales, `ref` la reference monospace
+ * sur son fond gris, `lead` le chapo en gras, `text` le corps, `desc` le
+ * commentaire en retrait.
+ */
+export type RmExportCardLine = 'meta' | 'ref' | 'lead' | 'text' | 'desc';
 /**
  * Une fiche : ce que la page montre sous forme de carte, rendu tel quel dans
  * le rapport PDF. Une page qui n'en declare pas en obtient quand meme, les
@@ -63,9 +70,31 @@ export interface RmExportCard {
     subtitle?: string;
     /** Etiquettes courtes posees sous le titre (SMR, statut, pays...). */
     badges?: string[];
+    /**
+     * Compteur de la fiche, celui que `RmResultCard` pose en gros a gauche
+     * (« 16 avis depuis 2018 »). C'est la premiere chose qu'on compare d'une
+     * fiche a l'autre : le rapport lui garde sa place et sa taille.
+     */
+    count?: {
+        value: string;
+        label?: string;
+        extra?: string;
+    };
+    /**
+     * Le corps de la fiche. Un champ sans intitule est une ligne libre (le
+     * resume, l'indication) : elle prend toute la largeur, comme a l'ecran.
+     * Un champ intitule est une rangee (SMR, statut) : intitule a gauche,
+     * valeur a droite.
+     *
+     * `kind` reprend le role que la carte donne a la ligne, et le rapport lui
+     * rend sa graisse et sa taille : sans lui, l'entete de date, le chapo et le
+     * texte reglementaire sortaient tous en 9 points gris, et la fiche imprimee
+     * n'avait plus la hierarchie de la fiche a l'ecran.
+     */
     fields: {
         label: string;
         value: string;
+        kind?: RmExportCardLine;
     }[];
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tekkare/romulus",
-  "version": "0.1.132",
+  "version": "0.1.134",
   "description": "Romulus Design System - Nuxt module by Tekkare",
   "license": "MIT",
   "type": "module",