Archive/rdio-scanner
1
0
Fork 0
mirror of https://github.com/chuot/rdio-scanner.git synced 2026-08-13 16:33:01 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

The call time now takes into account the reading progress

Browse source
This commit is contained in:
Chrystian Huot 2019-07-31 16:37:16 -04:00
parent fbb40f501c
commit ae19c079f7
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/imports/app/radio/radio-display/radio-display.component.html
View file

@ -19,7 +19,7 @@
<span>{{ currentCall ? currentCall.talkgroupData?.alphaTag : 'Alpha Tag' }}</span> <span>{{ currentCall ? currentCall.talkgroupData?.alphaTag : 'Alpha Tag' }}</span>
</div> </div>
<div> <div>
<span>{{ currentCall ? (currentCall.startTime | date:'HH:mm') : '00:00' }}</span> <span>{{ currentCall ? (currentTime | date:'HH:mm') : '00:00' }}</span>
</div> </div>
</div> </div>
<div> <div>

34
client/imports/app/radio/radio-display/radio-display.component.ts
View file

@ -17,6 +17,7 @@ export class AppRadioDisplayComponent implements OnDestroy, OnInit {
currentError = 0; currentError = 0;
currentFrequency = 0; currentFrequency = 0;
currentSpike = 0; currentSpike = 0;
currentTime: Date;
currentUnit = 0; currentUnit = 0;
history = new Array<RadioCall>(5); history = new Array<RadioCall>(5);
live = false; live = false;
@ -40,16 +41,17 @@ export class AppRadioDisplayComponent implements OnDestroy, OnInit {
} }
private _handleRadioCallEvent(event: RadioEvent): void { private _handleRadioCallEvent(event: RadioEvent): void {
if ( if (
'call' in event && 'call' in event &&
event.call !== null && event.call !== null &&
event.call !== this.currentCall && event.call !== this.currentCall &&
!this.history.find((call) => call === event.call) !this.history.find((call) => call === event.call)
) { ) {
this.history.pop(); this.history.pop();
this.history.unshift(this.currentCall); this.history.unshift(this.currentCall);
this.currentCall = event.call; this.currentCall = event.call;
} this.currentTime = event.call.startTime;
}
} }
private _handleRadioLiveEvent(event: RadioEvent): void { private _handleRadioLiveEvent(event: RadioEvent): void {
@ -75,12 +77,24 @@ export class AppRadioDisplayComponent implements OnDestroy, OnInit {
const currentError = currentFreq && currentFreq.errorCount; const currentError = currentFreq && currentFreq.errorCount;
const currentFrequency = (currentFreq && currentFreq.freq); const currentFrequency = (currentFreq && currentFreq.freq);
const currentSpike = currentFreq && currentFreq.spikeCount; const currentSpike = currentFreq && currentFreq.spikeCount;
const currentUnit = currentSrc && currentSrc.src; const currentUnit = currentSrc && currentSrc.src;
this.currentError = typeof currentError === 'number' ? currentError : 0; this.currentError = typeof currentError === 'number' ? currentError : 0;
this.currentFrequency = typeof currentFrequency === 'number' ? currentFrequency : this.currentCall.freq; this.currentFrequency = typeof currentFrequency === 'number' ? currentFrequency : this.currentCall.freq;
this.currentSpike = typeof currentSpike === 'number' ? currentSpike : 0; this.currentSpike = typeof currentSpike === 'number' ? currentSpike : 0;
this.currentUnit = typeof currentUnit === 'number' ? currentUnit : 0; this.currentUnit = typeof currentUnit === 'number' ? currentUnit : 0;
if (this.currentCall && this.currentCall.startTime instanceof Date) {
this.currentTime = new Date(
this.currentCall.startTime.getFullYear(),
this.currentCall.startTime.getMonth(),
this.currentCall.startTime.getDate(),
this.currentCall.startTime.getHours(),
this.currentCall.startTime.getMinutes(),
this.currentCall.startTime.getSeconds() + event.time
);
}
} }
} }