diff --git a/hwe/j_diplomacy_get_letter.php b/hwe/j_diplomacy_get_letter.php index 539ba24f..6486ec9c 100644 --- a/hwe/j_diplomacy_get_letter.php +++ b/hwe/j_diplomacy_get_letter.php @@ -38,7 +38,7 @@ $letters = []; foreach( $db->query( - 'SELECT * FROM ng_diplomacy WHERE src_nation_id = %i OR dest_nation_id = %i ORDER BY date desc', + 'SELECT * FROM ng_diplomacy WHERE (src_nation_id = %i OR dest_nation_id = %i) AND state != \'cancelled\' ORDER BY date desc', $me['nation'], $me['nation'] ) as $letter ){ @@ -52,7 +52,7 @@ foreach( $letter['src']['nationID'] = $letter['src_nation_id']; $letter['dest']['nationID'] = $letter['dest_nation_id']; - + $letters[$letter['no']] = [ 'no'=>$letter['no'], 'src'=>$letter['src'], diff --git a/hwe/js/diplomacy.js b/hwe/js/diplomacy.js index 4cd6e982..a18fbbd0 100644 --- a/hwe/js/diplomacy.js +++ b/hwe/js/diplomacy.js @@ -125,7 +125,7 @@ function rollbackLetter(letterNo){ function drawLetter(idx, letterObj){ - if(letterObj.state == 'cancelled' || letterObj.state == 'replaced'){ + if(letterObj.state == 'cancelled'){ //TODO: 취소되거나, 대체된 문서도 보여줄 방법을 찾아볼 것 return; } @@ -148,6 +148,11 @@ function drawLetter(idx, letterObj){ var targetColor = letterObj.src.nationID==myNationID?destColorFormat:srcColorFormat; var $letter = $letterFrame.clone(); + + if(letterObj.state == 'replaced'){ + $letter.hide(); + } + $letter.addClass('letterObj') .data('no', letterObj.no) .data('brief', letterObj.brief) @@ -166,7 +171,11 @@ function drawLetter(idx, letterObj){ }; $letter.find('.letterStatus').text(stateText[letterObj.state]); if(letterObj.prev_no !== null){ - $letter.find('.letterPrevNo').text('#'+letterObj.prev_no); + var $showPrev = $('#{0}'.format(letterObj.prev_no)); + $showPrev.click(function(){ + $('#letter_'+letterObj.prev_no).toggle(); + }) + $letter.find('.letterPrevNo').html($showPrev); } else{ $letter.find('.letterPrevNo').text('신규');