Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
third-party
Commits
e2a1e194
Commit
e2a1e194
authored
May 03, 2022
by
François C.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP: Add barcode encoded qty functionality to shelf inventory interface
parent
793d102f
Pipeline
#2167
passed with stage
in 1 minute 28 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
141 additions
and
29 deletions
+141
-29
shelfs.css
shelfs/static/css/shelfs.css
+4
-0
shelf_inventory.js
shelfs/static/js/shelf_inventory.js
+134
-29
shelf_inventory.html
templates/shelfs/shelf_inventory.html
+3
-0
No files found.
shelfs/static/css/shelfs.css
View file @
e2a1e194
...
@@ -147,6 +147,9 @@ div#container_edition {
...
@@ -147,6 +147,9 @@ div#container_edition {
#edition_input_label
{
#edition_input_label
{
margin-right
:
5px
;
margin-right
:
5px
;
}
}
#product_uom
{
font-size
:
small
;
}
.blink_me
{
.blink_me
{
animation
:
blinker
1s
ease-in-out
;
animation
:
blinker
1s
ease-in-out
;
...
@@ -282,3 +285,4 @@ hr {
...
@@ -282,3 +285,4 @@ hr {
visibility
:
visible
;
visibility
:
visible
;
opacity
:
1
;
opacity
:
1
;
}
}
shelfs/static/js/shelf_inventory.js
View file @
e2a1e194
...
@@ -26,7 +26,8 @@ var shelf,
...
@@ -26,7 +26,8 @@ var shelf,
processed_row_counter
=
0
,
// Keep count of the order the item were added in processed list
processed_row_counter
=
0
,
// Keep count of the order the item were added in processed list
search_chars
=
[],
search_chars
=
[],
user_comments
=
''
,
user_comments
=
''
,
adding_product
=
false
;
// True if modal to add a product is open
adding_product
=
false
,
// True if modal to add a product is open
barcodes
=
null
;
// Barcodes stored locally
/* UTILS */
/* UTILS */
...
@@ -44,14 +45,83 @@ Number.isSafeInteger = Number.isSafeInteger || function (value) {
...
@@ -44,14 +45,83 @@ Number.isSafeInteger = Number.isSafeInteger || function (value) {
return
Number
.
isInteger
(
value
)
&&
Math
.
abs
(
value
)
<=
Number
.
MAX_SAFE_INTEGER
;
return
Number
.
isInteger
(
value
)
&&
Math
.
abs
(
value
)
<=
Number
.
MAX_SAFE_INTEGER
;
};
};
function
back
()
{
function
back
()
{
document
.
location
.
href
=
parent_location
;
document
.
location
.
href
=
parent_location
;
}
}
function
get_added_qties_sum
(
item
)
{
let
total
=
null
;
function
add
(
accumulator
,
a
)
{
// for array sum
result
=
0
;
if
(
a
)
{
if
(
item
.
uom_id
[
1
]
==
"kg"
)
{
if
(
typeof
a
===
"string"
)
{
a
=
a
.
replace
(
','
,
'.'
)
}
result
=
parseFloat
(
accumulator
)
+
parseFloat
(
a
);
result
=
result
.
toFixed
(
3
);
}
else
{
result
=
parseInt
(
accumulator
,
10
)
+
parseInt
(
a
,
10
);
}
}
return
result
;
}
if
(
typeof
item
.
added_qties
!=
"undefined"
&&
item
.
added_qties
.
length
>
0
)
{
total
=
item
.
added_qties
.
reduce
(
add
);
}
return
total
;
}
function
barcode_analyzer
(
chars
)
{
let
barcode
=
chars
;
if
(
barcode
&&
barcode
.
length
>=
13
)
{
barcode
=
barcode
.
substring
(
barcode
.
length
-
13
);
}
else
if
(
barcode
&&
barcode
.
length
==
12
&&
barcode
.
indexOf
(
'0'
)
!==
0
)
{
// User may use a scanner which remove leading 0
barcode
=
'0'
+
barcode
;
}
else
{
//manually submitted after correction
var
barcode_input
=
$
(
'#search_input'
);
barcode
=
barcode_input
.
val
();
}
document
.
getElementById
(
'search_input'
).
value
=
''
;
$
(
'table.dataTable'
).
DataTable
()
.
search
(
''
)
.
draw
();
// If modal to add a product is open
if
(
adding_product
)
{
$
(
'input.add_product_input'
).
val
(
barcode
);
do_add_product
();
}
else
{
select_product_from_bc
(
barcode
);
}
}
// Directly send a line to edition when barcode is read
// Directly send a line to edition when barcode is read
function
select_product_from_bc
(
barcode
)
{
function
select_product_from_bc
(
barcode
)
{
var
found
=
null
,
qty
=
null
;
if
(
isValidEAN13
(
barcode
))
{
var
scannedProduct
=
barcodes
.
get_corresponding_odoo_product
(
barcode
);
if
(
scannedProduct
==
null
)
{
alert
(
"Le code-barre "
+
barcode
+
" ne correspond à aucun article connu."
);
return
-
1
;
}
else
{
barcode
=
scannedProduct
.
barcode
;
if
(
scannedProduct
.
rule
.
length
>
0
&&
scannedProduct
.
rule
!=
"product"
)
{
qty
=
scannedProduct
.
qty
;
}
}
}
if
(
editing_item
==
null
)
{
if
(
editing_item
==
null
)
{
var
found
=
null
;
$
.
each
(
list_to_process
,
function
(
i
,
e
)
{
$
.
each
(
list_to_process
,
function
(
i
,
e
)
{
if
(
e
.
barcode
==
barcode
)
{
if
(
e
.
barcode
==
barcode
)
{
...
@@ -64,25 +134,43 @@ function select_product_from_bc(barcode) {
...
@@ -64,25 +134,43 @@ function select_product_from_bc(barcode) {
$
.
each
(
shelf
.
list_processed
,
function
(
i
,
e
)
{
$
.
each
(
shelf
.
list_processed
,
function
(
i
,
e
)
{
if
(
e
.
barcode
==
barcode
)
{
if
(
e
.
barcode
==
barcode
)
{
found
=
e
;
found
=
e
;
if
(
qty
)
{
let
message
=
"Attention, ce produit a déjà été compté.
\
n"
;
message
+=
"La quantité "
+
qty
+
" n'a pas été ajoutée !
\
n"
;
// temporary add read qty and recorded one to added_qties to compute sum
found
.
added_qties
=
[
qty
,
found
.
qty
]
message
+=
"Le total serait "
+
get_added_qties_sum
(
found
);
alert
(
message
);
qty
=
null
;
}
editing_origin
=
'processed'
;
editing_origin
=
'processed'
;
}
}
});
});
}
}
if
(
found
!==
null
)
{
if
(
found
!==
null
)
{
setLineEdition
(
found
);
delete
found
.
added_qties
;
setLineEdition
(
found
,
qty
);
if
(
editing_origin
===
'to_process'
)
{
if
(
editing_origin
===
'to_process'
)
{
let
row
=
table_to_process
.
row
(
$
(
'tr#'
+
found
.
id
));
let
row
=
table_to_process
.
row
(
$
(
'tr#'
+
found
.
id
));
remove_from_toProcess
(
row
);
remove_from_toProcess
(
row
);
}
else
{
}
else
{
let
row
=
table_processed
.
row
(
$
(
'tr#'
+
found
.
id
));
let
row
=
table_processed
.
row
(
$
(
'tr#'
+
found
.
id
));
remove_from_processed
(
row
);
remove_from_processed
(
row
);
}
}
}
else
{
}
else
{
console
.
log
(
'Code barre introuvable'
);
console
.
log
(
'Code barre introuvable'
);
}
}
}
else
if
(
barcode
==
editing_item
.
barcode
&&
qty
){
// We scan the same product as the current one
let
edition_input
=
$
(
'#edition_input'
);
if
(
typeof
editing_item
.
added_qties
==
"undefined"
)
{
editing_item
.
added_qties
=
[
edition_input
.
val
()];
}
editing_item
.
added_qties
.
push
(
qty
);
// TODO : add an action icon to view added quantities
edition_input
.
val
(
get_added_qties_sum
(
editing_item
));
}
}
}
}
...
@@ -134,8 +222,12 @@ function edit_event(clicked) {
...
@@ -134,8 +222,12 @@ function edit_event(clicked) {
}
}
// Set edition area
// Set edition area
function
setLineEdition
(
item
)
{
/**
var
edition_input
=
$
(
'#edition_input'
);
* If qty is not null, it comes from barcode reading result
* */
function
setLineEdition
(
item
,
qty
)
{
var
edition_input
=
$
(
'#edition_input'
),
set_focus
=
true
;
editing_item
=
item
;
editing_item
=
item
;
$
(
'#product_name'
).
text
(
editing_item
.
name
);
$
(
'#product_name'
).
text
(
editing_item
.
name
);
...
@@ -148,11 +240,22 @@ function setLineEdition(item) {
...
@@ -148,11 +240,22 @@ function setLineEdition(item) {
edition_input
.
attr
(
'type'
,
'number'
).
attr
(
'step'
,
0.001
)
edition_input
.
attr
(
'type'
,
'number'
).
attr
(
'step'
,
0.001
)
.
attr
(
'max'
,
9999
);
.
attr
(
'max'
,
9999
);
}
}
if
(
qty
)
{
/*
To prevent futur data mess if someone scans barcode while focus is on edition input
qty is stored in editing_item object
*/
editing_item
.
qty
=
qty
;
edition_input
.
val
(
qty
);
set_focus
=
false
;
}
// If item is reprocessed, set input with value
// If item is reprocessed, set input with value
if
(
editing_origin
==
'processed'
)
{
if
(
editing_origin
==
'processed'
)
{
edition_input
.
val
(
editing_item
.
qty
);
edition_input
.
val
(
editing_item
.
qty
);
}
}
if
(
set_focus
===
true
)
edition_input
.
focus
();
edition_input
.
focus
();
// Make edition area blink when edition button clicked
// Make edition area blink when edition button clicked
...
@@ -166,6 +269,7 @@ function clearLineEdition() {
...
@@ -166,6 +269,7 @@ function clearLineEdition() {
$
(
'#product_name'
).
text
(
''
);
$
(
'#product_name'
).
text
(
''
);
$
(
'#edition_input'
).
val
(
''
);
$
(
'#edition_input'
).
val
(
''
);
$
(
'#search_input'
).
focus
();
$
(
'#search_input'
).
focus
();
$
(
"#reset_to_previous_qty"
).
hide
();
}
}
// Validate product edition
// Validate product edition
...
@@ -732,6 +836,11 @@ function init() {
...
@@ -732,6 +836,11 @@ function init() {
$(document.documentElement).scrollTop(scrollTo);
$(document.documentElement).scrollTop(scrollTo);
*/
*/
});
});
if
(
$
(
this
).
val
().
length
>
0
)
{
$
(
"#reset_to_previous_qty"
).
show
();
}
else
{
$
(
"#reset_to_previous_qty"
).
hide
();
}
})
})
.
on
(
'blur'
,
function
(
e
)
{
.
on
(
'blur'
,
function
(
e
)
{
$
(
this
).
off
(
'wheel.disableScroll'
);
$
(
this
).
off
(
'wheel.disableScroll'
);
...
@@ -783,35 +892,30 @@ function init() {
...
@@ -783,35 +892,30 @@ function init() {
}
}
});
});
//
Barcode reader: listen for 13 digits read in a very short time
//
Manual and textual input
$
(
'#search_input'
).
keypress
(
function
(
e
)
{
$
(
'#search_input'
).
keypress
(
function
(
e
)
{
if
(
e
.
which
>=
48
&&
e
.
which
<=
57
)
{
if
(
e
.
which
>=
48
&&
e
.
which
<=
57
)
{
// figures [0-9]
search_chars
.
push
(
String
.
fromCharCode
(
e
.
which
));
search_chars
.
push
(
String
.
fromCharCode
(
e
.
which
));
}
else
if
(
e
.
which
==
13
||
search_chars
.
length
>=
13
)
{
barcode_analyzer
();
}
}
if
(
search_chars
.
length
>=
13
)
{
});
var
barcode
=
search_chars
.
join
(
""
);
if
(
!
isNaN
(
barcode
))
{
search_chars
=
[];
setTimeout
(
function
()
{
document
.
getElementById
(
'search_input'
).
value
=
''
;
$
(
'table.dataTable'
).
DataTable
()
.
search
(
''
)
.
draw
();
// If modal to add a product is open
$
(
document
).
pos
();
if
(
adding_product
)
{
$
(
document
).
on
(
'scan.pos.barcode'
,
function
(
event
)
{
$
(
'input.add_product_input'
).
val
(
barcode
);
//access `event.code` - barcode data
do_add_product
();
var
barcode
=
event
.
code
;
}
else
{
barcode_analyzer
(
barcode
);
select_product_from_bc
(
barcode
);
}
},
300
);
}
}
});
});
}
}
// Load barcodes at page loading, then barcodes are stored locally
var
get_barcodes
=
async
function
()
{
if
(
barcodes
==
null
)
barcodes
=
await
init_barcodes
();
};
$
(
document
).
ready
(
function
()
{
$
(
document
).
ready
(
function
()
{
// Get Route parameter
// Get Route parameter
...
@@ -842,5 +946,6 @@ $(document).ready(function() {
...
@@ -842,5 +946,6 @@ $(document).ready(function() {
}
else
{
}
else
{
get_shelf_data
();
get_shelf_data
();
}
}
get_barcodes
();
});
});
templates/shelfs/shelf_inventory.html
View file @
e2a1e194
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
<script
type=
"text/javascript"
src=
"{% static 'js/download.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% static 'js/download.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% static 'js/datatables/jquery.dataTables.min.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% static 'js/datatables/jquery.dataTables.min.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% static 'js/datatables/dataTables.plugins.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% static 'js/datatables/dataTables.plugins.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% static 'js/jquery.pos.js' %}"
></script>
{% endblock %}
{% endblock %}
{% block content %}
{% block content %}
...
@@ -59,6 +60,7 @@
...
@@ -59,6 +60,7 @@
<label
for=
"edition_input"
id=
"edition_input_label"
>
Qté :
</label>
<label
for=
"edition_input"
id=
"edition_input_label"
>
Qté :
</label>
<input
type=
"text"
class=
"number input_small"
id=
"edition_input"
autocomplete=
"off"
required
>
<input
type=
"text"
class=
"number input_small"
id=
"edition_input"
autocomplete=
"off"
required
>
<span
id=
"product_uom"
></span>
<span
id=
"product_uom"
></span>
<i
class=
"fa fa-undo"
id=
"reset_to_previous_qty"
style=
"display:none;"
></i>
</div>
</div>
<div
class=
"col-1 center"
>
<div
class=
"col-1 center"
>
<a
class=
"btn"
id=
'edition_cancel'
>
<a
class=
"btn"
id=
'edition_cancel'
>
...
@@ -171,5 +173,6 @@
...
@@ -171,5 +173,6 @@
</script>
</script>
<script
src=
"{% static "
js
/
all_common
.
js
"
%}?
v=
"></script>
<script
src=
"{% static "
js
/
all_common
.
js
"
%}?
v=
"></script>
<script src="
{%
static
"
js
/
common
.
js
"
%}?
v=
"></script>
<script src="
{%
static
"
js
/
common
.
js
"
%}?
v=
"></script>
<script src='{% static "
js
/
barcodes
.
js
"
%}?
v=
'></script>
<script type="text/javascript" src="{% static '
js
/
shelf_inventory
.
js
'
%}"
></script>
<script type="text/javascript" src="{% static '
js
/
shelf_inventory
.
js
'
%}"
></script>
{% endblock %}
{% endblock %}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment