change restart order (on config) + hide time settings when disabled

This commit is contained in:
Cedric Verstraeten
2022-09-03 20:07:26 +02:00
parent ce4693cb0e
commit 235641cf72
3 changed files with 421 additions and 421 deletions
+1 -3
View File
@@ -64,9 +64,7 @@ loop:
var pkt av.Packet
if pkt, err = infile.ReadPacket(); err != nil { // sometimes this throws an end of file..
log.Log.Error("HandleStream: " + err.Error())
if err.Error() == "EOF" {
time.Sleep(30 * time.Second)
}
time.Sleep(1 * time.Second)
}
// Could be that a decode is throwing errors.
+3 -5
View File
@@ -136,13 +136,10 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
status = <-communication.HandleBootstrap
// Here we are cleaning up everything!
communication.HandleStream <- "stop"
if configuration.Config.Offline != "true" {
communication.HandleHeartBeat <- "stop"
communication.HandleUpload <- "stop"
}
infile.Close()
queue.Close()
close(communication.HandleONVIF)
@@ -150,10 +147,11 @@ func RunAgent(configuration *models.Configuration, communication *models.Communi
close(communication.HandleMotion)
routers.DisconnectMQTT(mqttClient)
decoder.Close()
communication.HandleStream <- "stop"
// Waiting for some seconds to make sure everything is properly closed.
log.Log.Info("RunAgent: waiting 1 second to make sure everything is properly closed.")
time.Sleep(time.Second * 1)
log.Log.Info("RunAgent: waiting 3 seconds to make sure everything is properly closed.")
time.Sleep(time.Second * 3)
} else {
log.Log.Error("Something went wrong while opening RTSP: " + err.Error())
time.Sleep(time.Second * 3)
+417 -413
View File
@@ -1261,425 +1261,429 @@ class Settings extends React.Component {
</div>
</div>
<span className="time-of-interest">Sunday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[0].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
0,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[0].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
0,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[0].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
0,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[0].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
0,
'end2',
event,
config.timetable
);
}}
/>
</div>
{config.time === 'true' && (
<div>
<span className="time-of-interest">Sunday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[0].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
0,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[0].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
0,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[0].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
0,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[0].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
0,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Monday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[1].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
1,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[1].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
1,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[1].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
1,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[1].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
1,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Monday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[1].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
1,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[1].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
1,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[1].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
1,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[1].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
1,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Tuesday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[2].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
2,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[2].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
2,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[2].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
2,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[2].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
2,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Tuesday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[2].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
2,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[2].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
2,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[2].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
2,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[2].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
2,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Wednesday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[3].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
3,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[3].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
3,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[3].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
3,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[3].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
3,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Wednesday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[3].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
3,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[3].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
3,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[3].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
3,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[3].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
3,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Thursday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[4].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
4,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[4].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
4,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[4].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
4,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[4].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
4,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Thursday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[4].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
4,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[4].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
4,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[4].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
4,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[4].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
4,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Friday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[5].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
5,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[5].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
5,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[5].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
5,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[5].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
5,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Friday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[5].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
5,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[5].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
5,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[5].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
5,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[5].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
5,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Saturday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[6].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
6,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[6].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
6,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[6].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
6,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[6].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
6,
'end2',
event,
config.timetable
);
}}
/>
</div>
<span className="time-of-interest">Saturday</span>
<div className="grid-4">
<Input
noPadding
placeholder="00:00"
value={this.timetable[6].start1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
6,
'start1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:00"
value={this.timetable[6].end1Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
6,
'end1',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="12:01"
value={this.timetable[6].start2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
6,
'start2',
event,
config.timetable
);
}}
/>
<Input
noPadding
placeholder="23:59"
value={this.timetable[6].end2Full}
onChange={(event) => {
this.onUpdateTimeline(
'timetable',
6,
'end2',
event,
config.timetable
);
}}
/>
</div>
</div>
)}
</div>
)}
</div>