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
4ec2983d
Commit
4ec2983d
authored
Jul 01, 2021
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix product days not covered
parent
10c3ffce
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
orders_helper.js
orders/static/js/orders_helper.js
+7
-7
models.py
products/models.py
+2
-2
No files found.
orders/static/js/orders_helper.js
View file @
4ec2983d
...
@@ -951,15 +951,15 @@ function _compute_product_data(product) {
...
@@ -951,15 +951,15 @@ function _compute_product_data(product) {
/* Coverage related data */
/* Coverage related data */
if
(
order_doc
.
coverage_days
!==
null
)
{
if
(
order_doc
.
coverage_days
!==
null
)
{
let
unmet_needs
=
product
.
daily_conso
*
order_doc
.
coverage_days
-
product
.
qty_available
-
product
.
incoming_qty
-
purchase_qty
;
let
qty_not_covered
=
product
.
daily_conso
*
order_doc
.
coverage_days
-
product
.
qty_available
-
product
.
incoming_qty
-
purchase_qty
;
// TODO diviser tout ça par la conso moyenne pour avoir nb de jour
s
let
days_not_covered
=
qty_not_covered
/
product
.
daily_conso
;
// get unmet needs in nb of day
s
unmet_needs
=
-
Math
.
round
(
unmet_needs
);
days_not_covered
=
-
Math
.
ceil
(
days_not_covered
);
// round up, so if a day is not fully covered display it
unmet_needs
=
(
unmet_needs
>
0
)
?
0
:
unmet_needs
;
days_not_covered
=
(
days_not_covered
>
0
)
?
0
:
days_not_covered
;
item
.
unmet_needs
=
unmet_needs
;
item
.
days_not_covered
=
days_not_covered
;
}
else
{
}
else
{
item
.
unmet_needs
=
'X'
;
item
.
days_not_covered
=
'X'
;
}
}
return
item
;
return
item
;
...
@@ -1121,7 +1121,7 @@ function prepare_datatable_columns() {
...
@@ -1121,7 +1121,7 @@ function prepare_datatable_columns() {
});
});
columns
.
push
({
columns
.
push
({
data
:
"
unmet_needs
"
,
data
:
"
days_not_covered
"
,
title
:
"Besoin non couvert"
,
title
:
"Besoin non couvert"
,
className
:
"dt-body-center"
,
className
:
"dt-body-center"
,
width
:
"4%"
width
:
"4%"
...
...
products/models.py
View file @
4ec2983d
...
@@ -503,8 +503,8 @@ class CagetteProducts(models.Model):
...
@@ -503,8 +503,8 @@ class CagetteProducts(models.Model):
sales_average_params
=
{
sales_average_params
=
{
'ids'
:
ptids
,
'ids'
:
ptids
,
#'from': '2019-06-10',
#
'from': '2019-06-10',
#'to': '2019-08-10',
#
'to': '2019-08-10',
}
}
sales
=
CagetteProducts
.
get_template_products_sales_average
(
sales_average_params
)
sales
=
CagetteProducts
.
get_template_products_sales_average
(
sales_average_params
)
...
...
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