@uxland/primary-shell 5.3.2 → 5.3.4

package/src/features/visit/get-visit-id/handler.ts

@@ -0,0 +1,27 @@
+import { TYPES } from "../../../infrastructure/ioc/types";
+import { inject } from "inversify";
+import { PrimariaApi } from "../../../api/api";
+import { GetVisitId } from "./request";
+
+export class GetVisitIdHandler {
+  constructor(
+    @inject(TYPES.primaryApi) private api: PrimariaApi,
+  ) {}
+  async handle(message: GetVisitId): Promise<string | undefined> {
+    try {
+      const visitIdData = await this.getVisitId();
+      console.log("Visit ID obtenido: ", visitIdData);
+      return visitIdData;
+    } catch (error) {
+      this.api.notificationService.error(error.message);
+      return undefined;
+    }
+  }
+
+  private getVisitId(): Promise<string | undefined> {
+    const urlParams = new URLSearchParams(window.location.search);
+    console.log("Paràmetres de la URL: ", window.location.search);
+    const visitId = urlParams.get("visit_id");
+    return Promise.resolve(visitId || undefined);
+  }
+}

package/src/features/visit/get-visit-id/request.ts

@@ -0,0 +1 @@
+export class GetVisitId {}

package/src/internal-plugins/activity-history/activity-history-item/domain/business-rules.ts

@@ -1,5 +1,29 @@
-import { IActivityHistoryItem } from "./model";
+import { IActivityHistoryItem, IActivityHistoryItemWithComponent } from "./model";
 
 export function shouldShowRole(item: IActivityHistoryItem): boolean {
   return !item.professional.speciality.description;
 }
+
+export const hasItemDivider = (
+  item: IActivityHistoryItemWithComponent,
+  items: IActivityHistoryItemWithComponent[],
+): boolean => {
+  const currentIndex = items.findIndex((i) => i.id === item.id);
+
+  if (currentIndex === -1) {
+    // Item no encontrado, por seguridad
+    return false;
+  }
+
+  if (currentIndex === items.length - 1) {
+    // Es el último elemento
+    return true;
+  }
+
+  const currentDate = new Date(item.date).getTime();
+  const nextDate = new Date(items[currentIndex + 1].date).getTime();
+
+  const diffMinutes = Math.abs(nextDate - currentDate) / (1000 * 60);
+
+  return diffMinutes > 15;
+};

package/src/internal-plugins/activity-history/activity-history-item/domain/is-valid-history-item/is-valid-history-item.test.ts

@@ -13,7 +13,7 @@ describe("isValidActivityHistoryItem", () => {
         role: { id: "role-1", description: "Lead Doctor" },
       },
       relevant: true,
-      diagnostics: [{ id: "diag-1", description: "High Blood Pressure" }],
+      diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
       center: { id: "center-1", description: "Main Hospital" },
       up: { id: "up-1", description: "Unit A" },
       ep: { id: "ep-1", description: "Emergency Room" },
@@ -33,7 +33,7 @@ describe("isValidActivityHistoryItem", () => {
         role: { id: "role-1", description: "Lead Doctor" },
       },
       relevant: true,
-      diagnostics: [{ id: "diag-1", description: "High Blood Pressure" }],
+      diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
       center: { id: "center-1", description: "Main Hospital" },
       up: { id: "up-1", description: "Unit A" },
       ep: { id: "ep-1", description: "Emergency Room" },
@@ -53,7 +53,7 @@ describe("isValidActivityHistoryItem", () => {
         role: { id: "role-1", description: "Lead Doctor" },
       },
       relevant: true,
-      diagnostics: [{ id: "diag-1", description: "High Blood Pressure" }],
+      diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
       center: { id: "center-1", description: "Main Hospital" },
       up: { id: "up-1", description: "Unit A" },
       ep: { id: "ep-1", description: "Emergency Room" },
@@ -74,7 +74,7 @@ describe("isValidActivityHistoryItem", () => {
         role: { id: "role-1", description: "Lead Doctor" },
       },
       relevant: true,
-      diagnostics: [{ id: "diag-1", description: "High Blood Pressure" }],
+      diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
       center: { id: "center-1", description: "Main Hospital" },
       up: { id: "up-1", description: "Unit A" },
       ep: { id: "ep-1", description: "Emergency Room" },
@@ -105,6 +105,48 @@ describe("isValidActivityHistoryItem", () => {
     expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
   });
 
+  it('should return true if "diagnostics" is null', () => {
+    const validItem = {
+      id: "123",
+      date: "2023-10-07",
+      professional: {
+        id: "prof-1",
+        name: "Dr. John Doe",
+        speciality: { id: "spec-1", description: "Cardiology" },
+        role: { id: "role-1", description: "Lead Doctor" },
+      },
+      relevant: true,
+      diagnostics: null,
+      center: { id: "center-1", description: "Main Hospital" },
+      up: { id: "up-1", description: "Unit A" },
+      ep: { id: "ep-1", description: "Emergency Room" },
+      service: { id: "service-1", description: "Cardiac Service" },
+    };
+
+    expect(isValidActivityHistoryItem(validItem)).toBe(true);
+  });
+
+  it('should return false if "diagnostics" are invalid', () => {
+    const invalidItem = {
+      id: "123",
+      date: "2023-10-07",
+      professional: {
+        id: "prof-1",
+        name: "Dr. John Doe",
+        speciality: { id: "spec-1", description: "Cardiology" },
+        role: { id: "role-1", description: "Lead Doctor" },
+      },
+      relevant: true,
+      diagnostics: [{ codi: null, cataleg: "001", descripcio: "High Blood Pressure" }],
+      center: { id: "center-1", description: "Main Hospital" },
+      up: { id: "up-1", description: "Unit A" },
+      ep: { id: "ep-1", description: "Emergency Room" },
+      service: { id: "service-1", description: "Cardiac Service" },
+    };
+
+    expect(isValidActivityHistoryItem(invalidItem)).toBe(false);
+  });
+
   it('should return false if "relevant" is not a boolean', () => {
     const invalidItem = {
       id: "123",
@@ -116,7 +158,7 @@ describe("isValidActivityHistoryItem", () => {
         role: { id: "role-1", description: "Lead Doctor" },
       },
       relevant: "not a boolean", // Should be boolean
-      diagnostics: [{ id: "diag-1", description: "High Blood Pressure" }],
+      diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
       center: { id: "center-1", description: "Main Hospital" },
       up: { id: "up-1", description: "Unit A" },
       ep: { id: "ep-1", description: "Emergency Room" },
@@ -136,7 +178,7 @@ describe("isValidActivityHistoryItem", () => {
         role: { id: "role-1", description: "Lead Doctor" },
       },
       relevant: true,
-      diagnostics: [{ id: "diag-1", description: "High Blood Pressure" }],
+      diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
       center: { id: "center-1", description: "Main Hospital" },
       up: { id: "up-1", description: "Unit A" },
       ep: { id: "ep-1", description: "Emergency Room" },

package/src/internal-plugins/activity-history/activity-history-item/domain/is-valid-history-item/is-valid-history-item.ts

@@ -23,14 +23,20 @@ export const isValidActivityHistoryItem = (obj: IActivityHistoryItem) => {
 
   // Comprueba las propiedades de un diagnóstico
   const hasValidDiagnostics = (diagnostics) => {
+    if (diagnostics === null || diagnostics === undefined) {
+      return true;
+    }
+
     return (
-      (diagnostics === null || isArray(diagnostics)) && // null or array
-      (diagnostics === null ||
-        diagnostics.every(
-          (diagnostic) =>
-            diagnostic === null ||
-            (diagnostic && isString(diagnostic.id) && isString(diagnostic.description)), // Permite que un diagnóstico sea null o tenga id y description válidos
-        ))
+      Array.isArray(diagnostics) &&
+      diagnostics.every(
+        (diagnostic) =>
+          diagnostic !== null &&
+          diagnostic !== undefined &&
+          typeof diagnostic.codi === "string" &&
+          typeof diagnostic.cataleg === "string" &&
+          typeof diagnostic.descripcio === "string",
+      )
     );
   };
 

package/src/internal-plugins/activity-history/activity-history-item/domain/model.ts

@@ -14,12 +14,21 @@ export type TSearchActivityHistoryItemPredicate = (
   item: IActivityHistoryItem,
 ) => boolean;
 
+export interface IActivityHistoryDiagnostic {
+  codi: string;
+  cataleg: string;
+  descripcio: string;
+  idEcap: string;
+  idCipds: string;
+  idCdr: string;
+}
+
 export interface IActivityHistoryItem {
   id: string;
   date: string;
   professional: IOwner;
   relevant: boolean;
-  diagnostics: IEntityDescription[];
+  diagnostics: IActivityHistoryDiagnostic[];
   center: IEntityDescription;
   up: IEntityDescription;
   ep: IEntityDescription;

package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/activity-history-timeline.ts

@@ -1,4 +1,4 @@
-import { LitElement, css, html, unsafeCSS } from "lit";
+import { LitElement, PropertyValues, css, html, unsafeCSS } from "lit";
 import { customElement } from "lit/decorators.js";
 import { connectedProperty } from "../../../../infrastructure/state/connected-property";
 import { IActivityHistoryGroup } from "../../../domain/model";
@@ -12,11 +12,27 @@ import styles from "./styles.css?inline";
 import { template } from "./template";
 import { unsafeHTML } from "lit/directives/unsafe-html.js";
 
+const createZIndexStyles = (max: number) => {
+  let styles = "";
+  for (let i = 0; i <= max; i++) {
+    styles += `.zIndex${i} { z-index: ${i} !important; }\n`;
+  }
+  return styles;
+};
+
 //@ts-ignore
 @customElement("activity-history-timeline")
 export class ActivityHistoryTimeline extends LitElement {
   render() {
-    return html`${template(this)}`;
+    const maxIndex = this.historyGroups?.length ?? 0;
+    const dynamicStyles = createZIndexStyles(maxIndex);
+
+    return html`
+    <style>
+      ${unsafeCSS(dynamicStyles)}
+    </style>
+    ${template(this)}
+  `;
   }
 
   static styles = css`
@@ -37,7 +53,8 @@ export class ActivityHistoryTimeline extends LitElement {
 
   _hasUpdatedOnce = false;
 
-  firstUpdated() {
+  firstUpdated(_changeProps: PropertyValues) {
+    super.firstUpdated(_changeProps);
     this._hasUpdatedOnce = true;
   }
 

package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/styles.css

@@ -60,8 +60,8 @@
     display: flex;
     flex-direction: column;
     gap: 16px;
-      .item {
-        border-bottom: var(--dss-border-width-sm) solid va(--color-neutral-200);
+      .item[has-divider] {
+        border-bottom: var(--dss-border-width-sm) solid var(--color-neutral-200);
         &:last-of-type {
           border: none;
         }
@@ -71,6 +71,10 @@
     display: flex;
     flex-direction: column;
     gap: 16px;
+    border-bottom: var(--dss-border-width-sm) solid var(--color-neutral-200);
+    &:last-of-type {
+      border: none;
+    }
     .diagnostics__header {
       display: flex;
       flex-direction: row;
@@ -80,8 +84,8 @@
     .diagnostics__items {
       display: flex;
       flex-direction: column;
-      .item {
-        border-bottom: var(--dss-border-width-sm) solid va(--color-neutral-200);
+      .item[has-divider] {
+        border-bottom: var(--dss-border-width-sm) solid var(--color-neutral-200);
         &:last-of-type {
           border: none;
         }

package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/template.ts

@@ -1,11 +1,11 @@
 import { html, nothing } from "lit";
 import { ActivityHistoryTimeline } from "./activity-history-timeline";
 import { repeat } from "lit/directives/repeat.js";
-import { IEntityDescription } from "@primaria/plugins-core";
 import { format } from "date-fns";
 import notFound from "../../../../../../UI/images/not-found.svg";
 import { ifDefined } from "lit/directives/if-defined.js";
 import {
+  IActivityHistoryDiagnostic,
   IActivityHistoryGroup,
   IActivityHistoryItem,
   IActivityHistoryItemWithComponent,
@@ -13,7 +13,7 @@ import {
 } from "../../../domain/model";
 import { translate } from "../../../../localization";
 import { virtualize } from "@lit-labs/virtualizer/virtualize.js";
-import { shouldShowRole } from "../../../domain/business-rules";
+import { hasItemDivider, shouldShowRole } from "../../../domain/business-rules";
 
 export const template = (props: ActivityHistoryTimeline) => {
   if (!props._hasUpdatedOnce) {
@@ -27,15 +27,15 @@ export const template = (props: ActivityHistoryTimeline) => {
           <div class="virtualizer">
             ${virtualize({
               items: props.historyGroups,
-              renderItem: (itemGroup: IActivityHistoryGroup) => html`
-                <div class="visit" data-date=${ifDefined(itemGroup.items[0]?.date || itemGroup.subGroups[0]?.items[0]?.date)}>
+              renderItem: (itemGroup: IActivityHistoryGroup, index: number) => html`
+                <div class="visit zIndex${props.historyGroups.length - index}" data-date=${ifDefined(itemGroup.items[0]?.date || itemGroup.subGroups[0]?.items[0]?.date)}>
                   ${visitHeaderTemplate(props, itemGroup.items[0] || itemGroup.subGroups[0]?.items[0])}
                   <div class="visit__items">
                     ${repeat(
                       itemGroup.items,
                       (item) => item.id,
                       (item: IActivityHistoryItemWithComponent) =>
-                        html`<div class="item">${item.component}</div> `,
+                        html`<div class="item" ?has-divider=${hasItemDivider(item, itemGroup.items as IActivityHistoryItemWithComponent[])}>${item.component}</div> `,
                     )}
                     ${repeat(
                       itemGroup.subGroups,
@@ -47,7 +47,7 @@ export const template = (props: ActivityHistoryTimeline) => {
                               subGroup.items,
                               (item) => item.id,
                               (item: IActivityHistoryItemWithComponent) =>
-                                html`<div class="item">${item?.component}</div>`,
+                                html`<div class="item" ?has-divider=${hasItemDivider(item, subGroup.items as IActivityHistoryItemWithComponent[])}>${item?.component}</div>`,
                             )}
                           </div>
                         </div>
@@ -114,13 +114,13 @@ const diagnosticHeaderTemplate = (item: IActivityHistoryItem | undefined) =>
       
       ${item.diagnostics
         .filter(
-          (diagnostic: IEntityDescription) =>
-            diagnostic.description != null && diagnostic.description.trim() !== "",
+          (diagnostic: IActivityHistoryDiagnostic) =>
+            diagnostic.descripcio != null && diagnostic.descripcio.trim() !== "",
         )
         .map(
-          (diagnostic: IEntityDescription) =>
+          (diagnostic: IActivityHistoryDiagnostic) =>
             html`<dss-badge text=${
-              diagnostic.description?.toUpperCase() as string
+              diagnostic.descripcio?.toUpperCase() as string
             } state="info" size="sm" outlined></dss-badge>`,
         )}
     </div>

package/src/internal-plugins/activity-history/activity-history-item/list/group-history-items/group-history-items.ts

@@ -1,8 +1,8 @@
-import { IEntityDescription } from "@primaria/plugins-core";
 import {
   IActivityHistoryItem,
   IActivityHistoryGroup,
   IActivityHistorySubGroup,
+  IActivityHistoryDiagnostic,
 } from "../../domain/model";
 
 const isSameVisit = (item1: IActivityHistoryItem, item2: IActivityHistoryItem): boolean => {
@@ -26,13 +26,16 @@ const withinEightHours = (date1: Date, date2: Date): boolean => {
   return timeDifference <= 8 * 60 * 60 * 1000; // 8 hours in milliseconds
 };
 
-const areSameDiagnostics = (diag1: IEntityDescription[], diag2: IEntityDescription[]): boolean => {
+const areSameDiagnostics = (
+  diag1: IActivityHistoryDiagnostic[],
+  diag2: IActivityHistoryDiagnostic[],
+): boolean => {
   if (diag1.length !== diag2.length) {
     return false;
   }
 
-  const sortedDiag1 = diag1.map((d) => d.id).sort();
-  const sortedDiag2 = diag2.map((d) => d.id).sort();
+  const sortedDiag1 = diag1.map((d) => d.codi).sort();
+  const sortedDiag2 = diag2.map((d) => d.codi).sort();
 
   return sortedDiag1.every((id, index) => id === sortedDiag2[index]);
 };

package/src/internal-plugins/activity-history/utils/get-unique-values-by-prop-path.test.ts

@@ -12,8 +12,8 @@ describe("getUniqueObjects", () => {
     const result = getUniqueObjects(items, ["data", "id"], ["data", "label"]);
 
     expect(result).toEqual([
-      { id: "1", description: "Item 1 (duplicate)" }, // 👈 el último
-      { id: "2", description: "Item 2" },
+      { id: "1", title: "Item 1 (duplicate)" }, // 👈 el último
+      { id: "2", title: "Item 2" },
     ]);
   });
 
@@ -26,7 +26,7 @@ describe("getUniqueObjects", () => {
 
     const result = getUniqueObjects(items, ["data", "id"], ["data", "label"]);
 
-    expect(result).toEqual([{ id: "1", description: "Valid" }]);
+    expect(result).toEqual([{ id: "1", title: "Valid" }]);
   });
 
   it("should return an empty array if input is empty", () => {
@@ -43,8 +43,8 @@ describe("getUniqueObjects", () => {
     const result = getUniqueObjects(items, ["a", "b", "c", "id"], ["a", "b", "c", "name"]);
 
     expect(result).toEqual([
-      { id: "x1", description: "Deep 1" },
-      { id: "x2", description: "Deep 2" },
+      { id: "x1", title: "Deep 1" },
+      { id: "x2", title: "Deep 2" },
     ]);
   });
 
@@ -56,6 +56,6 @@ describe("getUniqueObjects", () => {
 
     const result = getUniqueObjects(items, ["a", "b", "id"], ["a", "b", "name"]);
 
-    expect(result).toEqual([{ id: "1", description: "Good" }]);
+    expect(result).toEqual([{ id: "1", title: "Good" }]);
   });
 });

package/src/internal-plugins/activity-history/utils/get-unique-values-by-prop-path.ts

@@ -2,18 +2,15 @@ export function getUniqueObjects<T>(
   items: T[],
   propPathId: string[],
   propPathDescription: string[],
-): { id: string; description: string }[] {
+): { id: string; title: string }[] {
   return Array.from(
     items
       .map((item) => ({
         id: propPathId.reduce((acc, key) => acc?.[key], item),
-        description: propPathDescription.reduce((acc, key) => acc?.[key], item),
+        title: propPathDescription.reduce((acc, key) => acc?.[key], item),
       }))
-      .filter((obj) => typeof obj.id === "string" && typeof obj.description === "string")
-      .reduce(
-        (map, obj) => map.set(obj.id, obj),
-        new Map<string, { id: string; description: string }>(),
-      )
+      .filter((obj) => typeof obj.id === "string" && typeof obj.title === "string")
+      .reduce((map, obj) => map.set(obj.id, obj), new Map<string, { id: string; title: string }>())
       .values(),
   );
 }

package/src/locales.ts

@@ -36,6 +36,7 @@ export const locales = {
         toggleMenuClose: "Tancar menú",
         toggleMenuOpen: "Expandir menú",
         askExit: "Atenció, vols sortir igualment?",
+        finalizeVisit: "Finalitzar visita",
       },
       clinicalMonitoring: {
         title: "Seguiment clínic",