@uxland/primary-shell 5.4.1 → 5.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +13 -24
- package/dist/index.js.map +1 -1
- package/dist/index.umd.cjs +4 -4
- package/dist/index.umd.cjs.map +1 -1
- package/dist/primary/shell/src/internal-plugins/activity-history/activity-history-item/domain/model.d.ts +1 -1
- package/package.json +1 -1
- package/src/UI/internal-views/upper-nav-views.ts +9 -9
- package/src/internal-plugins/activity-history/activity-history-item/domain/model.ts +1 -1
- package/src/internal-plugins/activity-history/activity-history-item/domain/specs/diagnostics-filter-spec.test.ts +6 -6
- package/src/internal-plugins/activity-history/activity-history-item/domain/validation/diagnostics/has-valid-diagnostics.test.ts +7 -7
- package/src/internal-plugins/activity-history/activity-history-item/domain/validation/diagnostics/has-valid-diagnostics.ts +1 -1
- package/src/internal-plugins/activity-history/activity-history-item/domain/validation/is-valid-full-history-item.test.ts +7 -7
- package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/template.ts +3 -5
- package/src/internal-plugins/activity-history/activity-history-item/list/group-history-items/group-history-items.test.ts +3 -3
|
@@ -12,7 +12,7 @@ export type TSearchActivityHistoryItemPredicate = (searchString: string, item: I
|
|
|
12
12
|
export interface IActivityHistoryDiagnostic {
|
|
13
13
|
codi: string;
|
|
14
14
|
cataleg: string;
|
|
15
|
-
|
|
15
|
+
descripcio: string;
|
|
16
16
|
idEcap: string;
|
|
17
17
|
idCipds: string;
|
|
18
18
|
idCdr: string;
|
package/package.json
CHANGED
|
@@ -65,7 +65,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
|
|
|
65
65
|
{
|
|
66
66
|
icon: "open_in_new",
|
|
67
67
|
label: "ASSIR",
|
|
68
|
-
callbackFn: () =>
|
|
68
|
+
callbackFn: () => navigateToEcapWithoutClosingWithCip("NAVEGACIO_ASSIR"),
|
|
69
69
|
},
|
|
70
70
|
{
|
|
71
71
|
icon: "open_in_new",
|
|
@@ -119,7 +119,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
|
|
|
119
119
|
label: "Seguiment analític",
|
|
120
120
|
type: "item",
|
|
121
121
|
sortHint: "0060",
|
|
122
|
-
callbackFn: () =>
|
|
122
|
+
callbackFn: () => navigateToEcapWithoutClosingWithCip("SEGUIMENT_ANALITIC"),
|
|
123
123
|
},
|
|
124
124
|
{
|
|
125
125
|
id: "results-reports",
|
|
@@ -131,7 +131,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
|
|
|
131
131
|
{
|
|
132
132
|
icon: "open_in_new",
|
|
133
133
|
label: "Resultats i informes",
|
|
134
|
-
callbackFn: () =>
|
|
134
|
+
callbackFn: () => navigateToEcapWithoutClosingWithCip("RESULTAT_INFORMES"),
|
|
135
135
|
},
|
|
136
136
|
{
|
|
137
137
|
icon: "open_in_new",
|
|
@@ -144,7 +144,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
|
|
|
144
144
|
{
|
|
145
145
|
icon: "open_in_new",
|
|
146
146
|
label: "Informes clínics",
|
|
147
|
-
callbackFn: () =>
|
|
147
|
+
callbackFn: () => navigateToEcapWithoutClosingWithCip("INFORME_CLINIC_NET"),
|
|
148
148
|
},
|
|
149
149
|
],
|
|
150
150
|
},
|
|
@@ -166,22 +166,22 @@ const upperNavMenuItems: MenuItemConfig[] = [
|
|
|
166
166
|
{
|
|
167
167
|
icon: "open_in_new",
|
|
168
168
|
label: "Prescripció",
|
|
169
|
-
callbackFn: () =>
|
|
169
|
+
callbackFn: () => navigateToEcapWithoutClosingWithCip("PRESCIPCIO_ACTIVA"),
|
|
170
170
|
},
|
|
171
171
|
{
|
|
172
172
|
icon: "open_in_new",
|
|
173
173
|
label: "Ordres de tractament",
|
|
174
|
-
callbackFn: () =>
|
|
174
|
+
callbackFn: () => navigateToEcapWithoutClosingWithCip("ORDRE_TRACTAMENT"),
|
|
175
175
|
},
|
|
176
176
|
{
|
|
177
177
|
icon: "open_in_new",
|
|
178
178
|
label: "Dispensació material sanitari",
|
|
179
|
-
callbackFn: () =>
|
|
179
|
+
callbackFn: () => navigateToEcapWithoutClosingWithCip("DISPENSACIO_MATERIAL_PACIENT"),
|
|
180
180
|
},
|
|
181
181
|
{
|
|
182
182
|
icon: "open_in_new",
|
|
183
183
|
label: "Prescripció social",
|
|
184
|
-
callbackFn: () =>
|
|
184
|
+
callbackFn: () => navigateToEcapWithoutClosingWithCip("PRESCIPCIO_SOCIAL"),
|
|
185
185
|
},
|
|
186
186
|
],
|
|
187
187
|
},
|
|
@@ -191,7 +191,7 @@ const upperNavMenuItems: MenuItemConfig[] = [
|
|
|
191
191
|
label: "Immunitzacions",
|
|
192
192
|
type: "item",
|
|
193
193
|
sortHint: "0100",
|
|
194
|
-
callbackFn: () =>
|
|
194
|
+
callbackFn: () => navigateToEcapWithoutClosingWithCip("IMMUNITZACIONS"),
|
|
195
195
|
},
|
|
196
196
|
{
|
|
197
197
|
id: "it",
|
|
@@ -15,7 +15,7 @@ export type TSearchActivityHistoryItemPredicate = (searchString: string, item: I
|
|
|
15
15
|
export interface IActivityHistoryDiagnostic {
|
|
16
16
|
codi: string;
|
|
17
17
|
cataleg: string;
|
|
18
|
-
|
|
18
|
+
descripcio: string;
|
|
19
19
|
idEcap: string;
|
|
20
20
|
idCipds: string;
|
|
21
21
|
idCdr: string;
|
|
@@ -6,7 +6,7 @@ describe("DiagnosticCodeSpec", () => {
|
|
|
6
6
|
it("should return true if allowedCodes is empty", () => {
|
|
7
7
|
const spec = new DiagnosticCodeSpec([]);
|
|
8
8
|
const item: IActivityHistoryItem = {
|
|
9
|
-
diagnostics: [{ codi: "E11",
|
|
9
|
+
diagnostics: [{ codi: "E11", descripcio: "Diabetes" }],
|
|
10
10
|
};
|
|
11
11
|
expect(spec.isSatisfiedBy(item)).toBe(true);
|
|
12
12
|
});
|
|
@@ -15,8 +15,8 @@ describe("DiagnosticCodeSpec", () => {
|
|
|
15
15
|
const spec = new DiagnosticCodeSpec(["I10", "E11"]);
|
|
16
16
|
const item: IActivityHistoryItem = {
|
|
17
17
|
diagnostics: [
|
|
18
|
-
{ codi: "Z99",
|
|
19
|
-
{ codi: "E11",
|
|
18
|
+
{ codi: "Z99", descripcio: "No relevante" },
|
|
19
|
+
{ codi: "E11", descripcio: "Diabetes" },
|
|
20
20
|
],
|
|
21
21
|
};
|
|
22
22
|
expect(spec.isSatisfiedBy(item)).toBe(true);
|
|
@@ -26,8 +26,8 @@ describe("DiagnosticCodeSpec", () => {
|
|
|
26
26
|
const spec = new DiagnosticCodeSpec(["J00", "K52"]);
|
|
27
27
|
const item: IActivityHistoryItem = {
|
|
28
28
|
diagnostics: [
|
|
29
|
-
{ codi: "E11",
|
|
30
|
-
{ codi: "I10",
|
|
29
|
+
{ codi: "E11", descripcio: "Diabetes" },
|
|
30
|
+
{ codi: "I10", descripcio: "Hipertensió" },
|
|
31
31
|
],
|
|
32
32
|
};
|
|
33
33
|
expect(spec.isSatisfiedBy(item)).toBe(false);
|
|
@@ -52,7 +52,7 @@ describe("DiagnosticCodeSpec", () => {
|
|
|
52
52
|
it("should be case-sensitive by default (E11 !== e11)", () => {
|
|
53
53
|
const spec = new DiagnosticCodeSpec(["e11"]);
|
|
54
54
|
const item: IActivityHistoryItem = {
|
|
55
|
-
diagnostics: [{ codi: "E11",
|
|
55
|
+
diagnostics: [{ codi: "E11", descripcio: "Diabetes" }],
|
|
56
56
|
};
|
|
57
57
|
expect(spec.isSatisfiedBy(item)).toBe(false);
|
|
58
58
|
});
|
|
@@ -4,7 +4,7 @@ import { hasValidDiagnostic, hasValidDiagnostics } from "./has-valid-diagnostics
|
|
|
4
4
|
interface IActivityHistoryDiagnostic {
|
|
5
5
|
codi?: any;
|
|
6
6
|
cataleg?: any;
|
|
7
|
-
|
|
7
|
+
descripcio?: any;
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
describe("hasValidDiagnostic", () => {
|
|
@@ -12,7 +12,7 @@ describe("hasValidDiagnostic", () => {
|
|
|
12
12
|
const diag: IActivityHistoryDiagnostic = {
|
|
13
13
|
codi: "A123",
|
|
14
14
|
cataleg: "ICD-10",
|
|
15
|
-
|
|
15
|
+
descripcio: "Dolor lumbar",
|
|
16
16
|
};
|
|
17
17
|
expect(hasValidDiagnostic(diag)).toBe(true);
|
|
18
18
|
});
|
|
@@ -38,7 +38,7 @@ describe("hasValidDiagnostic", () => {
|
|
|
38
38
|
const diag: IActivityHistoryDiagnostic = {
|
|
39
39
|
codi: 123,
|
|
40
40
|
cataleg: "ICD",
|
|
41
|
-
|
|
41
|
+
descripcio: "Texto",
|
|
42
42
|
};
|
|
43
43
|
expect(hasValidDiagnostic(diag)).toBe(false);
|
|
44
44
|
});
|
|
@@ -47,8 +47,8 @@ describe("hasValidDiagnostic", () => {
|
|
|
47
47
|
describe("hasValidDiagnostics", () => {
|
|
48
48
|
it("returns true for a valid array of diagnostics", () => {
|
|
49
49
|
const diagnostics = [
|
|
50
|
-
{ codi: "A", cataleg: "X",
|
|
51
|
-
{ codi: "B", cataleg: "Y",
|
|
50
|
+
{ codi: "A", cataleg: "X", descripcio: "D1" },
|
|
51
|
+
{ codi: "B", cataleg: "Y", descripcio: "D2" },
|
|
52
52
|
];
|
|
53
53
|
expect(hasValidDiagnostics(diagnostics)).toBe(true);
|
|
54
54
|
});
|
|
@@ -63,8 +63,8 @@ describe("hasValidDiagnostics", () => {
|
|
|
63
63
|
|
|
64
64
|
it("returns false if not all diagnostics are valid", () => {
|
|
65
65
|
const diagnostics = [
|
|
66
|
-
{ codi: "A", cataleg: "X",
|
|
67
|
-
{ codi: "", cataleg: 42,
|
|
66
|
+
{ codi: "A", cataleg: "X", descripcio: "D1" },
|
|
67
|
+
{ codi: "", cataleg: 42, descripcio: null },
|
|
68
68
|
];
|
|
69
69
|
expect(hasValidDiagnostics(diagnostics)).toBe(false);
|
|
70
70
|
});
|
|
@@ -6,7 +6,7 @@ export const hasValidDiagnostic = (diagnostic: IActivityHistoryDiagnostic) => {
|
|
|
6
6
|
diagnostic !== undefined &&
|
|
7
7
|
typeof diagnostic.codi === "string" &&
|
|
8
8
|
typeof diagnostic.cataleg === "string" &&
|
|
9
|
-
typeof diagnostic.
|
|
9
|
+
typeof diagnostic.descripcio === "string"
|
|
10
10
|
);
|
|
11
11
|
};
|
|
12
12
|
|
|
@@ -13,7 +13,7 @@ describe("isValidFullActivityHistoryItem", () => {
|
|
|
13
13
|
role: { id: "role-1", description: "Lead Doctor" },
|
|
14
14
|
},
|
|
15
15
|
relevant: true,
|
|
16
|
-
diagnostics: [{ codi: "diag-1", cataleg: "001",
|
|
16
|
+
diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
|
|
17
17
|
center: { id: "center-1", description: "Main Hospital" },
|
|
18
18
|
up: { id: "up-1", description: "Unit A" },
|
|
19
19
|
ep: { id: "ep-1", description: "Emergency Room" },
|
|
@@ -33,7 +33,7 @@ describe("isValidFullActivityHistoryItem", () => {
|
|
|
33
33
|
role: { id: "role-1", description: "Lead Doctor" },
|
|
34
34
|
},
|
|
35
35
|
relevant: true,
|
|
36
|
-
diagnostics: [{ codi: "diag-1", cataleg: "001",
|
|
36
|
+
diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
|
|
37
37
|
center: { id: "center-1", description: "Main Hospital" },
|
|
38
38
|
up: { id: "up-1", description: "Unit A" },
|
|
39
39
|
ep: { id: "ep-1", description: "Emergency Room" },
|
|
@@ -53,7 +53,7 @@ describe("isValidFullActivityHistoryItem", () => {
|
|
|
53
53
|
role: { id: "role-1", description: "Lead Doctor" },
|
|
54
54
|
},
|
|
55
55
|
relevant: true,
|
|
56
|
-
diagnostics: [{ codi: "diag-1", cataleg: "001",
|
|
56
|
+
diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
|
|
57
57
|
center: { id: "center-1", description: "Main Hospital" },
|
|
58
58
|
up: { id: "up-1", description: "Unit A" },
|
|
59
59
|
ep: { id: "ep-1", description: "Emergency Room" },
|
|
@@ -74,7 +74,7 @@ describe("isValidFullActivityHistoryItem", () => {
|
|
|
74
74
|
role: { id: "role-1", description: "Lead Doctor" },
|
|
75
75
|
},
|
|
76
76
|
relevant: true,
|
|
77
|
-
diagnostics: [{ codi: "diag-1", cataleg: "001",
|
|
77
|
+
diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
|
|
78
78
|
center: { id: "center-1", description: "Main Hospital" },
|
|
79
79
|
up: { id: "up-1", description: "Unit A" },
|
|
80
80
|
ep: { id: "ep-1", description: "Emergency Room" },
|
|
@@ -137,7 +137,7 @@ describe("isValidFullActivityHistoryItem", () => {
|
|
|
137
137
|
role: { id: "role-1", description: "Lead Doctor" },
|
|
138
138
|
},
|
|
139
139
|
relevant: true,
|
|
140
|
-
diagnostics: [{ codi: null, cataleg: "001",
|
|
140
|
+
diagnostics: [{ codi: null, cataleg: "001", descripcio: "High Blood Pressure" }],
|
|
141
141
|
center: { id: "center-1", description: "Main Hospital" },
|
|
142
142
|
up: { id: "up-1", description: "Unit A" },
|
|
143
143
|
ep: { id: "ep-1", description: "Emergency Room" },
|
|
@@ -158,7 +158,7 @@ describe("isValidFullActivityHistoryItem", () => {
|
|
|
158
158
|
role: { id: "role-1", description: "Lead Doctor" },
|
|
159
159
|
},
|
|
160
160
|
relevant: "not a boolean", // Should be boolean
|
|
161
|
-
diagnostics: [{ codi: "diag-1", cataleg: "001",
|
|
161
|
+
diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
|
|
162
162
|
center: { id: "center-1", description: "Main Hospital" },
|
|
163
163
|
up: { id: "up-1", description: "Unit A" },
|
|
164
164
|
ep: { id: "ep-1", description: "Emergency Room" },
|
|
@@ -178,7 +178,7 @@ describe("isValidFullActivityHistoryItem", () => {
|
|
|
178
178
|
role: { id: "role-1", description: "Lead Doctor" },
|
|
179
179
|
},
|
|
180
180
|
relevant: true,
|
|
181
|
-
diagnostics: [{ codi: "diag-1", cataleg: "001",
|
|
181
|
+
diagnostics: [{ codi: "diag-1", cataleg: "001", descripcio: "High Blood Pressure" }],
|
|
182
182
|
center: { id: "center-1", description: "Main Hospital" },
|
|
183
183
|
up: { id: "up-1", description: "Unit A" },
|
|
184
184
|
ep: { id: "ep-1", description: "Emergency Room" },
|
package/src/internal-plugins/activity-history/activity-history-item/list/UI/timeline/template.ts
CHANGED
|
@@ -35,7 +35,7 @@ export const template = (props: ActivityHistoryTimeline) => {
|
|
|
35
35
|
.items=${props.historyGroups}
|
|
36
36
|
.renderItem=${(itemGroup: IActivityHistoryGroup, index: number) => html`
|
|
37
37
|
<div class="visit zIndex${props.historyGroups.length - index}"
|
|
38
|
-
data-date=${ifDefined(itemGroup?.items[0]?.date || itemGroup
|
|
38
|
+
data-date=${ifDefined(itemGroup?.items[0]?.date || itemGroup?.subGroups[0]?.items[0]?.date)}>
|
|
39
39
|
${visitHeaderTemplate(props, itemGroup.items[0] || itemGroup.subGroups[0]?.items[0])}
|
|
40
40
|
<div class="visit__items">
|
|
41
41
|
${repeat(
|
|
@@ -142,12 +142,10 @@ const diagnosticHeaderTemplate = (item: IActivityHistoryItem | undefined) =>
|
|
|
142
142
|
html`
|
|
143
143
|
<div class="diagnostics__header">
|
|
144
144
|
${item.diagnostics
|
|
145
|
-
.filter(
|
|
146
|
-
(diagnostic: IActivityHistoryDiagnostic) => diagnostic.description != null && diagnostic.description.trim() !== "",
|
|
147
|
-
)
|
|
145
|
+
.filter((diagnostic: IActivityHistoryDiagnostic) => diagnostic.descripcio != null && diagnostic.descripcio.trim() !== "")
|
|
148
146
|
.map(
|
|
149
147
|
(diagnostic: IActivityHistoryDiagnostic) =>
|
|
150
|
-
html`<dss-badge text=${diagnostic.
|
|
148
|
+
html`<dss-badge text=${diagnostic.descripcio?.toUpperCase() as string} state="info" size="sm" outlined></dss-badge>`,
|
|
151
149
|
)}
|
|
152
150
|
</div>
|
|
153
151
|
`;
|
|
@@ -69,7 +69,7 @@ describe("groupActivityHistoryItems", () => {
|
|
|
69
69
|
{
|
|
70
70
|
codi: "A123",
|
|
71
71
|
cataleg: "ICD-10",
|
|
72
|
-
|
|
72
|
+
descripcio: "Dolor lumbar",
|
|
73
73
|
},
|
|
74
74
|
];
|
|
75
75
|
const items = [
|
|
@@ -90,7 +90,7 @@ describe("groupActivityHistoryItems", () => {
|
|
|
90
90
|
{
|
|
91
91
|
codi: "A123",
|
|
92
92
|
cataleg: "ICD-10",
|
|
93
|
-
|
|
93
|
+
descripcio: "Dolor lumbar",
|
|
94
94
|
},
|
|
95
95
|
];
|
|
96
96
|
const diagnostics2 = [
|
|
@@ -119,7 +119,7 @@ describe("groupActivityHistoryItems", () => {
|
|
|
119
119
|
{
|
|
120
120
|
codi: "A123",
|
|
121
121
|
cataleg: "ICD-10",
|
|
122
|
-
|
|
122
|
+
descripcio: "Dolor lumbar",
|
|
123
123
|
},
|
|
124
124
|
],
|
|
125
125
|
}),
|