X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftemplates%2FTemplateDetailsViewModel.java;h=a24b97670a54b05e1d8bc3c7d9b56083e4677a48;hp=088b1b77c9100b6f5203a27e8a6bed2caa728208;hb=3ab99e1679326277d6ba7f8ce28f17a96dfa07aa;hpb=d95839304defead7c7d605cab2e612f1227cbfed diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java index 088b1b77..a24b9767 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/templates/TemplateDetailsViewModel.java @@ -24,12 +24,12 @@ import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModel; -import net.ktnx.mobileledger.dao.PatternAccountDAO; -import net.ktnx.mobileledger.dao.PatternHeaderDAO; +import net.ktnx.mobileledger.dao.TemplateAccountDAO; +import net.ktnx.mobileledger.dao.TemplateHeaderDAO; import net.ktnx.mobileledger.db.DB; -import net.ktnx.mobileledger.db.PatternWithAccounts; import net.ktnx.mobileledger.db.TemplateAccount; import net.ktnx.mobileledger.db.TemplateHeader; +import net.ktnx.mobileledger.db.TemplateWithAccounts; import net.ktnx.mobileledger.model.TemplateDetailsItem; import net.ktnx.mobileledger.utils.Logger; @@ -96,11 +96,11 @@ public class TemplateDetailsViewModel extends ViewModel { } DB db = DB.get(); - LiveData dbList = db.getPatternDAO() - .getPatternWithAccounts(mPatternId); - Observer observer = new Observer() { + LiveData dbList = db.getPatternDAO() + .getTemplateWithAccounts(mPatternId); + Observer observer = new Observer() { @Override - public void onChanged(PatternWithAccounts src) { + public void onChanged(TemplateWithAccounts src) { ArrayList l = new ArrayList<>(); TemplateDetailsItem header = TemplateDetailsItem.fromRoomObject(src.header); @@ -139,8 +139,8 @@ public class TemplateDetailsViewModel extends ViewModel { TemplateDetailsItem.Header modelHeader = list.get(0) .asHeaderItem(); - PatternHeaderDAO headerDAO = DB.get() - .getPatternDAO(); + TemplateHeaderDAO headerDAO = DB.get() + .getPatternDAO(); TemplateHeader dbHeader = modelHeader.toDBO(); if (newPattern) { dbHeader.setId(null); @@ -154,13 +154,13 @@ public class TemplateDetailsViewModel extends ViewModel { modelHeader)); - PatternAccountDAO paDAO = DB.get() - .getPatternAccountDAO(); + TemplateAccountDAO paDAO = DB.get() + .getPatternAccountDAO(); for (int i = 1; i < list.size(); i++) { final TemplateDetailsItem.AccountRow accRowItem = list.get(i) .asAccountRowItem(); TemplateAccount dbAccount = accRowItem.toDBO(dbHeader.getId()); - dbAccount.setPatternId(mPatternId); + dbAccount.setTemplateId(mPatternId); dbAccount.setPosition(i); if (newPattern) { dbAccount.setId(null);