mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
improvements
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
<!-- <ion-icon name="home"></ion-icon> -->
|
<!-- <ion-icon name="home"></ion-icon> -->
|
||||||
<ion-icon class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
|
<ion-icon class="nav-icon" src="assets/images/icons-nav-home.svg"></ion-icon>
|
||||||
<ion-badge color="danger">{{totalEvent}}</ion-badge>
|
<ion-badge color="danger">{{totalEvent}}</ion-badge>
|
||||||
<ion-label>Iníci1o</ion-label>
|
<ion-label>Início</ion-label>
|
||||||
</ion-tab-button>
|
</ion-tab-button>
|
||||||
|
|
||||||
<ion-tab-button tab="agenda">
|
<ion-tab-button tab="agenda">
|
||||||
|
|||||||
@@ -94,7 +94,7 @@
|
|||||||
class="icon-next"
|
class="icon-next"
|
||||||
slot="end"
|
slot="end"
|
||||||
src="assets/images/icons-arrow-circle-arrow-right.svg"
|
src="assets/images/icons-arrow-circle-arrow-right.svg"
|
||||||
(click)="openExpedientList()"
|
(click)="viewExpedientListPage()"
|
||||||
></ion-icon>
|
></ion-icon>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Component, OnInit, LOCALE_ID } from '@angular/core';
|
import { Component, OnInit, LOCALE_ID, EventEmitter, Output } from '@angular/core';
|
||||||
|
|
||||||
import { Event } from '../../models/event.model';
|
import { Event } from '../../models/event.model';
|
||||||
import { EventsService } from 'src/app/services/events.service';
|
import { EventsService } from 'src/app/services/events.service';
|
||||||
@@ -15,6 +15,7 @@ import { DailyWorkTask } from '../../models/dailyworktask.model';
|
|||||||
import { ViewEventPage } from '../agenda/view-event/view-event.page';
|
import { ViewEventPage } from '../agenda/view-event/view-event.page';
|
||||||
import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page';
|
import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page';
|
||||||
import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
|
import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
|
||||||
|
import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-events',
|
selector: 'app-events',
|
||||||
@@ -58,6 +59,8 @@ export class EventsPage implements OnInit {
|
|||||||
taskslist:DailyWorkTask[];
|
taskslist:DailyWorkTask[];
|
||||||
expedientList:any;
|
expedientList:any;
|
||||||
|
|
||||||
|
@Output() openExpedientListPage:EventEmitter<any> = new EventEmitter<any>();
|
||||||
|
|
||||||
constructor(private eventService: EventsService,
|
constructor(private eventService: EventsService,
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private storageService:StorageService,
|
private storageService:StorageService,
|
||||||
@@ -65,6 +68,7 @@ export class EventsPage implements OnInit {
|
|||||||
private alertController: AlertService,
|
private alertController: AlertService,
|
||||||
private authService: AuthService,
|
private authService: AuthService,
|
||||||
private processes:ProcessesService,
|
private processes:ProcessesService,
|
||||||
|
private gabineteService: GabineteDigitalPage,
|
||||||
private modalController:ModalController) {
|
private modalController:ModalController) {
|
||||||
this.prEventList = null;
|
this.prEventList = null;
|
||||||
|
|
||||||
@@ -239,8 +243,7 @@ export class EventsPage implements OnInit {
|
|||||||
return await modal.present();
|
return await modal.present();
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadList()
|
LoadList(){
|
||||||
{
|
|
||||||
this.processes.GetTasksList("Expediente", false).subscribe(result => {
|
this.processes.GetTasksList("Expediente", false).subscribe(result => {
|
||||||
this.expedientList = result.reverse();
|
this.expedientList = result.reverse();
|
||||||
console.log(this.expedientList);
|
console.log(this.expedientList);
|
||||||
@@ -306,13 +309,30 @@ export class EventsPage implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
viewExpedientListPage(){
|
||||||
|
if( window.innerWidth <= 1024){
|
||||||
|
this.openExpedientList();
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
console.log('ttt');
|
||||||
|
this.router.navigate(['/home/gabinete-digital']);
|
||||||
|
this.gabineteService.openExpedientListPage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async openExpedientList(){
|
async openExpedientList(){
|
||||||
|
let classs;
|
||||||
|
if( window.innerWidth <= 800){
|
||||||
|
classs = 'modal'
|
||||||
|
} else {
|
||||||
|
classs = 'modal modal-desktop'
|
||||||
|
}
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: ExpedientePage,
|
component: ExpedientePage,
|
||||||
componentProps:{
|
componentProps:{
|
||||||
profile: this.profile,
|
profile: this.profile,
|
||||||
},
|
},
|
||||||
cssClass: 'modal',
|
cssClass: classs,
|
||||||
backdropDismiss: false
|
backdropDismiss: false
|
||||||
});
|
});
|
||||||
await modal.present();
|
await modal.present();
|
||||||
|
|||||||
+5
-1
@@ -10,6 +10,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
|
|||||||
})
|
})
|
||||||
export class DiscartExpedientModalPage implements OnInit {
|
export class DiscartExpedientModalPage implements OnInit {
|
||||||
serialNumber:string;
|
serialNumber:string;
|
||||||
|
folderId:string;
|
||||||
constructor(
|
constructor(
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
private processes:ProcessesService,
|
private processes:ProcessesService,
|
||||||
@@ -17,6 +18,7 @@ export class DiscartExpedientModalPage implements OnInit {
|
|||||||
private navParams: NavParams,
|
private navParams: NavParams,
|
||||||
) {
|
) {
|
||||||
this.serialNumber = this.navParams.get('serialNumber');
|
this.serialNumber = this.navParams.get('serialNumber');
|
||||||
|
this.folderId = this.navParams.get('folderId');
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
@@ -24,13 +26,15 @@ export class DiscartExpedientModalPage implements OnInit {
|
|||||||
|
|
||||||
}
|
}
|
||||||
close(){
|
close(){
|
||||||
|
/* let body = { "serialNumber": this.serialNumber, "action": "Tratado" } */
|
||||||
|
this.processes.UpdateTaskStatus(this.folderId);
|
||||||
this.modalController.dismiss();
|
this.modalController.dismiss();
|
||||||
}
|
}
|
||||||
/* notDelete(){
|
/* notDelete(){
|
||||||
|
|
||||||
} */
|
} */
|
||||||
save(){
|
save(){
|
||||||
let body = { "serialNumber": this.serialNumber, "action": "Task Completed" }
|
let body = { "serialNumber": this.serialNumber, "action": "Tratado" }
|
||||||
console.log(body);
|
console.log(body);
|
||||||
this.processes.PostTaskAction(body);
|
this.processes.PostTaskAction(body);
|
||||||
this.router.navigate(['/home/gabinete-digital/expediente']);
|
this.router.navigate(['/home/gabinete-digital/expediente']);
|
||||||
|
|||||||
+1
@@ -224,6 +224,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
component: DiscartExpedientModalPage,
|
component: DiscartExpedientModalPage,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
serialNumber: this.task.serialNumber,
|
serialNumber: this.task.serialNumber,
|
||||||
|
folderId: this.task.workflowInstanceDataFields.FolderID,
|
||||||
},
|
},
|
||||||
cssClass: 'discart-expedient-modal',
|
cssClass: 'discart-expedient-modal',
|
||||||
backdropDismiss: false
|
backdropDismiss: false
|
||||||
|
|||||||
@@ -38,8 +38,7 @@ export class ExpedientePage implements OnInit {
|
|||||||
this.LoadList();
|
this.LoadList();
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadList()
|
LoadList(){
|
||||||
{
|
|
||||||
this.processes.GetTasksList("Expediente", false).subscribe(result => {
|
this.processes.GetTasksList("Expediente", false).subscribe(result => {
|
||||||
this.taskslist = new Array();
|
this.taskslist = new Array();
|
||||||
result.forEach(element => {
|
result.forEach(element => {
|
||||||
|
|||||||
@@ -200,7 +200,6 @@ this.processesbackend.GetActionsList().subscribe(res=>{
|
|||||||
async openExpedientList(){
|
async openExpedientList(){
|
||||||
|
|
||||||
this.closeAllDesktopComponent();
|
this.closeAllDesktopComponent();
|
||||||
|
|
||||||
let classs;
|
let classs;
|
||||||
if( window.innerWidth <= 1024){
|
if( window.innerWidth <= 1024){
|
||||||
classs = 'modal'
|
classs = 'modal'
|
||||||
|
|||||||
@@ -120,6 +120,20 @@ export class ProcessesService {
|
|||||||
console.log(res);
|
console.log(res);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UpdateTaskStatus(folderId: any){
|
||||||
|
const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus';
|
||||||
|
let params = new HttpParams();
|
||||||
|
params = params.set("FolderId", folderId);
|
||||||
|
let options = {
|
||||||
|
headers: this.headers,
|
||||||
|
params: params,
|
||||||
|
};
|
||||||
|
return this.http.post<any>(`${geturl}`, options).toPromise().then(res =>{
|
||||||
|
console.log(res);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
postDespatcho(body:any){
|
postDespatcho(body:any){
|
||||||
const geturl = environment.apiURL + 'Processes/CreateDispatch';
|
const geturl = environment.apiURL + 'Processes/CreateDispatch';
|
||||||
|
|||||||
@@ -41,12 +41,10 @@ export class ExpedientsPage implements OnInit {
|
|||||||
|
|
||||||
openExpedientDetailPage(data){
|
openExpedientDetailPage(data){
|
||||||
console.log(data);
|
console.log(data);
|
||||||
|
|
||||||
this.openExpedientDetail.emit(data);
|
this.openExpedientDetail.emit(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadList()
|
LoadList(){
|
||||||
{
|
|
||||||
this.processes.GetTasksList("Expediente", false).subscribe(result => {
|
this.processes.GetTasksList("Expediente", false).subscribe(result => {
|
||||||
this.taskslist = new Array();
|
this.taskslist = new Array();
|
||||||
let res = result.reverse();
|
let res = result.reverse();
|
||||||
|
|||||||
Reference in New Issue
Block a user