From 1e70da1d09806ba9088b7d2dba7a436bfb264d9a Mon Sep 17 00:00:00 2001 From: Josua Pascario Date: Tue, 25 Feb 2020 14:16:46 +0700 Subject: [PATCH] menambakan scan member di UI form utama, mengubah id di UI dialogTambahNota & controller, membuat fungsi scan member di formUtamaController --- .../posterminal/FormUtamaController.java | 26 ++++++++++++------- .../transaksi/DialogTambahNotaController.java | 15 +++-------- src/main/resources/fxml/DialogTambahNota.fxml | 2 +- src/main/resources/fxml/FormUtama.fxml | 6 +++-- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java index 9d3675f..5bcec0c 100644 --- a/src/main/java/id/amigogroup/posterminal/FormUtamaController.java +++ b/src/main/java/id/amigogroup/posterminal/FormUtamaController.java @@ -15,7 +15,6 @@ import id.amigogroup.posterminal.transaksi.FormTransaksiTunaiController; import id.amigogroup.posterminal.util.AlertUtil; import id.amigogroup.posterminal.util.Fucout; import io.reactivex.Observable; -import static io.reactivex.Observable.error; import io.reactivex.Observer; import io.reactivex.disposables.Disposable; import java.io.IOException; @@ -41,10 +40,12 @@ import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; +import javafx.scene.control.TextField; import javafx.scene.image.Image; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCodeCombination; import javafx.scene.input.KeyCombination; +import javafx.scene.input.KeyEvent; import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; import javafx.stage.Stage; @@ -76,6 +77,8 @@ public class FormUtamaController implements Initializable { private Label lblTglLahirPelanggan; @FXML private Label lblNoTelpPelanggan; + @FXML + private TextField tfScanMember; private final FormFactory formFactory = new FormFactory(); @@ -86,13 +89,13 @@ public class FormUtamaController implements Initializable { private final char NOTA_PREV = 'p'; private final char NOTA_NEXT = 'n'; private Observable pelangganObs; + AmigoPosRx posRx = new AmigoPosRx(); /** * Initializes the controller class. */ @Override public void initialize(URL url, ResourceBundle rb) { - AmigoPosRx posRx = new AmigoPosRx(); //Kode Nur Indah Suciati (00334), Kode Wuryaningsih/RT (010004) updateLabelMemberNonMember(); @@ -384,8 +387,7 @@ public class FormUtamaController implements Initializable { navigasi.add(buttonBaru); vbNavigasi.getChildren().add(buttonBaru); jumlahNota++; - } - else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Bon")) { + } else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Bon")) { Button buttonBaru = generateButtonNota("10-0220-0000X", FormConstanta.TRANSAKSI_BON, @@ -393,8 +395,7 @@ public class FormUtamaController implements Initializable { navigasi.add(buttonBaru); vbNavigasi.getChildren().add(buttonBaru); jumlahNota++; - } - else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Bawa Dulu")) { + } else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Bawa Dulu")) { Button buttonBaru = generateButtonNota("10-0220-0000X", FormConstanta.TRANSAKSI_BAWA, @@ -402,8 +403,7 @@ public class FormUtamaController implements Initializable { navigasi.add(buttonBaru); vbNavigasi.getChildren().add(buttonBaru); jumlahNota++; - } - else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Retur")) { + } else if (hasilReturn.isPresent() && hasilReturn.get().equals("Baru:Retur")) { Button buttonBaru = generateButtonNota("10-0220-0000X", FormConstanta.TRANSAKSI_RETUR, @@ -411,7 +411,7 @@ public class FormUtamaController implements Initializable { navigasi.add(buttonBaru); vbNavigasi.getChildren().add(buttonBaru); jumlahNota++; - } else if(hasilReturn.isPresent() && hasilReturn.get().contains("Checkout:")){ + } else if (hasilReturn.isPresent() && hasilReturn.get().contains("Checkout:")) { Button buttonBaru = generateButtonNota(hasilReturn.get().substring(9), FormConstanta.TRANSAKSI_TUNAI, Fucout.TIPE_NOTA_TUNAI); @@ -421,6 +421,14 @@ public class FormUtamaController implements Initializable { } } + //scan member + @FXML + void scanMemberOnPressed(KeyEvent event) { + if (event.getCode() == KeyCode.ENTER) { + posRx.getPelangganByKodeMember(tfScanMember.getText()).subscribe(pelangganObserver); + } + } + Observer pelangganObserver = new Observer() { @Override public void onSubscribe(Disposable dspsbl) { diff --git a/src/main/java/id/amigogroup/posterminal/transaksi/DialogTambahNotaController.java b/src/main/java/id/amigogroup/posterminal/transaksi/DialogTambahNotaController.java index 8a20fa5..dbd48ae 100644 --- a/src/main/java/id/amigogroup/posterminal/transaksi/DialogTambahNotaController.java +++ b/src/main/java/id/amigogroup/posterminal/transaksi/DialogTambahNotaController.java @@ -41,7 +41,7 @@ public class DialogTambahNotaController extends Dialog implements Initia @FXML private RadioButton rbAmbilDariCheckout; @FXML - private TextField txtFieldAmbilDariCheckout; + private TextField tfAmbilDariCheckout; public static final ButtonType btnLanjutkan = new ButtonType("Lanjutkan"); public static final ButtonType btnBatal = new ButtonType("Batal"); @@ -76,7 +76,7 @@ public class DialogTambahNotaController extends Dialog implements Initia if (((RadioButton) tgTipe.getSelectedToggle()) == rbBaru) { return "Baru:" + cbxPilihNota.getValue(); } else if (((RadioButton) tgTipe.getSelectedToggle()) == rbAmbilDariCheckout) { - return "Checkout:" + txtFieldAmbilDariCheckout.getText(); + return "Checkout:" + tfAmbilDariCheckout.getText(); } //baru, balikin tipe yang dipilih //dari checkout, balikin isi nomor nota (hanya jika nota ditemukan) @@ -92,19 +92,12 @@ public class DialogTambahNotaController extends Dialog implements Initia @FXML void rbNotaBaruOnAction(ActionEvent event) { cbxPilihNota.setDisable(false); - txtFieldAmbilDariCheckout.setDisable(true); - -// Button buttonBaru FormConstanta= generateButtonNota("10-0220-0000X", -// FormConstanta.TRANSAKSI_TUNAI, -// Fucout.TIPE_NOTA_TUNAI); -// navigasi.add(buttonBaru); -// vbNavigasi.getChildren().add(buttonBaru); -// jumlahNota++; + tfAmbilDariCheckout.setDisable(true); } @FXML void rbAmbilDariCheckoutOnAction(ActionEvent event) { cbxPilihNota.setDisable(true); - txtFieldAmbilDariCheckout.setDisable(false); + tfAmbilDariCheckout.setDisable(false); } } diff --git a/src/main/resources/fxml/DialogTambahNota.fxml b/src/main/resources/fxml/DialogTambahNota.fxml index 28bcde8..a9fc1a8 100644 --- a/src/main/resources/fxml/DialogTambahNota.fxml +++ b/src/main/resources/fxml/DialogTambahNota.fxml @@ -21,6 +21,6 @@ - + diff --git a/src/main/resources/fxml/FormUtama.fxml b/src/main/resources/fxml/FormUtama.fxml index 12aa44e..cfa44c7 100644 --- a/src/main/resources/fxml/FormUtama.fxml +++ b/src/main/resources/fxml/FormUtama.fxml @@ -6,6 +6,7 @@ + @@ -123,12 +124,13 @@ -