ronaldochristnawan
/
pos-terminal-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: ronaldochristnawan:a08b2fe770a6bb7c9e66e88ed0e20d39f77445ff
Branches Tags
ronaldochristnawan:master
..
compare: ronaldochristnawan:837f109692ed538ab2236c673d02fcb8c889cfd8
Branches Tags
ronaldochristnawan:master

No commits in common. 'a08b2fe770a6bb7c9e66e88ed0e20d39f77445ff' and '837f109692ed538ab2236c673d02fcb8c889cfd8' have entirely different histories.
a08b2fe770 ... 837f109692

9 changed files with 76 additions and 169 deletions
Show Stats

4
src/main/java/id/amigogroup/posterminal/FormUtamaController.java
Unescape Escape View File

@ -168,7 +168,6 @@ public class FormUtamaController implements Initializable {
case FormConstanta.TRANSAKSI_TUNAI:
if (notaContent.nodeTunai != null) {
node = notaContent.nodeTunai;
notaContent.controllerTunai.initShortcuts();
} else {
loader.setLocation(getClass().getResource("/fxml/FormTransaksiTunai.fxml"));
node = loader.load();
@ -586,9 +585,6 @@ public class FormUtamaController implements Initializable {
"Pelanggan dengan kode member tersebut tidak ditemukan.");
alert.initOwner(bpMain.getScene().getWindow());
alert.show();
break;
default:
Logger.getLogger(FormUtamaController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, bpMain.getScene().getWindow());

5
src/main/java/id/amigogroup/posterminal/bayar/FormBayarReturController.java
Unescape Escape View File

@ -5,6 +5,7 @@
*/
package id.amigogroup.posterminal.bayar;
import id.amigogroup.posterminal.FormUtamaController;
import id.amigogroup.posterminal.api.AmigoPosRx;
import id.amigogroup.posterminal.model.MNotaRetur;
import id.amigogroup.posterminal.util.AlertUtil;
@ -12,6 +13,7 @@ import id.amigogroup.posterminal.util.Fucout;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
import java.net.HttpURLConnection;
import java.net.SocketTimeoutException;
import java.net.URL;
import java.util.ResourceBundle;
import java.util.logging.Level;
@ -91,9 +93,6 @@ public class FormBayarReturController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormBayarReturController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());

49
src/main/java/id/amigogroup/posterminal/keamanan/FormLoginController.java
Unescape Escape View File

@ -7,7 +7,6 @@ package id.amigogroup.posterminal.keamanan;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import id.amigogroup.posterminal.SystemValue;
import id.amigogroup.posterminal.api.AmigoPosRx;
@ -18,7 +17,6 @@ import io.reactivex.Observable;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ResourceBundle;
@ -84,7 +82,7 @@ public class FormLoginController implements Initializable {
posRx.getKaryawanByNik(fldNamaPengguna.getText()),
posRx.loginKaryawanByNikPin(nik, fldKataSandi.getText()),
(Karyawan k, ResponseBody response) -> {
return new KaryawanLogin(k, response);
return new KaryawanLogin(k,response);
}).subscribe(karyawanLoginObserver);
} else {
Alert alert = AlertUtil.getAlertWarning(
@ -108,14 +106,15 @@ public class FormLoginController implements Initializable {
try {
JsonNode jsonNode = mapper.readTree(k.result.string());
ObjectNode objectNode = jsonNode.deepCopy();
if (objectNode.get("status").asBoolean()) {
if(objectNode.get("status").asBoolean()){
SystemValue.karyawanLogin = k.karyawan;
generateNewWindow("/fxml/FormUtama.fxml").show();
Stage thisStage = (Stage) apMain.getScene().getWindow();
thisStage.hide();
} else {
System.out.println("Gagal ");
}
else{
Alert alert = AlertUtil.getAlertError(
AlertUtil.ERROR_KARYAWAN_TIDAK_BOLEH_AKSES_TITLE,
objectNode.get("message").asText());
@ -143,46 +142,13 @@ public class FormLoginController implements Initializable {
@Override
public void onError(Throwable error) {
if (error instanceof HttpException) {
HttpException httpError = (HttpException) error;
Alert alert;
ObjectMapper mapper = new ObjectMapper();
try {
JsonNode jsonNode = null;
ObjectNode objectNode = new ObjectNode(JsonNodeFactory.instance);
objectNode.put("message", "Login invalid. Username/password salah");
if (httpError.response() != null && httpError.response().errorBody() != null) {
jsonNode = mapper.readTree(httpError.response().errorBody().string());
objectNode = jsonNode.deepCopy();
}
switch (((HttpException) error).code()) {
case HttpURLConnection.HTTP_NOT_FOUND:
alert = AlertUtil.getAlertError(
Alert alert = AlertUtil.getAlertError(
AlertUtil.ERROR_TIDAK_DITEMUKAN_TITLE,
"Karyawan dengan nomor tersebut tidak ditemukan.");
alert.initOwner(apMain.getScene().getWindow());
alert.show();
break;
case HttpURLConnection.HTTP_BAD_REQUEST:
alert = AlertUtil.getAlertError(
AlertUtil.ERROR_KARYAWAN_TIDAK_BOLEH_AKSES_TITLE,
objectNode.get("message").asText());
alert.initOwner(apMain.getScene().getWindow());
alert.show();
break;
default:
Logger.getLogger(FormLoginController.class.getName()).log(Level.SEVERE, null, error);
}
} catch (IOException ex) {
alert = AlertUtil.getAlertError(
AlertUtil.ERROR_KARYAWAN_TIDAK_BOLEH_AKSES_TITLE,
"Terjadi error yang tidak diduga sehingga karyawan tidak boleh mengakses.");
alert.initOwner((Stage) apMain.getScene().getWindow());
alert.show();
Logger.getLogger(FormLoginController.class.getName()).log(Level.SEVERE, null, ex);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());
@ -194,8 +160,7 @@ public class FormLoginController implements Initializable {
}
};
private class KaryawanLogin {
private class KaryawanLogin{
private Karyawan karyawan;
private ResponseBody result;

15
src/main/java/id/amigogroup/posterminal/pencarian/DialogCariBarangController.java
Unescape Escape View File

@ -213,9 +213,6 @@ public class DialogCariBarangController extends Dialog<BarangFull> implements In
"Barang dengan kode tersebut tidak ditemukan.");
alert.initOwner(apContent.getScene().getWindow());
alert.show();
break;
default:
Logger.getLogger(DialogCariBarangController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apContent.getScene().getWindow());
@ -248,9 +245,6 @@ public class DialogCariBarangController extends Dialog<BarangFull> implements In
alert.initOwner(apContent.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(DialogCariBarangController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apContent.getScene().getWindow());
@ -312,9 +306,6 @@ public class DialogCariBarangController extends Dialog<BarangFull> implements In
alert.initOwner(apContent.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(DialogCariBarangController.class.getName()).log(Level.SEVERE, null, error);
}
} else if (error instanceof InterruptedIOException) {
daftarTabelBarang.clear();
@ -365,9 +356,6 @@ public class DialogCariBarangController extends Dialog<BarangFull> implements In
alert.initOwner(apContent.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(DialogCariBarangController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apContent.getScene().getWindow());
@ -402,9 +390,6 @@ public class DialogCariBarangController extends Dialog<BarangFull> implements In
alert.initOwner(apContent.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(DialogCariBarangController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apContent.getScene().getWindow());

10
src/main/java/id/amigogroup/posterminal/pencarian/DialogCariNotaTundaController.java
Unescape Escape View File

@ -18,6 +18,7 @@ import java.net.URL;
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
@ -32,6 +33,9 @@ import javafx.scene.control.ComboBox;
import javafx.scene.control.Dialog;
import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.AnchorPane;
import javafx.stage.Window;
import retrofit2.HttpException;
@ -83,6 +87,7 @@ public class DialogCariNotaTundaController extends Dialog<String> implements Ini
//
}
public DialogCariNotaTundaController(/*FormPresensiController parent*/) {
try {
Window window = getDialogPane().getScene().getWindow();
@ -117,7 +122,7 @@ public class DialogCariNotaTundaController extends Dialog<String> implements Ini
@Override
public void onNext(Pagination<MNotaTunai> daftarMNotaTunai) {
for (MNotaTunai mNotaTunai : daftarMNotaTunai.getData()) {
for (MNotaTunai mNotaTunai : daftarMNotaTunai.getData()){
cbxCariNotaTunda.getItems().add(mNotaTunai.getNoNota());
}
}
@ -132,9 +137,6 @@ public class DialogCariNotaTundaController extends Dialog<String> implements Ini
"Nota Tunda Tidak Ditemukan");
alert.initOwner(apContent.getScene().getWindow());
alert.show();
break;
default:
Logger.getLogger(DialogCariNotaTundaController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apContent.getScene().getWindow());

7
src/main/java/id/amigogroup/posterminal/pencarian/DialogCariPelangganController.java
Unescape Escape View File

@ -5,6 +5,7 @@
*/
package id.amigogroup.posterminal.pencarian;
import id.amigogroup.posterminal.FormUtamaController;
import id.amigogroup.posterminal.api.AmigoPosRx;
import id.amigogroup.posterminal.model.Pagination;
import id.amigogroup.posterminal.model.Pelanggan;
@ -197,9 +198,6 @@ public class DialogCariPelangganController extends Dialog<Pelanggan> implements
"Pelanggan dengan kode member tersebut tidak ditemukan.");
alert.initOwner(apContent.getScene().getWindow());
alert.show();
break;
default:
Logger.getLogger(DialogCariPelangganController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apContent.getScene().getWindow());
@ -233,9 +231,6 @@ public class DialogCariPelangganController extends Dialog<Pelanggan> implements
"Pelanggan dengan kode member tersebut tidak ditemukan.");
alert.initOwner(apContent.getScene().getWindow());
alert.show();
break;
default:
Logger.getLogger(DialogCariPelangganController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apContent.getScene().getWindow());

3
src/main/java/id/amigogroup/posterminal/transaksi/DialogTambahNotaController.java
Unescape Escape View File

@ -133,9 +133,6 @@ public class DialogTambahNotaController extends Dialog<String> implements Initia
alert.initOwner(apTambahNota.getScene().getWindow());
alert.initModality(Modality.APPLICATION_MODAL);
alert.show();
break;
default:
Logger.getLogger(DialogTambahNotaController.class.getName()).log(Level.SEVERE, null, he);
}
} catch (Exception error) {
AmigoPosRx.handleGenericError(error, apTambahNota.getScene().getWindow());

17
src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiReturController.java
Unescape Escape View File

@ -23,8 +23,6 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.util.List;
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import javafx.application.Platform;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections;
@ -297,9 +295,6 @@ public class FormTransaksiReturController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormTransaksiReturController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());
@ -471,9 +466,6 @@ public class FormTransaksiReturController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormTransaksiReturController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());
@ -516,9 +508,6 @@ public class FormTransaksiReturController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormTransaksiReturController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());
@ -553,9 +542,6 @@ public class FormTransaksiReturController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormTransaksiReturController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());
@ -597,9 +583,6 @@ public class FormTransaksiReturController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormTransaksiReturController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());

23
src/main/java/id/amigogroup/posterminal/transaksi/FormTransaksiTunaiController.java
Unescape Escape View File

@ -26,8 +26,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
import javafx.application.Platform;
import javafx.beans.property.ReadOnlyObjectWrapper;
import javafx.collections.FXCollections;
@ -36,6 +34,8 @@ import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Alert;
import javafx.scene.control.Button;
import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.TableColumn;
@ -145,12 +145,13 @@ public class FormTransaksiTunaiController implements Initializable {
setTanggal();
}
public void initShortcuts() {
private void initShortcuts() {
Map<KeyCombination, Runnable> listShortcuts = new HashMap<>();
KeyCombination kcTundaNota = new KeyCodeCombination(KeyCode.T, KeyCombination.CONTROL_DOWN);
Runnable rnTundaNota = () -> {
List<DNotaTunai> daftarDNotaTunai = new ArrayList<>();
if (noNota != null && !noNota.equals("")) {
for (TabelBarangTunai tbt : daftarTabelTransaksi) {
tbt.getData().setNoNota(noNota);
@ -195,9 +196,7 @@ public class FormTransaksiTunaiController implements Initializable {
};
listShortcuts.put(kcTundaNota, rnTundaNota);
Platform.runLater(() -> {
apMain.getScene().getAccelerators().putAll(listShortcuts);
});
}
public void setTanggal() {
@ -434,9 +433,6 @@ public class FormTransaksiTunaiController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormTransaksiTunaiController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());
@ -478,9 +474,6 @@ public class FormTransaksiTunaiController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormTransaksiTunaiController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());
@ -530,9 +523,6 @@ public class FormTransaksiTunaiController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormTransaksiTunaiController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());
@ -568,9 +558,6 @@ public class FormTransaksiTunaiController implements Initializable {
alert.initOwner(apMain.getScene().getWindow());
alert.show();
});
break;
default:
Logger.getLogger(FormTransaksiTunaiController.class.getName()).log(Level.SEVERE, null, error);
}
} else {
AmigoPosRx.handleGenericError(error, apMain.getScene().getWindow());
@ -639,14 +626,12 @@ public class FormTransaksiTunaiController implements Initializable {
@Override
public void onComplete() {
Platform.runLater(() -> {
if (parent != null) {
parent.notaContent.setControllerTunai(null);
parent.notaContent.setNodeTunai(null);
parent.removeNota(parent.notaContent.getBtnTunai());
}
});
}
};
}

Write Preview
Loading…
Cancel
Save