-
Notifications
You must be signed in to change notification settings - Fork 86
Add more details to options during deck direct import #927
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mankinchi
wants to merge
4
commits into
main
Choose a base branch
from
tnguyen/NRDB-915
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,101 +1,128 @@ | ||
$(document).on('data.app', function() { | ||
$('#btn-import').prop('disabled', false); | ||
}); | ||
$(document).on('data.app', function () { | ||
$('#btn-import').prop('disabled', false) | ||
}) | ||
|
||
$(function() { | ||
$('#analyzed').on({ | ||
click: click_option | ||
}, 'ul.dropdown-menu a'); | ||
$('#analyzed').on({ | ||
click: click_trash | ||
}, 'a.glyphicon-trash'); | ||
}); | ||
$(function () { | ||
$('#analyzed').on( | ||
{ | ||
click: clickOption, | ||
}, | ||
'ul.dropdown-menu a' | ||
) | ||
$('#analyzed').on( | ||
{ | ||
click: click_trash, | ||
}, | ||
'a.glyphicon-trash' | ||
) | ||
}) | ||
|
||
function click_trash(event) { | ||
$(this).closest('li.list-group-item').remove(); | ||
update_stats(); | ||
$(this).closest('li.list-group-item').remove() | ||
updateStats() | ||
} | ||
function do_import() { | ||
$('#analyzed').empty(); | ||
var content = $('textarea[name="content"]').val(); | ||
var lines = content.split(/[\r\n]+/); | ||
for(var i=0; i<lines.length; i++) { | ||
var a = import_one_line(lines[i], i); | ||
if(!a) continue; | ||
$('#analyzed').append('<li class="list-group-item">'+a+'<a class="pull-right glyphicon glyphicon-trash"></a></li>'); | ||
$('#analyzed').empty() | ||
const content = $('textarea[name="content"]').val() | ||
const lines = content.split(/[\r\n]+/) | ||
|
||
for (let i = 0; i < lines.length; i++) { | ||
const cardRow = getCardRowForLine(lines[i], i) | ||
if (!cardRow) continue | ||
$('#analyzed').append( | ||
`<li class="list-group-item">${cardRow}<a class="pull-right glyphicon glyphicon-trash"></a></li>` | ||
) | ||
} | ||
update_stats(); | ||
updateStats() | ||
} | ||
function import_one_line(line, lineNumber) { | ||
var result = NRDB.fuzzy_search.lookup(line); | ||
if(!result) return; | ||
var options = result.cards, qty = result.qty; | ||
var qty_text = "", qty_int = qty; | ||
if(qty == null) { | ||
options = $.grep(options, function (card) { | ||
return card.type_code == "identity"; | ||
}); | ||
qty_int = 1; | ||
} else { | ||
qty_text = qty+"x "; | ||
} | ||
function getCardRowForLine(line, lineNumber) { | ||
const results = NRDB.fuzzy_search.lookup(line) | ||
if (!results || (results.cards.length === 0 && results.qty === null)) return | ||
|
||
if(options.length == 0) { | ||
if(qty == null) return; | ||
return '<i>No match for '+name+'</i>'; | ||
} else if(options.length == 1) { | ||
return '<input type="hidden" name="'+lineNumber+'" value="'+options[0].code+':'+qty_int+'">' | ||
+qty_text+'<a class="card" data-code="'+options[0].code+'" href="#">'+options[0].title+' </a>'; | ||
const { cards, qty } = results | ||
|
||
if (cards.length == 0) { | ||
return `<span class="card" href="#">No match for ${line}</span>` | ||
} else if (cards.length == 1) { | ||
return `<a class="card" data-code="${cards[0].code}" data-qty="${qty}" href="#">${cards[0].title}</a>` | ||
} else { | ||
var text = '<input type="hidden" name="'+lineNumber+'" value="'+options[0].code+':'+qty_int+'">' | ||
+qty_text+'<a class="card dropdown-toggle text-warning" data-toggle="dropdown" data-code="'+options[0].code+'" href="#">'+options[0].title+' <span class="caret"></span></a>'; | ||
text += '<ul class="dropdown-menu">'; | ||
$.each(options, function (index, option) { | ||
text += '<li><a href="#" data-code="'+option.code+'">'+option.title+'</a></li>'; | ||
}); | ||
text += '</ul>'; | ||
return text; | ||
return ` | ||
${qty}x <a class="card dropdown-toggle text-warning" data-toggle="dropdown" data-code="${ | ||
cards[0].code | ||
}" href="#"><span class="title">${ | ||
cards[0].title | ||
}</span> <span class="caret"></span></a> | ||
<ul class="dropdown-menu"> | ||
${cards | ||
.toSorted((a, b) => { | ||
// Keep cards with the same name as the first card at the top | ||
const aHasSameTitle = a.title === cards[0].title | ||
const bHasSameTitle = b.title === cards[0].title | ||
if (aHasSameTitle && !bHasSameTitle) return -1 | ||
if (!aHasSameTitle && bHasSameTitle) return 1 | ||
// If same title, sort by pack release date reversed | ||
if (a.title === b.title) { | ||
return b.pack.date_release.localCompare(a.pack.date_release) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this should be localeCompare. |
||
} | ||
// Else sort by title | ||
return a.title.localeCompare(b.title) | ||
}) | ||
.map( | ||
(card) => | ||
`<li><a href="#" data-code="${card.code}" data-title="${card.title}">${card.title} (${card.pack.cycle.name})</a></li>` | ||
) | ||
.join('')} | ||
</ul> | ||
` | ||
} | ||
} | ||
function click_option(event) { | ||
var name = $(this).text(); | ||
var code = $(this).data('code'); | ||
var input = $(this).closest('li.list-group-item').find('input[type="hidden"]'); | ||
input.val(input.val().replace(/^\d+/, code)); | ||
$(this).closest('li.list-group-item').find('a.card').html(name+' <span class="caret"></span>').data('code', code); | ||
update_stats(); | ||
function clickOption() { | ||
const name = $(this).data('title') | ||
const code = $(this).data('code') | ||
const row = $(this).closest('li.list-group-item').find('a.card') | ||
row.data('code', code) | ||
row.find('.title').text(name) | ||
updateStats() | ||
} | ||
function update_stats() { | ||
var deck = {}, size = 0, types = {}; | ||
$('#analyzed input[type="hidden"]').each(function (index, element) { | ||
var card = $(element).val().split(':'); | ||
var code = card[0], qty = parseInt(card[1], 10); | ||
deck[code] = qty; | ||
var record = NRDB.data.cards.findById(code); | ||
types[record.type.name] = types[record.type.name] || 0; | ||
types[record.type.name] += qty; | ||
}); | ||
var html = ''; | ||
$.each(types, function (key, value) { | ||
if(key != "Identity") { | ||
size+=value; | ||
html += value+' '+key+'s.<br>'; | ||
|
||
function updateStats() { | ||
let deckSize = 0 | ||
const types = {} | ||
$('#analyzed .card').each(function (_, element) { | ||
const card = $(element) | ||
const code = card.data('code') | ||
const qty = parseInt(card.data('qty'), 10) | ||
const record = NRDB.data.cards.findById(code) | ||
types[record.type.name] = types[record.type.name] ?? 0 + qty | ||
}) | ||
|
||
let html = '' | ||
for (const [type, amount] of Object.entries(types)) { | ||
if (type !== 'Identity') { | ||
deckSize += amount | ||
html += ` | ||
<div>${amount} ${type}s</div> | ||
` | ||
} | ||
}); | ||
html = size+' Cards.<br>'+html; | ||
$('#stats').html(html); | ||
if($('#analyzed li').length > 0) { | ||
$('#btn-save').prop('disabled', false); | ||
} | ||
html = `<div><strong>${deckSize} Cards.</strong></div>${html}` | ||
$('#stats').html(html) | ||
if ($('#analyzed li').length > 0) { | ||
$('#btn-save').prop('disabled', false) | ||
} else { | ||
$('#btn-save').prop('disabled', true); | ||
$('#btn-save').prop('disabled', true) | ||
} | ||
} | ||
function do_save() { | ||
var deck = {}; | ||
$('#analyzed input[type="hidden"]').each(function (index, element) { | ||
var card = $(element).val().split(':'); | ||
var code = card[0], qty = parseInt(card[1], 10); | ||
deck[code] = qty; | ||
}); | ||
$('input[name="content"]').val(JSON.stringify(deck)); | ||
const deck = {} | ||
$('#analyzed .card').each(function (_, element) { | ||
const card = $(element) | ||
const code = card.data('code') | ||
const qty = parseInt(card.data('qty'), 10) | ||
deck[code] = qty | ||
}) | ||
$('input[name="content"]').val(JSON.stringify(deck)) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please adjust the formatter settings you set up. It removed all trailing semicolons, which is a big, unnecessary change and will update a ton of files.
I would recommend not doing the linter / formatter at all in this PR, but as it's own PR so we can evaluate it's settings and impact.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh, I didn't realise that it removes the trailing semicolons (which I also don't like). I have prettier installed so it runs by default. I'll revert those changes 🐱