tango-app-api-trax 3.7.71 → 3.7.72

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/controllers/handlebar-helper.js +5 -0
  3. package/src/controllers/internalTrax.controller.js +0 -1
  4. package/src/controllers/mobileTrax.controller.js +6 -6
  5. package/src/hbs/template.hbs +113 -107
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tango-app-api-trax",
3
- "version": "3.7.71",
3
+ "version": "3.7.72",
4
4
  "description": "Trax",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/controllers/handlebar-helper.js CHANGED
@@ -8,4 +8,9 @@ Handlebars.registerHelper( 'neq', function( a, b, options ) {
8
8
  return a !== b ? options.fn( this ) : options.inverse( this );
9
9
  } );
10
10
 
11
+ Handlebars.registerHelper( 'includes', function( array, value ) {
12
+ if ( !Array.isArray( array ) ) return false;
13
+ return array.includes( value );
14
+ } );
15
+
11
16
  export default Handlebars;
package/src/controllers/internalTrax.controller.js CHANGED
@@ -1380,7 +1380,6 @@ export async function insertTimeDelayFlags( req, res ) {
1380
1380
  time: '--',
1381
1381
  domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags`,
1382
1382
  type: 'delay',
1383
- answerType: [ 'yes/no', 'descriptive', 'multiplechoicesingle', 'multiplechoicemultiple', 'dropdown' ],
1384
1383
  };
1385
1384
  const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
1386
1385
  const htmlContent = handlebars.compile( fileContent );
package/src/controllers/mobileTrax.controller.js CHANGED
@@ -4705,7 +4705,7 @@ export async function downloadChecklist( req, res ) {
4705
4705
  let requestData = req.body;
4706
4706
 
4707
4707
  if ( !requestData.checklistId ) {
4708
- res.sendError( 'checklistId is Required' );
4708
+ return res.sendError( 'checklistId is Required', 400 );
4709
4709
  }
4710
4710
 
4711
4711
  let checklistDetails;
@@ -4757,18 +4757,18 @@ export async function downloadChecklist( req, res ) {
4757
4757
  if ( answer?.referenceImage?.trim() ) {
4758
4758
  answer.referenceImage = 'https://d1r0hc2sskgmri.cloudfront.net/'+answer.referenceImage;
4759
4759
  }
4760
- if ( answer.validationType == 'Capture Image' && answer?.validationAnswer?.trim() ) {
4760
+ if ( [ 'Capture Image', 'Capture Video' ].includes( answer.validationType ) && answer?.validationAnswer?.trim() ) {
4761
4761
  answer.validationAnswer = 'https://d1r0hc2sskgmri.cloudfront.net/'+answer.validationAnswer;
4762
4762
  }
4763
- if ( answer?.answer?.trim() && [ 'image', 'descriptiveImage', 'multipleImage', 'image/video' ].includes( question.answerType ) ) {
4763
+ if ( answer?.answer?.trim() && [ 'image', 'descriptiveImage', 'multipleImage', 'image/video', 'video' ].includes( question.answerType ) ) {
4764
4764
  answer.answer = 'https://d1r0hc2sskgmri.cloudfront.net/'+answer.answer;
4765
- if ( question.answerType == 'multipleImage' ) {
4766
- }
4767
4765
  }
4768
4766
  } );
4769
4767
  } );
4770
4768
  } );
4771
4769
 
4770
+ checklistDetails['validateType']=[ 'yes/no', 'descriptive', 'multiplechoicesingle', 'multiplechoicemultiple', 'dropdown', 'date', 'linearscale', 'time' ];
4771
+
4772
4772
  const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/template.hbs', 'utf8' );
4773
4773
  const template = handlebars.compile( templateHtml );
4774
4774
  const html = template( { data: checklistDetails } );
@@ -4821,6 +4821,6 @@ export async function downloadChecklist( req, res ) {
4821
4821
  return res.end( pdfBuffer );
4822
4822
  } catch ( e ) {
4823
4823
  logger.error( { functionName: 'getChecklistQuestionAnswers', error: e } );
4824
- return res.sendError( e );
4824
+ return res.sendError( e, 500 );
4825
4825
  }
4826
4826
  }
package/src/hbs/template.hbs CHANGED
@@ -198,124 +198,130 @@
198
198
  </div>
199
199
  {{#each questions}}
200
200
  <div style="padding-bottom:20px">
201
- <span class="question">{{qno}}.</span>&nbsp;<span class="question">{{qname}}</span>
202
- {{#each userAnswer}}
203
- <div class="px-4 answer">
204
- {{#neq ../answerType 'video'}}
205
- {{#neq ../answerType 'image'}}
206
- {{#neq ../answerType 'descriptiveImage'}}
207
- {{#neq ../answerType 'multipleImage'}}
208
- {{#eq sopFlag true }}
209
- <span id="agreed" style="color:red">{{answer}}</span><br>
210
- {{/eq}}
211
- {{#eq sopFlag false }}
212
- <span id="agreed">{{answer}}</span><br>
213
- {{/eq}}
214
- {{#neq validationAnswer ''}}
215
- {{#eq validationType 'Capture Image'}}
216
- <img src = "{{validationAnswer}}" alt="test" width="200" height="180">
217
- {{/eq}}
218
- {{#neq validationType 'Capture Image'}}
219
- {{validationAnswer}}
220
- {{/neq}}
221
- {{/neq}}
222
- {{/neq}}
201
+ {{#if userAnswer.length}}
202
+ <span class="question">{{qno}}.</span>&nbsp;<span class="question">{{qname}}</span>
203
+ {{#each userAnswer}}
204
+ <div class="px-4 answer">
205
+ {{#if (includes ../../../data.validateType ../answerType)}}
206
+ {{#eq sopFlag true }}
207
+ <span id="agreed" style="color:red">{{answer}}</span><br>
208
+ {{/eq}}
209
+ {{#eq sopFlag false }}
210
+ <span id="agreed">{{answer}}</span><br>
211
+ {{/eq}}
212
+ {{#neq validationAnswer ''}}
213
+ {{#eq validationType 'Capture Image'}}
214
+ <img src = "{{validationAnswer}}" alt="test" width="200" height="180">
215
+ {{/eq}}
216
+ {{#eq validationType 'Capture Video'}}
217
+ <a href="{{validationAnswer}}" target="_blank" style="text-decoration: underline;color:#0085D2" id="agreed">{{validationAnswer}}</a><br>
218
+ {{/eq}}
219
+ {{#eq validationType 'Descriptive Answer'}}
220
+ {{validationAnswer}}
221
+ {{/eq}}
223
222
  {{/neq}}
224
- {{/neq}}
225
- {{/neq}}
226
- {{#eq ../answerType 'video'}}
227
- <a href="{{answer}}" target="_blank" style="text-decoration: underline;color:#0085D2"
228
- id="agreed">{{answer}}</a><br>
229
- {{/eq}}
230
- {{#eq ../answerType 'image'}}
231
- {{!-- {{#each ../answers}} --}}
232
- <table style="width:100%">
233
- <tr>
234
- {{#neq referenceImage ''}}
223
+ {{/if}}
224
+ {{#eq ../answerType 'video'}}
225
+ <a href="{{answer}}" target="_blank" style="text-decoration: underline;color:#0085D2"
226
+ id="agreed">{{answer}}</a><br>
227
+ {{/eq}}
228
+ {{#eq ../answerType 'image'}}
229
+ {{!-- {{#each ../answers}} --}}
230
+ <table style="width:100%">
231
+ <tr>
232
+ {{#neq referenceImage ''}}
233
+ <td style="width:50%">
234
+ <div class="Reference"><span>Reference Image</span><br>
235
+ <img src="{{referenceImage}}" width="200" height="180" />
236
+ </div>
237
+ </td>
238
+ {{/neq}}
235
239
  <td style="width:50%">
236
- <div class="Reference"><span>Reference Image</span><br>
237
- <img src="{{referenceImage}}" width="200" height="180" />
240
+ <div class="Reference"><span>Uploaded Image</span><br>
241
+ <img src="{{answer}}" width="200" height="180" />
238
242
  </div>
239
243
  </td>
240
- {{/neq}}
244
+ </tr>
245
+ </table>
246
+ {{!-- {{/each}} --}}
247
+ {{/eq}}
248
+ {{#eq ../answerType 'multipleImage'}}
249
+ {{!-- {{#each ../answers}} --}}
250
+ <table style="width:100%">
251
+ <tr>
252
+ {{#neq referenceImage ''}}
253
+ <td style="width:50%">
254
+ <div class="Reference"><span>Reference Image</span><br>
255
+ <img src="{{referenceImage}}" width="200" height="180" />
256
+ </div>
257
+ </td>
258
+ {{/neq}}
259
+ <td style="width:50%">
260
+ <div class="Reference"><span>Uploaded Image</span><br>
261
+ <img src="{{answer}}" width="200" height="180" />
262
+ </div>
263
+ </td>
264
+ </tr>
265
+ </table>
266
+ {{!-- {{/each}} --}}
267
+ {{/eq}}
268
+ {{#eq ../answerType 'image/video'}}
269
+ {{!-- {{#each ../answers}} --}}
270
+ <table style="width:100%">
271
+ <tr>
272
+ {{#neq referenceImage ''}}
273
+ <td style="width:50%">
274
+ <div class="Reference"><span>Reference Image</span><br>
275
+ <img src="{{referenceImage}}" width="200" height="180" />
276
+ </div>
277
+ </td>
278
+ {{/neq}}
279
+ {{#eq answerType 'image'}}
241
280
  <td style="width:50%">
242
281
  <div class="Reference"><span>Uploaded Image</span><br>
243
282
  <img src="{{answer}}" width="200" height="180" />
244
283
  </div>
245
284
  </td>
246
- </tr>
247
- </table>
285
+ {{/eq}}
286
+ {{#eq answerType 'video'}}
287
+ <td style="width:50%">
288
+ <a href="{{answer}}" target="_blank" style="text-decoration: underline;color:#0085D2" id="agreed">{{answer}}</a><br>
289
+ </td>
290
+ {{/eq}}
291
+ </tr>
292
+ </table>
248
293
  {{!-- {{/each}} --}}
249
- {{/eq}}
250
- {{#eq ../answerType 'multipleImage'}}
251
- {{!-- {{#each ../answers}} --}}
252
- <table style="width:100%">
253
- <tr>
254
- {{#neq referenceImage ''}}
255
- <td style="width:50%">
256
- <div class="Reference"><span>Reference Image</span><br>
257
- <img src="{{referenceImage}}" width="200" height="180" />
258
- </div>
259
- </td>
260
- {{/neq}}
261
- <td style="width:50%">
262
- <div class="Reference"><span>Uploaded Image</span><br>
263
- <img src="{{answer}}" width="200" height="180" />
264
- </div>
265
- </td>
266
- </tr>
267
- </table>
268
- {{!-- {{/each}} --}}
269
- {{/eq}}
270
- {{#eq ../answerType 'image/video'}}
271
- {{!-- {{#each ../answers}} --}}
272
- <table style="width:100%">
273
- <tr>
274
- {{#neq referenceImage ''}}
275
- <td style="width:50%">
276
- <div class="Reference"><span>Reference Image</span><br>
277
- <img src="{{referenceImage}}" width="200" height="180" />
278
- </div>
279
- </td>
280
- {{/neq}}
281
- <td style="width:50%">
282
- <div class="Reference"><span>Uploaded Image</span><br>
283
- <img src="{{answer}}" width="200" height="180" />
284
- </div>
285
- </td>
286
- </tr>
287
- </table>
288
- {{!-- {{/each}} --}}
289
- {{/eq}}
290
- {{#eq ../answerType 'descriptiveImage'}}
291
- {{!-- {{#each ../answers}} --}}
292
- <table style="width:100%">
293
- <tr>
294
- {{#neq referenceImage ''}}
295
- <td style="width:50%">
296
- <div class="Reference"><span>Reference Image</span><br>
297
- <img src="{{referenceImage}}" width="200" height="180" />
298
- </div>
299
- </td>
300
- {{/neq}}
301
- <td style="width:50%">
302
- <div class="Reference"><span>Uploaded Image</span><br>
303
- <img src="{{answer}}" width="200" height="180" />
304
- </div>
305
- </td>
306
- </tr>
307
- </table>
308
- {{!-- {{/each}} --}}
309
- {{/eq}}
310
- </div>
311
- {{/each}}
312
- {{#neq answerType 'descriptive'}}
313
- {{#neq remarks ''}}
314
- <div class="mt-8">
315
- <span id="remarks">Remarks: {{remarks}}</span><br>
316
- </div>
294
+ {{/eq}}
295
+ {{#eq ../answerType 'descriptiveImage'}}
296
+ {{!-- {{#each ../answers}} --}}
297
+ <table style="width:100%">
298
+ <tr>
299
+ {{#neq referenceImage ''}}
300
+ <td style="width:50%">
301
+ <div class="Reference"><span>Reference Image</span><br>
302
+ <img src="{{referenceImage}}" width="200" height="180" />
303
+ </div>
304
+ </td>
305
+ {{/neq}}
306
+ <td style="width:50%">
307
+ <div class="Reference"><span>Uploaded Image</span><br>
308
+ <img src="{{answer}}" width="200" height="180" />
309
+ </div>
310
+ </td>
311
+ </tr>
312
+ </table>
313
+ {{!-- {{/each}} --}}
314
+ {{/eq}}
315
+ </div>
316
+ {{/each}}
317
+ {{#neq answerType 'descriptive'}}
318
+ {{#neq remarks ''}}
319
+ <div class="mt-8">
320
+ <span id="remarks">Remarks: {{remarks}}</span><br>
321
+ </div>
322
+ {{/neq}}
317
323
  {{/neq}}
318
- {{/neq}}
324
+ {{/if}}
319
325
  </div>
320
326
  {{/each}}
321
327
  </div>