mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -118,6 +118,8 @@ export class DespachoPrPage implements OnInit {
|
||||
"activityInstanceName": res.activityInstanceName,
|
||||
}
|
||||
this.fulltask = res;
|
||||
|
||||
|
||||
console.log(this.task);
|
||||
|
||||
console.log('GetTask', res);
|
||||
|
||||
+3
@@ -111,6 +111,9 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
|
||||
this.loggeduser = userAuth.ValidatedUser;
|
||||
this.task = this.navParams.get('task');
|
||||
|
||||
console.log('create dispatch with this data', this.task);
|
||||
|
||||
this.SearchFolder = this.navParams.get('SearchFolder');
|
||||
this.aplicationId = this.navParams.get('aplicationId')
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import { ActivatedRoute, NavigationStart, Router } from '@angular/router';
|
||||
import { CalendarComponent } from 'ionic2-calendar';
|
||||
import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
|
||||
import { ProcessesService } from 'src/app/services/processes.service';
|
||||
import { ModalController, NavParams } from '@ionic/angular';
|
||||
import { ModalController, NavParams, Platform } from '@ionic/angular';
|
||||
import { AlertService } from 'src/app/services/alert.service';
|
||||
import { PedidosStore } from 'src/app/store/pedidos-store.service';
|
||||
import { ModalService } from 'src/app/services/modal.service';
|
||||
@@ -48,7 +48,8 @@ export class PedidosPage implements OnInit {
|
||||
private modalService: ModalService,
|
||||
private sqliteservice: SqliteService,
|
||||
private sortService: SortService,
|
||||
private backgroundservice: BackgroundService
|
||||
private backgroundservice: BackgroundService,
|
||||
private platform: Platform
|
||||
) {
|
||||
//Inicializar segment
|
||||
this.segment = 'parecer';
|
||||
@@ -158,7 +159,7 @@ export class PedidosPage implements OnInit {
|
||||
}
|
||||
this.parecerList.push(task);
|
||||
});
|
||||
this.sqliteservice.addProcess(this.parecerList);
|
||||
this.addPedidoToDb(this.parecerList);
|
||||
this.listToPresentparecerList = this.sortService.sortArrayISODate(this.parecerList);
|
||||
|
||||
}
|
||||
@@ -198,7 +199,7 @@ export class PedidosPage implements OnInit {
|
||||
}
|
||||
});
|
||||
});
|
||||
this.sqliteservice.addProcess(this.deferimentoList);
|
||||
this.addPedidoToDb(this.deferimentoList);
|
||||
this.listToPresentdeferimentoList = this.sortService.sortArrayISODate(this.deferimentoList);
|
||||
}
|
||||
|
||||
@@ -209,6 +210,13 @@ export class PedidosPage implements OnInit {
|
||||
|
||||
}
|
||||
|
||||
addPedidoToDb(pedido) {
|
||||
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||
} else {
|
||||
this.sqliteservice.addProcess(pedido);
|
||||
}
|
||||
}
|
||||
|
||||
getFromDb() {
|
||||
|
||||
let parecerlist = [];
|
||||
|
||||
Reference in New Issue
Block a user