Skip to content

Commit 65363f0

Browse files
added lab messages page (#485)
Add external messages page
1 parent 9b890fa commit 65363f0

58 files changed

Lines changed: 232 additions & 266 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

projects/api-proxy/proxy-server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,7 +1793,7 @@ app.use('/sormas-rest/dashboard/epiCurveDataPerFollowUpUntil', (req, res) => {
17931793
});
17941794
});
17951795

1796-
app.use('/sormas-rest/labMessage/indexList', (req, res) => {
1796+
app.use('/sormas-rest/externalMessage/indexList', (req, res) => {
17971797
res.status(200).send({
17981798
elements: [
17991799
{

src/app/_common-components/menu/menu.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ export const routesConfig: RouteItem[] = [
2121
{ link: 'events/list', label: 'captions.mainMenuEvents', selectedLink: 'events' },
2222
{ link: 'contacts/list', label: 'captions.mainMenuContacts', selectedLink: 'contacts' },
2323
{ link: 'samples/list', label: 'captions.mainMenuSamples', selectedLink: 'samples' },
24+
{
25+
link: 'messages/list',
26+
label: 'captions.mainMenuExternalMessages',
27+
selectedLink: 'messages',
28+
},
2429
{ link: 'shares/list', label: 'captions.mainMenuShareRequests', selectedLink: 'shares' },
2530
{ link: 'entries/list', label: 'captions.mainMenuEntries', selectedLink: 'entries' },
2631
{ link: 'reports/list', label: 'captions.mainMenuReports', selectedLink: 'reports' },

src/app/_constants/actions.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,7 @@ export const ACTIONS_IMMUNIZATION_EDIT = {
125125
DELETE: 'DELETE',
126126
};
127127

128-
export const ACTIONS_SAMPLES_VIEW_OPTIONS = {
129-
SAMPLES: '/samples/list',
130-
LAB_MESSAGES: '/lab-messages/list',
131-
};
132-
133-
export const ACTIONS_LAB_MESSAGE = {
128+
export const ACTIONS_EXTERNAL_MESSAGE = {
134129
ASSIGN: 'ASSIGN',
135130
PROCESS: 'PROCESS',
136131
DOWNLOAD: 'DOWNLOAD',

src/app/_constants/api.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -439,12 +439,12 @@ export const API_ROUTE_SHARE_REQUESTS = {
439439
DELETE: 'shareRequests/delete',
440440
};
441441

442-
export const API_ROUTE_LAB_MESSAGES = {
443-
ENDPOINT: 'labMessage',
444-
GET_ALL: 'labMessage/indexList',
445-
UPDATE: 'labMessage/push',
446-
ADD: 'labMessage/push',
447-
DELETE: 'labMessage/delete',
442+
export const API_ROUTE_EXTERNAL_MESSAGES = {
443+
ENDPOINT: 'externalMessage',
444+
GET_ALL: 'externalMessage/indexList',
445+
UPDATE: 'externalMessage/push',
446+
ADD: 'externalMessage/push',
447+
DELETE: 'externalMessage/delete',
448448
};
449449

450450
export const API_ROUTE_IMPORT_EXPORT = {

src/app/_constants/enums.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -986,11 +986,11 @@ export enum BooleanOption {
986986
false = 'strings.no',
987987
}
988988

989-
export enum LabMessageStatus {
990-
UNPROCESSED = 'enum.LabMessageStatus.UNPROCESSED',
991-
PROCESSED = 'enum.LabMessageStatus.PROCESSED',
992-
FORWARDED = 'enum.LabMessageStatus.FORWARDED',
993-
UNCLEAR = 'enum.LabMessageStatus.UNCLEAR',
989+
export enum ExternalMessageStatus {
990+
UNPROCESSED = 'enum.ExternalMessageStatus.UNPROCESSED',
991+
PROCESSED = 'enum.ExternalMessageStatus.PROCESSED',
992+
FORWARDED = 'enum.ExternalMessageStatus.FORWARDED',
993+
UNCLEAR = 'enum.ExternalMessageStatus.UNCLEAR',
994994
}
995995

996996
export enum ActionPriority {

src/app/_constants/form-identifiers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const WEEKLY_REPORT_FILTERS_FORM_ID = 'weeklyReportFilters';
6868

6969
export const SHARE_REQUEST_FILTERS_FORM_ID = 'shareRequestFilters';
7070

71-
export const LAB_MESSAGE_FILTERS_FORM_ID = 'labMessageFilters';
71+
export const EXTERNAL_MESSAGE_FILTERS_FORM_ID = 'externalMessageFilters';
7272

7373
export const USER_PROFILE_FORM_ID = 'userProfile';
7474
export const MERGE_DUPLICATES_FILTERS_FORM_ID = 'mergeDuplicatesFilters';

src/app/_constants/storage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const CONFIG_EVENTS = 'configEvents';
99
export const CONFIG_EVENTS_ACTIONS = 'configEventsActions';
1010
export const CONFIG_EVENTS_GROUPS = 'configEventsGroups';
1111
export const CONFIG_SAMPLES = 'configSamples';
12-
export const CONFIG_LAB_MESSAGES = 'configLabMessages';
12+
export const CONFIG_EXTERNAL_MESSAGES = 'configExternalMessages';
1313
export const CONFIG_PERSONS = 'configPersons';
1414
export const CONFIG_USERS = 'configUsers';
1515
export const CONFIG_IMMUNIZATIONS = 'configImmunizations';

src/app/_services/api/lab-message.service.ts renamed to src/app/_services/api/external-message.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { Serializer } from '../../_serializers/serializer';
1010
@Injectable({
1111
providedIn: 'root',
1212
})
13-
export class LabMessageService extends BaseService<LabMessageDto> {
13+
export class ExternalMessageService extends BaseService<LabMessageDto> {
1414
constructor(httpClient: HttpClient, helperService: HelperService) {
15-
super(httpClient, helperService, '', constants.API_ROUTE_LAB_MESSAGES, new Serializer());
15+
super(httpClient, helperService, '', constants.API_ROUTE_EXTERNAL_MESSAGES, new Serializer());
1616
}
1717
}

src/app/app-routing.module.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ const routes: Routes = [
9797
canActivate: [Guard],
9898
},
9999
{
100-
path: 'lab-messages',
101-
loadChildren: () =>
102-
import('./lab-messages/lab-messages.module').then((m) => m.LabMessagesModule),
100+
path: 'messages',
101+
loadChildren: () => import('./messages/messages.module').then((m) => m.MessagesModule),
103102
canActivate: [Guard],
104103
},
105104
{

src/app/lab-messages/lab-message/lab-message.component.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)