Merge pull request #26 from jaroslavhuss/core-architecture

localhost precommit

client/src/GLOBAL_URL.ts

@@ -1,3 +1,3 @@
-export const GLOBAL_URL: string = "https://vpsli4228.a24vps.com/uuiot";
-//
+export const GLOBAL_URL: string = "http://localhost:5001";
+//https://vpsli4228.a24vps.com/uuiot
 //http://localhost:5001

client/src/routes/iotDashboard.tsx

@@ -26,7 +26,7 @@ interface IHumidity {
 interface ITemperature {
     date: string
     gw: string
-    humidity: number
+    temperature: number
     __v: number
     _id: number
 }
@@ -107,8 +107,17 @@ const StudentsDashboard = () => {
 
             const humidityData: IHumidity[] = await responseHumidity.json();
             const temperatureData: ITemperature[] = await responseTemperature.json();
-
+            humidityData.forEach((h) => {
+                const niceDate = new Date(h.date).toLocaleDateString() + " " + new Date(h.date).toLocaleTimeString();
+                h.date = niceDate;
+                h.humidity = parseFloat(h.humidity.toFixed(1));
+            })
             setHumidity(humidityData)
+            temperatureData.forEach((h: ITemperature) => {
+                const niceDate = new Date(h.date).toLocaleDateString() + " " + new Date(h.date).toLocaleTimeString();
+                h.date = niceDate;
+                h.temperature = parseFloat(h.temperature.toFixed(1));
+            })
             setTemperature(temperatureData);
             setIsLoading(false);
         } catch (error) {
@@ -144,11 +153,11 @@ const StudentsDashboard = () => {
                         From:{" "}
                         <input value={startDate.toISOString().substring(0, 10)} type="date" onChange={(e: any) => {
                             setStartDate(new Date(e.target.value))
-                        }} max={todayFunciton().toISOString().substring(0, 10)} />{" "}
+                        }} max={endDate.toISOString().substring(0, 10)} />{" "}
                         To:{" "}
                         <input value={endDate.toISOString().substring(0, 10)} type="date" onChange={(e: any) => {
                             setEndDate(new Date(e.target.value))
-                        }} max={todayFunciton().toISOString().substring(0, 10)} />
+                        }} max={todayFunciton().toISOString().substring(0, 10)} min={startDate.toISOString().substring(0, 10)} />
                         {"  "}
                         <span onClick={() => {
                             getDataFromGW(gwID, startDate, endDate);

server/dist/gateway/gateway.controller.d.ts

@@ -1,7 +1,4 @@
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/connection" />
-/// <reference types="mongoose" />
+import { BadRequestException } from '@nestjs/common';
 import { createGateWayDto, GatewaySaveHumidityDto, GatewaySaveTemperatureDto } from './dto';
 import { GatewayService } from './gateway.service';
 export declare class GatewayController {
@@ -13,7 +10,7 @@ export declare class GatewayController {
     saveTemperature(body: GatewaySaveTemperatureDto[], gateway: any): Promise<import("@nestjs/common").InternalServerErrorException | (import("../schemas").Temperature & import("mongoose").Document<any, any, any> & {
         _id: any;
     })[]>;
-    createGateWay(dto: createGateWayDto, user: any): Promise<import("@nestjs/common").BadRequestException | (import("../schemas").Gateway & import("mongoose").Document<any, any, any> & {
+    createGateWay(dto: createGateWayDto, user: any): Promise<BadRequestException | (import("../schemas").Gateway & import("mongoose").Document<any, any, any> & {
         _id: any;
     })>;
     getAllGateways(): Promise<(import("../schemas").Gateway & import("mongoose").Document<any, any, any> & {
@@ -26,14 +23,10 @@ export declare class GatewayController {
         id: string;
         startDate: string;
         endDate: string;
-    }): Promise<import("@nestjs/common").BadRequestException | (import("../schemas").Humidity & import("mongoose").Document<any, any, any> & {
-        _id: any;
-    })[]>;
+    }): Promise<any[] | BadRequestException>;
     getGateWayTemperatureData(body: {
         id: string;
         startDate: string;
         endDate: string;
-    }): Promise<import("@nestjs/common").BadRequestException | (import("../schemas").Temperature & import("mongoose").Document<any, any, any> & {
-        _id: any;
-    })[]>;
+    }): Promise<any[] | BadRequestException>;
 }

server/dist/gateway/gateway.service.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="mongoose/types/pipelinestage" />
-/// <reference types="mongoose/types/error" />
-/// <reference types="mongoose/types/connection" />
 import { BadRequestException, InternalServerErrorException } from '@nestjs/common';
 import { Gateway, GatewayDocument, Humidity, HumidityDocument, Temperature, TemperatureDocument } from 'src/schemas';
 import { Model } from 'mongoose';
@@ -10,9 +7,9 @@ export declare class GatewayService {
     private humidityModel;
     private temperatureModel;
     constructor(gatewayModel: Model<GatewayDocument>, humidityModel: Model<HumidityDocument>, temperatureModel: Model<TemperatureDocument>);
-    createGateway(dto: createGateWayDto): Promise<BadRequestException | (Gateway & import("mongoose").Document<any, any, any> & {
+    createGateway(dto: createGateWayDto): Promise<(Gateway & import("mongoose").Document<any, any, any> & {
         _id: any;
-    })>;
+    }) | BadRequestException>;
     getAllGateways(): Promise<(Gateway & import("mongoose").Document<any, any, any> & {
         _id: any;
     })[]>;
@@ -25,10 +22,6 @@ export declare class GatewayService {
     saveTemperature(data: GatewaySaveTemperatureDto): Promise<InternalServerErrorException | (Temperature & import("mongoose").Document<any, any, any> & {
         _id: any;
     })[]>;
-    getHumidity(id: string, startDate: any, endDate: any): Promise<BadRequestException | (Humidity & import("mongoose").Document<any, any, any> & {
-        _id: any;
-    })[]>;
-    getTemperature(id: string, startDate: string, endDate: string): Promise<BadRequestException | (Temperature & import("mongoose").Document<any, any, any> & {
-        _id: any;
-    })[]>;
+    getHumidity(id: string, startDate: any, endDate: any): Promise<any[] | BadRequestException>;
+    getTemperature(id: string, startDate: string, endDate: string): Promise<any[] | BadRequestException>;
 }