Compare commits
No commits in common. "4e07b01b6ad7e8ce63f0586951bb0dcec0b76c74" and "a4ce8940abe8f9174a09ff381a63deebe9254b19" have entirely different histories.
4e07b01b6a
...
a4ce8940ab
@ -44,6 +44,7 @@ public class CreateEventController {
|
|||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
public void initialize() {
|
public void initialize() {
|
||||||
|
|
||||||
StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
|
StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
|
||||||
timeStart.set24HourView(true);
|
timeStart.set24HourView(true);
|
||||||
timeStart.setConverter(defaultConverter);
|
timeStart.setConverter(defaultConverter);
|
||||||
|
@ -148,7 +148,7 @@ public class DataController {
|
|||||||
ObjectMapper objectMapper = new ObjectMapper();
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
objectMapper.findAndRegisterModules();
|
objectMapper.findAndRegisterModules();
|
||||||
try {
|
try {
|
||||||
return (List<User>)objectMapper.readValue(userJSON, new TypeReference<List<User>>() {});
|
return objectMapper.readValue(userJSON, new TypeReference<List<User>>() {});
|
||||||
} catch (JsonProcessingException e) {
|
} catch (JsonProcessingException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
@ -158,11 +158,7 @@ public class DataController {
|
|||||||
public void createUser(User user) throws HttpRequestException {
|
public void createUser(User user) throws HttpRequestException {
|
||||||
sendBasicHttpRequest(
|
sendBasicHttpRequest(
|
||||||
ADD_USER_ENDPOINT,
|
ADD_USER_ENDPOINT,
|
||||||
"name=" + user.getName() +
|
"",
|
||||||
"&forename=" + user.getForename() +
|
|
||||||
"&login=" + user.getLogin() +
|
|
||||||
"&password=" + user.getPassword() +
|
|
||||||
"&isAdmin=" + user.isAdmin(),
|
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,6 @@ public class User {
|
|||||||
private String login;
|
private String login;
|
||||||
private String forename;
|
private String forename;
|
||||||
private String name;
|
private String name;
|
||||||
private String password;
|
|
||||||
private boolean isAdmin;
|
private boolean isAdmin;
|
||||||
|
|
||||||
public User(){}
|
public User(){}
|
||||||
@ -50,12 +49,4 @@ public class User {
|
|||||||
public void setAdmin(boolean admin) {
|
public void setAdmin(boolean admin) {
|
||||||
isAdmin = admin;
|
isAdmin = admin;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPassword() {
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPassword(String password) {
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user