mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -232,7 +232,7 @@ export class DespachoService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async getList({updateStore = false}): Promise<customTask[]> | null {
|
async getList({updateStore = false}) {
|
||||||
|
|
||||||
if (this.LoaderService.loading) {
|
if (this.LoaderService.loading) {
|
||||||
return this.despachoStore.list
|
return this.despachoStore.list
|
||||||
|
|||||||
@@ -97,12 +97,13 @@ export class HomePage implements OnInit {
|
|||||||
});
|
});
|
||||||
|
|
||||||
window['platform'] = platform
|
window['platform'] = platform
|
||||||
|
|
||||||
window['inactivity/function'] = () => {
|
window['inactivity/function'] = () => {
|
||||||
|
|
||||||
if (window.location.pathname != '/inactivity') {
|
if (window.location.pathname != '/inactivity') {
|
||||||
|
|
||||||
document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
|
document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
|
||||||
document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove())
|
document.querySelectorAll('.popover-viewport').forEach((e: any) => e.remove())
|
||||||
|
|
||||||
const pathname = window.location.pathname
|
const pathname = window.location.pathname
|
||||||
SessionStore.setUrlBeforeInactivity(pathname)
|
SessionStore.setUrlBeforeInactivity(pathname)
|
||||||
@@ -111,6 +112,7 @@ export class HomePage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
goto(url) {
|
goto(url) {
|
||||||
|
|||||||
@@ -448,6 +448,7 @@ export class DespachoPrPage implements OnInit {
|
|||||||
else if (actionName == 'Reexecução') {
|
else if (actionName == 'Reexecução') {
|
||||||
await this.reexecutar(res.data.note, docs);
|
await this.reexecutar(res.data.note, docs);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.goBack();
|
this.goBack();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -263,6 +263,7 @@ export class DespachosPrOptionsPage implements OnInit {
|
|||||||
else if(actionName == 'Concluido') {
|
else if(actionName == 'Concluido') {
|
||||||
await this.concluir(res.data.note, docs);
|
await this.concluir(res.data.note, docs);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.goBack();
|
this.goBack();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user