Commit 23d6a333 by Matteo

aggiornamento alla nuova chiamata per i documenti

parent f85504bf
......@@ -94,6 +94,7 @@ export class AuthService {
getId()
{
return this.getFromStorageAsync("idUser").then(state => {
AuthService.idReferente = state;
return state;
});
}
......@@ -107,7 +108,6 @@ export class AuthService {
getFromStorageAsync(param){
return this.storage.get(param).then((data)=>{
AuthService.idReferente = data;
return data;
});
}
......
import { Pair } from "./pair";
export interface DocumentiRequest {
referente: number;
cliente: number;
limite: number;
struttura:number;
......
......@@ -205,9 +205,10 @@ export class DocumentiPage implements OnInit {
if(this.date2 != null && this.date2 != "") dataA = this.utilService.dateFormatConvert(this.date2);
var request: DocumentiRequest;
this.idCliente = AuthService.clienteSelezionato.id;
var idReferente = AuthService.idReferente;
var strutturaSel = this.utilService.getStrutturaSel();
if(fase == "initial") request = this.docService.createInitialRequest(this.idCliente, strutturaSel.id);
else request = this.docService.createRequest(this.idCliente,null,tit,null,dataDa, dataA, strutturaSel.id);
if(fase == "initial") request = this.docService.createInitialRequest(idReferente, this.idCliente, strutturaSel.id);
else request = this.docService.createRequest(idReferente, this.idCliente,null,tit,null,dataDa, dataA, strutturaSel.id);
this.docService.getDocumenti(request).subscribe((res: DocumentiResponse)=>{
this.utilService.closeLoading();
if(res.error){
......
......@@ -42,6 +42,7 @@ export class PreviewHomePage implements OnInit {
setStrutture()
{
this.authService.getId();
this.authService.getName().then(state => {
this.name = state;
this.pageReady = true;
......
......@@ -23,7 +23,7 @@ export class DocumentiService {
}
encodeBodyDocumenti(params: DocumentiRequest) {
var request = "{\"cliente\" : "+params.cliente+",\"limite\" : "+params.limite+
var request = "{\"referente\" : "+params.referente+",\"cliente\" : "+params.cliente+",\"limite\" : "+params.limite+
",\"struttura\" : "+params.struttura+",\"filtri\" : {";
var filtro;
var first = true;
......@@ -41,7 +41,7 @@ export class DocumentiService {
return request;
}
createRequest(id, limite, titolo, tipo, daData, aData, strutturaSel): DocumentiRequest
createRequest(idReferente, id, limite, titolo, tipo, daData, aData, strutturaSel): DocumentiRequest
{
var request:DocumentiRequest;
var pair:Pair;
......@@ -88,6 +88,7 @@ export class DocumentiService {
}
request = {
referente: idReferente,
cliente: id,
limite: limite,
struttura: strutturaSel,
......@@ -97,9 +98,9 @@ export class DocumentiService {
return request;
}
createInitialRequest(id, strutturaSel): DocumentiRequest
createInitialRequest(idReferente, id, strutturaSel): DocumentiRequest
{
return this.createRequest(id, 10, null, null, null, null, strutturaSel);
return this.createRequest(idReferente, id, 10, null, null, null, null, strutturaSel);
}
getDocumenti(value: DocumentiRequest): Observable<DocumentiResponse>{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment