mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Update CompleteBuildOrder form (#3702)
- Load required data dynamically via the API - Hide form fields according to dynamic data - Show warnings according to dynamic data
This commit is contained in:
parent
2a846c7030
commit
33326f6eaf
@ -490,6 +490,21 @@ class OverallocationChoice():
|
||||
class BuildCompleteSerializer(serializers.Serializer):
|
||||
"""DRF serializer for marking a BuildOrder as complete."""
|
||||
|
||||
def get_context_data(self):
|
||||
"""Retrieve extra context data for this serializer.
|
||||
|
||||
This is so we can determine (at run time) whether the build is ready to be completed.
|
||||
"""
|
||||
|
||||
build = self.context['build']
|
||||
|
||||
return {
|
||||
'overallocated': build.has_overallocated_parts(),
|
||||
'allocated': build.are_untracked_parts_allocated(),
|
||||
'remaining': build.remaining,
|
||||
'incomplete': build.incomplete_count,
|
||||
}
|
||||
|
||||
accept_overallocated = serializers.ChoiceField(
|
||||
label=_('Overallocated Stock'),
|
||||
choices=list(OverallocationChoice.OPTIONS.items()),
|
||||
|
@ -228,11 +228,7 @@ src="{% static 'img/blank_image.png' %}"
|
||||
});
|
||||
|
||||
$("#build-complete").on('click', function() {
|
||||
completeBuildOrder({{ build.pk }}, {
|
||||
overallocated: {% if build.has_overallocated_parts %}true{% else %}false{% endif %},
|
||||
allocated: {% if build.are_untracked_parts_allocated %}true{% else %}false{% endif %},
|
||||
completed: {% if build.remaining == 0 %}true{% else %}false{% endif %},
|
||||
});
|
||||
completeBuildOrder({{ build.pk }});
|
||||
});
|
||||
{% endif %}
|
||||
|
||||
|
@ -201,7 +201,9 @@ function cancelBuildOrder(build_id, options={}) {
|
||||
/* Construct a form to "complete" (finish) a build order */
|
||||
function completeBuildOrder(build_id, options={}) {
|
||||
|
||||
var url = `/api/build/${build_id}/finish/`;
|
||||
constructForm(`/api/build/${build_id}/finish/`, {
|
||||
fieldsFunction: function(opts) {
|
||||
var ctx = opts.context || {};
|
||||
|
||||
var fields = {
|
||||
accept_unallocated: {},
|
||||
@ -209,12 +211,40 @@ function completeBuildOrder(build_id, options={}) {
|
||||
accept_incomplete: {},
|
||||
};
|
||||
|
||||
// Hide "accept overallocated" field if the build is *not* overallocated
|
||||
if (!ctx.overallocated) {
|
||||
delete fields.accept_overallocated;
|
||||
}
|
||||
|
||||
// Hide "accept incomplete" field if the build has been completed
|
||||
if (!ctx.remaining || ctx.remaining == 0) {
|
||||
delete fields.accept_incomplete;
|
||||
}
|
||||
|
||||
// Hide "accept unallocated" field if the build is fully allocated
|
||||
if (ctx.allocated) {
|
||||
delete fields.accept_unallocated;
|
||||
}
|
||||
|
||||
return fields;
|
||||
},
|
||||
preFormContent: function(opts) {
|
||||
var ctx = opts.context || {};
|
||||
|
||||
var html = '';
|
||||
|
||||
if (options.allocated && options.completed) {
|
||||
if (ctx.allocated && ctx.remaining == 0 && ctx.incomplete == 0) {
|
||||
html += `
|
||||
<div class='alert alert-block alert-success'>
|
||||
{% trans "Build order is ready to be completed" %}
|
||||
{% trans "Build order is ready to be completed" %}'
|
||||
</div>`;
|
||||
} else {
|
||||
|
||||
if (ctx.incomplete > 0) {
|
||||
html += `
|
||||
<div class='alert alert-block alert-danger'>
|
||||
<strong>{% trans "Build order has incomplete outputs" %}</strong><br>
|
||||
{% trans "This build order cannot be completed as there are incomplete outputs" %}
|
||||
</div>`;
|
||||
} else {
|
||||
html += `
|
||||
@ -222,37 +252,23 @@ function completeBuildOrder(build_id, options={}) {
|
||||
<strong>{% trans "Build Order is incomplete" %}</strong>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
if (!options.allocated) {
|
||||
if (!ctx.allocated) {
|
||||
html += `<div class='alert alert-block alert-warning'>{% trans "Required stock has not been fully allocated" %}</div>`;
|
||||
}
|
||||
|
||||
if (!options.completed) {
|
||||
if (ctx.remaining > 0) {
|
||||
html += `<div class='alert alert-block alert-warning'>{% trans "Required build quantity has not been completed" %}</div>`;
|
||||
}
|
||||
}
|
||||
|
||||
// Hide particular fields if they are not required
|
||||
|
||||
if (options.allocated) {
|
||||
delete fields.accept_unallocated;
|
||||
}
|
||||
|
||||
if (options.completed) {
|
||||
delete fields.accept_incomplete;
|
||||
}
|
||||
|
||||
if (!options.overallocated) {
|
||||
delete fields.accept_overallocated;
|
||||
}
|
||||
|
||||
constructForm(url, {
|
||||
fields: fields,
|
||||
return html;
|
||||
},
|
||||
reload: true,
|
||||
confirm: true,
|
||||
method: 'POST',
|
||||
title: '{% trans "Complete Build Order" %}',
|
||||
preFormContent: html,
|
||||
method: 'POST',
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user