Skip to content

Added columns to the components list to display the quantity. #14

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

Open
Water-zi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added columns to the components list to display the quantity. #14

Show file tree
Hide file tree
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
14 changes: 12 additions & 2 deletions html/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,15 @@ <h1 class="title is-size-4">Preload <input type="checkbox" id="preload_en" oncha
<br>
<div class="container">
<h1 class="title is-size-4">Components</h1>

<button id="btn_change_fuducial" class="button is-small" onclick="update_pos()">Update Quantity</button>
<label>(should click after changing the amount of Fiducials)</label>
&nbsp;
<label class="checkbox"><input id="quantity_pre_pcb" type="checkbox" onchange="update_pos('quantity_pre_pcb', 'quantity_pre_pcb_column')"> Show Quantity (pre PCB)</label>
&nbsp;|&nbsp;
<label class="checkbox"><input id="quantity_total" type="checkbox" checked onchange="update_pos('quantity_total', 'quantity_total_column')"> Show Quantity (total)</label>
<br>
<br>

Current: <span id="cur_progress">-- / --</span> &nbsp;|&nbsp;
<span id="cur_comp">-- -- --</span> <span id="cur_board">--</span> &nbsp;|&nbsp;
Height: <span id="cur_height">--</span>
Expand All @@ -205,7 +213,9 @@ <h1 class="title is-size-4">Components</h1>
<thead>
<tr>
<td style="width: 20em;">Footprint</td> <td>Offset</td>
<td style="width: 20em;">Value</td> <td style="width: 10em;">Reference</td>
<td style="width: 20em;">Value</td>
<td id="quantity_pre_pcb_column" style="width: 7em; display: none">Quantity<br>(pre PCB)</td> <td id="quantity_total_column" style="width: 7em;">Quantity<br>(total)</td>
<td style="width: 10em;">Reference</td>
<td style="width: 7em;">X</td> <td style="width: 7em;">Y</td> <td style="width: 7em;">R</td>
</tr>
</thead>
Expand Down
37 changes: 35 additions & 2 deletions html/pos_list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,14 @@ function search_comp_parents(comp, set_color=false, color='')
for (let elm of value_list) {
if (elm.contains(comp_elm)) {
let sub0 = elm.querySelector('td');
let quantity_list = elm.querySelectorAll('.list_quantity');
parents[1] = sub0.innerText;
if (set_color)
if (set_color) {
sub0.style.backgroundColor = color;
for (let quan_elm of quantity_list) {
quan_elm.style.backgroundColor = color;
}
}
break;
}
}
Expand Down Expand Up @@ -246,9 +251,23 @@ function pos_to_page(pos) {
<td style="width: 7em;">${readable_float(comp[3])}</td>
</tr>`;
}
let list_quantity_pre_pcb_html = '';
if (document.getElementById('quantity_pre_pcb').checked) {
list_quantity_pre_pcb_html = `
<td class='list_quantity' style="width: 7em;">${pos[footprint][value].length}</td>
`;
}
let list_quantity_total_html = '';
if (document.getElementById('quantity_total').checked) {
list_quantity_total_html = `
<td class='list_quantity' style="width: 7em;">${csa.fiducial_cam.length * pos[footprint][value].length}</td>
`;
}
html_value += `
<tr class='list_value'>
<td style="width: 20em;">${value}</td>
${list_quantity_pre_pcb_html}
${list_quantity_total_html}
<td>
<table>
<tbody class="js-sortable-table">
Expand All @@ -258,11 +277,14 @@ function pos_to_page(pos) {
</td>
</tr>`;
}
let colspan_counter = 5
colspan_counter += document.getElementById('quantity_pre_pcb').checked ? 1 : 0
colspan_counter += document.getElementById('quantity_total').checked ? 1 : 0
let html = `
<tr class='list_footprint'>
<td>${footprint}</td>
<td>--</td>
<td colspan="5">
<td colspan=${colspan_counter}>
<table>
<tbody class="js-sortable-table">
${html_value}
Expand Down Expand Up @@ -443,6 +465,17 @@ window.btn_select_board = async function (idx) {
await select_comp(search_current_comp());
};

async function update_pos(id="", column="") {
if (id != '' && column != '') {
let checkBox = document.getElementById(id);
let elm = document.getElementById(column);
elm.style.display = checkBox.checked ? '' : 'none';
}
let pos = await db.get('tmp', 'list');
if (pos)
pos_to_page(pos);
};
window.update_pos = update_pos;

export {
search_comp_parents, search_next_comp, search_current_comp, search_first_comp, select_comp, move_to_comp,
Expand Down