Produced by Araxis Merge on 4/8/2019 1:00:39 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\crp-fitheart-release-2.0\app\src\modules\trackers-fhir | fitness_main_fhir_service.js | Wed Mar 20 17:30:00 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\MHED P3 Healthshare 2.0-redacted\crp-fitheart-release-2.0\app\src\modules\trackers-fhir | fitness_main_fhir_service.js | Mon Apr 8 16:47:06 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 210 |
| Changed | 1 | 4 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | define(['a ngular', ' app', 'Tra ckersFHIRS ervice'], function ( angular, a pp) { | |
| 2 | 'use s trict'; | |
| 3 | ||
| 4 | app.se rvice('Fit nessMainFH IRService' , function (Trackers FHIRServic e) { | |
| 5 | va r emptyAct ivityResou rce = { | |
| 6 | meta: { | |
| 7 | tag: [ | |
| 8 | { | |
| 9 | 'system': 'https://w iki.mobile health. DOMAIN . EXT /display/P GDMS/Clien t+Provenan ce+Mapping ', | |
| 10 | 'code' : ' REDACTED ', | |
| 11 | 'displ ay': 'VA F itHeart' | |
| 12 | } | |
| 13 | ], | |
| 14 | }, | |
| 15 | code: {c oding: [{s ystem: 'ht tp://loinc .org',code : '55409-7 ',display: 'Exercise Tracking Panel'}] | |
| 16 | }, | |
| 17 | extensio n: [ | |
| 18 | { | |
| 19 | 'url': 'ph ysical-act ivity-cate gory', | |
| 20 | 'valueStri ng': 'goal ' | |
| 21 | }, | |
| 22 | { | |
| 23 | 'url': 'st eps', | |
| 24 | 'valueStri ng': '' | |
| 25 | }, | |
| 26 | { | |
| 27 | 'url': 'pr ogress', | |
| 28 | 'valueInte ger': 0 | |
| 29 | }, | |
| 30 | { | |
| 31 | 'url': 'ac tiveFlag', | |
| 32 | 'valueStri ng': 'fals e' | |
| 33 | }, | |
| 34 | { | |
| 35 | 'url': 'st artDate', | |
| 36 | 'valueStri ng': '' | |
| 37 | }, | |
| 38 | { | |
| 39 | 'url': 'en dDate', | |
| 40 | 'valueStri ng': '' | |
| 41 | } | |
| 42 | ], | |
| 43 | componen t: [ | |
| 44 | ||
| 45 | { | |
| 46 | code: {cod ing: [{sys tem: 'http ://loinc.o rg',code: '55411-3', display: ' Exercise D uration'}] }, | |
| 47 | valueQuant ity: {unit : "minutes "}, | |
| 48 | }, | |
| 49 | { | |
| 50 | code: {cod ing: [{sys tem: 'http ://loinc.o rg',code: '55412-1', display: ' Exercise D istance'}] }, | |
| 51 | valueQuant ity: {unit : "miles"} , | |
| 52 | }, | |
| 53 | { | |
| 54 | code: {cod ing: [{sys tem: 'http ://snomed. info/sct', code: '740 08-4',disp lay: 'Exer cise Inten sity'}]}, | |
| 55 | valueStrin g: "Easy", | |
| 56 | }, | |
| 57 | { | |
| 58 | code: {cod ing: [{sys tem: 'http ://loinc.o rg',code: '73985-4', display: ' Exercise A ctivity'}] }, | |
| 59 | valueStrin g: "Cyclin g", | |
| 60 | } | |
| 61 | ||
| 62 | ] | |
| 63 | } | |
| 64 | ||
| 65 | ||
| 66 | ||
| 67 | ||
| 68 | ||
| 69 | ||
| 70 | ||
| 71 | ||
| 72 | re turn angul ar.extend( {}, angula r.copy(Tra ckersFHIRS ervice), { | |
| 73 | code: 'h ttp://loin c.org|5540 9-7', | |
| 74 | supports Latest: tr ue, | |
| 75 | ||
| 76 | ||
| 77 | buildRes ource: fun ction (ngM odel) { | |
| 78 | Trac kersFHIRSe rvice.buil dResource( ngModel); | |
| 79 | ||
| 80 | ||
| 81 | ||
| 82 | ngMo del.compon ent = ngMo del.compon ent.map(fu nction (it em) { | |
| 83 | ||
| 84 | // convert string nu mbers back to regula r int | |
| 85 | if (item.h asOwnPrope rty('value Quantity') ) { | |
| 86 | item.v alueQuanti ty.value = parseInt( item.value Quantity.v alue); | |
| 87 | } | |
| 88 | return ite m; | |
| 89 | }); | |
| 90 | ||
| 91 | retu rn ngModel ; | |
| 92 | }, | |
| 93 | ||
| 94 | createEm pty: funct ion () { | |
| 95 | var emptyResou rce = angu lar.copy(e mptyActivi tyResource ); | |
| 96 | ||
| 97 | retu rn angular .extend({} , Trackers FHIRServic e.createEm pty(), emp tyResource ); | |
| 98 | }, | |
| 99 | ||
| 100 | transfor mItem: fun ction (ite m) { | |
| 101 | Trac kersFHIRSe rvice.tran sformItem( item); | |
| 102 | ||
| 103 | ||
| 104 | } | |
| 105 | }) ; | |
| 106 | }); | |
| 107 | }); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.