@kenyaemr/esm-service-queues-app 7.0.3-pre.89 → 8.0.1-pre.95

package/src/transition-queue-entry/transition-queue-entry-dialog.test.tsx

@@ -1,49 +1,22 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { navigate } from '@openmrs/esm-framework';
-import { serveQueueEntry, updateQueueEntry } from '../active-visits/active-visits-table.resource';
+import { render, screen } from '@testing-library/react';
+import { getDefaultsFromConfigSchema, navigate, useConfig } from '@openmrs/esm-framework';
+import { configSchema, type ConfigObject } from '../config-schema';
+import {
+  type MappedVisitQueueEntry,
+  serveQueueEntry,
+  updateQueueEntry,
+} from '../active-visits/active-visits-table.resource';
 import { requeueQueueEntry } from './transition-queue-entry.resource';
 import TransitionQueueEntryModal from './transition-queue-entry-dialog.component';
 
-const mockedNavigate = navigate as jest.Mock;
-
-jest.mock('@openmrs/esm-framework', () => ({
-  ...jest.requireActual('@openmrs/esm-framework'),
-  useTranslation: () => ({ t: jest.fn((key) => key) }),
-  navigate: jest.fn(),
-  toOmrsIsoString: jest.fn(),
-  toDateObjectStrict: jest.fn(),
-  useConfig: jest.fn(() => ({
-    concepts: {
-      defaultTransitionStatus: 'some-default-transition-status',
-    },
-    defaultIdentifierTypes: [
-      {
-        fieldName: 'openMrsId',
-        format: null,
-        identifierSources: [
-          {
-            uuid: '8549f706-7e85-4c1d-9424-217d50a2988b',
-            name: 'Generator for OpenMRS ID',
-            description: 'Generator for OpenMRS ID',
-            baseCharacterSet: '0123456789ACDEFGHJKLMNPRTUVWXY',
-            prefix: '',
-          },
-        ],
-        isPrimary: true,
-        name: 'OpenMRS ID',
-        required: true,
-        uniquenessBehavior: 'UNIQUE',
-        uuid: '05a29f94-c0ed-11e2-94be-8c13b969e334',
-      },
-    ],
-  })),
-}));
+const mockNavigate = jest.mocked(navigate);
+const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
 
 jest.mock('../active-visits/active-visits-table.resource', () => ({
-  serveQueueEntry: jest.fn(() => Promise.resolve({ status: 200 })),
-  updateQueueEntry: jest.fn(() => Promise.resolve({ status: 201 })),
+  serveQueueEntry: jest.fn().mockResolvedValue({ status: 200 }),
+  updateQueueEntry: jest.fn().mockResolvedValue({ status: 201 }),
 }));
 
 jest.mock('../hooks/useQueueEntries', () => ({
@@ -51,13 +24,19 @@ jest.mock('../hooks/useQueueEntries', () => ({
 }));
 
 jest.mock('./transition-queue-entry.resource', () => ({
-  requeueQueueEntry: jest.fn(() => Promise.resolve({ status: 200 })),
+  requeueQueueEntry: jest.fn().mockResolvedValue({ status: 200 }),
 }));
 
 describe('TransitionQueueEntryModal', () => {
   const queueEntry = {
     visitUuid: 'c90386ff-ae85-45cc-8a01-25852099c5ae',
-    identifiers: ['100GEJ'],
+    identifiers: [
+      {
+        identifier: '100GEJ',
+        display: 'OpenMRS ID',
+        uuid: 'ac1f1f1e-6b0e-4d4e-8f0b-0b0e4e6b1fac',
+      },
+    ],
     queueUuid: 'fa1e98f1-f002-4174-9e55-34d60951e710',
     queueEntryUuid: '712289ab-32c0-430f-87b6-d9c1e4e4686e',
     patientUuid: 'cc75ad73-c24b-499c-8db9-a7ef4fc0b36d',
@@ -66,13 +45,23 @@ describe('TransitionQueueEntryModal', () => {
       name: 'Triage Queue',
     },
     name: 'John Doe',
-  };
+  } as unknown as MappedVisitQueueEntry;
+
+  beforeEach(() => {
+    mockUseConfig.mockReturnValue({
+      ...getDefaultsFromConfigSchema(configSchema),
+      concepts: {
+        defaultTransitionStatus: 'some-default-transition-status',
+      },
+      defaultIdentifierTypes: ['05ee9cf4-7242-4a17-b4d4-00f707265c8a', 'f85081e2-b4be-4e48-b3a4-7994b69bb101'],
+    } as ConfigObject);
+  });
 
   it('renders modal content', () => {
     const closeModal = jest.fn();
     render(<TransitionQueueEntryModal queueEntry={queueEntry} closeModal={closeModal} />);
 
-    expect(screen.getByText('Serve patient')).toBeInTheDocument();
+    expect(screen.getByText(/Serve patient/i)).toBeInTheDocument();
     expect(screen.getByText(/Patient name :/i)).toBeInTheDocument();
   });
 
@@ -96,7 +85,7 @@ describe('TransitionQueueEntryModal', () => {
     await user.click(screen.getByText('Serve'));
 
     expect(updateQueueEntry).toHaveBeenCalled();
+    expect(mockNavigate).toHaveBeenCalled();
     expect(serveQueueEntry).toHaveBeenCalled();
-    expect(mockedNavigate).toHaveBeenCalled();
   });
 });

package/src/views/queue-tables-for-all-statuses.component.tsx

@@ -1,18 +1,16 @@
 import React, { useCallback, useState } from 'react';
-import { InlineNotification, Search } from '@carbon/react';
+import { InlineNotification, Search, SkeletonText } from '@carbon/react';
 import { Add } from '@carbon/react/icons';
-import { ExtensionSlot, isDesktop, launchWorkspace, showToast, useLayoutType } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
+import { ExtensionSlot, isDesktop, launchWorkspace, showToast, useLayoutType } from '@openmrs/esm-framework';
+import type { Concept, Queue, QueueEntry } from '../types';
 import { useQueueEntries } from '../hooks/useQueueEntries';
 import { useColumns } from '../queue-table/cells/columns.resource';
 import { QueueTableByStatusSkeleton } from '../queue-table/queue-table-by-status-skeleton.component';
 import QueueTable from '../queue-table/queue-table.component';
 import QueueTableMetrics from '../queue-table/queue-table-metrics.component';
-import styles from '../queue-table/queue-table.scss';
-import type { Concept, Queue, QueueEntry } from '../types';
 import PatientQueueHeader from '../patient-queue-header/patient-queue-header.component';
-import { SearchSkeleton } from '@carbon/react';
-import { SkeletonText } from '@carbon/react';
+import styles from '../queue-table/queue-table.scss';
 
 interface QueueTablesForAllStatusesProps {
   selectedQueue: Queue; // the selected queue
@@ -173,14 +171,16 @@ function QueueTableForQueueAndStatus({
   const filteredQueueEntries = filterQueueEntries(queueEntries, searchTerm, statusUuid);
   return (
     <div className={styles.statusTableContainer}>
-      <QueueTable
-        key={statusUuid}
-        queueEntries={filteredQueueEntries}
-        header={status.display}
-        isValidating={isValidating}
-        queueUuid={queue.uuid}
-        statusUuid={statusUuid}
-      />
+      <h5 className={styles.statusTableHeader}>{status.display}</h5>
+      <div className={styles.container}>
+        <QueueTable
+          key={statusUuid}
+          queueEntries={filteredQueueEntries}
+          isValidating={isValidating}
+          queueUuid={queue.uuid}
+          statusUuid={statusUuid}
+        />
+      </div>
     </div>
   );
 }

package/src/visits-missing-inqueue/visits-missing-inqueue.component.tsx

@@ -34,10 +34,10 @@ import {
   ConfigurableLink,
 } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
-import styles from './visits-missing-inqueue.scss';
 import { type ActiveVisit, useMissingQueueEntries } from './visits-missing-inqueue.resource';
 import { Add } from '@carbon/react/icons';
 import { type ConfigObject } from '../config-schema';
+import styles from './visits-missing-inqueue.scss';
 
 interface PaginationData {
   goTo: (page: number) => void;

package/src/visits-missing-inqueue/visits-missing-inqueue.resource.ts

@@ -81,7 +81,7 @@ export function useMissingQueueEntries() {
   return {
     activeVisits: formattedActiveVisits,
     isLoading: !data && !visitsError && !queueError,
-    isError: !visitsError && !queueError,
+    error: !visitsError && !queueError,
     visitsIsValidating,
     mutateQueueEntries,
   };

package/src/visits-missing-inqueue/visits-missing-inqueue.scss

@@ -1,6 +1,5 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '../root.scss';
+@use '@carbon/layout';
+@use '@carbon/type';
 
 .activeVisitsContainer {
   background-color: $ui-background;
@@ -14,7 +13,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05;
+  padding: layout.$spacing-04 0 layout.$spacing-04 layout.$spacing-05;
   background-color: $ui-background;
 }
 
@@ -48,15 +47,15 @@
 }
 
 .emptyRow {
-  padding: 0 1rem;
+  padding: 0 layout.$spacing-05;
   display: flex;
   align-items: center;
 }
 
 .visitSummaryContainer {
   width: 100%;
-  max-width: 768px;
-  margin: 1rem auto;
+  max-width: 48rem;
+  margin: layout.$spacing-05 auto;
 }
 
 .expandedActiveVisitRow > td > div {
@@ -64,29 +63,29 @@
 }
 
 .expandedActiveVisitRow td {
-  padding: 0 2rem;
+  padding: 0 layout.$spacing-07;
 }
 
 .expandedActiveVisitRow th[colspan] td[colspan] > div:first-child {
-  padding: 0 1rem;
+  padding: 0 layout.$spacing-05;
 }
 
 .action {
-  margin-bottom: spacing.$spacing-03;
+  margin-bottom: layout.$spacing-03;
 }
 
 .content {
   @include type.type-style('heading-compact-01');
   color: $text-02;
-  margin-top: spacing.$spacing-05;
-  margin-bottom: spacing.$spacing-03;
+  margin-top: layout.$spacing-05;
+  margin-bottom: layout.$spacing-03;
 }
 
 .desktopHeading,
 .tabletHeading {
   text-align: left;
   text-transform: capitalize;
-  margin-bottom: spacing.$spacing-05;
+  margin-bottom: layout.$spacing-05;
 
   h4 {
     @include type.type-style('heading-compact-02');
@@ -95,7 +94,7 @@
     &:after {
       content: '';
       display: block;
-      width: 2rem;
+      width: layout.$spacing-07;
       padding-top: 3px;
       border-bottom: 0.375rem solid;
       @include brand-03(border-bottom-color);
@@ -106,3 +105,7 @@
 .tile {
   text-align: center;
 }
+
+.bodyLong01 {
+  @include type.type-style('body-01');
+}

package/translations/am.json

@@ -83,6 +83,8 @@
   "femaleLabelText": "Female",
   "fields": "of the following fields",
   "filter": "Filter (1)",
+  "filterByService": "Filter by service :",
+  "filterByStatus": "Filter by status :",
   "filterTable": "Filter table",
   "firstName": "First name",
   "firstNameSort": "First name (a-z)",
@@ -257,7 +259,6 @@
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
   "sex": "Sex",
-  "showPatientsWaitingFor": "Show patients waiting for",
   "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
@@ -268,12 +269,13 @@
   "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
-  "submitting": "Submitting",
+  "submitting": "Submitting...",
   "success": "Success",
   "temperature": "Temperature",
   "ticketNumber": "Ticket number",
   "time": "Time",
   "timeCannotBeInFuture": "Time cannot be in the future",
+  "timeCannotBePriorToPreviousQueueEntry": "Time cannot be before start of previous queue entry: {{time}}",
   "timeOfTransition": "Time of transition",
   "tirageNotYetCompleted": "Triage has not yet been completed",
   "today": "Today",

package/translations/ar.json

@@ -83,6 +83,8 @@
   "femaleLabelText": "أنثى",
   "fields": "من الحقول التالية",
   "filter": "تصفية (1)",
+  "filterByService": "Filter by service :",
+  "filterByStatus": "Filter by status :",
   "filterTable": "جدول التصفية",
   "firstName": "الاسم الأول",
   "firstNameSort": "الاسم الأول (أ-ي)",
@@ -257,7 +259,6 @@
   "serviceQueue": "طابور الخدمة",
   "serviceQueues": "طوابير الخدمة",
   "sex": "الجنس",
-  "showPatientsWaitingFor": "عرض المرضى في الانتظار لـ",
   "sortBy": "ترتيب حسب",
   "sortWeight": "ترتيب حسب الوزن",
   "sp02": "Sp02",
@@ -268,12 +269,13 @@
   "startVisitQueueSuccessfully": "تمت إضافة المريض إلى قائمة الزيارات النشطة والطابور.",
   "status": "الحالة",
   "statusIsRequired": "Status is required",
-  "submitting": "Submitting",
+  "submitting": "Submitting...",
   "success": "نجاح",
   "temperature": "درجة الحرارة",
   "ticketNumber": "رقم التذكرة",
   "time": "الوقت",
   "timeCannotBeInFuture": "Time cannot be in the future",
+  "timeCannotBePriorToPreviousQueueEntry": "Time cannot be before start of previous queue entry: {{time}}",
   "timeOfTransition": "Time of transition",
   "tirageNotYetCompleted": "لم يتم الانتهاء من الترياج بعد",
   "today": "اليوم",

package/translations/en.json

@@ -275,6 +275,7 @@
   "ticketNumber": "Ticket Number",
   "time": "Time",
   "timeCannotBeInFuture": "Time cannot be in the future",
+  "timeCannotBePriorToPreviousQueueEntry": "Time cannot be before start of previous queue entry: {{time}}",
   "timeOfTransition": "Time of transition",
   "tirageNotYetCompleted": "Triage has not yet been completed",
   "today": "Today",

package/translations/es.json

@@ -83,6 +83,8 @@
   "femaleLabelText": "Female",
   "fields": "of the following fields",
   "filter": "Filter (1)",
+  "filterByService": "Filter by service :",
+  "filterByStatus": "Filter by status :",
   "filterTable": "Filter table",
   "firstName": "First name",
   "firstNameSort": "First name (a-z)",
@@ -257,7 +259,6 @@
   "serviceQueue": "Service queue",
   "serviceQueues": "Service queues",
   "sex": "Sex",
-  "showPatientsWaitingFor": "Show patients waiting for",
   "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
@@ -268,12 +269,13 @@
   "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
-  "submitting": "Submitting",
+  "submitting": "Submitting...",
   "success": "Success",
   "temperature": "Temperature",
   "ticketNumber": "Ticket number",
   "time": "Time",
   "timeCannotBeInFuture": "Time cannot be in the future",
+  "timeCannotBePriorToPreviousQueueEntry": "Time cannot be before start of previous queue entry: {{time}}",
   "timeOfTransition": "Time of transition",
   "tirageNotYetCompleted": "Triage has not yet been completed",
   "today": "Today",

package/translations/fr.json

@@ -4,16 +4,16 @@
   "activeVisitsNotInQueue": "Active visits not in queue",
   "addAProviderQueueRoom": "Add a provider queue room?",
   "addEntry": "Add entry",
-  "addisitToQueueTooltip": "Add to queue",
+  "addisitToQueueTooltip": "Add",
   "addNewQueueService": "Add New Queue Service",
   "addNewQueueServiceRoom": "Add new queue service room",
-  "addNewService": "Add new service",
+  "addNewService": "Ajouter un nouveau service",
   "addNewServiceRoom": "Add new service room",
-  "addPatientToQueue": "Add patient to queue",
+  "addPatientToQueue": "Ajouter un patient à la file d'attente",
   "addProviderQueueRoom": "Add provider queue room",
-  "addQueue": "Add queue",
+  "addQueue": "Ajouter une file d'attente",
   "addQueueName": "Please add a queue name",
-  "addQueueRoom": "Add queue room",
+  "addQueueRoom": "Ajouter une salle d'attente",
   "addQueueRoomName": "Please add a queue room name",
   "addQueueRoomService": "Please add a queue room service",
   "addRoom": "Add room",
@@ -21,13 +21,13 @@
   "addVisitToQueue": "Add Visit To Queue?",
   "advancedSearch": "Advanced search",
   "age": "Age",
-  "alistOfClients": "A list of clients waiting for ",
+  "alistOfClients": "Liste de patients attendus",
   "all": "All",
   "and": "And",
-  "anotherVisitType": "Start another visit type",
+  "anotherVisitType": "Commencer un autre type de visite",
   "any": "Any",
   "applyFilters": "Apply filters",
-  "averageWaitTime": "Average wait time today",
+  "averageWaitTime": "Temps d'attente moyen du jour",
   "backToScheduledVisits": "Back to scheduled visits",
   "backToSearchResults": "Back to search results",
   "backToSimpleSearch": "Back to simple search",
@@ -35,15 +35,15 @@
   "bmi": "Bmi",
   "bp": "Bp",
   "call": "Call",
-  "cancel": "Cancel",
-  "checkedInPatients": "Checked in patients",
+  "cancel": "Annuler",
+  "checkedInPatients": "Patients arrivés",
   "checkFilters": "Check the filters above",
   "chooseRoom": "Select a room",
   "chooseService": "Select a service",
   "clearAllQueueEntries": "Clear all queue entries?",
   "clearAllQueueEntriesWarningMessage": "Clearing all queue entries will remove  all the patients from the queues",
   "clearQueue": "Clear queue",
-  "clinicMetrics": "Clinic metrics",
+  "clinicMetrics": "Indicateurs cliniques",
   "configurePriorities": "Please configure priorities to continue.",
   "configureServices": "Please configure services to continue.",
   "configureStatus": "Please configure status to continue.",
@@ -71,7 +71,7 @@
   "endVisit": "End Visit",
   "endVisitWarningMessage": "Ending this visit will remove this patient from the queue and will not allow you to fill another encounter form for this patient",
   "enterCommentHere": "Enter Comment here",
-  "errorAddingQueue": "Error adding queue",
+  "errorAddingQueue": "Erreur lors de l'ajout de la file d'attente",
   "errorAddingQueueRoom": "Error adding queue room",
   "errorClearingQueues": "Error clearing queues",
   "errorFetchingAppointments": "Error fetching appointments",
@@ -83,6 +83,8 @@
   "femaleLabelText": "Female",
   "fields": "of the following fields",
   "filter": "Filter (1)",
+  "filterByService": "Filter by service :",
+  "filterByStatus": "Filter by status :",
   "filterTable": "Filter table",
   "firstName": "First name",
   "firstNameSort": "First name (a-z)",
@@ -91,7 +93,7 @@
   "gender": "Gender",
   "heartRate": "Heart rate",
   "height": "Height",
-  "home": "Home",
+  "home": "Accueil",
   "hourAndMinuteFormatted": "{{hours}} hour(s) and {{minutes}} minute(s)",
   "idNumber": "ID Number",
   "indication": "Indication",
@@ -120,21 +122,21 @@
   "missingService": "Missing service",
   "missingVisitType": "Missing visit type",
   "modifyDefaultValue": "Modify default value",
-  "movePatientToNextService": "Move patient to the next service?",
-  "moveToNextService": "Move to next service",
+  "movePatientToNextService": "Déplacer le patient vers le service suivant?",
+  "moveToNextService": "Déplacer vers le service suivant",
   "name": "Name",
-  "nextPage": "Next page",
-  "noActiveVisitsForLocation": "There are no active visits to display for this location.",
+  "nextPage": "Page suivante",
+  "noActiveVisitsForLocation": "Il n'y a pas de visite en cours pour cet emplacement",
   "noAppointmentsFound": "No appointments found",
   "noColumnsDefined": "No table columns defined. Check Configuration",
   "noEncountersFound": "No encounters found",
   "noLastEncounter": "There is no last encounter to display for this patient",
-  "noLocationsAvailable": "No locations available",
+  "noLocationsAvailable": "Aucun emplacement disponible",
   "noMedicationsFound": "No medications found",
   "noNotesFound": "No notes found",
   "noPatientFoundMessage": "Sorry, no patient has been found",
   "noPatientsToDisplay": "No patients to display",
-  "noPreviousVisitFound": "No previous visit found",
+  "noPreviousVisitFound": "Aucune visite précédente trouvée",
   "noPrioritiesConfigured": "No priorities configured",
   "noPrioritiesForService": "The selected service does not have any allowed priorities. This is an error in configuration. Please contact your system administrator.",
   "noPrioritiesForServiceTitle": "No priorities available",
@@ -147,7 +149,7 @@
   "notableConfig": "No table configuration",
   "notes": "Notes",
   "noVisitsNotInQueueFound": "No visits currently not in queue found",
-  "noVisitTypesMatchingSearch": "There are no visit types matching this search text",
+  "noVisitTypesMatchingSearch": "Il n'y a pas de visite correspondante à cette recherche",
   "noVitalsFound": "No vitals found",
   "oldest": "Oldest first",
   "onTime": "On time",
@@ -168,14 +170,14 @@
   "patientRemovedSuccessfully": "Paient removed from queue successfully",
   "patientRequeued": "Patient has been requeued",
   "patients": "Patients",
-  "patientsCurrentlyInQueue": "Patients currently in queue",
+  "patientsCurrentlyInQueue": "Patients actuellement en file d'attente",
   "personalDetails": "Personal details",
   "phoneNumber": "Phone Number",
-  "pleaseSelectLocation": "Please select a location",
+  "pleaseSelectLocation": "Veuillez sélectionner un emplacement",
   "pleaseSelectService": "Please select a service",
   "postCode": "Post code",
-  "previousPage": "Previous page",
-  "previousVisit": "Previous visit",
+  "previousPage": "Page précédente",
+  "previousVisit": "Visite précédente",
   "primaryHelperText": "Search for a patient",
   "priority": "Priority",
   "priorityComment": "Priority comment",
@@ -211,7 +213,7 @@
   "queueRoomAddFailed": "Error adding queue room",
   "queueRoomName": "Queue room name",
   "queueRoomUpdatedSuccessfully": "Queue room updated successfully",
-  "queuesClearedSuccessfully": "Queues cleared successfully",
+  "queuesClearedSuccessfully": "Files d'attente vidées avec succès",
   "queueScreen": "Queue screen",
   "queueService": "Queue service",
   "queueStatus": "Queue status",
@@ -229,8 +231,8 @@
   "room": "Room",
   "rRate": "R. Rate",
   "save": "Save",
-  "scheduledAppointmentsList": "Scheduled appointments patient list",
-  "scheduledToday": "Scheduled for today",
+  "scheduledAppointmentsList": "Liste des patients avec un rendez-vous planifié",
+  "scheduledToday": "Prévu pour aujourd'hui",
   "search": "Search",
   "searchboxPlaceholder": "Search for a patient name or ID number",
   "searchForAVisitType": "Search for a visit type",
@@ -244,36 +246,36 @@
   "selectOption": "Select an option",
   "selectProgramType": "Select program type",
   "selectQueue": "Select a queue",
-  "selectQueueLocation": "Select a queue location",
+  "selectQueueLocation": "Sélectionnez un emplacement de file d'attente",
   "selectQueueService": "Select a queue service",
   "selectRoom": "Select a room",
   "selectService": "Select a service",
-  "selectServiceType": "Select a service type",
+  "selectServiceType": "Sélectionner un type de service",
   "selectVisitType": "Please select a Visit Type",
   "serve": "Serve",
   "servePatient": "Serve patient",
   "service": "Service",
   "serviceIsRequired": "Status is required",
   "serviceQueue": "Service queue",
-  "serviceQueues": "Service queues",
+  "serviceQueues": "Files d'attente",
   "sex": "Sex",
-  "showPatientsWaitingFor": "Show patients waiting for",
   "sortBy": "Sort by",
   "sortWeight": "Sort weight",
   "sp02": "Sp02",
-  "startAgeRangeInvalid": "Start age range is not valid",
-  "startAVisit": "Start a visit",
-  "startVisit": "Start visit",
-  "startVisitError": "Error starting visit",
+  "startAgeRangeInvalid": "La tranche d'âge de départ n'est pas valide",
+  "startAVisit": "Commencer une visite",
+  "startVisit": "Commencer une visite",
+  "startVisitError": "Erreur lors du démarrage de la visite",
   "startVisitQueueSuccessfully": "Patient has been added to active visits list and queue.",
   "status": "Status",
   "statusIsRequired": "Status is required",
-  "submitting": "Submitting",
+  "submitting": "Submitting...",
   "success": "Success",
   "temperature": "Temperature",
   "ticketNumber": "Ticket number",
   "time": "Time",
   "timeCannotBeInFuture": "Time cannot be in the future",
+  "timeCannotBePriorToPreviousQueueEntry": "L’heure ne peut être antérieure au début de la file d’attente précédente: {{time}}",
   "timeOfTransition": "Time of transition",
   "tirageNotYetCompleted": "Triage has not yet been completed",
   "today": "Today",
@@ -298,7 +300,7 @@
   "vitals": "Vitals",
   "vitalsForm": "Vitals form",
   "vitalsNotRecordedForVisit": "Vitals has not been recorded for this patient for this visit",
-  "waitingFor": "Waiting for",
+  "waitingFor": "En attente",
   "weight": "Weight",
   "years": "Years",
   "youngest": "Youngest first"

package/translations/he.json

@@ -83,6 +83,8 @@
   "femaleLabelText": "נקבה",
   "fields": "מהשדות הבאים",
   "filter": "סנן",
+  "filterByService": "Filter by service :",
+  "filterByStatus": "Filter by status :",
   "filterTable": "סנן טבלה",
   "firstName": "שם פרטי",
   "firstNameSort": "שם פרטי (א-ת)",
@@ -257,7 +259,6 @@
   "serviceQueue": "תור השירות",
   "serviceQueues": "תורי השירות",
   "sex": "מגדר",
-  "showPatientsWaitingFor": "הצג מטופלים הממתינים ל",
   "sortBy": "מיין לפי",
   "sortWeight": "מיון לפי חוזק",
   "sp02": "רמת חמצן",
@@ -268,12 +269,13 @@
   "startVisitQueueSuccessfully": "המטופל הוסף לרשימת הביקורים הפעילים ולתור בהצלחה",
   "status": "מצב",
   "statusIsRequired": "Status is required",
-  "submitting": "Submitting",
+  "submitting": "Submitting...",
   "success": "הצלחה",
   "temperature": "טמפרטורה",
   "ticketNumber": "מספר כרטיס",
   "time": "זמן",
   "timeCannotBeInFuture": "Time cannot be in the future",
+  "timeCannotBePriorToPreviousQueueEntry": "Time cannot be before start of previous queue entry: {{time}}",
   "timeOfTransition": "Time of transition",
   "tirageNotYetCompleted": "הטריאז' עדיין לא הושלם",
   "today": "היום",