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
8cc3488e
Commit
8cc3488e
authored
Nov 17, 2021
by
Matteo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rimossi loader, fix chiusura menu e fix testo notifiche
parent
71228247
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
home.page.ts
src/app/pages/home/home.page.ts
+1
-0
notifiche.service.ts
src/app/service/notifiche.service.ts
+9
-3
util.service.ts
src/app/service/util.service.ts
+6
-4
No files found.
src/app/pages/home/home.page.ts
View file @
8cc3488e
...
@@ -238,6 +238,7 @@ export class HomePage {
...
@@ -238,6 +238,7 @@ export class HomePage {
if
(
struttura
==
"notifiche"
)
if
(
struttura
==
"notifiche"
)
{
{
this
.
utilService
.
apriPagina
(
struttura
);
this
.
utilService
.
apriPagina
(
struttura
);
this
.
closeSideMenu
();
return
;
return
;
}
}
let
ok
=
false
;
let
ok
=
false
;
...
...
src/app/service/notifiche.service.ts
View file @
8cc3488e
...
@@ -12,6 +12,9 @@ import { ArchiviaNotificaRequest } from '../interface/archivia-notifica-request'
...
@@ -12,6 +12,9 @@ import { ArchiviaNotificaRequest } from '../interface/archivia-notifica-request'
import
{
ParereResponse
}
from
'../interface/parere-response'
;
import
{
ParereResponse
}
from
'../interface/parere-response'
;
import
{
UtilService
}
from
'./util.service'
;
import
{
UtilService
}
from
'./util.service'
;
import
{
AuthService
}
from
'../auth/service/auth.service'
;
import
{
AuthService
}
from
'../auth/service/auth.service'
;
import
{
Platform
}
from
'@ionic/angular'
;
import
{
platformBrowserDynamicTesting
}
from
'@angular/platform-browser-dynamic/testing'
;
import
{
Notifica
}
from
'../interface/notifica'
;
@
Injectable
({
@
Injectable
({
providedIn
:
'root'
providedIn
:
'root'
...
@@ -20,7 +23,8 @@ export class NotificheService {
...
@@ -20,7 +23,8 @@ export class NotificheService {
constructor
(
constructor
(
private
httpClient
:
HttpClient
,
private
httpClient
:
HttpClient
,
private
httpClientDataService
:
HttpClientDataService
private
httpClientDataService
:
HttpClientDataService
,
private
platform
:
Platform
)
{
)
{
this
.
initService
();
this
.
initService
();
}
}
...
@@ -108,10 +112,12 @@ export class NotificheService {
...
@@ -108,10 +112,12 @@ export class NotificheService {
.
pipe
(
.
pipe
(
catchError
(
this
.
handleError
),
catchError
(
this
.
handleError
),
tap
(
(
res
:
NotificheResponse
)
=>
{
tap
(
(
res
:
NotificheResponse
)
=>
{
if
(
!
res
.
error
)
{
if
(
!
res
.
error
)
{
let
notifiche
:
Notifica
[]
=
[];
if
(
!
this
.
platform
.
is
(
"desktop"
))
res
.
notifiche
.
forEach
(
element
=>
element
.
contenuto
=
element
.
contenuto
.
replace
(
"<br>"
,
"
\
r
\
n"
));
this
.
errorRespose
.
error
=
false
;
this
.
errorRespose
.
error
=
false
;
return
res
;
return
notifiche
;
}
}
else
{
else
{
this
.
errorRespose
.
error
=
true
;
this
.
errorRespose
.
error
=
true
;
...
...
src/app/service/util.service.ts
View file @
8cc3488e
...
@@ -197,16 +197,17 @@ export class UtilService {
...
@@ -197,16 +197,17 @@ export class UtilService {
}
}
async
showLoading
()
{
async
showLoading
()
{
if
(
this
.
platform
.
is
(
"ios"
))
return
null
;
/*
if(this.platform.is("ios")) return null;
this.loader = await this.loadingCtrl.create({
this.loader = await this.loadingCtrl.create({
message: "Please wait...",
message: "Please wait...",
});
});
this.loaders.push(this.loader);
this.loaders.push(this.loader);
return
await
this
.
loader
.
present
();
return await this.loader.present();*/
return
null
;
}
}
closeLoading
()
{
closeLoading
()
{
if
(
this
.
platform
.
is
(
"ios"
))
return
null
;
/*
if(this.platform.is("ios")) return null;
if(this.loaders.length > 0)
if(this.loaders.length > 0)
{
{
this.loader = this.loaders.pop();
this.loader = this.loaders.pop();
...
@@ -216,7 +217,8 @@ export class UtilService {
...
@@ -216,7 +217,8 @@ export class UtilService {
setTimeout(() => {
setTimeout(() => {
this.secondClose()
this.secondClose()
}, 2000)
}, 2000)
}
}*/
return
null
;
}
}
secondClose
()
secondClose
()
...
...
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