Skip to content

Development to main #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
remko48 merged 3 commits into from
Oct 23, 2024
Merged

Development to main #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c67913
last changes to avoid errors
SudoThijn Oct 23, 2024
bc416fe
Get audittrails on update
remko48 Oct 23, 2024
6fe787a
Merge pull request #43 from ConductionNL/feature/EGISTERS-40/object-a…
SudoThijn Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/modals/objectAuditTrail/ViewObjectAuditTrail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ import { objectStore, navigationStore } from '../../store/store.js'
<h4>Changes:</h4>
<ul>
<li v-for="(change, key) in auditTrail.changed" :key="key">
<strong>{{ key }}:</strong>
<span>Old: {{ change.old }}</span>
<span>New: {{ change.new }}</span>
<strong>{{ key }}:</strong><br>
<span>Old: {{ change.old ?? 'N/A' }}</span><br>
<span>New: {{ change.new ?? 'N/A' }}</span>
</li>
</ul>
</div>

<div class="navigation-buttons">
<NcButton @click="navigateTo('schema', auditTrail.schema)">
Go to Schema {{ auditTrail.schema }}
<NcButton>
Go to linked Schema
</NcButton>
<NcButton @click="navigateTo('register', auditTrail.register)">
Go to Register {{ auditTrail.register }}
<NcButton>
Go to linked Register
</NcButton>
<NcButton @click="navigateTo('object', auditTrail.object)">
Go to Object {{ auditTrail.object }}
<NcButton>
Go to linked Object
</NcButton>
</div>
</div>
Expand Down Expand Up @@ -89,10 +89,14 @@ export default {

.audit-item {
border-bottom: 1px solid #ccc;
padding: 10px 0;
padding: 0 0 10px 0;
margin: 0 0 10px 0;
}

.navigation-buttons {
margin-top: 10px;
display: flex;
gap: 10px;
justify-content: center;
}
</style>
3 changes: 3 additions & 0 deletions src/store/modules/object.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ export const useObjectStore = defineStore('object', {
})
const data = await response.json()
this.setObjectItem(data)
this.getAuditTrails(data.id)

return data
} catch (err) {
console.error(err)
Expand Down Expand Up @@ -138,6 +140,7 @@ export const useObjectStore = defineStore('object', {

this.refreshObjectList()
this.setObjectItem(data)
this.getAuditTrails(data.id)

return { response, data }
},
Expand Down
6 changes: 3 additions & 3 deletions src/views/object/ObjectDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ import { objectStore, navigationStore } from '../../store/store.js'
</div>
</BTab>
<BTab title="Audit Trails">
<div v-if="auditTrails.length">
<NcListItem v-for="(auditTrail, key) in auditTrails"
<div v-if="objectStore.auditTrails.length">
<NcListItem v-for="(auditTrail, key) in objectStore.auditTrails"
:key="key"
:name="new Date(auditTrail.created).toLocaleString()"
:bold="false"
Expand All @@ -87,7 +87,7 @@ import { objectStore, navigationStore } from '../../store/store.js'
</template>
</NcListItem>
</div>
<div v-if="!auditTrails.length">
<div v-if="!objectStore.auditTrails.length">
No audit trails found
</div>
</BTab>
Expand Down