src/app/imex/sync/dialog-sync-conflict/dialog-sync-conflict.component.html
| | {{ T.F.SYNC.D_CONFLICT.TIMESTAMP | translate }} | {{ T.F.SYNC.D_CONFLICT.CHANGES | translate }} | | --- | --- | --- | | {{ T.F.SYNC.D_CONFLICT.REMOTE | translate }} | {{ remote.lastUpdate | localeDate: 'shortDate' }} | {{ remote.lastUpdate | shortTime }} | {{ remoteChangeCount }} | | {{ T.F.SYNC.D_CONFLICT.LOCAL | translate }} | {{ local.lastUpdate | localeDate: 'shortDate' }} | {{ local.lastUpdate | shortTime }} | {{ localChangeCount }} | | {{ T.F.SYNC.D_CONFLICT.LOCAL_REMOTE | translate }} | {{ local.lastSyncedUpdate ? (local.lastSyncedUpdate | localeDate: 'shortDate') : (T.F.SYNC.D_CONFLICT.NEVER | translate) }} | {{ local.lastSyncedUpdate ? (local.lastSyncedUpdate | shortTime) : '-' }} | - |
| | {{ T.F.SYNC.D_CONFLICT.LAST_WRITE | translate }} | | --- | --- | | {{ T.F.SYNC.D_CONFLICT.REMOTE | translate }} | {{ shortenAction(remote.lastUpdateAction || '?') }} | | {{ T.F.SYNC.D_CONFLICT.LOCAL | translate }} | {{ shortenAction(local.lastUpdateAction || '?') }} | | {{ T.F.SYNC.D_CONFLICT.LOCAL_REMOTE | translate }} | {{ shortenAction(local.lastSyncedAction || '-') }} |
@if (local.vectorClock || remote.vectorClock) {
| {{ T.F.SYNC.D_CONFLICT.REMOTE | translate }} | {{ getVectorClockString(remote.vectorClock) }} | | {{ T.F.SYNC.D_CONFLICT.LOCAL | translate }} | {{ getVectorClockString(local.vectorClock) }} | | {{ T.F.SYNC.D_CONFLICT.LAST_SYNCED | translate }} | {{ getVectorClockString(local.lastSyncedVectorClock) }} | | {{ T.F.SYNC.D_CONFLICT.COMPARISON_RESULT | translate }} | {{ getVectorClockComparisonLabel() | translate }} |
} {{ T.G.CANCEL | translate }} file_download {{ T.F.SYNC.D_CONFLICT.USE_REMOTE | translate }} file_upload {{ T.F.SYNC.D_CONFLICT.USE_LOCAL | translate }}