Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
Intranet
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Matteo
Intranet
Commits
23d6a333
Commit
23d6a333
authored
Mar 08, 2021
by
Matteo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aggiornamento alla nuova chiamata per i documenti
parent
f85504bf
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
7 deletions
+11
-7
auth.service.ts
src/app/auth/service/auth.service.ts
+1
-1
documenti-request.ts
src/app/interface/documenti-request.ts
+1
-0
documenti.page.ts
src/app/pages/documenti/documenti.page.ts
+3
-2
preview-home.page.ts
src/app/pages/preview-home/preview-home.page.ts
+1
-0
documenti.service.ts
src/app/service/documenti.service.ts
+5
-4
No files found.
src/app/auth/service/auth.service.ts
View file @
23d6a333
...
@@ -94,6 +94,7 @@ export class AuthService {
...
@@ -94,6 +94,7 @@ export class AuthService {
getId
()
getId
()
{
{
return
this
.
getFromStorageAsync
(
"idUser"
).
then
(
state
=>
{
return
this
.
getFromStorageAsync
(
"idUser"
).
then
(
state
=>
{
AuthService
.
idReferente
=
state
;
return
state
;
return
state
;
});
});
}
}
...
@@ -107,7 +108,6 @@ export class AuthService {
...
@@ -107,7 +108,6 @@ export class AuthService {
getFromStorageAsync
(
param
){
getFromStorageAsync
(
param
){
return
this
.
storage
.
get
(
param
).
then
((
data
)
=>
{
return
this
.
storage
.
get
(
param
).
then
((
data
)
=>
{
AuthService
.
idReferente
=
data
;
return
data
;
return
data
;
});
});
}
}
...
...
src/app/interface/documenti-request.ts
View file @
23d6a333
import
{
Pair
}
from
"./pair"
;
import
{
Pair
}
from
"./pair"
;
export
interface
DocumentiRequest
{
export
interface
DocumentiRequest
{
referente
:
number
;
cliente
:
number
;
cliente
:
number
;
limite
:
number
;
limite
:
number
;
struttura
:
number
;
struttura
:
number
;
...
...
src/app/pages/documenti/documenti.page.ts
View file @
23d6a333
...
@@ -205,9 +205,10 @@ export class DocumentiPage implements OnInit {
...
@@ -205,9 +205,10 @@ export class DocumentiPage implements OnInit {
if
(
this
.
date2
!=
null
&&
this
.
date2
!=
""
)
dataA
=
this
.
utilService
.
dateFormatConvert
(
this
.
date2
);
if
(
this
.
date2
!=
null
&&
this
.
date2
!=
""
)
dataA
=
this
.
utilService
.
dateFormatConvert
(
this
.
date2
);
var
request
:
DocumentiRequest
;
var
request
:
DocumentiRequest
;
this
.
idCliente
=
AuthService
.
clienteSelezionato
.
id
;
this
.
idCliente
=
AuthService
.
clienteSelezionato
.
id
;
var
idReferente
=
AuthService
.
idReferente
;
var
strutturaSel
=
this
.
utilService
.
getStrutturaSel
();
var
strutturaSel
=
this
.
utilService
.
getStrutturaSel
();
if
(
fase
==
"initial"
)
request
=
this
.
docService
.
createInitialRequest
(
this
.
idCliente
,
strutturaSel
.
id
);
if
(
fase
==
"initial"
)
request
=
this
.
docService
.
createInitialRequest
(
idReferente
,
this
.
idCliente
,
strutturaSel
.
id
);
else
request
=
this
.
docService
.
createRequest
(
this
.
idCliente
,
null
,
tit
,
null
,
dataDa
,
dataA
,
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
.
docService
.
getDocumenti
(
request
).
subscribe
((
res
:
DocumentiResponse
)
=>
{
this
.
utilService
.
closeLoading
();
this
.
utilService
.
closeLoading
();
if
(
res
.
error
){
if
(
res
.
error
){
...
...
src/app/pages/preview-home/preview-home.page.ts
View file @
23d6a333
...
@@ -42,6 +42,7 @@ export class PreviewHomePage implements OnInit {
...
@@ -42,6 +42,7 @@ export class PreviewHomePage implements OnInit {
setStrutture
()
setStrutture
()
{
{
this
.
authService
.
getId
();
this
.
authService
.
getName
().
then
(
state
=>
{
this
.
authService
.
getName
().
then
(
state
=>
{
this
.
name
=
state
;
this
.
name
=
state
;
this
.
pageReady
=
true
;
this
.
pageReady
=
true
;
...
...
src/app/service/documenti.service.ts
View file @
23d6a333
...
@@ -23,7 +23,7 @@ export class DocumentiService {
...
@@ -23,7 +23,7 @@ export class DocumentiService {
}
}
encodeBodyDocumenti
(
params
:
DocumentiRequest
)
{
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
\"
: {"
;
",
\"
struttura
\"
: "
+
params
.
struttura
+
",
\"
filtri
\"
: {"
;
var
filtro
;
var
filtro
;
var
first
=
true
;
var
first
=
true
;
...
@@ -41,7 +41,7 @@ export class DocumentiService {
...
@@ -41,7 +41,7 @@ export class DocumentiService {
return
request
;
return
request
;
}
}
createRequest
(
id
,
limite
,
titolo
,
tipo
,
daData
,
aData
,
strutturaSel
):
DocumentiRequest
createRequest
(
id
Referente
,
id
,
limite
,
titolo
,
tipo
,
daData
,
aData
,
strutturaSel
):
DocumentiRequest
{
{
var
request
:
DocumentiRequest
;
var
request
:
DocumentiRequest
;
var
pair
:
Pair
;
var
pair
:
Pair
;
...
@@ -88,6 +88,7 @@ export class DocumentiService {
...
@@ -88,6 +88,7 @@ export class DocumentiService {
}
}
request
=
{
request
=
{
referente
:
idReferente
,
cliente
:
id
,
cliente
:
id
,
limite
:
limite
,
limite
:
limite
,
struttura
:
strutturaSel
,
struttura
:
strutturaSel
,
...
@@ -97,9 +98,9 @@ export class DocumentiService {
...
@@ -97,9 +98,9 @@ export class DocumentiService {
return
request
;
return
request
;
}
}
createInitialRequest
(
id
,
strutturaSel
):
DocumentiRequest
createInitialRequest
(
id
Referente
,
id
,
strutturaSel
):
DocumentiRequest
{
{
return
this
.
createRequest
(
id
,
10
,
null
,
null
,
null
,
null
,
strutturaSel
);
return
this
.
createRequest
(
id
Referente
,
id
,
10
,
null
,
null
,
null
,
null
,
strutturaSel
);
}
}
getDocumenti
(
value
:
DocumentiRequest
):
Observable
<
DocumentiResponse
>
{
getDocumenti
(
value
:
DocumentiRequest
):
Observable
<
DocumentiResponse
>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment