mirror of
https://github.com/openmhz/trunk-server.git
synced 2026-11-16 10:47:32 -05:00
play icon to events, fixing call-id
This commit is contained in:
@@ -127,7 +127,7 @@ async function getCalls(req, res, next) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
db.get().collection('calls', function (err, transCollection) {
|
db.get().collection('calls', function (err, transCollection) {
|
||||||
transCollection.findOne({
|
transCollection.findOne({
|
||||||
'_id': o_id
|
'_id': o_id
|
||||||
@@ -168,7 +168,11 @@ async function getCalls(req, res, next) {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
next()
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@@ -179,8 +183,8 @@ async function getCalls(req, res, next) {
|
|||||||
// -------------------------------------------
|
// -------------------------------------------
|
||||||
app.use(express.static(path.join(__dirname, "public")));
|
app.use(express.static(path.join(__dirname, "public")));
|
||||||
|
|
||||||
app.get("/system/:shortName", getCalls)
|
//app.get("/system/:shortName", getCalls)
|
||||||
app.get("/cards/:id", getCard)
|
//app.get("/cards/:id", getCard)
|
||||||
|
|
||||||
app.get("*", (req, res, next) => {
|
app.get("*", (req, res, next) => {
|
||||||
res.sendFile(__dirname + '/public/index.html');
|
res.sendFile(__dirname + '/public/index.html');
|
||||||
|
|||||||
@@ -39,8 +39,24 @@ const EventCallItem = (props) => {
|
|||||||
} else {
|
} else {
|
||||||
talkgroup = talkgroupsData.talkgroups[call.talkgroupNum].description;
|
talkgroup = talkgroupsData.talkgroups[call.talkgroupNum].description;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const cirlceStyle = {width:"4px",
|
||||||
|
margin:"6px",
|
||||||
|
height: "4px",
|
||||||
|
borderRadius:"50%"}
|
||||||
|
|
||||||
|
|
||||||
|
let playStatus = (<></>)
|
||||||
|
if (activeCall) {
|
||||||
|
playStatus = (<Icon name="play" size='small' color="green"/>)
|
||||||
|
|
||||||
|
} else {
|
||||||
|
playStatus = (<div style={cirlceStyle}/>)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Table.Row onClick={(e) => props.onClick({ call: call }, e)} {...rowSelected}>
|
<Table.Row onClick={(e) => props.onClick({ call: call }, e)} {...rowSelected}>
|
||||||
|
<Table.Cell>{playStatus}</Table.Cell>
|
||||||
<Table.Cell> {call.len} </Table.Cell>
|
<Table.Cell> {call.len} </Table.Cell>
|
||||||
<Table.Cell> {talkgroup} </Table.Cell>
|
<Table.Cell> {talkgroup} </Table.Cell>
|
||||||
<Table.Cell> {time.toLocaleTimeString()} </Table.Cell>
|
<Table.Cell> {time.toLocaleTimeString()} </Table.Cell>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import {skipToken} from '@reduxjs/toolkit/query'
|
|||||||
import MediaPlayer from "../Call/components/MediaPlayer";
|
import MediaPlayer from "../Call/components/MediaPlayer";
|
||||||
|
|
||||||
import SupportModal from "../Call/components/SupportModal";
|
import SupportModal from "../Call/components/SupportModal";
|
||||||
|
|
||||||
import EventCallInfo from "./EventCallInfo";
|
import EventCallInfo from "./EventCallInfo";
|
||||||
import ListEventCalls from "./ListEventCalls";
|
import ListEventCalls from "./ListEventCalls";
|
||||||
import { useSelector, useDispatch } from 'react-redux'
|
import { useSelector, useDispatch } from 'react-redux'
|
||||||
@@ -62,7 +61,9 @@ function EventPlayer(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const playCall = (data) => {
|
const playCall = (data) => {
|
||||||
|
//data.call.played = true;
|
||||||
setCurrentCall(data.call);
|
setCurrentCall(data.call);
|
||||||
|
|
||||||
setIsPlaying(true);
|
setIsPlaying(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,7 +74,7 @@ function EventPlayer(props) {
|
|||||||
if (autoPlay && (currentIndex > 0)) {
|
if (autoPlay && (currentIndex > 0)) {
|
||||||
|
|
||||||
const nextCall = eventData.calls[currentIndex - 1];
|
const nextCall = eventData.calls[currentIndex - 1];
|
||||||
|
//eventData.calls[currentIndex].played = true;
|
||||||
setCurrentCall(nextCall);
|
setCurrentCall(nextCall);
|
||||||
setIsPlaying(true);
|
setIsPlaying(true);
|
||||||
} else {
|
} else {
|
||||||
@@ -103,9 +104,7 @@ function EventPlayer(props) {
|
|||||||
<Sidebar.Pusher
|
<Sidebar.Pusher
|
||||||
style={{ minHeight: '100vh' }}
|
style={{ minHeight: '100vh' }}
|
||||||
>
|
>
|
||||||
|
|
||||||
<ListEventCalls eventData={eventData} activeCallId={isPlaying ? currentCallId : false} playCall={playCall} />
|
<ListEventCalls eventData={eventData} activeCallId={isPlaying ? currentCallId : false} playCall={playCall} />
|
||||||
|
|
||||||
</Sidebar.Pusher>
|
</Sidebar.Pusher>
|
||||||
</Sidebar.Pushable>
|
</Sidebar.Pushable>
|
||||||
<Rail position='right' className="desktop-only" >
|
<Rail position='right' className="desktop-only" >
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ const ListEventCalls = (props) => {
|
|||||||
<Table id="calls" unstackable >
|
<Table id="calls" unstackable >
|
||||||
<Table.Header >
|
<Table.Header >
|
||||||
<Table.Row>
|
<Table.Row>
|
||||||
|
<Table.HeaderCell> </Table.HeaderCell>
|
||||||
<Table.HeaderCell>Len</Table.HeaderCell>
|
<Table.HeaderCell>Len</Table.HeaderCell>
|
||||||
<Table.HeaderCell>Talkgroup</Table.HeaderCell>
|
<Table.HeaderCell>Talkgroup</Table.HeaderCell>
|
||||||
<Table.HeaderCell>Time</Table.HeaderCell>
|
<Table.HeaderCell>Time</Table.HeaderCell>
|
||||||
|
|||||||
@@ -25,13 +25,20 @@ export const apiSlice = createApi({
|
|||||||
// The URL for the request is '/fakeApi/posts'
|
// The URL for the request is '/fakeApi/posts'
|
||||||
query: () => ({ url: '/events' }),
|
query: () => ({ url: '/events' }),
|
||||||
transformResponse: responseData => {
|
transformResponse: responseData => {
|
||||||
return responseData.sort(function compareFn(a, b) { if (a.createdAt < b.createdAt) return 1; else return -1; })
|
return responseData.sort(function compareFn(a, b) { if (a.createdAt < b.createdAt) return 1; else return -1; });
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
getEvent: builder.query({
|
getEvent: builder.query({
|
||||||
// The URL for the request is '/fakeApi/posts'
|
// The URL for the request is '/fakeApi/posts'
|
||||||
query: (eventId) => ({ url: `/events/${eventId}` }),
|
query: (eventId) => ({ url: `/events/${eventId}` }),
|
||||||
|
transformResponse: responseData => {
|
||||||
|
|
||||||
|
//let temp = responseData.sort(function compareFn(a, b) { if (a.createdAt < b.createdAt) return 1; else return -1; })
|
||||||
|
responseData.calls.forEach(function (call) {
|
||||||
|
call.played = false;
|
||||||
|
});
|
||||||
|
return responseData;
|
||||||
|
}
|
||||||
}),
|
}),
|
||||||
getTalkgroups: builder.query({
|
getTalkgroups: builder.query({
|
||||||
// The URL for the request is '/fakeApi/posts'
|
// The URL for the request is '/fakeApi/posts'
|
||||||
|
|||||||
Reference in New Issue
Block a user