Skip to content

Use single method for formatting graph labels; use Intl object and user's browser locale to format label numbers #72

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.

Sign up for GitHub

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

Closed
IanKemp wants to merge 1 commit into from
Closed

Use single method for formatting graph labels; use Intl object and user's browser locale to format label numbers #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions src/Tools/Production/ProductionToolResult.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export class ProductionToolResult
if (input.item) {
this.nodes.add({
id: id,
label: ProductionToolResult.getRecipeDisplayedName(model.getItem(input.item).prototype.name) + '\n' + input.amount.toFixed(2) + ' / min',
label: ProductionToolResult.formatLabel(ProductionToolResult.getRecipeDisplayedName(model.getItem(input.item).prototype.name), input.amount),
title: '',
color: this.getNodeColor(ProductionToolResult.TYPE_RAW, false),
font: this.getFontColor(false),
Expand Down Expand Up @@ -145,7 +145,7 @@ export class ProductionToolResult
edges[key] = {
from: input.nodeId,
to: recipe.nodeId,
label: ingredient.item.prototype.name + '\n' + diff.toFixed(2) + '/min',
label: ProductionToolResult.formatLabel(ingredient.item.prototype.name, diff),
color: this.getEdgeColor(false),
font: this.getFontColor(false),
};
Expand Down Expand Up @@ -174,13 +174,13 @@ export class ProductionToolResult
edges[key] = {
from: re.nodeId,
to: recipe.nodeId,
label: ingredient.item.prototype.name + '\n' + diff.toFixed(2) + '/min',
label: ProductionToolResult.formatLabel(ingredient.item.prototype.name, diff),
color: this.getEdgeColor(false),
font: this.getFontColor(false),
};
} else {
edges[reverseKey].arrows = 'from,to';
edges[reverseKey].label = edges[reverseKey].label.replace('\n', ': ') + '\n' + ingredient.item.prototype.name + ': ' + diff.toFixed(2) + '/min';
edges[reverseKey].label = ProductionToolResult.formatLabel(edges[reverseKey].label.replace('\n', ': ') + '\n' + ingredient.item.prototype.name, diff, ': ');
}
this.elkGraph.edges.push({
id: nodeId.toString(),
Expand Down Expand Up @@ -225,7 +225,7 @@ export class ProductionToolResult
// TODO add miners
this.nodes.add({
id: id,
label: ProductionToolResult.getRecipeDisplayedName(item.prototype.name) + '\n' + resource.amount.toFixed(2) + ' / min',
label: ProductionToolResult.formatLabel(ProductionToolResult.getRecipeDisplayedName(item.prototype.name), resource.amount),
title: '',
color: this.getNodeColor(ProductionToolResult.TYPE_RAW, false),
font: this.getFontColor(false),
Expand All @@ -241,7 +241,7 @@ export class ProductionToolResult
this.edges.add({
from: id,
to: data.id,
label: item.prototype.name + '\n' + data.amount.toFixed(2) + ' / min',
label: ProductionToolResult.formatLabel(item.prototype.name, data.amount),
color: this.getEdgeColor(false),
font: this.getFontColor(false),
});
Expand Down Expand Up @@ -281,7 +281,7 @@ export class ProductionToolResult

this.nodes.add({
id: id,
label: ProductionToolResult.getRecipeDisplayedName(itemName) + '\n' + amount.toFixed(2) + ' / min',
label: ProductionToolResult.formatLabel(ProductionToolResult.getRecipeDisplayedName(itemName), amount),
color: this.getNodeColor(ProductionToolResult.TYPE_PRODUCT, false),
font: this.getFontColor(false),
type: ProductionToolResult.TYPE_PRODUCT,
Expand All @@ -296,7 +296,7 @@ export class ProductionToolResult
this.edges.add({
from: parseInt(producedNodeId, 10),
to: id,
label: itemName + '\n' + producedItem[producedNodeId].toFixed(2) + ' / min',
label: ProductionToolResult.formatLabel(itemName, producedItem[producedNodeId]),
color: this.getEdgeColor(false),
font: this.getFontColor(false),
});
Expand Down Expand Up @@ -422,4 +422,15 @@ export class ProductionToolResult
return '<b>' + parts.join(' ') + '</b>';
}

private static formatLabel(text: string, quantity: number, postfix?: string | null | undefined): string
{
const separator: string = (typeof postfix === 'string') ? postfix : '\n';

return text + separator + ProductionToolResult.formatQuantity(quantity) + ' / min';
}

private static formatQuantity(quantity: number): string
{
return new Intl.NumberFormat(undefined, { minimumFractionDigits: 2 }).format(quantity);
}
}