Compare commits
4 Commits
854cdded3d
...
dee494f7ca
| Author | SHA1 | Date | |
|---|---|---|---|
| dee494f7ca | |||
| a261d8eb9b | |||
| dbd84f193e | |||
| fa395b5a33 |
@@ -295,7 +295,7 @@ public class SqliteDb extends BaseDb implements AccountDb {
|
|||||||
}
|
}
|
||||||
} else if (transaction.isDirty()) {
|
} else if (transaction.isDirty()) {
|
||||||
try {
|
try {
|
||||||
if (transaction.amount() == 0) {
|
if (transaction.amount() == 0 || transaction.source().isEmpty() || transaction.destination().isEmpty()) {
|
||||||
delete().from(TABLE_TRANSACTIONS).where(Field.ID, equal(transaction.id())).where(ACCOUNT, equal(transaction.accountId())).execute(db);
|
delete().from(TABLE_TRANSACTIONS).where(Field.ID, equal(transaction.id())).where(ACCOUNT, equal(transaction.accountId())).execute(db);
|
||||||
} else {
|
} else {
|
||||||
replaceInto(TABLE_TRANSACTIONS, Field.ID, Field.ACCOUNT, Field.TIMESTAMP, Field.SOURCE, Field.DESTINATION, Field.AMOUNT, Field.DESCRIPTION)
|
replaceInto(TABLE_TRANSACTIONS, Field.ID, Field.ACCOUNT, Field.TIMESTAMP, Field.SOURCE, Field.DESTINATION, Field.AMOUNT, Field.DESCRIPTION)
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ import de.srsoftware.umbrella.core.constants.Field;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import static de.srsoftware.tools.Optionals.isSet;
|
||||||
|
import static de.srsoftware.tools.Optionals.nullIfEmpty;
|
||||||
|
|
||||||
public class IdOrString implements Mappable {
|
public class IdOrString implements Mappable {
|
||||||
private final Long id;
|
private final Long id;
|
||||||
private final String value;
|
private final String value;
|
||||||
@@ -52,6 +55,10 @@ public class IdOrString implements Mappable {
|
|||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isEmpty() {
|
||||||
|
return id == null && !isSet(value);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return value;
|
return value;
|
||||||
@@ -60,4 +67,4 @@ public class IdOrString implements Mappable {
|
|||||||
public String value(){
|
public String value(){
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -155,5 +155,8 @@
|
|||||||
{/if}
|
{/if}
|
||||||
{:else}
|
{:else}
|
||||||
<Display classes={{editable}} markdown={value} {onclick} {oncontextmenu} title={t('right_click_to_edit')} wrapper={type} />
|
<Display classes={{editable}} markdown={value} {onclick} {oncontextmenu} title={t('right_click_to_edit')} wrapper={type} />
|
||||||
|
{#if !value.display}
|
||||||
|
<button onclick={oncontextmenu}>{t('add_object',{object:t('content')})}</button>
|
||||||
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -200,9 +200,10 @@
|
|||||||
<LineEditor bind:value={project.name} editable={true} onSet={val => update({name:val})} />
|
<LineEditor bind:value={project.name} editable={true} onSet={val => update({name:val})} />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<button onclick={kanban}>{t('show_kanban')}</button>
|
{t('options')}
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
<button onclick={kanban}><span class="symbol"></span> {t('show_kanban')}</button>
|
||||||
<button onclick={toggleSettings}><span class="symbol"></span> {t('settings')}</button>
|
<button onclick={toggleSettings}><span class="symbol"></span> {t('settings')}</button>
|
||||||
</div>
|
</div>
|
||||||
<div>{t('state')}</div>
|
<div>{t('state')}</div>
|
||||||
|
|||||||
@@ -192,6 +192,8 @@
|
|||||||
"items": "Artikel",
|
"items": "Artikel",
|
||||||
|
|
||||||
"join_objects" : "{objects} zusammenführen",
|
"join_objects" : "{objects} zusammenführen",
|
||||||
|
|
||||||
|
"kanban": "Kanban",
|
||||||
"key": "Suchbegriff",
|
"key": "Suchbegriff",
|
||||||
|
|
||||||
"language": "Sprache",
|
"language": "Sprache",
|
||||||
@@ -307,6 +309,7 @@
|
|||||||
"project ({id})": "Projekt ({id})",
|
"project ({id})": "Projekt ({id})",
|
||||||
"Project '{project}' was edited": "Projekt '{project}' wurde bearbeitet",
|
"Project '{project}' was edited": "Projekt '{project}' wurde bearbeitet",
|
||||||
"projects": "Projekte",
|
"projects": "Projekte",
|
||||||
|
"Projects": "Projekte",
|
||||||
"properties": "Eigenschaften",
|
"properties": "Eigenschaften",
|
||||||
"property": "Eigenschaft",
|
"property": "Eigenschaft",
|
||||||
"purpose": "Zweck",
|
"purpose": "Zweck",
|
||||||
|
|||||||
@@ -192,6 +192,8 @@
|
|||||||
"items": "items",
|
"items": "items",
|
||||||
|
|
||||||
"join_objects" : "join {objects}",
|
"join_objects" : "join {objects}",
|
||||||
|
|
||||||
|
"kanban": "Kanban",
|
||||||
"key": "search term",
|
"key": "search term",
|
||||||
|
|
||||||
"language": "language",
|
"language": "language",
|
||||||
@@ -307,6 +309,7 @@
|
|||||||
"project ({id})": "project ({id})",
|
"project ({id})": "project ({id})",
|
||||||
"Project '{project}' was edited": "Project '{project}' was edited",
|
"Project '{project}' was edited": "Project '{project}' was edited",
|
||||||
"projects": "projects",
|
"projects": "projects",
|
||||||
|
"Projects": "projects",
|
||||||
"properties": "properties",
|
"properties": "properties",
|
||||||
"property": "property",
|
"property": "property",
|
||||||
"purpose": "purpose",
|
"purpose": "purpose",
|
||||||
|
|||||||
Reference in New Issue
Block a user