Produced by Araxis Merge on 12/7/2018 11:36:22 AM Central Standard 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:\SCRUB\MHED\MHED\VATS 2.3.0\var-utility-web-2.3.0@19406cb7810\app\src\container\components\footer | footer_controller.js | Thu Sep 13 18:55:48 2018 UTC |
| 2 | C:\MHED-scrubbed\MHED\MHED\VATS 2.3.0\var-utility-web-2.3.0@19406cb7810\app\src\container\components\footer | footer_controller.js | Fri Dec 7 13:49:46 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 62 |
| Changed | 2 | 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 pp', 'page _service'] , function (app) { | |
| 2 | "u se strict" ; | |
| 3 | ap p.controll er('Footer Controller ', functio n ($scope, mhpuser, authentica tionServic e, config, pageServi ce) { | |
| 4 | $scope. V s ID
|
|
| 5 | $sco pe.advocat eForName = null; | |
| 6 | $sco pe.facilit yName = nu ll; | |
| 7 | $sco pe.appVers ion = conf ig.app.tit le + ' - v ' + pageSe rvice.getV ersionNumb er(); | |
| 8 | ||
| 9 | if ( authentica tionServic e.isAuthen ticated()) { | |
| 10 | mhpuse r.fetch(). then(funct ion (user) { | |
| 11 | loadUser Details(us er); | |
| 12 | }); | |
| 13 | } | |
| 14 | ||
| 15 | func tion loadU serDetails (user) { | |
| 16 | if (us er) { | |
| 17 | $scope. V s ID
|
|
| 18 | ||
| 19 | if (isAd vocate(use r)) { | |
| 20 | $scope.adv ocateForNa me = user. patient.di splayName; | |
| 21 | } else i f (user.fa cilityName ) { | |
| 22 | $scope.fac ilityName = user.fac ilityName; | |
| 23 | } | |
| 24 | } | |
| 25 | } | |
| 26 | ||
| 27 | func tion isAdv ocate(user ) { | |
| 28 | return user.pati ent.patien tIdentifie r !== null | |
| 29 | && user. patient.pa tientIdent ifier.uniq ueId !== n ull | |
| 30 | && user. id !== use r.patient. patientIde ntifier.un iqueId; | |
| 31 | }; | |
| 32 | }) ; | |
| 33 | }); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.