zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show transaction pictures in data management page

Browse Source
This commit is contained in:
MaysWind
2024-08-30 21:58:25 +08:00
parent 216c8211ac
commit 636ac974b8
7 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/data_managements.go
+17
View File
@@ -26,6 +26,7 @@ type DataManagementsApi struct {
users *services.UserService
accounts *services.AccountService
transactions *services.TransactionService
pictures *services.TransactionPictureService
categories *services.TransactionCategoryService
tags *services.TransactionTagService
templates *services.TransactionTemplateService
@@ -43,6 +44,7 @@ var (
users: services.Users,
accounts: services.Accounts,
transactions: services.Transactions,
pictures: services.TransactionPictures,
categories: services.TransactionCategories,
tags: services.TransactionTags,
templates: services.TransactionTemplates,
@@ -90,6 +92,13 @@ func (a *DataManagementsApi) DataStatisticsHandler(c *core.WebContext) (any, *er
return nil, errs.ErrOperationFailed
}
totalTransactionPictureCount, err := a.pictures.GetTotalTransactionPicturesCountByUid(c, uid)
if err != nil {
log.Errorf(c, "[data_managements.DataStatisticsHandler] failed to get total transaction picture count for user \"uid:%d\", because %s", uid, err.Error())
return nil, errs.ErrOperationFailed
}
totalTransactionTemplateCount, err := a.templates.GetTotalNormalTemplateCountByUid(c, uid)
if err != nil {
@@ -109,6 +118,7 @@ func (a *DataManagementsApi) DataStatisticsHandler(c *core.WebContext) (any, *er
TotalTransactionCategoryCount: totalTransactionCategoryCount,
TotalTransactionTagCount: totalTransactionTagCount,
TotalTransactionCount: totalTransactionCount,
TotalTransactionPictureCount: totalTransactionPictureCount,
TotalTransactionTemplateCount: totalTransactionTemplateCount,
TotalScheduledTransactionCount: totalScheduledTransactionCount,
}
@@ -148,6 +158,13 @@ func (a *DataManagementsApi) ClearDataHandler(c *core.WebContext) (any, *errs.Er
return nil, errs.Or(err, errs.ErrOperationFailed)
}
err = a.pictures.DeleteAllPictures(c, uid)
if err != nil {
log.Errorf(c, "[data_managements.ClearDataHandler] failed to delete all transaction pictures, because %s", err.Error())
return nil, errs.Or(err, errs.ErrOperationFailed)
}
err = a.transactions.DeleteAllTransactions(c, uid)
if err != nil {
pkg/models/data_management.go
+1
View File
@@ -11,6 +11,7 @@ type DataStatisticsResponse struct {
TotalTransactionCategoryCount int64 `json:"totalTransactionCategoryCount,string"`
TotalTransactionTagCount int64 `json:"totalTransactionTagCount,string"`
TotalTransactionCount int64 `json:"totalTransactionCount,string"`
TotalTransactionPictureCount int64 `json:"totalTransactionPictureCount,string"`
TotalTransactionTemplateCount int64 `json:"totalTransactionTemplateCount,string"`
TotalScheduledTransactionCount int64 `json:"totalScheduledTransactionCount,string"`
}
pkg/services/transaction_pictures.go
+35
View File
@@ -38,6 +38,17 @@ var (
}
)
// GetTotalTransactionPicturesCountByUid returns total transaction pictures count of user
func (s *TransactionPictureService) GetTotalTransactionPicturesCountByUid(c core.Context, uid int64) (int64, error) {
if uid <= 0 {
return 0, errs.ErrUserIdInvalid
}
count, err := s.UserDataDB(uid).NewSession(c).Where("uid=? AND deleted=?", uid, false).Count(&models.TransactionPictureInfo{})
return count, err
}
// GetPictureInfoByPictureId returns a transaction picture info model according to transaction picture id
func (s *TransactionPictureService) GetPictureInfoByPictureId(c core.Context, uid int64, pictureId int64) (*models.TransactionPictureInfo, error) {
if uid <= 0 {
@@ -138,3 +149,27 @@ func (s *TransactionPictureService) UploadPicture(c core.Context, pictureInfo *m
return err
})
}
// DeleteAllPictures deletes all existed transaction pictures from database
func (s *TransactionPictureService) DeleteAllPictures(c core.Context, uid int64) error {
if uid <= 0 {
return errs.ErrUserIdInvalid
}
now := time.Now().Unix()
updateModel := &models.TransactionPictureInfo{
Deleted: true,
DeletedUnixTime: now,
}
return s.UserDataDB(uid).DoTransaction(c, func(sess *xorm.Session) error {
_, err := sess.Cols("deleted", "deleted_unix_time").Where("uid=? AND deleted=?", uid, false).Update(updateModel)
if err != nil {
return err
}
return nil
})
}
src/locales/en.json
+1
View File
@@ -1413,6 +1413,7 @@
"Unable to delete this account": "Unable to delete this account",
"Transaction": "Transaction",
"Transactions": "Transactions",
"Transaction Pictures": "Transaction Pictures",
"Add Transaction": "Add Transaction",
"Edit Transaction": "Edit Transaction",
"Add Transaction Template": "Add Transaction Template",
src/locales/zh_Hans.json
+1
View File
@@ -1413,6 +1413,7 @@
"Unable to delete this account": "无法删除该账户",
"Transaction": "交易",
"Transactions": "交易",
"Transaction Pictures": "交易图片",
"Add Transaction": "添加交易",
"Edit Transaction": "编辑交易",
"Add Transaction Template": "添加交易模板",
src/views/desktop/user/settings/tabs/UserDataManagementSettingTab.vue
+9
View File
@@ -43,6 +43,12 @@
icon: icons.tags,
color: 'secondary'
},
{
title: 'Transaction Pictures',
count: displayDataStatistics ? displayDataStatistics.totalTransactionPictureCount : '-',
icon: icons.pictures,
color: 'error-darken-1'
},
{
title: 'Transaction Templates',
count: displayDataStatistics ? displayDataStatistics.totalTransactionTemplateCount : '-',
@@ -167,6 +173,7 @@ import {
mdiViewDashboardOutline,
mdiTagOutline,
mdiClipboardTextOutline,
mdiImage,
mdiClipboardTextClockOutline,
mdiAlert
} from '@mdi/js';
@@ -185,6 +192,7 @@ export default {
accounts: mdiCreditCardOutline,
categories: mdiViewDashboardOutline,
tags: mdiTagOutline,
pictures: mdiImage,
templates: mdiClipboardTextOutline,
scheduledTransactions: mdiClipboardTextClockOutline,
alert: mdiAlert
@@ -205,6 +213,7 @@ export default {
totalAccountCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalAccountCount),
totalTransactionCategoryCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalTransactionCategoryCount),
totalTransactionTagCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalTransactionTagCount),
totalTransactionPictureCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalTransactionPictureCount),
totalTransactionTemplateCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalTransactionTemplateCount),
totalScheduledTransactionCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalScheduledTransactionCount)
};
src/views/mobile/users/DataManagementPage.vue
+2
View File
@@ -16,6 +16,7 @@
<f7-list-item :title="$t('Accounts')" :after="displayDataStatistics.totalAccountCount"></f7-list-item>
<f7-list-item :title="$t('Transaction Categories')" :after="displayDataStatistics.totalTransactionCategoryCount"></f7-list-item>
<f7-list-item :title="$t('Transaction Tags')" :after="displayDataStatistics.totalTransactionTagCount"></f7-list-item>
<f7-list-item :title="$t('Transaction Pictures')" :after="displayDataStatistics.totalTransactionPictureCount"></f7-list-item>
<f7-list-item :title="$t('Transaction Templates')" :after="displayDataStatistics.totalTransactionTemplateCount"></f7-list-item>
<f7-list-item :title="$t('Scheduled Transactions')" :after="displayDataStatistics.totalScheduledTransactionCount"></f7-list-item>
</f7-list>
@@ -111,6 +112,7 @@ export default {
totalAccountCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalAccountCount),
totalTransactionCategoryCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalTransactionCategoryCount),
totalTransactionTagCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalTransactionTagCount),
totalTransactionPictureCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalTransactionPictureCount),
totalTransactionTemplateCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalTransactionTemplateCount),
totalScheduledTransactionCount: self.$locale.appendDigitGroupingSymbol(self.userStore, self.dataStatistics.totalScheduledTransactionCount)
};