@uxland/primary-shell 5.6.4 → 5.6.6

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/component.d.ts

@@ -0,0 +1,6 @@
+import { LitElement } from 'lit';
+
+export declare class ActivityHistoryIsGroupingBusy extends LitElement {
+    static styles: import('lit').CSSResult;
+    render(): import('lit').TemplateResult<1>;
+}

package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/template.d.ts

@@ -0,0 +1,3 @@
+import { ActivityHistoryIsGroupingBusy } from './component';
+
+export declare const template: (_props: ActivityHistoryIsGroupingBusy) => import('lit').TemplateResult<1>;

package/dist/primary/shell/src/internal-plugins/activity-history/localization.d.ts

@@ -18,6 +18,11 @@ export declare const locales: {
             goToDate: string;
             busyEntriesLoading: string;
             noResults: string;
+            noData: {
+                title: string;
+                description: string;
+            };
+            isGrouping: string;
             searchBarResults: string;
             actions: {
                 cronogram: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxland/primary-shell",
-  "version": "5.6.4",
+  "version": "5.6.6",
   "description": "Primaria Shell",
   "author": "UXLand <dev@uxland.es>",
   "homepage": "https://github.com/uxland/harmonix/tree/app#readme",

package/src/internal-plugins/activity-history/activity-history-item/add/add-history-item/handler.ts

@@ -9,14 +9,14 @@ export class AddHistoryItemHandler extends StoreBaseHandler {
   async handle(payload: AddHistoryItemPayload) {
     try {
       ensureAreValidBasicActivityHistoryItems([payload.item]);
+      handleAddDiagnosticsFilter([payload.item], this.store);
+      handleAddUpFilter([payload.item], this.store);
       this.store.dispatch(
         addActivityHistoryItem({
           id: payload.entityId,
           item: payload.item,
         }),
       );
-      handleAddDiagnosticsFilter([payload.item], this.store);
-      handleAddUpFilter([payload.item], this.store);
     } catch (e) {
       console.log(e.message);
     }

package/src/internal-plugins/activity-history/activity-history-item/add/add-history-items/handler.ts

@@ -9,6 +9,8 @@ export class AddHistoryItemsHandler extends StoreBaseHandler {
   async handle(payload: AddHistoryItemsPayload) {
     try {
       const validItems = validateAndFilterBasicItems(payload.items);
+      handleAddDiagnosticsFilter(validItems, this.store);
+      handleAddUpFilter(validItems, this.store);
       this.store.dispatch(
         addActivityHistoryItems({
           id: payload.entityId,
@@ -17,8 +19,6 @@ export class AddHistoryItemsHandler extends StoreBaseHandler {
           searchPredicate: payload.searchPredicate,
         }),
       );
-      handleAddDiagnosticsFilter(validItems, this.store);
-      handleAddUpFilter(validItems, this.store);
     } catch (e) {
       console.log(e.message);
     }

package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/component.ts

@@ -0,0 +1,15 @@
+import { LitElement, html, css, unsafeCSS } from "lit";
+import { customElement } from "lit/decorators.js";
+import styles from "./styles.css?inline";
+import { template } from "./template";
+
+@customElement("activity-history-is-grouping-busy")
+export class ActivityHistoryIsGroupingBusy extends LitElement {
+  static styles = css`
+    ${unsafeCSS(styles)}
+  `;
+
+  render() {
+    return template(this);
+  }
+} 

package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/styles.css

@@ -0,0 +1,8 @@
+.grouping-busy-container {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 24px;
+  justify-content: center;
+  padding-top:16px
+}

package/src/internal-plugins/activity-history/activity-history-item/add/handle-busy/is-grouping-busy/template.ts

@@ -0,0 +1,10 @@
+import { html } from "lit";
+import { ActivityHistoryIsGroupingBusy } from "./component";
+import { translate } from "../../../../localization";
+
+export const template = (_props: ActivityHistoryIsGroupingBusy) => html`
+  <div class="grouping-busy-container">
+    <dss-spinner size="sm"></dss-spinner>
+    <div>${translate("isGrouping")}</div>
+  </div>
+`;

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

@@ -1,5 +1,5 @@
 import { LitElement, PropertyValues, css, html, unsafeCSS } from "lit";
-import { customElement, query } from "lit/decorators.js";
+import { customElement, query, state } from "lit/decorators.js";
 import { connectedProperty } from "../../../../infrastructure/state/connected-property";
 import { IActivityHistoryGroup } from "../../../domain/model";
 import { activityHistorySearchStringSelector } from "../../../search/selectors";
@@ -52,11 +52,18 @@ export class ActivityHistoryTimeline extends LitElement {
 
   @query(".virtualizer") private _virtualizer!: HTMLElement;
 
-  _hasUpdatedOnce = false;
+  @state()
+  renderGroupsControlTimeExpired = false;
 
-  firstUpdated(_changeProps: PropertyValues) {
-    super.firstUpdated(_changeProps);
-    this._hasUpdatedOnce = true;
+  connectedCallback(): void {
+    super.connectedCallback();
+    setTimeout(() => {
+      this.renderGroupsControlTimeExpired = true;
+    }, 8000);
+  }
+
+  disconnectedCallback(): void {
+    super.disconnectedCallback();
   }
 
   async updated(changedProperties) {

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

@@ -9,7 +9,6 @@ import {
   IActivityHistoryGroup,
   IActivityHistoryItem,
   IActivityHistoryItemWithComponent,
-  IActivityHistorySubGroup,
 } from "../../../domain/model";
 import { translate } from "../../../../localization";
 import { hasItemDivider, shouldShowRole } from "../../../domain/business-rules";
@@ -17,11 +16,9 @@ import {
   ActivityHistoryEntry,
   mergeHistoryItemsAndSubgroups,
 } from "../../merge-history-items-and-subgroups/merge-history-items-and-subgroups";
+import "../../../add/handle-busy/is-grouping-busy/component";
 
 export const template = (props: ActivityHistoryTimeline) => {
-  if (!props._hasUpdatedOnce) {
-    return html`<div class="container"></div>`;
-  }
   return html`
     <div class="container">
       <activity-history-full-data-error></activity-history-full-data-error>
@@ -78,20 +75,30 @@ export const template = (props: ActivityHistoryTimeline) => {
               `}
             ></lit-virtualizer>
           `
-          : !props.isCollectionInitialState && !props.isSomeCollectionLoadedAndOtherLoading
-            ? html`
-              <dss-user-feedback
-                class="feedback"
-                imagesrc=${notFound}
-                title=${translate("noResults")}>
-              </dss-user-feedback>
-            `
-            : nothing
+          : noGroupsTemplate(props)
       }
     </div>
   `;
 };
 
+const noGroupsTemplate = (props: ActivityHistoryTimeline)=> html `
+${props.searchString?.length > 1
+      ? html`
+          <dss-user-feedback
+            class="feedback"
+            imagesrc=${notFound}
+            title=${translate("noResults")}>
+          </dss-user-feedback>
+        `
+      : props.renderGroupsControlTimeExpired
+      ? html`<dss-user-feedback
+            class="feedback"
+            imagesrc=${notFound}
+            title=${translate("noData.title")}
+            description=${translate("noData.description")}>
+          </dss-user-feedback>`
+      : html`<activity-history-is-grouping-busy></activity-history-is-grouping-busy>`}`;
+
 const visitHeaderTemplate = (props: ActivityHistoryTimeline, item: IActivityHistoryItem | undefined) => {
   if (!item) return nothing;
   return html`  

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

@@ -2,25 +2,37 @@ import { IActivityHistoryItem, IActivityHistoryGroup, IActivityHistorySubGroup }
 import { areSameDiagnostics } from "../../domain/validation/diagnostics/are-same-diagnostics";
 import { hasValidDiagnostics } from "../../domain/validation/diagnostics/has-valid-diagnostics";
 
-const isSameVisit = (item1: IActivityHistoryItem, item2: IActivityHistoryItem): boolean => {
-  const sameProfessional =
-    item1.professional?.id === item2.professional?.id &&
-    item1.professional?.role?.id === item2.professional?.role?.id &&
-    item1.professional?.speciality?.id === item2.professional?.speciality?.id;
-  const sameLocation =
-    item1.ep?.id === item2.ep?.id &&
-    item1.up?.id === item2.up?.id &&
-    item1.center?.id === item2.center?.id &&
-    item1.service?.id === item2.service?.id;
-
-  const sameDay = new Date(item1.date).toDateString() === new Date(item2.date).toDateString();
-
-  return sameProfessional && sameLocation && sameDay;
+// Cache para evitar recalcular fechas
+const dateStringCache = new Map<string, string>();
+const dateObjectCache = new Map<string, Date>();
+
+const getDateString = (dateStr: string): string => {
+  if (!dateStringCache.has(dateStr)) {
+    dateStringCache.set(dateStr, new Date(dateStr).toDateString());
+  }
+  return dateStringCache.get(dateStr)!;
+};
+
+const getDateObject = (dateStr: string): Date => {
+  if (!dateObjectCache.has(dateStr)) {
+    dateObjectCache.set(dateStr, new Date(dateStr));
+  }
+  return dateObjectCache.get(dateStr)!;
+};
+
+// Crear una clave única para cada combinación de visita
+const createVisitKey = (item: IActivityHistoryItem): string => {
+  const professionalKey = `${item.professional?.id || 'null'}-${item.professional?.role?.id || 'null'}-${item.professional?.speciality?.id || 'null'}`;
+  const locationKey = `${item.ep?.id || 'null'}-${item.up?.id || 'null'}-${item.center?.id || 'null'}-${item.service?.id || 'null'}`;
+  const dayKey = getDateString(item.date);
+  
+  return `${professionalKey}|${locationKey}|${dayKey}`;
 };
 
 const withinEightHours = (date1: string, date2: string): boolean => {
-  const timeDifference = Math.abs(new Date(date1).getTime() - new Date(date2).getTime());
-  return timeDifference <= 8 * 60 * 60 * 1000; // 8 hours in milliseconds
+  const time1 = getDateObject(date1).getTime();
+  const time2 = getDateObject(date2).getTime();
+  return Math.abs(time1 - time2) <= 8 * 60 * 60 * 1000; // 8 hours in milliseconds
 };
 
 function groupByValidDiagnostics(groups: IActivityHistoryGroup[]) {
@@ -30,12 +42,12 @@ function groupByValidDiagnostics(groups: IActivityHistoryGroup[]) {
 
     group.items.forEach((item) => {
       const diagnostics = item.diagnostics;
-
       const allDiagnosticsValid = diagnostics?.length > 0 && hasValidDiagnostics(diagnostics);
 
       if (allDiagnosticsValid) {
         let addedToSubGroup = false;
 
+        // Optimización: usar for...of con break para salir temprano
         for (const subGroup of subGroups) {
           const firstSubGroupItem = subGroup.items[0];
 
@@ -63,38 +75,59 @@ function groupByValidDiagnostics(groups: IActivityHistoryGroup[]) {
 }
 
 const groupActivityHistoryItems = (items: IActivityHistoryItem[]): IActivityHistoryGroup[] => {
-  const groups: IActivityHistoryGroup[] = [];
+  if (!items?.length) return [];
 
-  items?.forEach((item) => {
-    let added = false;
+  // Limpiar caches al inicio
+  dateStringCache.clear();
+  dateObjectCache.clear();
 
-    for (const group of groups) {
-      const firstItem = group.items[0];
-      const lastItem = group.items[group.items.length - 1];
+  // Mapa para agrupar por clave de visita
+  const visitGroups = new Map<string, IActivityHistoryGroup>();
+
+  items.forEach((item) => {
+    const visitKey = createVisitKey(item);
+    
+    if (!visitGroups.has(visitKey)) {
+      // Crear nuevo grupo
+      visitGroups.set(visitKey, {
+        idGroup: Math.random().toString(36).substr(2, 9),
+        items: [item],
+      });
+    } else {
+      // Verificar si está dentro del rango de 8 horas
+      const existingGroup = visitGroups.get(visitKey)!;
+      const firstItem = existingGroup.items[0];
+      const lastItem = existingGroup.items[existingGroup.items.length - 1];
 
       if (
-        isSameVisit(firstItem, item) &&
         withinEightHours(firstItem.date, item.date) &&
         withinEightHours(lastItem.date, item.date)
       ) {
-        group.items.push(item);
-        added = true;
-        break;
+        existingGroup.items.push(item);
+      } else {
+        // Si no está dentro del rango, crear un nuevo grupo con un sufijo
+        let counter = 1;
+        let newKey = `${visitKey}_${counter}`;
+        
+        while (visitGroups.has(newKey)) {
+          counter++;
+          newKey = `${visitKey}_${counter}`;
+        }
+        
+        visitGroups.set(newKey, {
+          idGroup: Math.random().toString(36).substr(2, 9),
+          items: [item],
+        });
       }
     }
-
-    if (!added) {
-      groups.push({
-        idGroup: Math.random().toString(36).substr(2, 9),
-        items: [item],
-      });
-    }
   });
 
-  // Crear subgrupos por diagnósticos iguales. Los items que no tienen diagnostico, se quedan fuera de subgrupos (remaining items)
+  const groups = Array.from(visitGroups.values());
+
+  // Crear subgrupos por diagnósticos iguales
   groupByValidDiagnostics(groups);
 
   return groups;
 };
 
-export { groupActivityHistoryItems };
+export { groupActivityHistoryItems };

package/src/internal-plugins/activity-history/localization.ts

@@ -32,6 +32,11 @@ export const locales = {
       goToDate: "Anar a data",
       busyEntriesLoading: "Carregant totes les entrades",
       noResults: "Sense resultats. Modifica la cerca",
+      noData: {
+        title: "Sense dades",
+        description: "No existeix informació per a mostrar"
+      },
+      isGrouping: "Creant agrupacions i preparant les dades...",
       searchBarResults: "Resultats per",
       actions: {
         cronogram: "Cronograma",