ODWRTW/canape
2
2
Fork 0
Code Issues 3 Pull Requests 1 Releases Activity

Merge branch 'greg/dev' into 'master'

Browse Source 
greg/dev

See merge request !59
This commit is contained in:
Lucas 2017-04-22 09:12:51 +00:00
commit 806fad299d
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/internal/backend/show_wishlist.go
View File

@ -15,20 +15,16 @@ const (
SET imdb_id=$1, user_id=$2, season=$3, episode=$4;` SET imdb_id=$1, user_id=$2, season=$3, episode=$4;`
isShowWishlistedQueryByUserID = ` isShowWishlistedQueryByUserID = `
SELECT SELECT s.imdb_id, t.season, t.episode
shows.imdb_id FROM shows s INNER JOIN shows_tracked t
FROM shows INNER JOIN shows_tracked ON s.imdb_id = t.imdb_id AND t.user_id=$2
ON WHERE t.imdb_id=$1;`
shows.imdb_id=shows_tracked.imdb_id
AND
shows_tracked.user_id=$2
WHERE shows.imdb_id=$1;`
getShowWishlistQueryByUserID = ` getShowWishlistQueryByUserID = `
SELECT SELECT s.imdb_id, t.season, t.episode
shows.imdb_id, shows_tracked.season, shows_tracked.episode FROM shows s
FROM shows INNER JOIN shows_tracked INNER JOIN shows_tracked t
ON shows.imdb_id=shows_tracked.imdb_id AND shows_tracked.user_id=$1;` ON s.imdb_id = t.imdb_id AND t.user_id=$1;`
deleteShowWishlistedQueryByID = `DELETE FROM shows_tracked WHERE imdb_id=$1 AND user_id=$2;` deleteShowWishlistedQueryByID = `DELETE FROM shows_tracked WHERE imdb_id=$1 AND user_id=$2;`
) )

21
src/public/js/components/list/details.js
View File

@ -9,11 +9,30 @@ export default function ListDetails(props) {
).join(', '); ).join(', ');
} }
let wishlistStr = "";
if (props.data.wishlisted === true) {
wishlistStr = "Wishlisted";
}
if (props.data.tracked_episode !== null && props.data.tracked_season != null) {
let season = props.data.tracked_season;
let episode = props.data.tracked_episode;
if ((season === 0) && (episode === 0)) {
wishlistStr = "Whole show tracked";
} else {
wishlistStr = `Tracked from season ${season} episode ${episode}`;
}
}
return ( return (
<div className="col-xs-7 col-md-4"> <div className="col-xs-7 col-md-4">
<div className="show-detail affix"> <div className="affix">
<h1 className="hidden-xs">{props.data.title}</h1> <h1 className="hidden-xs">{props.data.title}</h1>
<h3 className="visible-xs">{props.data.title}</h3> <h3 className="visible-xs">{props.data.title}</h3>
{wishlistStr !== "" &&
<span className="label label-default">
<i className="fa fa-bookmark"></i> {wishlistStr}
</span>
}
<h4>{props.data.year}</h4> <h4>{props.data.year}</h4>
{props.data.runtime && {props.data.runtime &&
<p> <p>