diff options
author | David McMackins II <contact@mcmackins.org> | 2016-11-11 10:51:17 -0600 |
---|---|---|
committer | David McMackins II <contact@mcmackins.org> | 2016-11-11 10:51:17 -0600 |
commit | 6474078ba69227059cef46ddc7b4664c926e4887 (patch) | |
tree | 50d44ce1947964e19960d41f9201d28affff3432 | |
parent | cea0931193134c3989ea0f0672b2415a79df7edf (diff) |
Add ordering
-rw-r--r-- | lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar | bin | 0 -> 26948 bytes | |||
-rw-r--r-- | lib/LGoodDatePicker-7.6.3-backport.jar | bin | 0 -> 312058 bytes | |||
-rw-r--r-- | lib/nblibraries.properties | 4 | ||||
-rw-r--r-- | lib/threetenbp-1.3.1.jar | bin | 0 -> 506960 bytes | |||
-rw-r--r-- | nbproject/build-impl.xml | 35 | ||||
-rw-r--r-- | nbproject/genfiles.properties | 6 | ||||
-rw-r--r-- | nbproject/project.properties | 6 | ||||
-rw-r--r-- | nbproject/project.xml | 3 | ||||
-rw-r--r-- | src/com/delwink/icebox/Inventory.java | 41 | ||||
-rw-r--r-- | src/com/delwink/icebox/Order.java | 52 | ||||
-rw-r--r-- | src/com/delwink/icebox/lang/en_US.lang | 12 | ||||
-rw-r--r-- | src/com/delwink/icebox/swing/DoubleClickListener.java | 50 | ||||
-rw-r--r-- | src/com/delwink/icebox/swing/MainWindow.java | 12 | ||||
-rw-r--r-- | src/com/delwink/icebox/swing/OrderEditor.java | 185 | ||||
-rw-r--r-- | src/com/delwink/icebox/swing/OrderListDialog.java | 167 | ||||
-rw-r--r-- | src/com/delwink/icebox/swing/TextChangeListener.java | 40 | ||||
-rw-r--r-- | src/com/delwink/icebox/table/OrderListTableModel.java | 81 | ||||
-rw-r--r-- | src/com/delwink/icebox/table/OrderTableModel.java | 99 |
18 files changed, 765 insertions, 28 deletions
diff --git a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar Binary files differnew file mode 100644 index 0000000..d405fda --- /dev/null +++ b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar diff --git a/lib/LGoodDatePicker-7.6.3-backport.jar b/lib/LGoodDatePicker-7.6.3-backport.jar Binary files differnew file mode 100644 index 0000000..ba3b81a --- /dev/null +++ b/lib/LGoodDatePicker-7.6.3-backport.jar diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties new file mode 100644 index 0000000..6d0afb5 --- /dev/null +++ b/lib/nblibraries.properties @@ -0,0 +1,4 @@ +libs.CopyLibs.classpath=\ + ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar +libs.CopyLibs.displayName=CopyLibs Task +libs.CopyLibs.prop-version=2.0 diff --git a/lib/threetenbp-1.3.1.jar b/lib/threetenbp-1.3.1.jar Binary files differnew file mode 100644 index 0000000..e754d82 --- /dev/null +++ b/lib/threetenbp-1.3.1.jar diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 7fb33e9..57f3abf 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -42,18 +42,43 @@ is divided into following sections: <property file="nbproject/private/configs/${config}.properties"/> <property file="nbproject/private/private.properties"/> </target> - <target depends="-pre-init,-init-private" name="-init-user"> + <target name="-pre-init-libraries"> + <property location="./lib/nblibraries.properties" name="libraries.path"/> + <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/> + <pathconvert dirsep="/" property="libraries.dir"> + <path path="${libraries.dir.nativedirsep}"/> + </pathconvert> + <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/> + <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/> + </target> + <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries"> + <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties"> + <filterchain> + <replacestring from="$${base}" to="${libraries.dir}"/> + <escapeunicode/> + </filterchain> + </loadproperties> + </target> + <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries"> + <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}"> + <filterchain> + <replacestring from="$${base}" to="${libraries.dir}"/> + <escapeunicode/> + </filterchain> + </loadproperties> + </target> + <target depends="-pre-init,-init-private,-init-libraries" name="-init-user"> <property file="${user.properties.file}"/> <!-- The two properties below are usually overridden --> <!-- by the active platform. Just a fallback. --> <property name="default.javac.source" value="1.4"/> <property name="default.javac.target" value="1.4"/> </target> - <target depends="-pre-init,-init-private,-init-user" name="-init-project"> + <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project"> <property file="nbproject/configs/${config}.properties"/> <property file="nbproject/project.properties"/> </target> - <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> + <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init"> <property name="platform.java" value="${java.home}/bin/java"/> <available file="${manifest.file}" property="manifest.available"/> <condition property="splashscreen.available"> @@ -228,7 +253,7 @@ is divided into following sections: <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check"> + <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check"> <fail unless="src.dir">Must set src.dir</fail> <fail unless="test.src.dir">Must set test.src.dir</fail> <fail unless="build.dir">Must set build.dir</fail> @@ -881,7 +906,7 @@ is divided into following sections: <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline"> <property name="ap.cmd.line.internal" value=""/> </target> - <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/> + <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/> <!-- =================== COMPILATION SECTION diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 0390e98..db5ad96 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=84db0246 +build.xml.data.CRC32=c819d446 build.xml.script.CRC32=bbbf2609 build.xml.stylesheet.CRC32=8064a381@1.79.1.48 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=84db0246 -nbproject/build-impl.xml.script.CRC32=d4e75421 +nbproject/build-impl.xml.data.CRC32=c819d446 +nbproject/build-impl.xml.script.CRC32=243d4ab8 nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index 574fc6c..3b2b37c 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -29,9 +29,13 @@ dist.jar=${dist.dir}/IceBox.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= +file.reference.LGoodDatePicker-7.6.3-backport.jar=lib/LGoodDatePicker-7.6.3-backport.jar +file.reference.threetenbp-1.3.1.jar=lib/threetenbp-1.3.1.jar includes=** jar.compress=false -javac.classpath= +javac.classpath=\ + ${file.reference.threetenbp-1.3.1.jar}:\ + ${file.reference.LGoodDatePicker-7.6.3-backport.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/nbproject/project.xml b/nbproject/project.xml index e2cd950..d518143 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -11,5 +11,8 @@ <root id="test.src.dir"/> </test-roots> </data> + <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1"> + <definitions>./lib/nblibraries.properties</definitions> + </libraries> </configuration> </project> diff --git a/src/com/delwink/icebox/Inventory.java b/src/com/delwink/icebox/Inventory.java index 698c934..b2a0b5e 100644 --- a/src/com/delwink/icebox/Inventory.java +++ b/src/com/delwink/icebox/Inventory.java @@ -74,12 +74,14 @@ public class Inventory { for (int i = 0; i < items.getLength(); ++i) { Element item = (Element) items.item(i); - int id = Integer.parseInt(item.getAttribute("id")); - int reorderAt = Integer.parseInt(item.getAttribute("reorder")); - String name = item.getAttribute("name"); - String unit = item.getAttribute("unit"); - - addNewItem(new InventoryItem(id, name, unit, reorderAt)); + if (item.getParentNode().isSameNode(root)) { // make sure it's top-level + int id = Integer.parseInt(item.getAttribute("id")); + int reorderAt = Integer.parseInt(item.getAttribute("reorder")); + String name = item.getAttribute("name"); + String unit = item.getAttribute("unit"); + + addNewItem(new InventoryItem(id, name, unit, reorderAt)); + } } } @@ -90,7 +92,7 @@ public class Inventory { String orderNumber = order.getAttribute("num"); Date orderDate = new Date(Long.parseLong(order.getAttribute("date"))); - Order newOrder = new Order(orderNumber, orderDate); + Order newOrder = new Order(this, orderNumber, orderDate); NodeList items = order.getElementsByTagName("item"); for (int j = 0; j < items.getLength(); ++j) { @@ -99,7 +101,7 @@ public class Inventory { int id = Integer.parseInt(item.getAttribute("id")); int qty = Integer.parseInt(item.getAttribute("qty")); - newOrder.addItem(id, qty); + newOrder.setItem(id, qty); } addOrder(newOrder); @@ -173,6 +175,21 @@ public class Inventory { writer.flush(); } + public void refreshQuantities() { + for (InventoryItem item : ITEMS.values()) + item.addStock(-item.getStock()); // clear stock before refreshing + + List<Order> orders = new ArrayList<>(ORDERS); + ORDERS.clear(); + for (Order order : orders) + addOrder(order); + + List<QuantityUpdate> updates = new ArrayList<>(UPDATES); + UPDATES.clear(); + for (QuantityUpdate update : updates) + addUpdate(update); + } + public final void addOrder(Order order) { ORDERS.add(order); @@ -185,6 +202,10 @@ public class Inventory { } } + public List<Order> getOrders() { + return ORDERS; + } + public final void addUpdate(QuantityUpdate update) { UPDATES.add(update); @@ -197,6 +218,10 @@ public class Inventory { } } + public List<QuantityUpdate> getUpdates() { + return UPDATES; + } + public final void addNewItem(InventoryItem item) { ITEMS.put(item.getID(), item); } diff --git a/src/com/delwink/icebox/Order.java b/src/com/delwink/icebox/Order.java index 1609484..1036067 100644 --- a/src/com/delwink/icebox/Order.java +++ b/src/com/delwink/icebox/Order.java @@ -17,9 +17,12 @@ package com.delwink.icebox; +import com.delwink.icebox.lang.Lang; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; /** @@ -27,39 +30,68 @@ import java.util.Map; * @author David McMackins II */ public class Order implements Iterable<Integer> { - protected final Map<Integer, Integer> ITEMS; + protected final List<InventoryItem> ITEMS; + protected final Map<Integer, Integer> BOM; protected Date orderDate; protected String orderNumber; /** * Creates a new empty order. + * @param inventory The inventory for this order. * @param orderNumber Identifier for this order. * @param orderDate The date of this order. */ - public Order(String orderNumber, Date orderDate) { - ITEMS = new HashMap<>(); + public Order(Inventory inventory, String orderNumber, Date orderDate) { + ITEMS = new ArrayList<>(inventory.getItems()); + BOM = new HashMap<>(); this.orderDate = orderDate; this.orderNumber = orderNumber; } /** * Creates a new empty order. + * @param inventory The inventory for this order. */ - public Order() { - this("", new Date()); + public Order(Inventory inventory) { + this(inventory, Lang.get("Order.new"), new Date()); } /** - * Adds an item to this order. + * Sets the quantity of an item on this order (adds if item not on order). * @param itemID ID of the item to be added. * @param qty Quantity of the item to be added. */ - public void addItem(int itemID, int qty) { - ITEMS.put(itemID, qty); + public void setItem(int itemID, int qty) { + BOM.put(itemID, qty); + } + + /** + * Gets an item from the order by index. + * @param i The index of the item. + * @return The InventoryItem at index i. + */ + public InventoryItem getItem(int i) { + for (Integer id : BOM.keySet()) { + if (i == 0) { + for (InventoryItem item : ITEMS) + if (item.getID() == id) + return item; + + throw new IndexOutOfBoundsException(); + } + + --i; + } + + throw new IndexOutOfBoundsException(); + } + + public int getItemCount() { + return BOM.size(); } public int getQuantityByID(int itemID) { - return ITEMS.get(itemID); + return BOM.get(itemID); } public Date getOrderDate() { @@ -80,6 +112,6 @@ public class Order implements Iterable<Integer> { @Override public Iterator<Integer> iterator() { - return ITEMS.keySet().iterator(); + return BOM.keySet().iterator(); } } diff --git a/src/com/delwink/icebox/lang/en_US.lang b/src/com/delwink/icebox/lang/en_US.lang index 73b1cab..31f69d2 100644 --- a/src/com/delwink/icebox/lang/en_US.lang +++ b/src/com/delwink/icebox/lang/en_US.lang @@ -21,6 +21,18 @@ MainWindow.SessionMenu.name=Session MainWindow.title=IceBox Inventory MainWindow.update=Update +Order.date=Order Date +Order.new=New Order +Order.number=Order # + +OrderEditor.column0=Item +OrderEditor.column1=Qty +OrderEditor.title=Edit Order + +OrderList.column0=Order # +OrderList.column1=Order Date +OrderList.title=Manage Orders + Report.soldVsWaste=Sold vs. Waste Setting.dialogTitle=Settings diff --git a/src/com/delwink/icebox/swing/DoubleClickListener.java b/src/com/delwink/icebox/swing/DoubleClickListener.java new file mode 100644 index 0000000..0967a2b --- /dev/null +++ b/src/com/delwink/icebox/swing/DoubleClickListener.java @@ -0,0 +1,50 @@ +/* + * IceBox - inventory management software for restaurants + * Copyright (C) 2016 Delwink, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package com.delwink.icebox.swing; + +import java.awt.Toolkit; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +/** + * A mouse listener which detects double clicks. + * @author David McMackins II + */ +public abstract class DoubleClickListener extends MouseAdapter { + public static final int INTERVAL = (Integer) Toolkit.getDefaultToolkit().getDesktopProperty("awt.multiClickInterval"); + + private Long lastClick = null; + + @Override + public final void mouseClicked(MouseEvent e) { + if (e.getButton() == MouseEvent.BUTTON1) { + if (lastClick != null && e.getWhen() - lastClick < INTERVAL) { + mouseDoubleClicked(e); + lastClick = null; + } else { + lastClick = e.getWhen(); + } + } + } + + /** + * Called when a double click is detected. + * @param e The last MouseEvent which triggered the double click. + */ + public abstract void mouseDoubleClicked(MouseEvent e); +} diff --git a/src/com/delwink/icebox/swing/MainWindow.java b/src/com/delwink/icebox/swing/MainWindow.java index 4c87c06..6b12c1d 100644 --- a/src/com/delwink/icebox/swing/MainWindow.java +++ b/src/com/delwink/icebox/swing/MainWindow.java @@ -144,7 +144,17 @@ public class MainWindow extends JFrame { ORDERS_BUTTON.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ae) { - throw new UnsupportedOperationException("Not supported yet."); + OrderListDialog dialog = new OrderListDialog(MainWindow.this, INVENTORY); + + dialog.addWindowListener(new WindowAdapter() { + @Override + public void windowClosed(WindowEvent e) { + INVENTORY.refreshQuantities(); + INVENTORY_TABLE.setModel(new MainWindowTableModel(INVENTORY)); + } + }); + + dialog.setVisible(true); } }); diff --git a/src/com/delwink/icebox/swing/OrderEditor.java b/src/com/delwink/icebox/swing/OrderEditor.java new file mode 100644 index 0000000..e18485e --- /dev/null +++ b/src/com/delwink/icebox/swing/OrderEditor.java @@ -0,0 +1,185 @@ +/* + * IceBox - inventory management software for restaurants + * Copyright (C) 2016 Delwink, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package com.delwink.icebox.swing; + +import com.delwink.icebox.Inventory; +import com.delwink.icebox.InventoryItem; +import com.delwink.icebox.Order; +import com.delwink.icebox.lang.Lang; +import com.delwink.icebox.table.OrderTableModel; +import com.github.lgooddatepicker.components.DatePicker; +import com.github.lgooddatepicker.optionalusertools.DateChangeListener; +import com.github.lgooddatepicker.zinternaltools.DateChangeEvent; +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.TreeSet; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import org.threeten.bp.LocalDate; + +/** + * Dialog for editing orders. + * @author David McMackins II + */ +public class OrderEditor extends JDialog { + private final DatePicker ORDER_DATE_FIELD; + private final JButton ADD_BUTTON, CANCEL_BUTTON, SAVE_BUTTON; + private final JComboBox<String> NEW_ITEM_MENU; + private final JTable BOM; + private final JTextField ORDER_NUMBER_FIELD; + private final Order ORDER; + + private boolean orderNumberChanged = false; + + public OrderEditor(Frame parent, Inventory inventory, Order order) { + super(parent, Lang.get("OrderEditor.title")); + setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setModal(true); + + ORDER = order; + + ORDER_DATE_FIELD = new DatePicker(); + ORDER_DATE_FIELD.setDate(LocalDate.ofEpochDay(ORDER.getOrderDate().getTime() / (3600 * 24 * 1000))); + ORDER_DATE_FIELD.addDateChangeListener(new DateChangeListener() { + @Override + public void dateChanged(DateChangeEvent dce) { + ORDER.setOrderDate(new Date(dce.getNewDate().toEpochDay())); + } + }); + + ORDER_NUMBER_FIELD = new JTextField(15); + ORDER_NUMBER_FIELD.setText(ORDER.getOrderNumber()); + ORDER_NUMBER_FIELD.getDocument().addDocumentListener(new TextChangeListener() { + @Override + public void textChanged(DocumentEvent e) { + ORDER.setOrderNumber(ORDER_NUMBER_FIELD.getText()); + orderNumberChanged = true; + } + }); + + BOM = new JTable(new OrderTableModel(ORDER)); + JScrollPane bomPane = new JScrollPane(BOM); + + final List<Integer> itemIDs = new ArrayList<>(); + NEW_ITEM_MENU = new JComboBox<>(); + for (InventoryItem item : new TreeSet<>(inventory.getItems())) { + String name = item.getName(); + + for (int i = 0; i < NEW_ITEM_MENU.getItemCount(); ++i) { + if (NEW_ITEM_MENU.getItemAt(i).equals(name)) { + name += " (id=" + item.getID() + ")"; + break; + } + } + + NEW_ITEM_MENU.addItem(name); + itemIDs.add(item.getID()); + } + + ADD_BUTTON = new JButton("+"); + ADD_BUTTON.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + ORDER.setItem(itemIDs.get(NEW_ITEM_MENU.getSelectedIndex()), 0); + BOM.setModel(new OrderTableModel(ORDER)); + } + }); + + final ActionListener doneEditingListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + dispose(); + } + }; + + CANCEL_BUTTON = new JButton(Lang.get("cancel")); + CANCEL_BUTTON.addActionListener(doneEditingListener); + + SAVE_BUTTON = new JButton(Lang.get("save")); + SAVE_BUTTON.addActionListener(doneEditingListener); + + JPanel orderHeader = new JPanel(); + orderHeader.setLayout(new BoxLayout(orderHeader, BoxLayout.Y_AXIS)); + + JPanel orderNumberBox = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + orderNumberBox.add(new JLabel(Lang.get("Order.number"))); + orderNumberBox.add(ORDER_NUMBER_FIELD); + + JPanel orderDateBox = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + orderDateBox.add(new JLabel(Lang.get("Order.date"))); + orderDateBox.add(ORDER_DATE_FIELD); + + orderHeader.add(orderNumberBox); + orderHeader.add(orderDateBox); + + JPanel buttonBox = new JPanel(new BorderLayout()); + JPanel leftButtonBox = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JPanel rightButtonBox = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + + leftButtonBox.add(ADD_BUTTON); + leftButtonBox.add(NEW_ITEM_MENU); + buttonBox.add(leftButtonBox, BorderLayout.WEST); + + rightButtonBox.add(CANCEL_BUTTON); + rightButtonBox.add(SAVE_BUTTON); + buttonBox.add(rightButtonBox, BorderLayout.EAST); + + setLayout(new BorderLayout()); + add(orderHeader, BorderLayout.NORTH); + add(bomPane, BorderLayout.CENTER); + add(buttonBox, BorderLayout.SOUTH); + + pack(); + centorOnParent(); + } + + public boolean isOrderNumberChanged() { + return orderNumberChanged; + } + + /** + * Overrides the order number changed flag. + * @param b Whether to say the order number has changed. + */ + public void setOrderNumberChanged(boolean b) { + orderNumberChanged = b; + } + + public Order getOrder() { + return ORDER; + } + + public void addSaveListener(ActionListener al) { + SAVE_BUTTON.addActionListener(al); + } +} diff --git a/src/com/delwink/icebox/swing/OrderListDialog.java b/src/com/delwink/icebox/swing/OrderListDialog.java new file mode 100644 index 0000000..e4f9b38 --- /dev/null +++ b/src/com/delwink/icebox/swing/OrderListDialog.java @@ -0,0 +1,167 @@ +/* + * IceBox - inventory management software for restaurants + * Copyright (C) 2016 Delwink, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package com.delwink.icebox.swing; + +import com.delwink.icebox.DataDir; +import com.delwink.icebox.Inventory; +import com.delwink.icebox.Order; +import com.delwink.icebox.lang.Lang; +import com.delwink.icebox.table.OrderListTableModel; +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; + +/** + * Dialog for selecting an order to edit. + * @author David McMackins II + */ +public class OrderListDialog extends JDialog { + private final JButton ADD_BUTTON; + private final JTable LIST_TABLE; + private final Inventory INVENTORY; + + public OrderListDialog(final Frame parent, Inventory inventory) { + super(parent, Lang.get("OrderList.title")); + setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setModal(true); + + INVENTORY = inventory; + + LIST_TABLE = new JTable(new OrderListTableModel(INVENTORY)); + JScrollPane tablePane = new JScrollPane(LIST_TABLE); + + final WindowListener doneEditingListener = new WindowAdapter() { + @Override + public void windowClosed(WindowEvent e) { + OrderListDialog.this.setVisible(true); + } + }; + + final ActionListener orderSavedListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + JButton button = (JButton) e.getSource(); + // I'm sorry + OrderEditor editor = (OrderEditor) button.getParent().getParent().getParent().getParent().getParent().getParent(); + Order order = editor.getOrder(); + + if (editor.isOrderNumberChanged()) { + List<Order> orders = INVENTORY.getOrders(); + String orig = order.getOrderNumber(); + int suffix = 1; + + for (int i = 0; i < orders.size(); ++i) { + Order o = orders.get(i); + if (o.getOrderNumber().equals(order.getOrderNumber()) && o != order) { + order.setOrderNumber(String.format("%s (%d)", orig, suffix++)); + i = -1; // will be 0 on next loop to restart it + } + } + } + + LIST_TABLE.setModel(new OrderListTableModel(INVENTORY)); + + try (OutputStream os = new FileOutputStream(DataDir.INVENTORY_FILE)) { + INVENTORY.saveXml(os); + } catch (IOException ex) { + Logger.getLogger(OrderListDialog.class.getName()).log(Level.SEVERE, null, ex); + } + } + }; + + LIST_TABLE.addMouseListener(new DoubleClickListener() { + @Override + public void mouseDoubleClicked(MouseEvent e) { + int row = LIST_TABLE.getSelectedRow(); + String orderNumber = (String) LIST_TABLE.getModel().getValueAt(row, 0); + Order order = null; + + for (Order o : INVENTORY.getOrders()) { + if (o.getOrderNumber().equals(orderNumber)) { + order = o; + break; + } + } + + if (order == null) + throw new IllegalStateException("Order with number \"" + orderNumber + "\" does not exist!"); + + OrderEditor editor = new OrderEditor(parent, INVENTORY, order); + editor.addSaveListener(orderSavedListener); + editor.addWindowListener(doneEditingListener); + + OrderListDialog.this.setVisible(false); + editor.setVisible(true); + } + }); + + ADD_BUTTON = new JButton("+"); + ADD_BUTTON.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + final Order order = new Order(INVENTORY, Lang.get("Order.new"), new Date()); + OrderEditor editor = new OrderEditor(parent, INVENTORY, order); + editor.setOrderNumberChanged(true); // since order name might conflict + editor.addSaveListener(orderSavedListener); + editor.addWindowListener(doneEditingListener); + + editor.addSaveListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + INVENTORY.addOrder(order); + } + }); + + OrderListDialog.this.setVisible(false); + editor.setVisible(true); + } + }); + + JPanel buttonBox = new JPanel(new BorderLayout()); + JPanel leftButtonBox = new JPanel(new FlowLayout(FlowLayout.LEFT)); + + leftButtonBox.add(ADD_BUTTON); + buttonBox.add(leftButtonBox, BorderLayout.WEST); + + setLayout(new BorderLayout()); + add(tablePane, BorderLayout.CENTER); + add(buttonBox, BorderLayout.SOUTH); + + pack(); + centorOnParent(); + } +} diff --git a/src/com/delwink/icebox/swing/TextChangeListener.java b/src/com/delwink/icebox/swing/TextChangeListener.java new file mode 100644 index 0000000..00b4feb --- /dev/null +++ b/src/com/delwink/icebox/swing/TextChangeListener.java @@ -0,0 +1,40 @@ +/* + * IceBox - inventory management software for restaurants + * Copyright (C) 2016 Delwink, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package com.delwink.icebox.swing; + +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; + +public abstract class TextChangeListener implements DocumentListener { + @Override + public void insertUpdate(DocumentEvent e) { + textChanged(e); + } + + @Override + public void removeUpdate(DocumentEvent e) { + textChanged(e); + } + + @Override + public void changedUpdate(DocumentEvent e) { + textChanged(e); + } + + public abstract void textChanged(DocumentEvent e); +} diff --git a/src/com/delwink/icebox/table/OrderListTableModel.java b/src/com/delwink/icebox/table/OrderListTableModel.java new file mode 100644 index 0000000..f8ed618 --- /dev/null +++ b/src/com/delwink/icebox/table/OrderListTableModel.java @@ -0,0 +1,81 @@ +/* + * IceBox - inventory management software for restaurants + * Copyright (C) 2016 Delwink, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package com.delwink.icebox.table; + +import com.delwink.icebox.Inventory; +import com.delwink.icebox.Order; +import com.delwink.icebox.lang.Lang; +import java.util.Date; +import javax.swing.table.AbstractTableModel; + +/** + * Table model for the order list. + * @author David McMackins II + */ +public class OrderListTableModel extends AbstractTableModel { + private final Inventory INVENTORY; + + public OrderListTableModel(Inventory inventory) { + INVENTORY = inventory; + } + + @Override + public int getRowCount() { + return INVENTORY.getOrders().size(); + } + + @Override + public int getColumnCount() { + return 2; + } + + @Override + public String getColumnName(int column) { + return Lang.get("OrderList.column" + column); + } + + @Override + public Class<?> getColumnClass(int column) { + switch (column) { + case 0: + return String.class; + + case 1: + return Date.class; + + default: + throw new IndexOutOfBoundsException(); + } + } + + @Override + public Object getValueAt(int row, int column) { + Order order = INVENTORY.getOrders().get(row); + + switch (column) { + case 0: + return order.getOrderNumber(); + + case 1: + return order.getOrderDate(); + + default: + throw new IndexOutOfBoundsException(); + } + } +} diff --git a/src/com/delwink/icebox/table/OrderTableModel.java b/src/com/delwink/icebox/table/OrderTableModel.java new file mode 100644 index 0000000..a202a1a --- /dev/null +++ b/src/com/delwink/icebox/table/OrderTableModel.java @@ -0,0 +1,99 @@ +/* + * IceBox - inventory management software for restaurants + * Copyright (C) 2016 Delwink, LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package com.delwink.icebox.table; + +import com.delwink.icebox.InventoryItem; +import com.delwink.icebox.Order; +import com.delwink.icebox.lang.Lang; +import javax.swing.table.AbstractTableModel; + +/** + * Table model for the order editor. + * @author David McMackins II + */ +public class OrderTableModel extends AbstractTableModel { + private final Order ORDER; + + public OrderTableModel(Order order) { + ORDER = order; + } + + @Override + public int getRowCount() { + return ORDER.getItemCount(); + } + + @Override + public int getColumnCount() { + return 2; + } + + @Override + public String getColumnName(int columnIndex) { + return Lang.get("OrderEditor.column" + columnIndex); + } + + @Override + public boolean isCellEditable(int row, int col) { + return col == 1; + } + + @Override + public Class<?> getColumnClass(int columnIndex) { + switch (columnIndex) { + case 0: + return String.class; + + case 1: + return Integer.class; + + default: + throw new IndexOutOfBoundsException(); + } + } + + @Override + public Object getValueAt(int row, int col) { + InventoryItem item = ORDER.getItem(row); + + switch (col) { + case 0: + return item.getName(); + + case 1: + return ORDER.getQuantityByID(item.getID()); + + default: + throw new IndexOutOfBoundsException(); + } + } + + @Override + public void setValueAt(Object o, int row, int col) { + InventoryItem item = ORDER.getItem(row); + + switch (col) { + case 1: + ORDER.setItem(item.getID(), (Integer) o); + break; + + default: + throw new IndexOutOfBoundsException(); + } + } +} |