From 3bc2990531a0fb9f478c8599c6d532469d745bb2 Mon Sep 17 00:00:00 2001 From: Matthew Stratford Date: Sun, 12 Apr 2020 15:25:59 +0100 Subject: [PATCH] Add selector options for special case shows. --- src/broadcast/state.ts | 40 ++++++++++++++++- src/optionsMenu/AdvancedTab.tsx | 78 +++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 2 deletions(-) diff --git a/src/broadcast/state.ts b/src/broadcast/state.ts index 9198d82..a2ea586 100644 --- a/src/broadcast/state.ts +++ b/src/broadcast/state.ts @@ -18,6 +18,10 @@ export type BroadcastStageEnum = interface BroadcastState { stage: BroadcastStageEnum; connID: number | null; + sourceID: number; + autoNewsBeginning: boolean; + autoNewsMiddle: boolean; + autoNewsEnd: boolean; tracklisting: boolean; connectionState: ConnectionStateEnum; recordingState: ConnectionStateEnum; @@ -34,11 +38,20 @@ const broadcastState = createSlice({ initialState: { stage: "NOT_REGISTERED", connID: null, + sourceID: 5, + autoNewsBeginning: true, + autoNewsMiddle: true, + autoNewsEnd: true, tracklisting: false, connectionState: "NOT_CONNECTED", recordingState: "NOT_CONNECTED" } as BroadcastState, reducers: { + changeSetting(state: BroadcastState, action: PayloadAction<{ key: K, val: BroadcastState[K] }>) { + state[action.payload.key] = action.payload.val; + console.log("Changing timeslot broadcast options.") + changeTimeslot() + }, toggleTracklisting(state) { state.tracklisting = !state.tracklisting; }, @@ -61,12 +74,16 @@ const broadcastState = createSlice({ export default broadcastState.reducer; + export interface TrackListItem { audiologid: number; } - +export const changeBroadcastSetting = (key: K, val: BroadcastState[K]): AppThunk => async (dispatch, getState) => { + dispatch(broadcastState.actions.changeSetting({key: key, val: val})); + dispatch(changeTimeslot()); + } @@ -76,7 +93,7 @@ export const registerTimeslot = (): AppThunk => async (dispatch, getState) => { const memberid = state.currentUser?.memberid; const timeslotid = state.currentTimeslot?.timeslot_id; console.log("Attempting to Register for Broadcast."); - var sourceid = 4; // TODO: make UI for this. + var sourceid = getState().broadcast.sourceID; var connID = (await sendBroadcastRegister(timeslotid, memberid, sourceid)); if (connID !== undefined) { dispatch(broadcastState.actions.setConnID(connID["connid"])); @@ -98,6 +115,15 @@ export const cancelTimeslot = (): AppThunk => async (dispatch, getState) => { } }; +export const changeTimeslot = (): AppThunk => async (dispatch, getState) => { + var state = getState().broadcast; + if (state.stage === "REGISTERED") { + console.log("Attempting to Change Broadcast Options."); + var response = (await sendBroadcastChange(state.connID, state.sourceID, state.autoNewsBeginning, state.autoNewsMiddle, state.autoNewsEnd)); + + } +}; + export function sendBroadcastRegister(timeslotid: number | undefined, memberid: number | undefined, sourceid: number): Promise { return broadcastApiRequest("/registerTimeslot", "POST", { memberid: memberid, @@ -111,6 +137,16 @@ export function sendBroadcastCancel(connid: number | null): Promise { + return broadcastApiRequest("/changeTimeslot", "POST", { + connid: connid, + sourceid: sourceid, + beginning: beginning, + middle: middle, + end: end + }); +} + diff --git a/src/optionsMenu/AdvancedTab.tsx b/src/optionsMenu/AdvancedTab.tsx index e1df45d..39d7974 100644 --- a/src/optionsMenu/AdvancedTab.tsx +++ b/src/optionsMenu/AdvancedTab.tsx @@ -2,13 +2,91 @@ import React from "react"; import { RootState } from "../rootReducer"; import { useSelector, useDispatch } from "react-redux"; import { changeSetting } from "./settingsState"; +import { changeBroadcastSetting } from "../broadcast/state"; export function AdvancedTab() { const settings = useSelector((state: RootState) => state.settings); + const broadcastState = useSelector((state: RootState) => state.broadcast); const dispatch = useDispatch(); return ( <> +

Selector Options

+ +
+ + +
+

Automatic News

+ +
+ + dispatch( + changeBroadcastSetting( + "autoNewsBeginning", + e.target.checked + ) + ) + } + /> + +
+
+ + dispatch( + changeBroadcastSetting( + "autoNewsMiddle", + e.target.checked + ) + ) + } + /> + +
+
+ + dispatch( + changeBroadcastSetting( + "autoNewsEnd", + e.target.checked, + ) + ) + } + /> + +
+
+

Misc