Kinder und Eltern
This commit is contained in:
parent
17bf862890
commit
c5f7391631
@ -3,6 +3,8 @@
|
|||||||
|
|
||||||
package Logik;
|
package Logik;
|
||||||
|
|
||||||
|
import RestAPISchnittstelle.RestApiClient;
|
||||||
|
|
||||||
public class Account {
|
public class Account {
|
||||||
|
|
||||||
// region Felder
|
// region Felder
|
||||||
@ -14,7 +16,6 @@ public class Account {
|
|||||||
|
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
|
|
||||||
private int rid;
|
private int rid;
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
@ -57,6 +58,7 @@ public class Account {
|
|||||||
public Account(String passwort, String name, String email) {
|
public Account(String passwort, String name, String email) {
|
||||||
this.passwort = passwort;
|
this.passwort = passwort;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
this.email = email;
|
||||||
|
|
||||||
if(this instanceof MitarbeiterAccount)
|
if(this instanceof MitarbeiterAccount)
|
||||||
rid = 0;
|
rid = 0;
|
||||||
@ -64,5 +66,4 @@ public class Account {
|
|||||||
rid = 1;
|
rid = 1;
|
||||||
}
|
}
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -138,6 +138,9 @@ public class AccounterstellungMitarbeiter {
|
|||||||
status.setText("Daten Erfolgreich gespeichert");
|
status.setText("Daten Erfolgreich gespeichert");
|
||||||
einmalpw.setText(einmalPwGenerieren());
|
einmalpw.setText(einmalPwGenerieren());
|
||||||
|
|
||||||
|
RestApiClient api = new RestApiClient();
|
||||||
|
int id = api.nextId("Benutzer");
|
||||||
|
|
||||||
|
|
||||||
//String json = String.format("{\"name\":\"%s\", \"email\":\"%s\", \"passwort\":\"%d\", \"rid\":\"%d\"}",
|
//String json = String.format("{\"name\":\"%s\", \"email\":\"%s\", \"passwort\":\"%d\", \"rid\":\"%d\"}",
|
||||||
// accountname.getText(), email.getText(), einmalpw.getText().hashCode(), (typMitarbeiter.isSelected() ? 0:1));
|
// accountname.getText(), email.getText(), einmalpw.getText().hashCode(), (typMitarbeiter.isSelected() ? 0:1));
|
||||||
@ -145,6 +148,7 @@ public class AccounterstellungMitarbeiter {
|
|||||||
Account neuer;
|
Account neuer;
|
||||||
if (typEltern.isSelected()) {
|
if (typEltern.isSelected()) {
|
||||||
neuer = new ElternAccount(String.format("%d",einmalpw.getText().hashCode()), accountname.getText(), email.getText());
|
neuer = new ElternAccount(String.format("%d",einmalpw.getText().hashCode()), accountname.getText(), email.getText());
|
||||||
|
System.out.println(neuer.getEmail());
|
||||||
for (Kind k : kinder) {
|
for (Kind k : kinder) {
|
||||||
((ElternAccount)neuer).getKinder().add(k);
|
((ElternAccount)neuer).getKinder().add(k);
|
||||||
}
|
}
|
||||||
@ -161,10 +165,10 @@ public class AccounterstellungMitarbeiter {
|
|||||||
Gson gson = new Gson();
|
Gson gson = new Gson();
|
||||||
|
|
||||||
System.out.println(gson.toJson(neuer));
|
System.out.println(gson.toJson(neuer));
|
||||||
RestApiClient api = new RestApiClient();
|
|
||||||
api.post("Benutzer", gson.toJson(neuer));
|
api.post("Benutzer", gson.toJson(neuer));
|
||||||
if (neuer instanceof ElternAccount) {
|
if (neuer instanceof ElternAccount) {
|
||||||
for (Kind k : ((ElternAccount)neuer).getKinder()) {
|
for (Kind k : ((ElternAccount)neuer).getKinder()) {
|
||||||
|
k.setBid(id);
|
||||||
api.post("Kind", gson.toJson(k));
|
api.post("Kind", gson.toJson(k));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -172,7 +176,5 @@ public class AccounterstellungMitarbeiter {
|
|||||||
else {
|
else {
|
||||||
status.setText("Accounterstellung Fehlgeschlagen");
|
status.setText("Accounterstellung Fehlgeschlagen");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
package de.subway_surfers.vpr_app;
|
package de.subway_surfers.vpr_app;
|
||||||
|
|
||||||
|
import Logik.Account;
|
||||||
|
import RestAPISchnittstelle.RestApiClient;
|
||||||
import javafx.event.ActionEvent;
|
import javafx.event.ActionEvent;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.fxml.FXMLLoader;
|
import javafx.fxml.FXMLLoader;
|
||||||
|
Loading…
Reference in New Issue
Block a user