-
+
- Confirm
+ Confirm
- Back
+ Back
@@ -192,9 +198,6 @@ export var Checkout = Vue.component("checkout", {
`,
computed: {
- utils: function() {
- return utils;
- },
// TODO: move these to methods
manual_select_picking_fields: function() {
return [
@@ -221,10 +224,34 @@ export var Checkout = Vue.component("checkout", {
// this._state_load(state);
// },
methods: {
- record_by_id: function(records, _id) {
- // TODO: double check when the process is done if this is still needed or not.
- // `manual-select` can now buble up events w/ full record.
- return _.first(_.filter(records, {id: _id}));
+ screen_title: function() {
+ if (_.isEmpty(this.current_doc()) || this.state_is("confirm_start"))
+ return this.menu_item.name;
+ let title = this.current_doc().record.name;
+ return title;
+ },
+ current_doc: function() {
+ const data = this.state_get_data("select_line");
+ if (_.isEmpty(data)) {
+ return null;
+ }
+ return {
+ record: data.picking,
+ identifier: data.picking.name,
+ };
+ },
+ select_line_manual_select_opts: function() {
+ return {
+ group_color: this.utils.colors.color_for("screen_step_todo"),
+ };
+ },
+ select_package_manual_select_opts: function() {
+ return {
+ multiple: true,
+ initSelectAll: true,
+ list_item_component: "picking-select-package-content",
+ list_item_options: {actions: ["action_qty_edit"]},
+ };
},
},
data: function() {
@@ -368,6 +395,11 @@ export var Checkout = Vue.component("checkout", {
console.log("unselected", unselected);
this.wait_call(
this.odoo.call("reset_line_qty", {
+ picking_id: this.state.data.picking.id,
+ selected_line_ids: _.map(
+ this.state.data.selected,
+ _.property("id")
+ ),
move_line_id: unselected.id,
})
);
@@ -377,7 +409,7 @@ export var Checkout = Vue.component("checkout", {
this.state_set_data(
{
picking: this.state.data.picking,
- record: record,
+ line: record,
selected_line_ids: _.map(
this.state.data.selected,
_.property("id")
@@ -431,6 +463,7 @@ export var Checkout = Vue.component("checkout", {
},
events: {
qty_change_confirm: "on_confirm",
+ qty_edit: "on_qty_update",
},
on_back: () => {
this.state_to("select_package");
@@ -445,7 +478,7 @@ export var Checkout = Vue.component("checkout", {
this.odoo.call("set_custom_qty", {
picking_id: this.state.data.picking.id,
selected_line_ids: this.state.data.selected_line_ids,
- move_line_id: this.state.data.record.id,
+ move_line_id: this.state.data.line.id,
qty_done: this.state.data.qty,
})
);
diff --git a/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js b/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
index 6511b94411..80702afb4f 100644
--- a/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
+++ b/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
@@ -20,14 +20,15 @@ export var ClusterPicking = Vue.component("cluster-picking", {
/>
-
-
-
@@ -114,14 +112,32 @@ export var ClusterPicking = Vue.component("cluster-picking", {
if (_.isEmpty(this.current_batch()) || this.state_is("confirm_start"))
return this.menu_item.name;
let title = this.current_batch().name;
- // if (this.current_picking) {
- // title += " - " + this.current_picking.name;
- // }
+ const picking = this.current_picking();
+ if (picking) {
+ title += " > " + picking.name;
+ }
return title;
},
current_batch: function() {
return this.state_get_data("confirm_start");
},
+ current_picking: function() {
+ const data = this.state_get_data("start_line") || {};
+ if (!data.picking) {
+ return null;
+ }
+ return data.picking;
+ },
+ current_doc: function() {
+ const picking = this.current_picking();
+ if (!picking) {
+ return {};
+ }
+ return {
+ record: picking,
+ identifier: picking.name,
+ };
+ },
action_full_bin: function() {
this.wait_call(
this.odoo.call("prepare_unload", {
@@ -228,13 +244,16 @@ export var ClusterPicking = Vue.component("cluster-picking", {
title: "Check qty and scan a destination bin",
scan_placeholder: "Scan destination bin",
},
+ events: {
+ qty_edit: "on_qty_edit",
+ },
enter: () => {
// TODO: shalle we hook v-model for qty input straight to the state data?
this.scan_destination_qty = this.state_get_data(
"start_line"
).quantity;
},
- on_qty_update: qty => {
+ on_qty_edit: qty => {
this.scan_destination_qty = parseInt(qty);
},
on_scan: scanned => {
diff --git a/shopfloor_mobile/static/wms/src/scenario/delivery.js b/shopfloor_mobile/static/wms/src/scenario/delivery.js
index cbb75b0487..b3fcd1ce68 100644
--- a/shopfloor_mobile/static/wms/src/scenario/delivery.js
+++ b/shopfloor_mobile/static/wms/src/scenario/delivery.js
@@ -1,6 +1,5 @@
import {ScenarioBaseMixin} from "./mixins.js";
import {process_registry} from "../services/process_registry.js";
-import {utils} from "../utils.js";
import {demotools} from "../demo/demo.core.js"; // FIXME: dev only
import {} from "../demo/demo.delivery.js"; // FIXME: dev only
@@ -28,8 +27,8 @@ export var Delivery = Vue.component("checkout", {
@@ -59,11 +58,6 @@ export var Delivery = Vue.component("checkout", {
`,
- computed: {
- utils: function() {
- return utils;
- },
- },
// FIXME: just for dev
// mounted: function() {
// // TEST force state and data
@@ -74,17 +68,12 @@ export var Delivery = Vue.component("checkout", {
// this._state_load(state);
// },
methods: {
- record_by_id: function(records, _id) {
- // TODO: double check when the process is done if this is still needed or not.
- // `manual-select` can now buble up events w/ full record.
- return _.first(_.filter(records, {id: _id}));
- },
deliver_move_line_list_options: function() {
return {
list_item_options: {
actions: ["action_cancel_line"],
fields: this.move_line_detail_fields(),
- list_item_klass_maker: this.utils.move_line_color_klass,
+ list_item_klass_maker: this.utils.misc.move_line_color_klass,
},
};
},
@@ -102,7 +91,7 @@ export var Delivery = Vue.component("checkout", {
label: "Lines",
renderer: function(rec, field) {
return (
- self.utils.picking_completed_lines(rec) +
+ self.utils.misc.picking_completed_lines(rec) +
" / " +
rec.move_lines.length
);
@@ -194,7 +183,7 @@ export var Delivery = Vue.component("checkout", {
},
visible_records: records => {
const self = this;
- let visible_records = utils.order_picking_by_completeness(
+ let visible_records = this.utils.misc.order_picking_by_completeness(
records
);
if (this.state.data.filtered) {
diff --git a/shopfloor_mobile/static/wms/src/scenario/mixins.js b/shopfloor_mobile/static/wms/src/scenario/mixins.js
index 224c84f400..ecd4689e25 100644
--- a/shopfloor_mobile/static/wms/src/scenario/mixins.js
+++ b/shopfloor_mobile/static/wms/src/scenario/mixins.js
@@ -84,6 +84,7 @@ export var ScenarioBaseMixin = {
return {
// you can provide a different screen title
title: this.screen_title ? this.screen_title() : this.menu_item.name,
+ current_doc: this.current_doc ? this.current_doc() : null,
klass: this.usage + " " + "state-" + this.state.key,
user_message: this.user_message,
user_popup: this.user_popup,
@@ -104,6 +105,11 @@ export var ScenarioBaseMixin = {
},
},
methods: {
+ make_state_component_key: function(bits) {
+ bits.unshift(this.current_state_key);
+ bits.unshift(this.usage);
+ return this.make_component_key(bits);
+ },
storage_key: function(state_key) {
state_key = _.isUndefined(state_key) ? this.current_state_key : state_key;
return this.usage + "." + state_key;
@@ -321,10 +327,10 @@ export var ScenarioBaseMixin = {
_.each(self.state.events, function(handler, name) {
if (typeof handler == "string") handler = self.state[handler];
const event_name = self.state.key + ":" + name;
- // Wipe old handlers
- // TODO: any way to register them just once?
- self.$root.event_hub.$off(event_name, handler);
- self.$root.event_hub.$on(event_name, handler);
+ const existing = self.$root.event_hub._events[event_name];
+ if (handler && _.isEmpty(existing)) {
+ self.$root.event_hub.$on(event_name, handler);
+ }
});
}
},
diff --git a/shopfloor_mobile/static/wms/src/services/color_registry.js b/shopfloor_mobile/static/wms/src/services/color_registry.js
index 17e3b97aed..d7c2e1d184 100644
--- a/shopfloor_mobile/static/wms/src/services/color_registry.js
+++ b/shopfloor_mobile/static/wms/src/services/color_registry.js
@@ -2,7 +2,38 @@ import {ColorRegistry} from "./registry.js";
export var color_registry = new ColorRegistry();
-color_registry.add_theme({
- screen_step_done: "green accent-4",
- screen_step_missing: "amber",
-});
+color_registry.add_theme(
+ {
+ /**
+ * standard keys
+ */
+ primary: "#491966",
+ secondary: "#CFD2FF",
+ accent: "#82B1FF",
+ error: "#c22a4a",
+ info: "#5e60ab",
+ success: "#8fbf44",
+ warning: "amber",
+ /**
+ * app specific
+ */
+ screen_step_done: "success",
+ screen_step_todo: "#FFE3AC",
+ /**
+ * icons
+ */
+ info_icon: "info darken-2",
+ /**
+ * buttons / actions
+ */
+ btn_action: "primary lighten-2",
+ btn_action_cancel: "error",
+ btn_action_warn: "amber",
+ btn_action_complete: "success",
+ /**
+ * selection
+ */
+ item_selected: "success",
+ },
+ "light"
+); // TODO: we should bave a theme named "coosa" and select it
diff --git a/shopfloor_mobile/static/wms/src/services/registry.js b/shopfloor_mobile/static/wms/src/services/registry.js
index 08938eb670..8da03a0efb 100644
--- a/shopfloor_mobile/static/wms/src/services/registry.js
+++ b/shopfloor_mobile/static/wms/src/services/registry.js
@@ -21,26 +21,26 @@ export class Registry {
}
export class ColorRegistry {
- constructor(theme, _default = "default") {
- this.themes = [];
- this.colors = {};
+ constructor(theme, _default = "light") {
+ this.themes = {};
this.default_theme = _default;
}
add_theme(colors, theme) {
if (_.isUndefined(theme)) theme = this.default_theme;
- if (!this.themes.includes(theme)) {
- this.themes.push(theme);
- }
- this.colors[theme] = colors;
+ this.themes[theme] = colors;
}
color_for(key, theme) {
if (_.isUndefined(theme)) theme = this.default_theme;
- if (!this.themes.includes(theme)) {
- console.log("Theme", theme, "not registeed.");
+ if (!this.themes[theme]) {
+ console.log("Theme", theme, "not registered.");
return null;
}
- return this.colors[theme][key];
+ return this.themes[theme][key];
+ }
+
+ get_themes() {
+ return this.themes;
}
}
diff --git a/shopfloor_mobile/static/wms/src/settings/profile.js b/shopfloor_mobile/static/wms/src/settings/profile.js
index 8e150047ce..720cd65b23 100644
--- a/shopfloor_mobile/static/wms/src/settings/profile.js
+++ b/shopfloor_mobile/static/wms/src/settings/profile.js
@@ -33,12 +33,12 @@ export var Profile = Vue.component("profile", {
- Reload config and menu
+ Reload config and menu
- Logout
+ Logout
diff --git a/shopfloor_mobile/static/wms/src/utils.js b/shopfloor_mobile/static/wms/src/utils.js
index ee7e78d0ac..617ef0ef80 100644
--- a/shopfloor_mobile/static/wms/src/utils.js
+++ b/shopfloor_mobile/static/wms/src/utils.js
@@ -146,6 +146,8 @@ export class Utils {
return _.reverse(ordered);
}
+ // DIsplay utils: TODO: split them to their own place
+
format_date_display(date_string, options = {}) {
_.defaults(options, {
locale: navigator ? navigator.language : "en-US",
@@ -174,6 +176,48 @@ export class Utils {
}
return "move-line-" + klass;
}
+
+ /**
+ * Provide display options for rendering move line product's info.
+ *
+ * TODO: @simahawk this is a first attempt to stop creating a specific widget of each case
+ * whereas you have to handle different options.
+ * The aim is to be able to re-use detail-card and alike by passing options only.
+ *
+ * @param {*} line The move line
+ */
+ move_line_product_detail_options(line, override = {}) {
+ const fields = [
+ {path: "package_src.name", label: "Pack"},
+ {path: "lot.name", label: "Lot"},
+ {
+ path: "quantity",
+ label: "Qty",
+ render_component: "packaging-qty-picker-display",
+ render_options: function(record) {
+ return {
+ init_value: record.quantity,
+ available_packaging: record.product.packaging,
+ };
+ },
+ },
+ {path: "product.qty_available", label: "Qty on hand"},
+ ];
+ let opts = {
+ main: true,
+ key_title: "product.display_name",
+ fields: fields,
+ title_action_field: {action_val_path: "product.barcode"},
+ };
+ return _.extend(opts, override || {});
+ }
+ move_line_qty_picker_options(line, override = {}) {
+ let opts = {
+ init_value: line.quantity,
+ available_packaging: line.product.packaging,
+ };
+ return _.extend(opts, override || {});
+ }
}
export const utils = new Utils();