From ecc839f0c77b201212f20bc0ac3c087e0a4a0b2c Mon Sep 17 00:00:00 2001 From: lethanhdat <91755733+ldss13@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:06:12 -0600 Subject: [PATCH] feat (print demo and service dialog) --- checkup_details.pdf | 83 +++++ medical_invoice.pdf | Bin 0 -> 12010 bytes pom.xml | 18 + .../ui/component/CheckUpPage/CheckUpPage.java | 52 ++- .../Demo.java | 2 +- .../MedicineDialog.java | 11 +- .../PrintDialog/EditableMedicalInvoice.java | 0 .../PrintDialog/MedicalInvoiceWithGUI.java | 183 ++++++++++ .../CheckUpPage/PrintDialog/PrintDialog.java | 6 + .../ServiceDialog/ServiceDialog.java | 334 ++++++++++++++++++ .../common/packet/req/GetSerInfoRequest.java | 12 + .../common/packet/res/GetSerInfoResponse.java | 13 + .../server/network/handler/ServerHandler.java | 34 ++ src/main/resources/database/BSK.db | Bin 73728 -> 73728 bytes 14 files changed, 730 insertions(+), 18 deletions(-) create mode 100644 checkup_details.pdf create mode 100644 medical_invoice.pdf rename src/main/java/BsK/client/ui/component/CheckUpPage/{MedicineWindow => MedicineDialog}/Demo.java (93%) rename src/main/java/BsK/client/ui/component/CheckUpPage/{MedicineWindow => MedicineDialog}/MedicineDialog.java (97%) create mode 100644 src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/EditableMedicalInvoice.java create mode 100644 src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/MedicalInvoiceWithGUI.java create mode 100644 src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/PrintDialog.java create mode 100644 src/main/java/BsK/client/ui/component/CheckUpPage/ServiceDialog/ServiceDialog.java create mode 100644 src/main/java/BsK/common/packet/req/GetSerInfoRequest.java create mode 100644 src/main/java/BsK/common/packet/res/GetSerInfoResponse.java diff --git a/checkup_details.pdf b/checkup_details.pdf new file mode 100644 index 0000000..3eb1ced --- /dev/null +++ b/checkup_details.pdf @@ -0,0 +1,83 @@ +%PDF-1.4 +% +1 0 obj +<< +/Type /Catalog +/Version /1.4 +/Pages 2 0 R +>> +endobj +2 0 obj +<< +/Type /Pages +/Kids [3 0 R] +/Count 1 +>> +endobj +3 0 obj +<< +/Type /Page +/MediaBox [0.0 0.0 595.27563 841.8898] +/Parent 2 0 R +/Contents 4 0 R +/Resources 5 0 R +>> +endobj +4 0 obj +<< +/Length 260 +/Filter /FlateDecode +>> +stream +xuR E|[tQif:uq,I_4'~$`=x̀qPaBz 7 +Wa?kozeȭꑤE3wBY0$$p. +X+Cr"1a"\DEt91J{Wg lƗgI\􊮉-֟&w&7Lצji:HW}ͱxgǒo#XQ3AGmub<#fgq +endstream +endobj +5 0 obj +<< +/Font 6 0 R +>> +endobj +6 0 obj +<< +/F1 7 0 R +/F2 8 0 R +>> +endobj +7 0 obj +<< +/Type /Font +/Subtype /Type1 +/BaseFont /Helvetica +/Encoding /WinAnsiEncoding +>> +endobj +8 0 obj +<< +/Type /Font +/Subtype /Type1 +/BaseFont /Helvetica-Bold +/Encoding /WinAnsiEncoding +>> +endobj +xref +0 9 +0000000000 65535 f +0000000015 00000 n +0000000078 00000 n +0000000135 00000 n +0000000254 00000 n +0000000588 00000 n +0000000621 00000 n +0000000662 00000 n +0000000759 00000 n +trailer +<< +/Root 1 0 R +/ID [<0D096FE5232DC05955FD1862642B6A74> <0D096FE5232DC05955FD1862642B6A74>] +/Size 9 +>> +startxref +861 +%%EOF diff --git a/medical_invoice.pdf b/medical_invoice.pdf new file mode 100644 index 0000000000000000000000000000000000000000..29a5c5660997ac5bc4d2c37bfc46adc1ca347a31 GIT binary patch literal 12010 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 KtV&wS*#8E7H$L?M literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index 5e89c79..cfeca41 100644 --- a/pom.xml +++ b/pom.xml @@ -116,6 +116,24 @@ 1.6.1 + + com.itextpdf + itextpdf + 5.5.13.2 + + + + org.apache.pdfbox + pdfbox + 2.0.27 + + + + com.itextpdf + itext7-core + 7.1.12 + pom + diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java b/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java index dcf8e2b..57ee088 100644 --- a/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java +++ b/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java @@ -3,7 +3,8 @@ package BsK.client.ui.component.CheckUpPage; import BsK.client.LocalStorage; import BsK.client.network.handler.ClientHandler; import BsK.client.network.handler.ResponseListener; -import BsK.client.ui.component.CheckUpPage.MedicineWindow.MedicineDialog; +import BsK.client.ui.component.CheckUpPage.MedicineDialog.MedicineDialog; +import BsK.client.ui.component.CheckUpPage.ServiceDialog.ServiceDialog; import BsK.client.ui.component.MainFrame; import BsK.client.ui.component.common.DateLabelFormatter; import BsK.client.ui.component.common.RoundedPanel; @@ -19,6 +20,8 @@ import lombok.extern.slf4j.Slf4j; import org.jdatepicker.impl.JDatePanelImpl; import org.jdatepicker.impl.JDatePickerImpl; import org.jdatepicker.impl.UtilDateModel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.swing.*; import javax.swing.table.DefaultTableModel; @@ -34,6 +37,7 @@ import java.util.Properties; @Slf4j public class CheckUpPage extends JPanel { + private static final Logger log = LoggerFactory.getLogger(CheckUpPage.class); private String[][] queue; private String[][] history; private DefaultTableModel model, historyModel; @@ -47,11 +51,13 @@ public class CheckUpPage extends JPanel { private JComboBox doctorComboBox, statusComboBox; private JDatePickerImpl datePicker; private String[][] medicinePrescription; + private String[][] servicePrescription; private String[] doctorOptions; - private MedicineDialog dialog = null; + private MedicineDialog medDialog = null; + private ServiceDialog serDialog = null; private int previousSelectedRow = -1; private boolean saved = false; - + boolean returnCell = false; public void updateQueue() { ClientHandler.addResponseListener(GetCheckUpQueueResponse.class, checkUpQueueListener); @@ -286,6 +292,7 @@ public class CheckUpPage extends JPanel { statusComboBox = new JComboBox<>(statusOptions); inputPanel.add(statusComboBox, gbc); table1.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + table1.getSelectionModel().addListSelectionListener(e -> { if (!e.getValueIsAdjusting()) { // Ensure final selection event int selectedRow = table1.getSelectedRow(); @@ -294,6 +301,7 @@ public class CheckUpPage extends JPanel { if(previousSelectedRow != selectedRow) { if(!saved) { JOptionPane.showMessageDialog(null, "Please save changes before selecting another patient"); + returnCell = true; table1.setRowSelectionInterval(previousSelectedRow, previousSelectedRow); return; } @@ -301,8 +309,12 @@ public class CheckUpPage extends JPanel { } // reset information + if (returnCell) { + returnCell = false; + return; + } medicinePrescription = new String[][]{}; - + servicePrescription = new String[][]{}; handleRowSelection(selectedRow); } @@ -330,8 +342,21 @@ public class CheckUpPage extends JPanel { JOptionPane.showMessageDialog(null, "Add action triggered"); break; case "service": - // Edit action - JOptionPane.showMessageDialog(null, "stethoscope action triggered"); + // If there is no user selected, show a warning message + if (checkupIdField.getText().isEmpty()) { + JOptionPane.showMessageDialog(null, "Please select a patient from the queue"); + return; + } + // Open service dialog + if(serDialog == null) { + serDialog = new ServiceDialog(mainFrame); + previousSelectedRow = table1.getSelectedRow(); + } + serDialog.setVisible(true); + saved = false; + servicePrescription = serDialog.getServicePrescription(); + + log.info("Service prescription: {}", servicePrescription); break; case "save": { //Warning message @@ -352,15 +377,22 @@ public class CheckUpPage extends JPanel { return; } // Open medicine dialog - if(previousSelectedRow != table1.getSelectedRow()) { - dialog = new MedicineDialog(mainFrame); + if(medDialog == null) { + medDialog = new MedicineDialog(mainFrame); previousSelectedRow = table1.getSelectedRow(); } - dialog.setVisible(true); + medDialog.setVisible(true); saved = false; - medicinePrescription = dialog.getMedicinePrescription(); + medicinePrescription = medDialog.getMedicinePrescription(); log.info("Medicine prescription: {}", medicinePrescription); + + break; + case "printer": + // Print action + JOptionPane.showMessageDialog(null, "Print action triggered"); + log.info("Medicine prescription: {}", (Object) medicinePrescription); + log.info("Service prescription: {}", (Object) servicePrescription); break; default: throw new IllegalStateException("Unexpected value: " + name); diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/MedicineWindow/Demo.java b/src/main/java/BsK/client/ui/component/CheckUpPage/MedicineDialog/Demo.java similarity index 93% rename from src/main/java/BsK/client/ui/component/CheckUpPage/MedicineWindow/Demo.java rename to src/main/java/BsK/client/ui/component/CheckUpPage/MedicineDialog/Demo.java index 78f9e9b..fc6006a 100644 --- a/src/main/java/BsK/client/ui/component/CheckUpPage/MedicineWindow/Demo.java +++ b/src/main/java/BsK/client/ui/component/CheckUpPage/MedicineDialog/Demo.java @@ -1,4 +1,4 @@ -package BsK.client.ui.component.CheckUpPage.MedicineWindow; +package BsK.client.ui.component.CheckUpPage.MedicineDialog; import javax.swing.*; import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator; diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/MedicineWindow/MedicineDialog.java b/src/main/java/BsK/client/ui/component/CheckUpPage/MedicineDialog/MedicineDialog.java similarity index 97% rename from src/main/java/BsK/client/ui/component/CheckUpPage/MedicineWindow/MedicineDialog.java rename to src/main/java/BsK/client/ui/component/CheckUpPage/MedicineDialog/MedicineDialog.java index 0affa11..587b72b 100644 --- a/src/main/java/BsK/client/ui/component/CheckUpPage/MedicineWindow/MedicineDialog.java +++ b/src/main/java/BsK/client/ui/component/CheckUpPage/MedicineDialog/MedicineDialog.java @@ -1,21 +1,17 @@ -package BsK.client.ui.component.CheckUpPage.MedicineWindow; +package BsK.client.ui.component.CheckUpPage.MedicineDialog; import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumnModel; -import javax.swing.table.TableRowSorter; import BsK.client.network.handler.ClientHandler; import BsK.client.network.handler.ResponseListener; -import BsK.common.packet.req.GetDoctorGeneralInfo; import BsK.common.packet.req.GetMedInfoRequest; import BsK.common.packet.res.GetMedInfoResponse; import BsK.common.util.network.NetworkUtil; -import BsK.server.network.util.UserUtil; import lombok.extern.slf4j.Slf4j; -import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,11 +21,9 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.HashMap; -import java.util.List; @Slf4j public class MedicineDialog extends JDialog { - private static final Logger log = LoggerFactory.getLogger(MedicineDialog.class); private JTextField medicineNameField; private JTextField medicineCompanyField; private JTextArea medicineDescriptionField; @@ -335,6 +329,7 @@ public class MedicineDialog extends JDialog { rowData[i] = tableModel.getValueAt(modelRow, i); } + rowData[4] = quantitySpinner.getValue(); rowData[7] = totalField.getText(); rowData[8] = noteField.getText(); selectedTableModel.addRow(rowData); @@ -387,6 +382,8 @@ public class MedicineDialog extends JDialog { quantityLeftField.setText(stock); UnitComboBox.setSelectedItem(unit); priceField.setText(price); + totalField.setText("0"); + noteField.setText(""); } public static void main(String[] args) { diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/EditableMedicalInvoice.java b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/EditableMedicalInvoice.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/MedicalInvoiceWithGUI.java b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/MedicalInvoiceWithGUI.java new file mode 100644 index 0000000..582abde --- /dev/null +++ b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/MedicalInvoiceWithGUI.java @@ -0,0 +1,183 @@ +package BsK.client.ui.component.CheckUpPage.PrintDialog; + +import com.itextpdf.io.image.ImageData; +import com.itextpdf.io.image.ImageDataFactory; +import com.itextpdf.kernel.pdf.PdfDocument; +import com.itextpdf.kernel.pdf.PdfWriter; +import com.itextpdf.layout.Document; +import com.itextpdf.layout.element.*; +import com.itextpdf.layout.element.Image; +import com.itextpdf.layout.property.UnitValue; + +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.rendering.PDFRenderer; + +import javax.print.*; +import javax.print.attribute.HashPrintRequestAttributeSet; +import javax.print.attribute.PrintRequestAttributeSet; +import javax.swing.*; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.*; + +public class MedicalInvoiceWithGUI { + + public static void main(String[] args) { + SwingUtilities.invokeLater(() -> new MedicalInvoiceWithGUI().createGUI()); + } + + private void createGUI() { + JFrame frame = new JFrame("Medical Invoice"); + frame.setSize(600, 600); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setLayout(new BorderLayout()); + + JPanel buttonPanel = new JPanel(new GridLayout(1, 3)); + JButton previewButton = new JButton("Preview PDF"); + JButton saveButton = new JButton("Save PDF"); + JButton printButton = new JButton("Print PDF"); + + buttonPanel.add(previewButton); + buttonPanel.add(saveButton); + buttonPanel.add(printButton); + + JLabel pdfViewer = new JLabel(); + JScrollPane scrollPane = new JScrollPane(pdfViewer); + frame.add(scrollPane, BorderLayout.CENTER); + frame.add(buttonPanel, BorderLayout.SOUTH); + + String pdfPath = "medical_invoice.pdf"; + + // Preview PDF Action + previewButton.addActionListener(e -> { + try { + generatePdf(pdfPath); + displayPdfInLabel(pdfPath, pdfViewer); + } catch (Exception ex) { + ex.printStackTrace(); + JOptionPane.showMessageDialog(frame, "Error displaying PDF: " + ex.getMessage()); + } + }); + + // Save PDF Action + saveButton.addActionListener(e -> { + try { + generatePdf(pdfPath); + JFileChooser fileChooser = new JFileChooser(); + fileChooser.setDialogTitle("Save PDF As"); + fileChooser.setSelectedFile(new File("medical_invoice.pdf")); + int userSelection = fileChooser.showSaveDialog(frame); + + if (userSelection == JFileChooser.APPROVE_OPTION) { + File fileToSave = fileChooser.getSelectedFile(); + File generatedFile = new File(pdfPath); + try (InputStream in = new FileInputStream(generatedFile); + OutputStream out = new FileOutputStream(fileToSave)) { + byte[] buffer = new byte[1024]; + int bytesRead; + while ((bytesRead = in.read(buffer)) != -1) { + out.write(buffer, 0, bytesRead); + } + JOptionPane.showMessageDialog(frame, "PDF saved: " + fileToSave.getAbsolutePath()); + } + } + } catch (Exception ex) { + ex.printStackTrace(); + JOptionPane.showMessageDialog(frame, "Error saving PDF: " + ex.getMessage()); + } + }); + + // Print PDF Action + printButton.addActionListener(e -> { + try { + generatePdf(pdfPath); + File pdfFile = new File(pdfPath); + printPdf(pdfFile); + JOptionPane.showMessageDialog(frame, "Printing triggered."); + } catch (Exception ex) { + ex.printStackTrace(); + JOptionPane.showMessageDialog(frame, "Error printing PDF: " + ex.getMessage()); + } + }); + + frame.setVisible(true); + } + + private void generatePdf(String pdfPath) throws Exception { + PdfWriter writer = new PdfWriter(pdfPath); + PdfDocument pdfDoc = new PdfDocument(writer); + Document document = new Document(pdfDoc); + + // Add logo + String logoPath = "/Users/lethanhdat/Documents/GitHub/ldS_BsK/src/main/java/BsK/client/ui/assets/icon/add.png"; // Path to your logo + ImageData imageData = ImageDataFactory.create(logoPath); + Image logo = new Image(imageData).scaleToFit(100, 100); + logo.setFixedPosition(50, 750); + document.add(logo); + + // Add clinic information + String clinicInfo = "Your Clinic Name\n123 Clinic Street\nCity, State, ZIP\nPhone: (123) 456-7890\nEmail: clinic@example.com"; + Paragraph clinicInfoParagraph = new Paragraph(clinicInfo).setTextAlignment(com.itextpdf.layout.property.TextAlignment.RIGHT); + document.add(clinicInfoParagraph); + + // Add patient and doctor names + String patientDoctorInfo = "Patient: John Doe\nDoctor: Dr. Jane Smith"; + Paragraph patientDoctorParagraph = new Paragraph(patientDoctorInfo); + document.add(patientDoctorParagraph); + + // Add services and medicine table + Table table = new Table(UnitValue.createPercentArray(new float[]{4, 2, 2})) + .setWidth(UnitValue.createPercentValue(100)); + table.addHeaderCell("Service/Medicine"); + table.addHeaderCell("Quantity"); + table.addHeaderCell("Price"); + table.addCell("Consultation"); + table.addCell("1"); + table.addCell("$50"); + table.addCell("Aspirin"); + table.addCell("2"); + table.addCell("$10"); + document.add(table); + + // Add diagnosis and notes + String diagnosisNotes = "Diagnosis: Flu\nNotes: Rest and hydration recommended"; + Paragraph diagnosisNotesParagraph = new Paragraph(diagnosisNotes); + document.add(diagnosisNotesParagraph); + + // Add signature area + Paragraph signatureArea = new Paragraph("\n\n\nSignature: ________________________"); + document.add(signatureArea); + + document.close(); + } + + private void displayPdfInLabel(String pdfPath, JLabel label) throws IOException { + PDDocument document = PDDocument.load(new File(pdfPath)); + PDFRenderer renderer = new PDFRenderer(document); + + // Render the first page + BufferedImage pageImage = renderer.renderImageWithDPI(0, 100); // 100 DPI for reasonable quality + ImageIcon icon = new ImageIcon(pageImage); + label.setIcon(icon); + + document.close(); + } + + public static void printPdf(File pdfFile) { + try { + PrintService printService = PrintServiceLookup.lookupDefaultPrintService(); + if (printService != null) { + DocPrintJob printJob = printService.createPrintJob(); + Doc pdfDoc = new SimpleDoc(pdfFile.toURI().toURL().openStream(), + javax.print.DocFlavor.INPUT_STREAM.PDF, null); + PrintRequestAttributeSet attributes = new HashPrintRequestAttributeSet(); + printJob.print(pdfDoc, attributes); + System.out.println("PDF sent to the printer."); + } else { + System.out.println("No default print service found."); + } + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/PrintDialog.java b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/PrintDialog.java new file mode 100644 index 0000000..c2671a0 --- /dev/null +++ b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/PrintDialog.java @@ -0,0 +1,6 @@ +package BsK.client.ui.component.CheckUpPage.PrintDialog; + + +public class PrintDialog { + +} diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/ServiceDialog/ServiceDialog.java b/src/main/java/BsK/client/ui/component/CheckUpPage/ServiceDialog/ServiceDialog.java new file mode 100644 index 0000000..21295b1 --- /dev/null +++ b/src/main/java/BsK/client/ui/component/CheckUpPage/ServiceDialog/ServiceDialog.java @@ -0,0 +1,334 @@ +package BsK.client.ui.component.CheckUpPage.ServiceDialog; + +import javax.swing.*; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableColumnModel; + +import BsK.client.network.handler.ClientHandler; +import BsK.client.network.handler.ResponseListener; +import BsK.common.packet.req.GetSerInfoRequest; +import BsK.common.packet.res.GetSerInfoResponse; +import BsK.common.util.network.NetworkUtil; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.awt.*; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.HashMap; + +@Slf4j +public class ServiceDialog extends JDialog { + private JTextField serviceNameField; + private JSpinner quantitySpinner; + private JTextField priceField; + private JTextField totalField; + private JTextArea noteField; + private DefaultTableModel tableModel, selectedTableModel; + private String[] serviceColumns = {"ID", "Service Name", "Price"}; + private String[][] serviceData; + private final ResponseListener getSerInfoResponseListener = this::getSerInfoHandler; + private TableColumnModel columnModel; + private HashMap selectedService = new HashMap<>(); + private JTable serviceTable; + private JTable selectedTable; + + private String[][] servicePrescription; + + public String[][] getServicePrescription() { + return servicePrescription; + } + + void getSerInfoHandler(GetSerInfoResponse response) { + log.info("Received service data"); + serviceData = response.getSerInfo(); + tableModel.setDataVector(serviceData, serviceColumns); + + // resize column width + columnModel = serviceTable.getColumnModel(); + columnModel.getColumn(0).setPreferredWidth(10); + columnModel.getColumn(1).setPreferredWidth(200); + columnModel.getColumn(2).setPreferredWidth(50); + } + + void sendGetSerInfoRequest() { + log.info("Sending GetSerInfoRequest"); + NetworkUtil.sendPacket(ClientHandler.ctx.channel(), new GetSerInfoRequest()); + } + + public ServiceDialog(Frame parent) { + super(parent, "Enter Service Details", true); + + // Set the size of the dialog + setSize(1100, 500); + setResizable(true); + + ClientHandler.addResponseListener(GetSerInfoResponse.class, getSerInfoResponseListener); + sendGetSerInfoRequest(); + + setLayout(new BorderLayout()); + + + JPanel inputPanel = new JPanel(); + inputPanel.setLayout(new GridBagLayout()); + GridBagConstraints gbc = new GridBagConstraints(); + + + gbc.insets = new Insets(5, 5, 5, 5); // Padding between components + gbc.weightx = 1.0; // Components stretch horizontally + gbc.weighty = 0.0; // Allow minor vertical flexibility + gbc.fill = GridBagConstraints.HORIZONTAL; + + gbc.anchor = GridBagConstraints.WEST; // Align components to the left + gbc.gridx = 0; + gbc.gridy = 0; + + inputPanel.add(new JLabel("Service Name:"), gbc); + gbc.gridx = 1; + serviceNameField = new JTextField(15); + inputPanel.add(serviceNameField, gbc); + + // Listen for changes in the text event + tableModel = new DefaultTableModel(serviceData, serviceColumns) { + @Override + public boolean isCellEditable(int row, int column) { + return false; + } + }; + serviceTable = new JTable(tableModel); + serviceTable.setFont(new Font("Serif", Font.BOLD, 20)); + serviceTable.setRowHeight(30); + serviceTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + JScrollPane scrollPane = new JScrollPane(serviceTable); + + + serviceTable.setPreferredScrollableViewportSize(new Dimension(625, 200)); + + + scrollPane.setPreferredSize(new Dimension(625, 200)); + + + serviceTable.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + SwingUtilities.invokeLater(() -> { + int selectedRow = serviceTable.getSelectedRow(); + if (selectedRow != -1) { + handleRowSelection(selectedRow); + } + }); + } + }); + + serviceNameField.addKeyListener(new KeyAdapter() { + @Override + public void keyPressed(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_ENTER) { + handleRowSelection(serviceTable.getSelectedRow()); + } + } + }); + + + serviceNameField.getDocument().addDocumentListener(new DocumentListener() { + @Override + public void insertUpdate(DocumentEvent e) { + findAndSelectRow(); + } + + @Override + public void removeUpdate(DocumentEvent e) { + findAndSelectRow(); + } + + @Override + public void changedUpdate(DocumentEvent e) { + findAndSelectRow(); + } + + private void findAndSelectRow() { + String searchText = serviceNameField.getText().trim(); + if (searchText.isEmpty()) { + // Clear selection if search text is empty + serviceTable.clearSelection(); + return; + } + + boolean found = false; + for (int row = 0; row < serviceTable.getRowCount(); row++) { + // Assuming the search is targeting the name column (column index 1) + String cellValue = serviceTable.getValueAt(row, 1).toString(); + if (cellValue.toLowerCase().contains(searchText.toLowerCase())) { + serviceTable.setRowSelectionInterval(row, row); + serviceTable.scrollRectToVisible(serviceTable.getCellRect(row, 1, true)); + found = true; + break; // Stop after selecting the first match + } + } + + if (!found) { + serviceTable.clearSelection(); // No matches found + } + } + }); + + + gbc.gridx = 0; + gbc.gridy++; + inputPanel.add(new JLabel("Quantity:"), gbc); + + gbc.gridx = 1; + // Create and set preferred size for the spinner + quantitySpinner = new JSpinner(); + quantitySpinner.setPreferredSize(new Dimension(100, 25)); // Adjust width and height as needed + inputPanel.add(quantitySpinner, gbc); + + + gbc.gridx = 0; + gbc.gridy++; + inputPanel.add(new JLabel("Price:"), gbc); + gbc.gridx = 1; + priceField = new JTextField(15); + inputPanel.add(priceField, gbc); + + gbc.gridx = 0; + gbc.gridy++; + inputPanel.add(new JLabel("Total:"), gbc); + gbc.gridx = 1; + totalField = new JTextField(15); + inputPanel.add(totalField, gbc); + + gbc.anchor = GridBagConstraints.NORTHWEST; + gbc.gridx = 0; + gbc.gridy++; + inputPanel.add(new JLabel("Note:"), gbc); + gbc.gridx = 1; + noteField = new JTextArea(2, 15); + inputPanel.add(noteField, gbc); + gbc.anchor = GridBagConstraints.WEST; + + quantitySpinner.addChangeListener(e -> { + int quantity = (int) quantitySpinner.getValue(); + if (quantity < 0) { + quantity = 0; + quantitySpinner.setValue(quantity); + } + + double price = Double.parseDouble(priceField.getText()); + totalField.setText(String.valueOf(quantity * price)); + }); + + + + // Set the split pane + JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, inputPanel, scrollPane); + splitPane.setResizeWeight(0.5); // Allocate more space to the inputPanel + // Wrap the splitPane in a JPanel to control height + JPanel topPanel = new JPanel(new BorderLayout()); + topPanel.add(splitPane, BorderLayout.CENTER); + + + // Create a table to display selected services + String[] columnNames = {"ID", "Service Name", "Quantity", "Single Price", "Total Price", "Note"}; + selectedTableModel = new DefaultTableModel(new String[][]{}, columnNames) { + @Override + public boolean isCellEditable(int row, int column) { + return false; + } + }; + + selectedTable = new JTable(selectedTableModel); + JScrollPane tableScrollPane = new JScrollPane(selectedTable); + + // Create a panel for add and remove buttons + JPanel buttonPanel = new JPanel(); + JButton addButton = new JButton("Add"); + JButton removeButton = new JButton("Remove"); + JButton submitButton = new JButton("Submit"); + buttonPanel.add(addButton); + buttonPanel.add(removeButton); + buttonPanel.add(submitButton); + + addButton.addActionListener(e -> { + int selectedRow = serviceTable.getSelectedRow(); + if (selectedRow != -1) { + int modelRow = serviceTable.convertRowIndexToModel(selectedRow); + if(selectedService.containsKey(tableModel.getValueAt(modelRow, 0).toString())) { + JOptionPane.showMessageDialog(this, "Service already added", "Error", JOptionPane.ERROR_MESSAGE); + return; + } + selectedService.put((String) tableModel.getValueAt(modelRow, 0), true); + Object[] rowData = new Object[6]; + + rowData[0] = tableModel.getValueAt(modelRow, 0); + rowData[1] = tableModel.getValueAt(modelRow, 1); + rowData[2] = quantitySpinner.getValue(); + rowData[3] = priceField.getText(); + rowData[4] = totalField.getText(); + rowData[5] = noteField.getText(); + selectedTableModel.addRow(rowData); + log.info("Added service with id: {}", tableModel.getValueAt(modelRow, 0)); + } + }); + + removeButton.addActionListener(e -> { + int selectedRow = selectedTable.getSelectedRow(); + if (selectedRow != -1) { + String id = selectedTableModel.getValueAt(selectedRow, 0).toString(); + selectedService.remove(id); + log.info("Removed service with id: {}", id); + selectedTableModel.removeRow(selectedRow); + } + }); + + submitButton.addActionListener(e -> { + int rows = selectedTableModel.getRowCount(); + servicePrescription = new String[rows][6]; + for (int i = 0; i < rows; i++) { + for (int j = 0; j < 6; j++) { + servicePrescription[i][j] = selectedTableModel.getValueAt(i, j).toString(); + } + } + dispose(); + }); + + // Add components to the dialog + add(topPanel, BorderLayout.NORTH); + add(tableScrollPane, BorderLayout.CENTER); + add(buttonPanel, BorderLayout.SOUTH); + + setLocationRelativeTo(parent); + } + + private void handleRowSelection(int selectedRow) { + String id = (String) tableModel.getValueAt(selectedRow, 0); + String name = (String) tableModel.getValueAt(selectedRow, 1); + String price = (String) tableModel.getValueAt(selectedRow, 2); + + serviceNameField.setText(name); + quantitySpinner.setValue(0); + priceField.setText(price); + totalField.setText("0"); + noteField.setText(""); + } + + public static void main(String[] args) { + JFrame frame = new JFrame(); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setSize(400, 300); + frame.setVisible(true); + + JButton openDialogButton = new JButton("Open Service Dialog"); + openDialogButton.addActionListener(e -> { + ServiceDialog dialog = new ServiceDialog(frame); + dialog.setVisible(true); + }); + + frame.add(openDialogButton, BorderLayout.CENTER); + } +} diff --git a/src/main/java/BsK/common/packet/req/GetSerInfoRequest.java b/src/main/java/BsK/common/packet/req/GetSerInfoRequest.java new file mode 100644 index 0000000..dc3fb92 --- /dev/null +++ b/src/main/java/BsK/common/packet/req/GetSerInfoRequest.java @@ -0,0 +1,12 @@ +package BsK.common.packet.req; + +import BsK.common.packet.Packet; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Data +@AllArgsConstructor +public class GetSerInfoRequest implements Packet { +} diff --git a/src/main/java/BsK/common/packet/res/GetSerInfoResponse.java b/src/main/java/BsK/common/packet/res/GetSerInfoResponse.java new file mode 100644 index 0000000..5276232 --- /dev/null +++ b/src/main/java/BsK/common/packet/res/GetSerInfoResponse.java @@ -0,0 +1,13 @@ +package BsK.common.packet.res; + +import BsK.common.packet.Packet; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Data +@AllArgsConstructor +public class GetSerInfoResponse implements Packet { + private String[][] serInfo; +} diff --git a/src/main/java/BsK/server/network/handler/ServerHandler.java b/src/main/java/BsK/server/network/handler/ServerHandler.java index f5f36b3..df2ec9a 100644 --- a/src/main/java/BsK/server/network/handler/ServerHandler.java +++ b/src/main/java/BsK/server/network/handler/ServerHandler.java @@ -236,6 +236,40 @@ public class ServerHandler extends SimpleChannelInboundHandler resultList = new ArrayList<>(); + while (rs.next()) { + String serId = rs.getString("service_id"); + String serName = rs.getString("service_name"); + String serPrice = rs.getString("service_cost"); + + String result = String.join("|", serId, serName, serPrice); + resultList.add(result); + } + + String[] resultString = resultList.toArray(new String[0]); + String[][] resultArray = new String[resultString.length][]; + for (int i = 0; i < resultString.length; i++) { + resultArray[i] = resultString[i].split("\\|"); + } + + UserUtil.sendPacket(user.getSessionId(), new GetSerInfoResponse(resultArray)); + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + } } } diff --git a/src/main/resources/database/BSK.db b/src/main/resources/database/BSK.db index 450d809238300dd4d8695716e9a8673b136d6437..929fa47afa48c5060307b107623d49b5d6aa4de7 100644 GIT binary patch delta 183 zcmZoTz|wGlWr8&0w}~>&jNdjU6zVgwOunSA&(B}Lz{2;KiGMqPDZdKeqymW<-qQkqA6~Zd>N=nKc(sL6tbM%t)a}7)_ zj17zo3@wcrr+9yhcJO58U=TJ28eklDc%dplVJ1_lOJc?TvA260)C_>l<@cTacE jOjPho&&ZtIW3SET#t5`jb@E<&iOJXOwKo5^XM6wvo^m@C delta 116 zcmZoTz|wGlWr8&0mx(gYj9)e;6zVfFPrjtD&&$BTz|610z`vcpfL~>^qJkJdpBFO+ zgQzisrlN7!;jIdj4ejk@T$wl+P4SMGg-DNG2ds