IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

some more fixes

Browse Source
This commit is contained in:
einhornimmond 2023-11-29 13:13:36 +01:00
parent 4d69e39b57
commit 0df7b4e74f
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
View File

@ -163,21 +163,18 @@ export default {
this.$apollo
.mutate({ mutation, variables })
.then((result) => {
this.$el.ownerDocument.defaultView.console.log('after calling mutation')
if (
this.hideResubmission &&
this.showResubmissionDate &&
this.combineResubmissionDateAndTime() > new Date()
) {
this.$el.ownerDocument.defaultView.console.log('before update-contributions')
this.$emit('update-contributions')
} else {
this.$emit('update-status', this.contributionId)
if (this.tabindex === 2) {
this.$emit('reload-contribution', this.contributionId)
} else {
this.$emit('get-list-contribution-messages', this.contributionId)
}
}
this.onReset()
this.$el.ownerDocument.defaultView.console.log('before reload contribution')
this.$emit('reload-contribution', this.contributionId)
}
this.toastSuccess(this.$t('message.request'))
this.loading = false
})

1
admin/src/pages/CreationConfirm.vue
View File

@ -142,6 +142,7 @@ export default {
},
methods: {
reloadContribution(id) {
console.log('reload contribution with id: %d', id)
this.$apollo
.query({ query: getContribution, variables: { id } })
.then((result) => {

5
backend/src/graphql/resolver/ContributionMessageResolver.ts
View File

@ -148,13 +148,14 @@ export class ContributionMessageResolver {
async (transactionalEntityManager: EntityManager) => {
const { contribution, contributionMessage, contributionChanged } =
await updateUnconfirmedContributionContext.run(transactionalEntityManager, relations)
console.log('contribution changed: %d', contributionChanged)
if (contributionChanged) {
await transactionalEntityManager.update(
Contribution,
DbContribution,
{ id: contributionId },
contribution,
)
console.log('new contribution resubmission at: %s, status: %s', contribution.resubmissionAt, contribution.contributionStatus)
}
if (contributionMessage) {
await transactionalEntityManager.insert(DbContributionMessage, contributionMessage)

2
backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts
View File

@ -29,8 +29,10 @@ export class UnconfirmedContributionAdminAddMessageRole extends AbstractUnconfir
) {
this.self.contributionStatus = newStatus
this.self.resubmissionAt = resubmissionDate
console.log('update, change status and/or resubmissionAt')
} else {
this.changed = false
console.log('no changes, resubmission date: %s', resubmissionDate?.toString())
}
}