diff --git a/app/src/app/socket.service.ts b/app/src/app/socket.service.ts index 9bd2c19..2825aa2 100644 --- a/app/src/app/socket.service.ts +++ b/app/src/app/socket.service.ts @@ -37,7 +37,7 @@ export class WebsocketService { getOrder() { return new Observable((observer) => { - this.socket.on('meals', (message) => { + this.socket.on('meal', (message) => { observer.next(message); }); }); diff --git a/server/src/services/Meal.ts b/server/src/services/Meal.ts index 4120f44..4273c85 100644 --- a/server/src/services/Meal.ts +++ b/server/src/services/Meal.ts @@ -13,14 +13,16 @@ export class Meal { for (const scale of this.buffet.scaleList) { const currentWeight = scale.getCurrentWeight(); let previousWeight = scale.getPreviousWeight(); - let measureSeconds = scale.getMeasureSeconds(); + let measuredSeconds = scale.getMeasuredSeconds(); - if (previousWeight === currentWeight && currentWeight > 0) { - measureSeconds = measureSeconds += time; + if (previousWeight === currentWeight) { + measuredSeconds = measuredSeconds += time; } else { - measureSeconds = 0; + measuredSeconds = 0; } + scale.setMeasuredSeconds(measuredSeconds); + const buffetType = this.generateBuffetType(currentWeight); const total = this.generateTotal(currentWeight); @@ -30,9 +32,9 @@ export class Meal { const datetime = new Date().toLocaleString("pt-BR"); - if (measureSeconds >= orderSeconds) { + if (measuredSeconds >= orderSeconds) { this.socket.emit( - "order", + "meal", JSON.stringify({ weight: currentWeight, buffetType, @@ -40,12 +42,9 @@ export class Meal { datetime, }) ); - previousWeight = 0; - measureSeconds = 0; + scale.setPreviosWeight(0); + scale.setMeasuredSeconds(0); } - - scale.setMeasureseconds(measureSeconds); - scale.setPreviosWeight(previousWeight); } }, time); } diff --git a/server/src/services/Scale.ts b/server/src/services/Scale.ts index 77be38c..2bd7d06 100644 --- a/server/src/services/Scale.ts +++ b/server/src/services/Scale.ts @@ -9,7 +9,7 @@ export class Scale { private serialPort: SerialPort; private unitOfMeasurement = ""; private currentWeight = 0; - private measureSeconds = 0; + private measuredSeconds = 0; private previosWeight = 0; constructor( @@ -54,11 +54,11 @@ export class Scale { this.previosWeight = weight; } - public getMeasureSeconds(): number { - return this.measureSeconds; + public getMeasuredSeconds(): number { + return this.measuredSeconds; } - public setMeasureseconds(seconds: number): void { - this.measureSeconds = seconds; + public setMeasuredSeconds(seconds: number): void { + this.measuredSeconds = seconds; } }