@quesmed/types-rn 2.5.63 → 2.5.65

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/resolvers/query/restricted/preset.js +2 -2
  3. package/utils/commonFunctions.js +13 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@quesmed/types-rn",
3
- "version": "2.5.63",
3
+ "version": "2.5.65",
4
4
  "description": "Typescript types for Quesmed",
5
5
  "keywords": [
6
6
  "quesmed",
package/resolvers/query/restricted/preset.js CHANGED
@@ -46,9 +46,9 @@ exports.PRESETS = (0, client_1.gql) `
46
46
  }
47
47
  `;
48
48
  exports.PRESET = (0, client_1.gql) `
49
- query Preset($id: Int) {
49
+ query Preset($id: Int!) {
50
50
  restricted {
51
- presets(id: $id) {
51
+ preset(id: $id) {
52
52
  id
53
53
  createdAt
54
54
  updatedAt
package/utils/commonFunctions.js CHANGED
@@ -109,14 +109,19 @@ function formatPrescribeAnswer(baseAnswer) {
109
109
  }
110
110
  obj.duration.value = [...durationMatches].filter((x) => !!x).join(',');
111
111
  const orgFrequencyValue = obj.frequency.value.toLowerCase();
112
+ const timesPerDay = obj.frequency.value.includes('times per day') ||
113
+ obj.frequency.value.includes('times a day');
114
+ // remove whitespace for processing
112
115
  obj.frequency.value = orgFrequencyValue.replace(/\s/g, '');
116
+ const freqWordsToInt = (0, wordsToNumber_1.wordsToNumber)(orgFrequencyValue, true);
113
117
  const frequencyIncHourly = obj.frequency.value.includes('hour');
114
- const hourlyFreqInt = parseInt(obj.frequency.value);
118
+ const textToInt = parseInt(obj.frequency.value);
115
119
  if (obj.frequency.value === 'once-off') {
116
120
  obj.frequency.value = 'stat';
117
121
  }
118
122
  else if (obj.frequency.value.includes('once') ||
119
- (frequencyIncHourly && hourlyFreqInt === 24)) {
123
+ (frequencyIncHourly && textToInt === 24) ||
124
+ (timesPerDay && freqWordsToInt === 1)) {
120
125
  obj.frequency.value = 'od';
121
126
  }
122
127
  else if (obj.frequency.value.includes('nightly') ||
@@ -124,14 +129,17 @@ function formatPrescribeAnswer(baseAnswer) {
124
129
  obj.frequency.value = 'od';
125
130
  }
126
131
  else if (obj.frequency.value.includes('twice') ||
127
- (frequencyIncHourly && hourlyFreqInt === 12)) {
132
+ (frequencyIncHourly && textToInt === 12) ||
133
+ (timesPerDay && freqWordsToInt === 2)) {
128
134
  obj.frequency.value = 'bd';
129
135
  }
130
136
  else if (obj.frequency.value.includes('trice') ||
131
- (frequencyIncHourly && hourlyFreqInt === 8)) {
137
+ (frequencyIncHourly && textToInt === 8) ||
138
+ (timesPerDay && freqWordsToInt === 3)) {
132
139
  obj.frequency.value = 'tds';
133
140
  }
134
- else if (frequencyIncHourly && hourlyFreqInt === 6) {
141
+ else if ((frequencyIncHourly && textToInt === 6) ||
142
+ (timesPerDay && freqWordsToInt === 4)) {
135
143
  obj.frequency.value = 'qds';
136
144
  }
137
145
  else if (!ACCEPTED_FREQ.includes(obj.frequency.value)) {