diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts
index 752d87894..ab417f7a7 100644
--- a/src/app/models/dailyworktask.model.ts
+++ b/src/app/models/dailyworktask.model.ts
@@ -3,4 +3,5 @@ export class DailyWorkTask{
Folio: string;
Senders: string;
CreateDate: string;
+ DocumentURL: string;
}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 63a04c373..d8b2c8a81 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -3,7 +3,7 @@
- Detalhes do Processo
+ Expediente
@@ -11,7 +11,7 @@
Assunto
- {{task.Folio }}
+ {{ task.Folio }}
Remetentes
@@ -26,15 +26,11 @@
{{ task.CreateDate }}
- Documentos a Anexar
-
+
- Lei do orçamento geral do Estado
+ Ver documento
-
- Guardar
-
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index afc75bc03..4df16fdaf 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -1,8 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { ProcessesService } from 'src/app/services/processes.service';
-
+import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute } from '@angular/router';
+import { formatDate } from '@angular/common';
@Component({
selector: 'app-expediente-detail',
@@ -11,11 +12,11 @@ import { ActivatedRoute } from '@angular/router';
})
export class ExpedienteDetailPage implements OnInit {
- constructor(private activateRoute: ActivatedRoute,private processes:ProcessesService) { }
+ constructor(private activateRoute: ActivatedRoute,private processes:ProcessesService,private iab: InAppBrowser) { }
- task:DailyWorkTask;
+ task: DailyWorkTask;
-serialnumber:string;
+ serialnumber:string;
ngOnInit() {
this.activateRoute.paramMap.subscribe(paramMap => {
@@ -29,7 +30,20 @@ serialnumber:string;
LoadTaskDetail(serial:string)
{
- this.task = this.processes.GetTaskDetail(serial);
+ this.processes.GetTask(serial).subscribe(result => {
+ this.task = {
+ "SerialNumber": result.serialNumber,
+ "Folio": result.workflowInstanceFolio,
+ "Senders": result.originator.email,
+ "CreateDate": formatDate(new Date(result.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+ "DocumentURL": result.formURL
+ }
+ });
}
+ viewDocument()
+ {
+ const browser = this.iab.create(this.task.DocumentURL);
+ browser.show();
+ }
}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index fa41b97ce..7ba3c0f54 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -39,7 +39,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 98481f4f0..fc3ad676b 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -6,6 +6,7 @@ import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
+import { formatDate } from '@angular/common';
@Component({
selector: 'app-expediente',
@@ -57,17 +58,25 @@ export class ExpedientePage implements OnInit {
)
);
}
- /* Here you save the data entered */
- /* this.eventSource.push(result.data.event); */
- /* Here you load the data saved */
- /* this.myCal.loadEvents(); */
}
});
}
LoadList()
{
- this.taskslist = this.processes.GetDailyWorkTasks();
+ this.processes.GetTasksList("Expediente", false).subscribe(result => {
+ this.taskslist = new Array();
+ result.forEach(element => {
+ let task: DailyWorkTask = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceFolio,
+ "Senders": element.originator.email,
+ "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+ "DocumentURL": element.formURL
+ }
+ this.taskslist.push(task);
+ });
+ });
}
}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 5920edacd..4085fb253 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -23,12 +23,11 @@ export class GabineteDigitalPage implements OnInit {
this.LoadCounts();
}
- load(){
-
- }
-
LoadCounts() {
- this.count_exp_dailywork = this.processesbackend.GetDailyWorkCount();
+ this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
+ this.count_exp_dailywork = result;
+ });
+
this.count_exp_pp = "-";
this.count_exp_pd = "-";
this.count_dip_apr = "-";
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index e8990d1a4..7726e15f4 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -1,8 +1,6 @@
import { Injectable } from '@angular/core';
import { StorageService } from './storage.service';
-import { HttpService } from './http.service';
import { Router } from '@angular/router';
-import { AuthConnstants } from '../config/auth-constants';
import { HttpClient } from '@angular/common/http';
import { User } from '../models/user.model';
import { environment } from 'src/environments/environment';
@@ -15,8 +13,6 @@ export class AuthService {
constructor(
- private storageService: StorageService,
- private router: Router,
private http: HttpClient
) { }
diff --git a/src/app/services/http.service.spec.ts b/src/app/services/http.service.spec.ts
deleted file mode 100644
index 7b345d485..000000000
--- a/src/app/services/http.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { HttpService } from './http.service';
-
-describe('HttpService', () => {
- let service: HttpService;
-
- beforeEach(() => {
- TestBed.configureTestingModule({});
- service = TestBed.inject(HttpService);
- });
-
- it('should be created', () => {
- expect(service).toBeTruthy();
- });
-});
diff --git a/src/app/services/http.service.ts b/src/app/services/http.service.ts
deleted file mode 100644
index b76b0188b..000000000
--- a/src/app/services/http.service.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { environment } from '../../environments/environment';
-import { reject } from 'q';
-
-@Injectable({
-providedIn: 'root'
-})
-export class HttpService {
- constructor(private http: HttpClient) {}
-
- /* post(serviceName: string, data: any) {
- const headers = new HttpHeaders();
- const options = { headers: headers, withCredintials: false };
- const url = environment.apiURL + serviceName;
-
- return this.http.post(url, JSON.stringify(data), options);
- } */
-
- private API_URL = 'https://gpr-dev-08.gabinetedigital.local/api/v2.0/me/calendarview';
-
- /* loginRequest(username:string, password: string, domain: string){
- return new Promise((resolve, reject) => {
- var data = {
- emusernameail: username,
- password: password,
- domain: domain
- };
- this.http.post(this.API_URL, data)
- .subscribe(result: any)=> {
- resolve(result.json());
- },
- (error)=>{
- reject(error.json());
- }
-
- })
- } */
- /* request(API_URL, { json: true },{username:"tiago.kayaya"}, {password:"tabteste@006"}, {domain:"gabinetedigital.local"} ,(err, res, body) => {
- if (err) { return console.log(err); }
- console.log(body.url);
- console.log(body.explanation);
- }); */
-
-}
\ No newline at end of file
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index 64577e128..ea98642ff 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -1,48 +1,55 @@
import { Injectable } from '@angular/core';
-
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { DailyWorkTask } from '../models/dailyworktask.model';
+import { AuthService } from '../services/auth.service';
+import { User } from '../models/user.model';
+import { environment } from 'src/environments/environment';
+import { Observable } from 'rxjs';
@Injectable({
providedIn: 'root'
})
export class ProcessesService {
- constructor() { }
+ authheader = {};
+ loggeduser: User;
+ headers: HttpHeaders;
- GetDailyWorkCount()
- {
- return 100;
+ constructor(private http: HttpClient, user: AuthService) {
+ this.loggeduser = user.ValidatedUser;
+ this.headers = new HttpHeaders();
+ this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey);
}
- private tasks: DailyWorkTask[] = [
- {
- SerialNumber: "1",
- Folio: "Teste 1",
- Senders: "MINEC, MINPLAN, MINFIN",
- CreateDate: "2020-08-18"
- },
- {
- SerialNumber: "2",
- Folio: "Teste 2",
- Senders: "MINFIN",
- CreateDate: "2020-08-19"
- },{
- SerialNumber: "3",
- Folio: "Teste 3",
- Senders: "MINEC",
- CreateDate: "2020-08-20"
- }
- ];
-
- GetDailyWorkTasks()
+ GetTasksList(processname:string, onlycount:boolean): Observable
{
- return this.tasks;
+ const geturl = environment.apiURL + 'processes/GetTasksList';
+ let params = new HttpParams();
+
+ params = params.set("ProcessName", processname);
+ params = params.set("OnlyCount", onlycount.toString());
+
+ let options = {
+ headers: this.headers,
+ params: params
+ };
+
+ return this.http.get(`${geturl}`, options);
}
- GetTaskDetail(serialnumber:string)
+ GetTask(serialnumber:string): Observable
{
- console.log(serialnumber);
- return this.tasks.find(t => t.SerialNumber = serialnumber);
+ const geturl = environment.apiURL + 'processes/GetTask';
+ let params = new HttpParams();
+
+ params = params.set("TaskSerialNumber", serialnumber);
+
+ let options = {
+ headers: this.headers,
+ params: params
+ };
+
+ return this.http.get(`${geturl}`, options);
}
}