Produced by Araxis Merge on 4/2/2019 1:08:02 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\ARS_Frontend\ars-app\src\app\fpps\home | home.service.ts | Wed Mar 27 19:18:32 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\ARS_Frontend\ars-app\src\app\fpps\home | home.service.ts | Thu Mar 28 18:00:30 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 3 | 116 |
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 | import { I njectable } from '@a ngular/cor e'; | |
2 | import { H ttp, Respo nse } from '@angular /http'; | |
3 | import { H ttpClient } from '@a ngular/com mon/http'; | |
4 | import { B ehaviorSub ject } fro m 'rxjs/Be haviorSubj ect'; | |
5 | import 'rx js/add/ope rator/map' ; | |
6 | import { U serInfoMod el } from './user.in fo.model'; | |
7 | ||
8 | import { U serFacilit yData } fr om './home .model'; | |
9 | // import 'rxjs/add/ operator/d o'; | |
10 | // import 'rxjs/add/ operator/c atch'; | |
11 | import { e nvironment } from '. /../../../ environmen ts/environ ment'; | |
12 | @Injectabl e() | |
13 | export cla ss HomeSer vice { | |
14 | private selectedSt ations: an y[]; | |
15 | selected StationNot ifier$: Be haviorSubj ect<any> = new Behav iorSubject (null); | |
16 | construc tor(privat e http: Ht tp, privat e _http: H ttpClient) { | |
17 | if (se ssionStora ge.getItem ('activeSt ations')) { | |
18 | this .selectedS tations = JSON.parse ( | |
19 | se ssionStora ge.getItem ('activeSt ations') | |
20 | ); | |
21 | this .selectedS tationNoti fier$.next (this.sele ctedStatio ns); | |
22 | } | |
23 | } | |
24 | refreshS tats(userN ame) { | |
25 | return this._htt p.get<User FacilityDa ta>( | |
26 | `${e nvironment .nodeserve r}/login/r efreshStat s/${userNa me}`, | |
27 | { wi thCredenti als: true } | |
28 | ); | |
29 | // ret urn this.h ttp | |
30 | // .g et(`${envi ronment.no deserver}/ login/refr eshStats/$ {userName} `, {withCr edentials: true}) | |
31 | // .m ap((respon se: Respon se) => res ponse.json ()); | |
32 | } | |
33 | getUserF acilities( userName) { | |
34 | return this._htt p.post( | |
35 | `${e nvironment .nodeserve r}/home/ge tUserFacil ities`, | |
36 | { userName : AI }, | |
37 | { wi thCredenti als: true } | |
38 | ); | |
39 | // ret urn this.h ttp | |
40 | // .post(`${e nvironment .nodeserve r}/home/ge tUserFacil ities`, { userName: AI }, {withCr edentials: true}) | |
41 | // .m ap((respon se: Respon se) => res ponse.json ()); | |
42 | } | |
43 | ||
44 | getUserI nfo(userNa me) { | |
45 | return this._htt p.post<Use rInfoModel >( | |
46 | `${e nvironment .nodeserve r}/fppsLog in/roles`, | |
47 | { | |
48 | us erName | |
49 | } | |
50 | ); | |
51 | } | |
52 | ||
53 | setActiv eStations( selectedSt ations) { | |
54 | this.s electedSta tions = se lectedStat ions; | |
55 | this.s electedSta tionNotifi er$.next(t his.select edStations ); | |
56 | } | |
57 | getActiv eStaions() { | |
58 | return this.sele ctedStatio ns; | |
59 | } | |
60 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.