GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-14 09:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

show all systems

Browse Source
This commit is contained in:
Luke Berndt
2023-01-30 22:15:12 -05:00
parent 2183e44dfd
commit 4b4d21df23
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/controllers/systems.js
View File

@@ -33,7 +33,6 @@ exports.get_systems = function (req, res) {
lastActive: results[result].lastActive, lastActive: results[result].lastActive,
callAvg: results[result].callAvg, callAvg: results[result].callAvg,
description: results[result].description, description: results[result].description,
planType: results[result].planType,
clientCount: clientCount clientCount: clientCount
} }
if (results[result].showScreenName && results[result].userId) { if (results[result].showScreenName && results[result].userId) {

1
backend/models/system.js
View File

@@ -16,6 +16,7 @@ var systemSchema = mongoose.Schema({
callCount: Number, callCount: Number,
ignoreUnknownTalkgroup : Boolean, ignoreUnknownTalkgroup : Boolean,
active: {type: Boolean, default: false}, active: {type: Boolean, default: false},
lastActive: Date,
planType: {type: Number, default: 0}, planType: {type: Number, default: 0},
userId: {type: mongoose.Schema.Types.ObjectId, ref: 'User'}, userId: {type: mongoose.Schema.Types.ObjectId, ref: 'User'},
key: String key: String

9
frontend/src/System/ListSystems.js
View File

@@ -25,15 +25,16 @@ import InternationList from "./InternationList";
const ListSystems = (props) => { const ListSystems = (props) => {
const { data: allSystems, isSuccess } = useGetSystemsQuery(); const { data: systems, isSuccess } = useGetSystemsQuery();
const systems = useSelector(selectActiveSystems) //const systems = useSelector(selectActiveSystems)
const contextRef = useRef(); const contextRef = useRef();
// Sorts the systems by State and also creates an International Arry // Sorts the systems by State and also creates an International Arry
let states = {}; let states = {};
let other = [] let other = []
for (var i = 0; i < systems.length; i++) { if (isSuccess && systems.systems)
const system = systems[i]; for (var i = 0; i < systems.systems.length; i++) {
const system = systems.systems[i];
if (system.hasOwnProperty("state")) { if (system.hasOwnProperty("state")) {
if (!states.hasOwnProperty(system.state)) { if (!states.hasOwnProperty(system.state)) {
states[system.state] = []; states[system.state] = [];