diff --git a/frontend/src/Helpers/Props/icons.js b/frontend/src/Helpers/Props/icons.js index 945294d22..2c664676e 100644 --- a/frontend/src/Helpers/Props/icons.js +++ b/frontend/src/Helpers/Props/icons.js @@ -30,6 +30,7 @@ import { faBookmark as fasBookmark, faBookReader as fasBookReader, faBug as fasBug, + faBullhorn as fasBullhorn, faBroadcastTower as fasBroadcastTower, faCalendarAlt as fasCalendarAlt, faCaretDown as fasCaretDown, @@ -91,6 +92,7 @@ import { faTable as fasTable, faTh as fasTh, faThList as fasThList, + faTicketAlt as fasTicketAlt, faTrashAlt as fasTrashAlt, faTimes as fasTimes, faTimesCircle as fasTimesCircle, @@ -108,6 +110,7 @@ export const ACTIVITY = farClock; export const ADD = fasPlus; export const ALTERNATE_TITLES = farClone; export const ADVANCED_SETTINGS = fasCog; +export const ANNOUNCED = fasBullhorn; export const ARROW_LEFT = fasArrowCircleLeft; export const ARROW_RIGHT = fasArrowCircleRight; export const BACKUP = farFileArchive; @@ -148,6 +151,7 @@ export const HEALTH = fasMedkit; export const HEART = fasHeart; export const HISTORY = fasHistory; export const HOUSEKEEPING = fasHome; +export const IN_CINEMAS = fasTicketAlt; export const INFO = fasInfoCircle; export const INTERACTIVE = fasUser; export const KEYBOARD = farKeyboard; diff --git a/frontend/src/Movie/Index/Table/MovieStatusCell.js b/frontend/src/Movie/Index/Table/MovieStatusCell.js index ae2a67fbc..7865c7d4f 100644 --- a/frontend/src/Movie/Index/Table/MovieStatusCell.js +++ b/frontend/src/Movie/Index/Table/MovieStatusCell.js @@ -25,12 +25,32 @@ function MovieStatusCell(props) { title={monitored ? 'Movie is monitored' : 'Movie is unmonitored'} /> - : null + } - /> + { + status === 'inCinemas' ? + : null + } + + { + status === 'released' ? + : null + } ); } diff --git a/frontend/src/Store/Actions/movieIndexActions.js b/frontend/src/Store/Actions/movieIndexActions.js index 6f4d7a59d..ba65b0c67 100644 --- a/frontend/src/Store/Actions/movieIndexActions.js +++ b/frontend/src/Store/Actions/movieIndexActions.js @@ -58,14 +58,15 @@ export const defaultState = { columns: [ { name: 'select', - columnLabel: 'select', + columnLabel: 'Select', isSortable: false, isVisible: true, - isModifiable: false + isModifiable: false, + isHidden: true }, { name: 'status', - columnLabel: 'Status', + columnLabel: 'Release Status', isSortable: true, isVisible: true, isModifiable: false