Skip to content

Commit 36d9550

Browse files
committed
v1.0.2 release
1 parent 8b11b6e commit 36d9550

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

app/src/main/java/mavonie/subterminal/Forms/SuitForm.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,11 @@ public void save() {
140140

141141
getItem().setManufacturer(suitManufacturer);
142142
getItem().setModel(suitModel);
143-
getItem().setDateInUse(suitDateInUse);
143+
144+
if (suitDateInUse.length() > 0) {
145+
getItem().setDateInUse(suitDateInUse);
146+
}
147+
144148
getItem().setSerial(suitSerial);
145149

146150
getItem().setType(Integer.parseInt(String.valueOf(this.suitType.getSelectedItemId())));
@@ -168,11 +172,6 @@ protected boolean validateForm() {
168172
valid = false;
169173
}
170174

171-
if (suitDateInUse.getText().length() == 0) {
172-
this.suitDateInUse.setError("Date required");
173-
valid = false;
174-
}
175-
176175
return valid;
177176
}
178177

app/src/main/java/mavonie/subterminal/Models/Suit.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ Model populateFromCursor(Cursor cursor) {
127127
suit.setManufacturer(cursor.getString(idManufacturer));
128128
suit.setType(cursor.getInt(idType));
129129
suit.setModel(cursor.getString(idModel));
130-
suit.setDateInUse(cursor.getString(idDateInUse));
130+
131+
if (cursor.getString(idDateInUse) != null && cursor.getString(idDateInUse).length() > 0) {
132+
suit.setDateInUse(cursor.getString(idDateInUse));
133+
}
134+
131135
suit.setSerial(cursor.getString(idSerial));
132136

133137
suit.populateSynchronizationFromCursor(cursor);
@@ -188,7 +192,7 @@ public LinkedHashMap<String, String> getItemsForSpinner(Integer type) {
188192

189193
for (Model suit : items) {
190194
if (suit instanceof Suit) {
191-
if (((Suit) suit).getType() == type) {
195+
if (type != null && ((Suit) suit).getType() == type) {
192196
results.put(Integer.toString(suit.getId()), ((Suit) suit).getManufacturer() + " - " + ((Suit) suit).getModel());
193197
}
194198
}

0 commit comments

Comments
 (0)