This commit is contained in:
parent
c23d8282eb
commit
f0024346a8
|
@ -48,8 +48,7 @@ module.exports = Self => {
|
|||
action: action
|
||||
}
|
||||
});
|
||||
console.log('ENTRY');
|
||||
console.log(filter, signed);
|
||||
|
||||
if (!filter) {
|
||||
filter = {
|
||||
condition: [
|
||||
|
|
|
@ -88,7 +88,6 @@ module.exports = Self => {
|
|||
filter,
|
||||
options.headers
|
||||
);
|
||||
console.log(data.data);
|
||||
return parser(data.data, parse);
|
||||
};
|
||||
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
INSERT INTO `vn`.`docuware` (code, fileCabinetName, `action`, dialogName, findById)
|
||||
VALUES
|
||||
('hr', 'RRHH', 'find', 'Búsqueda', 'N__DOCUMENTO');
|
||||
|
||||
INSERT INTO `salix`.`url` (appName, environment, url)
|
||||
VALUES
|
||||
('docuware', 'production', 'https://verdnatura.docuware.cloud/DocuWare/Platform/');
|
||||
|
|
|
@ -66,7 +66,11 @@ export default class App {
|
|||
|
||||
return this.logger.$http.get('Urls/findOne', {filter})
|
||||
.then(res => {
|
||||
return res.data.url + route;
|
||||
if (res && res.data)
|
||||
return res.data.url + route;
|
||||
})
|
||||
.catch(() => {
|
||||
this.showError('Direction not found');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,3 +4,4 @@ Please enter your username: Por favor introduce tu nombre de usuario
|
|||
It seems that the server has fall down: Parece que el servidor se ha caído, espera unos minutos e inténtalo de nuevo
|
||||
Session has expired: Tu sesión ha expirado, por favor vuelve a iniciar sesión
|
||||
Access denied: Acción no permitida
|
||||
Direction not found: Dirección no encontrada
|
||||
|
|
|
@ -63,7 +63,7 @@ module.exports = Self => {
|
|||
'Tipo Documento': 'description',
|
||||
'Stored on': 'created',
|
||||
};
|
||||
const workerDocuware = await models.Docuware.getById('hr', 'BONO MOLA XAVIER', docuwareParse);// worker.lastName + worker.firstName);
|
||||
const workerDocuware = await models.Docuware.getById('hr', worker.lastName + worker.firstName, docuwareParse);
|
||||
for (document of workerDocuware) {
|
||||
const defaultData = {
|
||||
file: document.dmsFk + '.png',
|
||||
|
@ -75,8 +75,6 @@ module.exports = Self => {
|
|||
|
||||
document = Object.assign(document, defaultData);
|
||||
}
|
||||
console.log(workerDocuware);
|
||||
console.log(workerDms);
|
||||
|
||||
return workerDms.concat(workerDocuware);
|
||||
};
|
||||
|
|
|
@ -60,11 +60,13 @@
|
|||
<vn-td shrink-datetime>
|
||||
{{::document.created | date:'dd/MM/yyyy HH:mm'}}
|
||||
</vn-td>
|
||||
<vn-td expand>
|
||||
<vn-td shrink>
|
||||
<vn-icon-button title="{{'Download file' | translate}}"
|
||||
icon="cloud_download"
|
||||
ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
|
||||
</vn-icon-button>
|
||||
</vn-td>
|
||||
<vn-td expand ng-if="::!document.isDocuware">
|
||||
<vn-icon-button ui-sref="worker.card.dms.edit({dmsId: {{::document.dmsFk}}})"
|
||||
icon="edit"
|
||||
title="{{'Edit file' | translate}}">
|
||||
|
@ -76,19 +78,11 @@
|
|||
tabindex="-1">
|
||||
</vn-icon-button>
|
||||
</vn-td>
|
||||
<vn-td expand>
|
||||
<vn-icon-button title="{{'Download file' | translate}}"
|
||||
icon="cloud_download"
|
||||
ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
|
||||
</vn-icon-button>
|
||||
<vn-icon-button ui-sref="worker.card.dms.edit({dmsId: {{::document.dmsFk}}})"
|
||||
icon="edit"
|
||||
title="{{'Edit file' | translate}}">
|
||||
</vn-icon-button>
|
||||
<vn-td expand ng-if="::document.isDocuware">
|
||||
<vn-icon-button
|
||||
icon="delete"
|
||||
ng-click="confirm.show($index)"
|
||||
title="{{'Remove file' | translate}}"
|
||||
icon="open_in_new"
|
||||
ng-click="$ctrl.openDocuware()"
|
||||
title="{{'Open in docuware' | translate}}"
|
||||
tabindex="-1">
|
||||
</vn-icon-button>
|
||||
</vn-td>
|
||||
|
|
|
@ -21,6 +21,11 @@ class Controller extends Component {
|
|||
if (isDocuware) return this.vnFile.download(`api/workerDms/${dmsId}/docuwareDownload`);
|
||||
this.vnFile.download(`api/workerDms/${dmsId}/downloadFile`);
|
||||
}
|
||||
|
||||
async openDocuware() {
|
||||
const url = await this.vnApp.getUrl(`WebClient`, 'docuware');
|
||||
if (url) window.open(url).focus();
|
||||
}
|
||||
}
|
||||
|
||||
Controller.$inject = ['$element', '$scope', 'vnFile'];
|
||||
|
|
Loading…
Reference in New Issue