WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/ListeDesTicketsPanel.java

  package org.openconcerto.erp.core.sales.pos.ui;
 import org.openconcerto.erp.core.sales.pos.TicketPrinterConfiguration;
 import org.openconcerto.erp.core.sales.pos.io.Printable;
 import org.openconcerto.erp.core.sales.pos.io.TicketPrinter;
-import org.openconcerto.erp.core.sales.pos.model.Article;
 import org.openconcerto.erp.core.sales.pos.model.RegisterFiles;
 import org.openconcerto.erp.core.sales.pos.model.RegisterLog;
 import org.openconcerto.erp.core.sales.pos.model.Ticket;
 import org.openconcerto.ui.DefaultListModel;
 import org.openconcerto.ui.touch.ScrollableList;
 import org.openconcerto.utils.ExceptionHandler;
-import org.openconcerto.utils.Pair;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
         protected Z(final RegisterFiles files, final Calendar day) throws IOException, JDOMException {
             super("Z", new RegisterLog(files.getLogFile(day)).parse());
+        }
         @Override
-        protected final List<Ticket> getReceipts() throws ParseException {
+        protected final List<Ticket> getReceipts() throws ParseException, IOException {
             return this.getLog().parseReceipts();
+        }
         @Override
         public String getLabel() {
         c.gridheight = 2;
         try {
             final RegisterLog lastLog = this.frame.getFiles().getLastLog();
             final List<Ticket> receipts = lastLog.parseReceipts();
-            ticketLlistModel = new DefaultListModel();
+            this.ticketLlistModel = new DefaultListModel();
-            ticketLlistModel.addElement(new X(lastLog, receipts));
+            this.ticketLlistModel.addElement(new X(lastLog, receipts));
-            ticketLlistModel.addElement(new XLite(lastLog, receipts));
+            this.ticketLlistModel.addElement(new XLite(lastLog, receipts));
             final Date previousDate = lastLog.getFirstRegisterEvent().getPreviousDate();
             if (previousDate != null) {
                 final Calendar cal = Calendar.getInstance();
                 cal.setTime(previousDate);
-                ticketLlistModel.addElement(new Z(this.frame.getFiles(), cal));
+                this.ticketLlistModel.addElement(new Z(this.frame.getFiles(), cal));
+            }
-            ticketLlistModel.addAll(receipts);
+            this.ticketLlistModel.addAll(receipts);
         } catch (Exception exn) {
             ExceptionHandler.handle(this.frame, "Impossible de charger les tickets", exn);
+        }
         final Font f = new Font(ARIAL_FONT, Font.PLAIN, 24);
-        ticketList = new ScrollableList(ticketLlistModel) {
+        this.ticketList = new ScrollableList(this.ticketLlistModel) {
             @Override
             public void paintCell(Graphics g, Object object, int index, boolean isSelected, int posY) {
                 g.setFont(f);
                 if (isSelected) {
                 } else {
                     g.drawString(((RegisterSummary) object).getLabel(), 10, posY + 39);
+                }
+            }
         };
-        this.add(ticketList, c);
+        this.add(this.ticketList, c);
         // Ticket
         c.fill = GridBagConstraints.VERTICAL;
+        c.weightx = 0;
         c.gridx++;
         c.gridheight = 1;
         c.insets = new Insets(10, 10, 10, 10);
-        ticketP = new TextAreaTicketPrinter();
+        this.ticketP = new TextAreaTicketPrinter();
-        JScrollPane scrollPane = new JScrollPane(ticketP);
+        JScrollPane scrollPane = new JScrollPane(this.ticketP);
         scrollPane.setPreferredSize(new Dimension(400, 200));
         scrollPane.setMinimumSize(new Dimension(400, 200));
         this.add(scrollPane, c);
-        ticketList.addListSelectionListener(new ListSelectionListener() {
+        this.ticketList.addListSelectionListener(new ListSelectionListener() {
             @Override
             public void valueChanged(ListSelectionEvent e) {
-                Object selectedValue = ticketList.getSelectedValue();
+                Object selectedValue = ListeDesTicketsPanel.this.ticketList.getSelectedValue();
                 setSelectedTicket(selectedValue);
+            }
         });
         // Menu
         c.gridy++;
         c.weighty = 0;
         c.fill = GridBagConstraints.NONE;
         final Font font = new Font(ARIAL_FONT, Font.PLAIN, 46);
-        l = new JList(new String[] { "Imprimer", "Annuler" });
+        this.l = new JList(new String[] { "Imprimer", "Annuler le ticket" });
-        l.setCellRenderer(new ListCellRenderer() {
+        this.l.setCellRenderer(new ListCellRenderer() {
             @Override
             public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                 JLabel l = new JLabel(value.toString()) {
                     @Override
                 l.setFont(font);
                 return l;
+            }
         });
-        l.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        this.l.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        l.getSelectionModel().addListSelectionListener(this);
+        this.l.getSelectionModel().addListSelectionListener(this);
-        l.setFixedCellHeight(160);
+        this.l.setFixedCellHeight(100);
-        this.add(l, c);
+        this.add(this.l, c);
         setFont(new Font(ARIAL_FONT, Font.BOLD, 24));
         // Listeners
         bBack.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                frame.showCaisse();
+                ListeDesTicketsPanel.this.frame.showCaisse();
+            }
         });
+    }
     @Override
     public void valueChanged(ListSelectionEvent e) {
         if (e.getValueIsAdjusting()) {
             return;
+        }
-        Object selectedValue = ticketList.getSelectedValue();
+        Object selectedValue = this.ticketList.getSelectedValue();
-        int selectedIndex = l.getSelectedIndex();
+        int selectedIndex = this.l.getSelectedIndex();
         if (selectedIndex == 0 && selectedValue != null) {
             this.frame.getPOSConf().printOnceOnFirstPrinter(((Printable) selectedValue));
-        } else if (selectedIndex == 1 && selectedValue != null) {
+        } else if (selectedIndex == 1 && selectedValue != null && selectedValue instanceof Ticket) {
-            // Annulation du ticket
             Ticket t = (Ticket) selectedValue;
-            for (Pair<Article, Integer> a : t.getArticles()) {
-                frame.getControler().addArticle(a.getFirst());
+            this.frame.getControler().cancel(t);
-                frame.getControler().setArticleCount(a.getFirst(), -a.getSecond());
-                frame.getControler().setArticleHT(a.getFirst(), a.getFirst().getPriceWithoutTax());
-            }
-            frame.showCaisse();
+        }
-        l.clearSelection();
+        this.l.clearSelection();
+    }
     public void setSelectedTicket(Object selectedValue) {
-        ticketP.clear();
+        this.ticketP.clear();
         if (selectedValue != null) {
             this.frame.getPOSConf().print(((Printable) selectedValue), new TicketPrinterConfiguration() {
                 @Override
                 public TicketPrinter createTicketPrinter() {
-                    return ticketP;
+                    return ListeDesTicketsPanel.this.ticketP;
+                }
                 @Override
                 public int getCopyCount() {
                     return 1;
                 public boolean isValid() {
                     return true;
+                }
             });
             try {
-                ticketP.printBuffer();
+                this.ticketP.printBuffer();
             } catch (Exception e1) {
                 e1.printStackTrace();
+            }
+        }
-        ticketList.setSelectedValue(selectedValue, true);
+        this.ticketList.setSelectedValue(selectedValue, true);
+    }
+}

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/ListeDesTicketsPanel.java - Rev 156 → 174