Name changes for future

This commit is contained in:
2017-04-05 11:05:36 +02:00
parent 0b6b63df4f
commit ce08741718
6 changed files with 11 additions and 11 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+4 -4
View File
@@ -56,13 +56,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
var DataService = (function () {
function DataService(http) {
this.http = http;
this.baseUrl = '/webapi/data';
this.dashboardURL = '/webapi/dashboard';
}
DataService.prototype.get = function () {
DataService.prototype.dashboard = function () {
var lineChartData$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get(("" + this.baseUrl), { headers: this.getHeaders() })
.get(("" + this.dashboardURL), { headers: this.getHeaders() })
.map(mapData);
return lineChartData$;
};
@@ -323,7 +323,7 @@ var LineChartComponent = (function () {
LineChartComponent.prototype.ngOnInit = function () {
var _this = this;
this.dataService
.get()
.dashboard()
.subscribe(function (res) {
console.log("Received from service:");
console.log(res);
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -50,7 +50,7 @@ router.get('/', function(req, res) {
router.get('/data', function(req, res) {
router.get('/dashboard', function(req, res) {
connection.query(
'SELECT TOE1`, time FROM measurement ORDER BY time DESC LIMIT 0,10',
+1 -1
View File
@@ -43,7 +43,7 @@ export class LineChartComponent implements OnInit {
ngOnInit(): void {
this.dataService
.get()
.dashboard()
.subscribe(res => {
console.log("Received from service:");
console.log(res);
+3 -3
View File
@@ -9,15 +9,15 @@ import { LabelData } from './label-data';
@Injectable()
export class DataService {
private baseUrl: string = '/webapi/data';
private dashboardURL: string = '/webapi/dashboard';
constructor(private http : Http){}
get(): Observable<GraphData> {
dashboard(): Observable<GraphData> {
let lineChartData$ =
//<LineData>( {data: [65, 59, 80, 81, 56, 55, 40], label: 'Series A'} );
this.http
.get((`${this.baseUrl}`)
.get((`${this.dashboardURL}`)
, {headers: this.getHeaders()})
.map(mapData);