verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

refs #3302
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Juan Ferrer 2022-11-09 09:19:56 +01:00
parent 5dafdd5daa
commit 993ae11277
3 changed files with 68 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
front/salix/components/log/index.html
View File

@ -13,12 +13,11 @@
<vn-thead>
<vn-tr>
<vn-th field="creationDate">Date</vn-th>
<vn-th field="userFk" class="expendable" shrink>Author</vn-th>
<vn-th field="userFk" class="expendable" shrink>User</vn-th>
<vn-th field="changedModel" class="expendable">Model</vn-th>
<vn-th field="action" class="expendable" shrink>Action</vn-th>
<vn-th field="changedModelValue" class="expendable">Name</vn-th>
<vn-th expand>Before</vn-th>
<vn-th expand>After</vn-th>
<vn-th expand>Changes</vn-th>
</vn-tr>
</vn-thead>
<vn-tbody>
@ -62,27 +61,23 @@
<vn-td class="expendable" expand>
{{::log.changedModelValue}}
</vn-td>
<vn-td expand class="before">
<vn-one ng-repeat="old in log.oldProperties">
<div>
<vn-label-value
no-ellipsize
label="{{::old.key}}"
value="{{::old.value}}">
</vn-label-value>
</div>
</vn-one>
</vn-td>
<vn-td expand class="after">
<vn-one ng-repeat="new in log.newProperties" ng-if="!log.description" id="newInstance">
<div>
<vn-label-value
no-ellipsize
label="{{::new.key}}"
value="{{::new.value}}">
</vn-label-value>
</div>
</vn-one>
<table class="attributes">
<thead>
<tr>
<th class="field">Field</th>
<th>Before</th>
<th>After</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="prop in ::log.props">
<td class="field">{{prop.name}}</td>
<td>{{::$ctrl.formatValue(prop.old)}}</td>
<td>{{::$ctrl.formatValue(prop.new)}}</td>
</tr>
</tbody>
</table>
<vn-one ng-if="!log.newProperties" id="description">
<div>
<span no-ellipsize>{{::log.description}}</span>

29
front/salix/components/log/index.js
View File

@ -33,14 +33,35 @@ export default class Controller extends Section {
set logs(value) {
this._logs = value;
if (!this.logs) return;
for (const log of value) {
// log.oldProperties = this.getInstance(log.oldInstance);
// log.newProperties = this.getInstance(log.newInstance);
if (this.logs) {
this.logs.forEach(log => {
log.oldProperties = this.getInstance(log.oldInstance);
log.newProperties = this.getInstance(log.newInstance);
let props = [].concat(
Object.keys(log.oldInstance),
Object.keys(log.newInstance)
);
props = [...new Set(props)];
log.props = [];
for (const prop of props) {
log.props.push({
name: prop,
old: log.oldInstance[prop],
new: log.newInstance[prop]
});
}
}
}
formatValue(value) {
switch (typeof value) {
case 'boolean':
return value ? '✓' : '✗';
default:
return value;
}
}
getInstance(instance) {
const properties = [];

16
front/salix/components/log/style.scss
View File

@ -23,6 +23,22 @@ vn-log {
display: block;
}
}
.attributes {
width: 100%;
tr {
height: 10px;
& > td {
padding: 2px;
width: 33%;
}
& > td.field,
& > th.field {
color: gray;
}
}
}
}
.ellipsis {
white-space: nowrap;