mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
Sqlite Bug presenting details on web fixed
This commit is contained in:
@@ -19,7 +19,7 @@ import { ToastService } from 'src/app/services/toast.service';
|
|||||||
import { Location } from '@angular/common'
|
import { Location } from '@angular/common'
|
||||||
import { DespachoService } from 'src/app/Rules/despacho.service';
|
import { DespachoService } from 'src/app/Rules/despacho.service';
|
||||||
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
|
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
|
||||||
|
import { Platform } from '@ionic/angular';
|
||||||
import { SqliteService } from 'src/app/services/sqlite.service';
|
import { SqliteService } from 'src/app/services/sqlite.service';
|
||||||
import { BackgroundService } from 'src/app/services/background.service';
|
import { BackgroundService } from 'src/app/services/background.service';
|
||||||
|
|
||||||
@@ -57,7 +57,8 @@ export class DespachoPrPage implements OnInit {
|
|||||||
private location: Location,
|
private location: Location,
|
||||||
private despachoService: DespachoService,
|
private despachoService: DespachoService,
|
||||||
private sqliteservice: SqliteService,
|
private sqliteservice: SqliteService,
|
||||||
private backgroundservice: BackgroundService
|
private backgroundservice: BackgroundService,
|
||||||
|
private platform: Platform,
|
||||||
) {
|
) {
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
if (params["params"].SerialNumber) {
|
if (params["params"].SerialNumber) {
|
||||||
@@ -123,16 +124,14 @@ export class DespachoPrPage implements OnInit {
|
|||||||
console.log(this.task);
|
console.log(this.task);
|
||||||
|
|
||||||
console.log('GetTask', res);
|
console.log('GetTask', res);
|
||||||
this.sqliteservice.updateProcess(res)
|
this.updateProcessOnDB(res);
|
||||||
|
|
||||||
let thedate = new Date(this.task.CreateDate);
|
let thedate = new Date(this.task.CreateDate);
|
||||||
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
||||||
|
|
||||||
|
|
||||||
this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users => {
|
this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users => {
|
||||||
this.sqliteservice.updateProcessInterveners(JSON.stringify(this.serialNumber), JSON.stringify(users)).then(() => {
|
this.updateProcessInterveners(users)
|
||||||
console.log('internen despacho pr ')
|
|
||||||
})
|
|
||||||
this.intervenientes = users.filter(user => {
|
this.intervenientes = users.filter(user => {
|
||||||
return user.Type == 'I';
|
return user.Type == 'I';
|
||||||
});
|
});
|
||||||
@@ -162,6 +161,19 @@ export class DespachoPrPage implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
updateProcessOnDB(res) {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
|
this.sqliteservice.updateProcess(res);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
updateProcessInterveners(users) {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
|
this.sqliteservice.updateProcessInterveners(JSON.stringify(this.serialNumber), JSON.stringify(users))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
getFromDB() {
|
getFromDB() {
|
||||||
|
|
||||||
this.sqliteservice.getProcessById(this.serialNumber).then((process: any[]) => {
|
this.sqliteservice.getProcessById(this.serialNumber).then((process: any[]) => {
|
||||||
|
|||||||
@@ -144,14 +144,14 @@ export class DespachoPage implements OnInit {
|
|||||||
"Status": res.workflowInstanceDataFields.Status,
|
"Status": res.workflowInstanceDataFields.Status,
|
||||||
}
|
}
|
||||||
|
|
||||||
this.sqliteservice.updateProcess(res);
|
this.updateProcessOnDB(res);
|
||||||
this.fulltask = res;
|
this.fulltask = res;
|
||||||
|
|
||||||
let thedate = new Date(this.task.CreateDate);
|
let thedate = new Date(this.task.CreateDate);
|
||||||
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
||||||
|
|
||||||
this.processes.GetTaskParticipants(this.task.FolderID).subscribe(users => {
|
this.processes.GetTaskParticipants(this.task.FolderID).subscribe(users => {
|
||||||
this.sqliteservice.updateProcessInterveners(JSON.stringify(this.serialnumber), JSON.stringify(users))
|
this.updateProcessInterveners(users)
|
||||||
console.log('interveniers online', users)
|
console.log('interveniers online', users)
|
||||||
|
|
||||||
this.intervenientes = users.filter(user => {
|
this.intervenientes = users.filter(user => {
|
||||||
@@ -177,9 +177,24 @@ export class DespachoPage implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
updateProcessOnDB(res) {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
|
this.sqliteservice.updateProcess(res);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
updateProcessInterveners(users) {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
|
this.sqliteservice.updateProcessInterveners(JSON.stringify(this.serialnumber), JSON.stringify(users))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
getFromDb() {
|
getFromDb() {
|
||||||
|
|
||||||
this.platform.ready().then(() => {
|
this.platform.ready().then(() => {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
this.sqliteservice.getProcessById(this.serialnumber).then((process) => {
|
this.sqliteservice.getProcessById(this.serialnumber).then((process) => {
|
||||||
|
|
||||||
var workflow = JSON.parse(process[0].workflowInstanceDataFields);
|
var workflow = JSON.parse(process[0].workflowInstanceDataFields);
|
||||||
@@ -243,6 +258,7 @@ export class DespachoPage implements OnInit {
|
|||||||
});
|
});
|
||||||
|
|
||||||
})
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -76,6 +76,8 @@ export class DespachosPage implements OnInit {
|
|||||||
getFromDb() {
|
getFromDb() {
|
||||||
|
|
||||||
this.platform.ready().then(() => {
|
this.platform.ready().then(() => {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
this.sqliteservice.getprocessByworkflow('Despacho').then((process: any[]) => {
|
this.sqliteservice.getprocessByworkflow('Despacho').then((process: any[]) => {
|
||||||
var listtopresent = [];
|
var listtopresent = [];
|
||||||
process.forEach(element => {
|
process.forEach(element => {
|
||||||
@@ -102,6 +104,7 @@ export class DespachosPage implements OnInit {
|
|||||||
console.log('Tarefas de despach', this.listToPresent)
|
console.log('Tarefas de despach', this.listToPresent)
|
||||||
|
|
||||||
})
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deplo
|
|||||||
import { ToastService } from 'src/app/services/toast.service';
|
import { ToastService } from 'src/app/services/toast.service';
|
||||||
import { Location } from '@angular/common';
|
import { Location } from '@angular/common';
|
||||||
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
|
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
|
||||||
|
import { Platform } from '@ionic/angular';
|
||||||
import { SqliteService } from 'src/app/services/sqlite.service';
|
import { SqliteService } from 'src/app/services/sqlite.service';
|
||||||
import { BackgroundService } from 'src/app/services/background.service';
|
import { BackgroundService } from 'src/app/services/background.service';
|
||||||
|
|
||||||
@@ -47,7 +47,8 @@ export class DiplomaPage implements OnInit {
|
|||||||
private toastService: ToastService,
|
private toastService: ToastService,
|
||||||
private location: Location,
|
private location: Location,
|
||||||
private sqliteservice: SqliteService,
|
private sqliteservice: SqliteService,
|
||||||
private backgroundservice: BackgroundService
|
private backgroundservice: BackgroundService,
|
||||||
|
private platform: Platform,
|
||||||
) {
|
) {
|
||||||
this.activatedRoute.paramMap.subscribe(params => {
|
this.activatedRoute.paramMap.subscribe(params => {
|
||||||
// console.log(params["params"]);
|
// console.log(params["params"]);
|
||||||
@@ -134,15 +135,13 @@ export class DiplomaPage implements OnInit {
|
|||||||
"activityInstanceName": res.activityInstanceName,
|
"activityInstanceName": res.activityInstanceName,
|
||||||
}
|
}
|
||||||
this.fulltask = res;
|
this.fulltask = res;
|
||||||
this.sqliteservice.updateProcess(res)
|
this.updateProcessOnDB(res)
|
||||||
|
|
||||||
let thedate = new Date(this.task.CreateDate);
|
let thedate = new Date(this.task.CreateDate);
|
||||||
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
||||||
|
|
||||||
this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users => {
|
this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users => {
|
||||||
this.sqliteservice.updateProcessInterveners(JSON.stringify(this.serialNumber), JSON.stringify(users)).then(() => {
|
this.updateProcessInterveners(users)
|
||||||
console.log('internen diploma ')
|
|
||||||
})
|
|
||||||
this.intervenientes = users.filter(user => {
|
this.intervenientes = users.filter(user => {
|
||||||
return user.Type == 'I';
|
return user.Type == 'I';
|
||||||
});
|
});
|
||||||
@@ -167,6 +166,19 @@ export class DiplomaPage implements OnInit {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
updateProcessOnDB(res) {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
|
this.sqliteservice.updateProcess(res);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
updateProcessInterveners(users) {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
|
this.sqliteservice.updateProcessInterveners(JSON.stringify(this.serialNumber), JSON.stringify(users))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
getFromDb() {
|
getFromDb() {
|
||||||
|
|
||||||
this.sqliteservice.getProcessById(this.serialNumber).then((process) => {
|
this.sqliteservice.getProcessById(this.serialNumber).then((process) => {
|
||||||
|
|||||||
@@ -268,6 +268,9 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
|
|||||||
|
|
||||||
addProcessToDB(data) {
|
addProcessToDB(data) {
|
||||||
this.platform.ready().then(() => {
|
this.platform.ready().then(() => {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
|
||||||
|
} else {
|
||||||
data.forEach(element => {
|
data.forEach(element => {
|
||||||
|
|
||||||
let process = {
|
let process = {
|
||||||
@@ -289,6 +292,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
|
|||||||
|
|
||||||
this.sqliteservice.addProcess(process);
|
this.sqliteservice.addProcess(process);
|
||||||
});
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import { AuthService } from 'src/app/services/auth.service';
|
|||||||
import { LoginUserRespose } from 'src/app/models/user.model';
|
import { LoginUserRespose } from 'src/app/models/user.model';
|
||||||
import { ToastService } from 'src/app/services/toast.service';
|
import { ToastService } from 'src/app/services/toast.service';
|
||||||
import { ForwardPage } from 'src/app/modals/forward/forward.page';
|
import { ForwardPage } from 'src/app/modals/forward/forward.page';
|
||||||
|
import { Platform } from '@ionic/angular';
|
||||||
import { Location } from '@angular/common';
|
import { Location } from '@angular/common';
|
||||||
import { PedidoService } from 'src/app/Rules/pedido.service';
|
import { PedidoService } from 'src/app/Rules/pedido.service';
|
||||||
|
|
||||||
@@ -62,7 +62,8 @@ export class PedidoPage implements OnInit {
|
|||||||
private location: Location,
|
private location: Location,
|
||||||
private pedidoService: PedidoService,
|
private pedidoService: PedidoService,
|
||||||
private sqliteservice: SqliteService,
|
private sqliteservice: SqliteService,
|
||||||
private backgroundservices: BackgroundService
|
private backgroundservices: BackgroundService,
|
||||||
|
private platform: Platform
|
||||||
) {
|
) {
|
||||||
this.loggeduser = authService.ValidatedUser;
|
this.loggeduser = authService.ValidatedUser;
|
||||||
|
|
||||||
@@ -127,7 +128,7 @@ export class PedidoPage implements OnInit {
|
|||||||
"Status": res.workflowInstanceDataFields.Status,
|
"Status": res.workflowInstanceDataFields.Status,
|
||||||
}
|
}
|
||||||
console.log(this.task);
|
console.log(this.task);
|
||||||
this.sqliteservice.updateProcess(res);
|
this.updateProcess(res);
|
||||||
}
|
}
|
||||||
else if (res.workflowDisplayName == 'Pedido de Deferimento') {
|
else if (res.workflowDisplayName == 'Pedido de Deferimento') {
|
||||||
|
|
||||||
@@ -152,16 +153,14 @@ export class PedidoPage implements OnInit {
|
|||||||
"activityInstanceName": res.activityInstanceName,
|
"activityInstanceName": res.activityInstanceName,
|
||||||
"Status": res.workflowInstanceDataFields.Status,
|
"Status": res.workflowInstanceDataFields.Status,
|
||||||
}
|
}
|
||||||
this.sqliteservice.updateProcess(res);
|
this.updateProcess(res)
|
||||||
}
|
}
|
||||||
|
|
||||||
let thedate = new Date(res.taskStartDate);
|
let thedate = new Date(res.taskStartDate);
|
||||||
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
||||||
|
|
||||||
this.processes.GetTaskParticipants(res.workflowInstanceDataFields.FolderID).subscribe(users => {
|
this.processes.GetTaskParticipants(res.workflowInstanceDataFields.FolderID).subscribe(users => {
|
||||||
this.sqliteservice.updateProcessInterveners(JSON.stringify(this.serialnumber), JSON.stringify(users)).then(() => {
|
this.updateProcessInterveners(users)
|
||||||
console.log('Pedido ')
|
|
||||||
})
|
|
||||||
this.intervenientes = users.filter(user => {
|
this.intervenientes = users.filter(user => {
|
||||||
return user.Type == 'I';
|
return user.Type == 'I';
|
||||||
});
|
});
|
||||||
@@ -186,8 +185,23 @@ export class PedidoPage implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
getfromDb() {
|
updateProcess(res) {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
|
this.sqliteservice.updateProcess(res);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
updateProcessInterveners(users) {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
|
this.sqliteservice.updateProcessInterveners(JSON.stringify(this.serialnumber), JSON.stringify(users));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getfromDb() {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
this.sqliteservice.getProcessById(this.serialnumber).then((process) => {
|
this.sqliteservice.getProcessById(this.serialnumber).then((process) => {
|
||||||
|
|
||||||
console.log('PROCESS BY ID', process, this.serialnumber)
|
console.log('PROCESS BY ID', process, this.serialnumber)
|
||||||
@@ -274,6 +288,7 @@ export class PedidoPage implements OnInit {
|
|||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
getDocumentDetails(forlderId: string, applicationId: string) {
|
getDocumentDetails(forlderId: string, applicationId: string) {
|
||||||
this.processes.GetDocumentDetails(forlderId, applicationId).subscribe(res => {
|
this.processes.GetDocumentDetails(forlderId, applicationId).subscribe(res => {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { Router, NavigationEnd } from '@angular/router';
|
import { Router, NavigationEnd } from '@angular/router';
|
||||||
import { ModalController } from '@ionic/angular';
|
import { ModalController, Platform } from '@ionic/angular';
|
||||||
import { PublicationFolder } from 'src/app/models/publicationfolder';
|
import { PublicationFolder } from 'src/app/models/publicationfolder';
|
||||||
import { PublicationsService } from 'src/app/services/publications.service';
|
import { PublicationsService } from 'src/app/services/publications.service';
|
||||||
import { NewActionPage } from './new-action/new-action.page';
|
import { NewActionPage } from './new-action/new-action.page';
|
||||||
@@ -65,7 +65,8 @@ export class PublicationsPage implements OnInit {
|
|||||||
private publications: PublicationsService,
|
private publications: PublicationsService,
|
||||||
private toastService: ToastService,
|
private toastService: ToastService,
|
||||||
private sqliteservice: SqliteService,
|
private sqliteservice: SqliteService,
|
||||||
private backgroundservice: BackgroundService
|
private backgroundservice: BackgroundService,
|
||||||
|
private platform: Platform
|
||||||
) {
|
) {
|
||||||
this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
|
this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
|
||||||
this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
|
this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
|
||||||
@@ -150,7 +151,7 @@ export class PublicationsPage implements OnInit {
|
|||||||
ActionType: data.ActionType,
|
ActionType: data.ActionType,
|
||||||
}
|
}
|
||||||
|
|
||||||
this.sqliteservice.addactions(folder);
|
this.addActionToDB(folder)
|
||||||
|
|
||||||
if (data.ActionType == "Evento") {
|
if (data.ActionType == "Evento") {
|
||||||
console.log('Evento', folder)
|
console.log('Evento', folder)
|
||||||
@@ -172,8 +173,17 @@ export class PublicationsPage implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addActionToDB(folder) {
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
|
this.sqliteservice.addactions(folder);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
getFromDB() {
|
getFromDB() {
|
||||||
|
|
||||||
|
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||||
|
} else {
|
||||||
this.sqliteservice.getAllActions().then((actions: any[]) => {
|
this.sqliteservice.getAllActions().then((actions: any[]) => {
|
||||||
|
|
||||||
console.log('offline publi', actions)
|
console.log('offline publi', actions)
|
||||||
@@ -202,6 +212,7 @@ export class PublicationsPage implements OnInit {
|
|||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async editAction(folderId?: string) {
|
async editAction(folderId?: string) {
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
|
|||||||
Reference in New Issue
Block a user