Release v8.6.0

android/app/build.gradle

@@ -116,13 +116,13 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 def getAppVersion() {
-    def inputFile = new File("../package.json")
+    def inputFile = new File("${project.projectDir}/../../package.json")
     def packageJson = new JsonSlurper().parseText(inputFile.text)
     return packageJson["version"]
 }
 
 def getAppName() {
-    def inputFile = new File("../package.json")
+    def inputFile = new File("${project.projectDir}/../../package.json")
     def packageJson = new JsonSlurper().parseText(inputFile.text)
     return packageJson["name"]
 }

package.json

@@ -5,7 +5,7 @@
   },
   "name": "mSupplyMobile",
   "//": "version must be in the format ${majorNumber}.${minorNumber}.${patchNumber}-rc${releaseCandidateNumber}",
-  "version": "8.5.0",
+  "version": "8.6.0",
   "private": false,
   "license": "MIT",
   "description": "Mobile app for use with the mSupply medical inventory control software",
@@ -16,7 +16,8 @@
   "url": "http://github.com/sussol/mobile",
   "homepage": "http://msupply.org.nz",
   "scripts": {
-    "start": "react-native run-android",
+    "start": "react-native start",
+    "android": "react-native run-android",
     "log": "react-native log-android",
     "shake": "adb shell input keyevent KEYCODE_MENU",
     "rr": "adb shell input text \"RR\"",

src/actions/Entities/NameActions.js

@@ -73,7 +73,7 @@ const select = name => async dispatch => {
     const result = await createPatientVisibility(name);
     if (result) {
       UIDatabase.write(() => {
-        selectedName = createRecord(UIDatabase, 'Patient', name);
+        selectedName = createRecord(UIDatabase, 'Patient', name, true);
       });
     } else {
       ToastAndroid.show(generalStrings.problem_connecting_please_try_again, ToastAndroid.LONG);
@@ -96,15 +96,15 @@ const filter = (key, value) => ({ type: NAME_ACTIONS.FILTER, payload: { key, val
 
 const sort = sortKey => ({ type: NAME_ACTIONS.SORT, payload: { sortKey } });
 
-const saveEditing = () => (dispatch, getState) => {
+const saveEditing = (shouldCreateNameNames = true) => (dispatch, getState) => {
   const currentPatient = selectEditingName(getState());
   const createdDate = currentPatient?.createdDate ? new Date(currentPatient.createdDate) : null;
   const dateOfBirth = new Date(currentPatient.dateOfBirth);
   const name = `${currentPatient.lastName}, ${currentPatient.firstName}`;
 
   const patientRecord = { ...currentPatient, dateOfBirth, createdDate, name };
 
-  UIDatabase.write(() => createRecord(UIDatabase, 'Patient', patientRecord));
+  UIDatabase.write(() => createRecord(UIDatabase, 'Patient', patientRecord, shouldCreateNameNames));
   dispatch(reset());
 };
 

src/actions/Entities/NameNoteActions.js

@@ -1,12 +1,15 @@
 import { generateUUID } from 'react-native-database';
 import merge from 'lodash.merge';
+import { ToastAndroid } from 'react-native';
 import { createRecord, UIDatabase } from '../../database/index';
 import {
   selectCreatingNameNote,
   selectMostRecentNameNote,
 } from '../../selectors/Entities/nameNote';
 import { selectSurveySchemas } from '../../selectors/formSchema';
 import { validateJsonSchemaData } from '../../utilities/ajvValidator';
+import { vaccineStrings } from '../../localization';
+import { checkIsObjectEmpty } from '../../utilities';
 
 export const NAME_NOTE_ACTIONS = {
   SELECT: 'NAME_NOTE/select',
@@ -22,6 +25,7 @@ const createDefaultNameNote = (nameID = '') => {
     entryDate: new Date(),
     patientEventID: pcd?.id ?? '',
     nameID,
+    isDeleted: false,
   };
 };
 
@@ -60,13 +64,73 @@ const updateForm = (data, validator) => ({
 const saveEditing = () => (dispatch, getState) => {
   const nameNote = selectCreatingNameNote(getState()) ?? {};
   const patient = UIDatabase.get('Name', nameNote?.nameID);
-  const isDirty = JSON.stringify(patient?.mostRecentPCD?.data) !== JSON.stringify(nameNote?.data);
+  const isDirty =
+    !checkIsObjectEmpty(nameNote?.data) &&
+    JSON.stringify(patient?.mostRecentPCD?.data) !== JSON.stringify(nameNote?.data);
   if (isDirty) {
     UIDatabase.write(() => createRecord(UIDatabase, 'NameNote', nameNote));
   }
   dispatch(reset());
 };
 
+const updateNameNote = (originalNote, updatedData) => () => {
+  const { id, patientEvent, name, entryDate, _data, isDeleted } = originalNote;
+
+  // Quick & dirty check if the object was updated, trims out some un-needed updates
+  const isDirty = _data !== JSON.stringify(updatedData);
+
+  if (isDirty) {
+    const updatedNote = {
+      id,
+      patientEvent,
+      name,
+      entryDate: new Date(entryDate),
+      _data: JSON.stringify(updatedData),
+      isDeleted,
+    };
+
+    UIDatabase.write(() => {
+      UIDatabase.update('NameNote', updatedNote);
+      UIDatabase.create('NameNote', createNameNoteAudit(originalNote, updatedData));
+    });
+    ToastAndroid.show(vaccineStrings.vaccination_updated, ToastAndroid.LONG);
+  } else {
+    ToastAndroid.show(vaccineStrings.vaccination_not_updated, ToastAndroid.LONG);
+  }
+};
+
+const deleteNameNote = NameNote => () => {
+  UIDatabase.write(() => {
+    UIDatabase.update('NameNote', { id: NameNote.id, isDeleted: true });
+  });
+};
+
+const createNameNoteAudit = (originalNote, updatedData) => {
+  const { patientEvent, name, entryDate, isDeleted } = originalNote;
+  const [auditEvent] = UIDatabase.objects('PatientEvent').filtered('code == "NameNoteModified"');
+
+  const auditNameNote = {
+    id: generateUUID(),
+    name,
+    auditEvent,
+    entryDate: new Date(),
+    _data: JSON.stringify({
+      patientEvent,
+      old: {
+        entryDate,
+        data: originalNote.data,
+      },
+      new: {
+        entryDate: new Date(),
+        data: updatedData,
+      },
+    }),
+    isDeleted,
+  };
+
+  return auditNameNote;
+};
+
 const createNotes = (nameNotes = []) => {
   UIDatabase.write(() => {
     nameNotes.forEach(nameNote => {
@@ -80,6 +144,7 @@ const createNotes = (nameNotes = []) => {
           name,
           _data: JSON.stringify(nameNote?.data),
           entryDate: new Date(nameNote?.entryDate),
+          isDeleted: nameNote.isDeleted,
         };
 
         UIDatabase.update('NameNote', toSave);
@@ -99,5 +164,7 @@ export const NameNoteActions = {
   reset,
   createSurveyNameNote,
   updateForm,
+  updateNameNote,
+  deleteNameNote,
   saveEditing,
 };

src/actions/Entities/VaccinePrescriptionActions.js

@@ -11,12 +11,13 @@ import {
   selectSelectedSupplementalData,
   selectSelectedVaccinator,
 } from '../../selectors/Entities/vaccinePrescription';
-import { selectEditingNameId } from '../../selectors/Entities/name';
+import { selectEditingNameId, selectEditingName } from '../../selectors/Entities/name';
 import { NameActions } from './NameActions';
 import { NameNoteActions } from './NameNoteActions';
 import { goBack, gotoVaccineDispensingPage } from '../../navigation/actions';
 import { selectSupplementalDataSchemas } from '../../selectors/formSchema';
 import { validateJsonSchemaData } from '../../utilities/ajvValidator';
+import { SETTINGS_KEYS } from '../../settings';
 
 export const VACCINE_PRESCRIPTION_ACTIONS = {
   CREATE: 'VACCINE_PRESCRIPTION/create',
@@ -29,7 +30,6 @@ export const VACCINE_PRESCRIPTION_ACTIONS = {
   SELECT_BATCH: 'VACCINE_PRESCRIPTION/selectBatch',
   SELECT_VACCINATOR: 'VACCINE_PRESCRIPTION/selectVaccinator',
   SET_BONUS_DOSE: 'VACCINE_PRESCRIPTION/setBonusDose',
-  TOGGLE_HISTORY: 'VACCINE_PRESCRIPTION/toggleHistory',
   SELECT_DEFAULT_VACCINE: 'VACCINE_PRESCRIPTION/selectDefaultVaccine',
 };
 
@@ -191,6 +191,8 @@ const createVaccinationNameNote = (
 
   // Extract name notes from the patient before saving as this can get huuuge(!)
   const { nameNotes, ...patientObject } = patient.toJSON();
+  const storeId = UIDatabase.getSetting(SETTINGS_KEYS.THIS_STORE_ID);
+  const storeNameId = UIDatabase.getSetting(SETTINGS_KEYS.THIS_STORE_NAME_ID);
 
   const data = {
     refused,
@@ -208,13 +210,16 @@ const createVaccinationNameNote = (
       patient: patientObject,
     },
     pcdNameNoteId: getPcdNameNoteID(patient.id),
+    storeId,
+    storeName: UIDatabase.objects('Name').filtered('id == $0', storeNameId)[0]?.name,
   };
   const newNameNote = {
     id,
     name: patient,
     patientEvent,
     entryDate: new Date(),
     _data: JSON.stringify(data),
+    isDeleted: false,
   };
   UIDatabase.write(() => UIDatabase.create('NameNote', newNameNote));
 };
@@ -225,6 +230,7 @@ const getPcdNameNoteID = patientId => {
     .sorted('entryDate', true);
   return patientNameNotes.length > 0 ? patientNameNotes[0].id : '';
 };
+
 const createSupplementaryData = () => (dispatch, getState) => {
   // Create a supplementaryData object which is seeded with the data that was last
   // entered against a prescription
@@ -276,7 +282,14 @@ const confirm = () => (dispatch, getState) => {
     });
   }
   batch(() => {
-    dispatch(NameActions.saveEditing());
+    const { isEditable = true } = selectEditingName(getState());
+
+    // We are already not allowing patient update for patient that do not belong
+    // to the current store. This check will stop unnecessary updates.
+    if (isEditable) {
+      dispatch(NameActions.saveEditing(false));
+    }
+
     dispatch(NameNoteActions.saveEditing());
     dispatch(reset());
   });
@@ -315,17 +328,33 @@ const confirmAndRepeat = () => dispatch =>
     dispatch(gotoVaccineDispensingPage());
   });
 
-const toggleHistory = toggle => ({
-  type: VACCINE_PRESCRIPTION_ACTIONS.TOGGLE_HISTORY,
-  payload: { toggle },
-});
+const returnVaccineToStock = (patientID, transactionBatch) => (dispatch, getState) => {
+  const { user } = getState();
+  const { currentUser } = user;
+  const { totalQuantity } = transactionBatch;
+  const patient = UIDatabase.get('Name', patientID);
+
+  UIDatabase.write(() => {
+    const customerCredit = createRecord(
+      UIDatabase,
+      'CustomerCredit',
+      currentUser,
+      patient,
+      -totalQuantity,
+      'dispensary'
+    );
+    createRecord(UIDatabase, 'RefundLine', customerCredit, transactionBatch);
+    customerCredit.finalise(UIDatabase);
+  });
+};
 
 export const VaccinePrescriptionActions = {
   cancel,
   confirm,
   create,
   createSupplementaryData,
   reset,
+  returnVaccineToStock,
   selectBatch,
   selectSupplementalData,
   selectVaccine,
@@ -334,7 +363,6 @@ export const VaccinePrescriptionActions = {
   selectVaccinator,
   confirmAndRepeat,
   setBonusDose,
-  toggleHistory,
   selectDefaultVaccine,
   updateSupplementalData,
 };

src/actions/PatientActions.js

@@ -5,11 +5,13 @@
 
 import { batch } from 'react-redux';
 
+import { ToastAndroid } from 'react-native';
 import { createRecord, UIDatabase } from '../database';
 import { selectCurrentUser } from '../selectors/user';
 
 import { createPatientVisibility } from '../sync/lookupApiUtils';
 import { DispensaryActions } from './DispensaryActions';
+import { dispensingStrings } from '../localization';
 
 export const PATIENT_ACTIONS = {
   PATIENT_EDIT: 'Patient/patientEdit',
@@ -22,6 +24,7 @@ export const PATIENT_ACTIONS = {
   SAVE_ADR: 'Patient/saveADR',
   CANCEL_ADR: 'Patient/cancelADR',
   REFRESH: 'Patient/refresh',
+  PATIENT_DELETE: 'Patient/delete',
 };
 
 const closeModal = () => ({ type: PATIENT_ACTIONS.COMPLETE });
@@ -34,6 +37,18 @@ const makePatientVisibility = async name => {
   return response;
 };
 
+const patientDelete = () => (dispatch, getState) => {
+  const { patient } = getState();
+  const { currentPatient } = patient;
+  UIDatabase.write(() => {
+    UIDatabase.update('Name', { id: currentPatient.id, isDeleted: true });
+  });
+
+  ToastAndroid.show(dispensingStrings.patient_deleted, ToastAndroid.LONG);
+  dispatch(closeModal());
+  return { type: PATIENT_ACTIONS.PATIENT_DELETE, payload: { patient } };
+};
+
 const patientUpdate = patientDetails => async (dispatch, getState) => {
   const { patient } = getState();
   const { currentPatient } = patient;
@@ -53,6 +68,7 @@ const patientUpdate = patientDetails => async (dispatch, getState) => {
     country: currentCountry,
     supplyingStoreId: currentSupplyingStoreId,
     isActive: currentIsActive,
+    isDeceased: currentIsDeceased,
     female: currentFemale,
     ethnicity: currentEthnicity,
     nationality: currentNationality,
@@ -82,6 +98,7 @@ const patientUpdate = patientDetails => async (dispatch, getState) => {
     country: patientCountry,
     supplyingStoreId: patientSupplyingStoreId,
     female: patientFemale,
+    isDeceased: patientIsDeceased,
     ethnicity: patientEthnicity,
     nationality: patientNationality,
   } = patientDetails ?? {};
@@ -102,6 +119,7 @@ const patientUpdate = patientDetails => async (dispatch, getState) => {
   const billPostalZipCode = patientPostalZipCode ?? currentZipCode;
   const country = patientCountry ?? currentCountry;
   const female = patientFemale ?? currentFemale;
+  const isDeceased = patientIsDeceased ?? currentIsDeceased;
   const supplyingStoreId = patientSupplyingStoreId ?? currentSupplyingStoreId;
   const isActive = currentIsActive;
   const ethnicity = patientEthnicity ?? currentEthnicity;
@@ -124,14 +142,15 @@ const patientUpdate = patientDetails => async (dispatch, getState) => {
     billPostalZipCode,
     country,
     female,
+    isDeceased,
     supplyingStoreId,
     isActive,
     ethnicity,
     nationality,
     createdDate,
   };
 
-  UIDatabase.write(() => createRecord(UIDatabase, 'Patient', patientRecord));
+  UIDatabase.write(() => createRecord(UIDatabase, 'Patient', patientRecord, false));
 
   batch(() => {
     dispatch(closeModal());
@@ -176,6 +195,7 @@ export const PatientActions = {
   closeADRModal,
   createPatient,
   patientUpdate,
+  patientDelete,
   editPatient,
   closeModal,
   sortPatientHistory,

src/authentication/DemoSiteRequest.js

@@ -52,7 +52,7 @@ export class DemoSiteRequest {
   // TODO: Could be extracted to a helper file to be used elsewhere.
   // eslint-disable-next-line class-methods-use-this
   validateEmail(text) {
-    const reg = /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/;
+    const reg = /^[^\s@]+@[^\s@]+\.[^\s@]{2,}$/;
     return reg.test(text);
   }