Skip to content

I
Intranet
Commit 924d6510 by Matteo
Options

Su android funziona

parent 71a3fd61
Showing with 134 additions and 106 deletions
package.json
{ {
"name": "2P2 App", "name": "2p2app",
"version": "1.0", "version": "0.0.1",
"author": "Aim Consulting s.r.l.", "author": "Aim Consulting s.r.l.",
"homepage": "https://www.aimconsulting.it/", "homepage": "https://www.aimconsulting.it/",
"scripts": { "scripts": {
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
"cordova-plugin-x-socialsharing": "^6.0.3", "cordova-plugin-x-socialsharing": "^6.0.3",
"es6-promise-plugin": "^4.2.2", "es6-promise-plugin": "^4.2.2",
"ionic-angular": "^3.9.10", "ionic-angular": "^3.9.10",
"jetifier": "^2.0.0",
"phonegap-plugin-multidex": "^1.0.0", "phonegap-plugin-multidex": "^1.0.0",
"phonegap-plugin-push": "^2.3.0", "phonegap-plugin-push": "^2.3.0",
"rxjs": "~6.6.0", "rxjs": "~6.6.0",
......
src/app/app.component.ts
...@@ -31,6 +31,7 @@ export class AppComponent { ...@@ -31,6 +31,7 @@ export class AppComponent {
this.created = true; this.created = true;
} }
this.utilService.loadLingua(); this.utilService.loadLingua();
UtilService.isNotificaResume = true;
this.utilService.initConfig(false, 'notifiche'); this.utilService.initConfig(false, 'notifiche');
} }
......
src/app/auth/pages/change-pwd/change-pwd.page.html
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<ion-row justify-content-center *ngIf="platform.is('desktop')"> <ion-row justify-content-center *ngIf="platform.is('desktop')">
<ion-col> <ion-col>
<ion-buttons class="back-button-desktop-cp" (click)="back()" title="{{ 'back_login' | translate }}"> <ion-buttons class="back-button-desktop-cp" (click)="back()" title="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
<!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>--> <!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons> </ion-buttons>
</ion-col> </ion-col>
......
src/app/auth/pages/login/login.page.html
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</div> </div>
</div> </div>
</ion-content> </ion-content>
<ion-footer class="footer-smartphone"> <ion-footer class="footer-smartphone ion-no-border">
<ion-col class="desktop-bcall-col"align-self-center> <ion-col class="desktop-bcall-col"align-self-center>
<div class="smartphone-bcall"> <div class="smartphone-bcall">
<div class="bcall-title"> <div class="bcall-title">
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</div> </div>
</ion-content> </ion-content>
<ion-footer class="contenitore-desktop" *ngIf="platform.is('desktop')" no-border> <ion-footer class="contenitore-desktop ion-no-border" *ngIf="platform.is('desktop')" no-border>
<form #form="ngForm" (ngSubmit)="login(form)" class="form-desktop"> <form #form="ngForm" (ngSubmit)="login(form)" class="form-desktop">
<ion-grid class="login-grid"> <ion-grid class="login-grid">
<ion-row class="login-row"> <ion-row class="login-row">
......
src/app/auth/pages/registrazione/registrazione.page.html
<ion-header> <ion-header class="ion-no-border">
<title>2p2</title> <title>2p2</title>
</ion-header> </ion-header>
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<ion-col align-self-center> <ion-col align-self-center>
<ion-toolbar class="business-toolbar"> <ion-toolbar class="business-toolbar">
<ion-buttons (click)="back()" slot="start" title="{{ 'back_login' | translate }}"> <ion-buttons (click)="back()" slot="start" title="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back-white" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back-white" tappable></ion-icon>
<!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>--> <!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons> </ion-buttons>
<img src="assets/img/LogoBianco.svg" class="immagine-piccola"> <img src="assets/img/LogoBianco.svg" class="immagine-piccola">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<ion-col align-self-center> <ion-col align-self-center>
<ion-row class="margin-top" *ngIf="platform.is('desktop')"> <ion-row class="margin-top" *ngIf="platform.is('desktop')">
<ion-buttons (click)="back()" title="{{ 'back_login' | translate }}" class="back-button-desktop back-button-desktop-reset"> <ion-buttons (click)="back()" title="{{ 'back_login' | translate }}" class="back-button-desktop back-button-desktop-reset">
<ion-icon name="arrow-round-back" color="#232D4B" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#232D4B" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<ion-title class="logo-piccolo"> <ion-title class="logo-piccolo">
......
src/app/auth/pages/reset/reset.page.html
<ion-header> <ion-header class="ion-no-border">
<title>2p2</title> <title>2p2</title>
</ion-header> </ion-header>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<ion-col align-self-center> <ion-col align-self-center>
<ion-toolbar class="business-toolbar"> <ion-toolbar class="business-toolbar">
<ion-buttons (click)="back()" slot="start" title="{{ 'back_login' | translate }}"> <ion-buttons (click)="back()" slot="start" title="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back-white" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back-white" tappable></ion-icon>
<!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>--> <!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons> </ion-buttons>
<img src="assets/img/LogoBianco.svg" class="immagine-piccola"> <img src="assets/img/LogoBianco.svg" class="immagine-piccola">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<ion-col align-self-center> <ion-col align-self-center>
<ion-row *ngIf="platform.is('desktop')"> <ion-row *ngIf="platform.is('desktop')">
<ion-buttons (click)="back()" title="{{ 'back_login' | translate }}" class="back-button-desktop back-button-desktop-reset"> <ion-buttons (click)="back()" title="{{ 'back_login' | translate }}" class="back-button-desktop back-button-desktop-reset">
<ion-icon name="arrow-round-back" color="#232D4B" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#232D4B" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<ion-title class="logo-piccolo"> <ion-title class="logo-piccolo">
......
src/app/pages/about/about.html
<ion-header> <ion-header class="ion-no-border">
<ion-navbar> <ion-navbar>
<ion-title> <ion-title>
About About
......
src/app/pages/bi/bi.page.html
<ion-header> <ion-header class="ion-no-border">
<ion-toolbar> <ion-toolbar>
<ion-title>bi</ion-title> <ion-title>bi</ion-title>
</ion-toolbar> </ion-toolbar>
......
src/app/pages/businesscall/businesscall.page.html
<ion-header> <ion-header class="ion-no-border">
<title>2p2</title> <title>2p2</title>
</ion-header> </ion-header>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<ion-col align-self-center> <ion-col align-self-center>
<ion-toolbar class="business-toolbar"> <ion-toolbar class="business-toolbar">
<ion-buttons (click)="back()" slot="start" title="{{ 'back_login' | translate }}"> <ion-buttons (click)="back()" slot="start" title="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back-white" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back-white" tappable></ion-icon>
<!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>--> <!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons> </ion-buttons>
<img src="assets/img/LogoBianco.svg" class="immagine-piccola"> <img src="assets/img/LogoBianco.svg" class="immagine-piccola">
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<div class="logo-grande2"> <div class="logo-grande2">
<ion-toolbar class="business-toolbar2"> <ion-toolbar class="business-toolbar2">
<ion-buttons (click)="back()" slot="start" title="{{ 'back_login' | translate }}" class="back-button-desktop"> <ion-buttons (click)="back()" slot="start" title="{{ 'back_login' | translate }}" class="back-button-desktop">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
<!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>--> <!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons> </ion-buttons>
<ion-title class="bc-title2"> <ion-title class="bc-title2">
......
src/app/pages/contact/contact.html
<ion-header> <ion-header class="ion-no-border">
<ion-navbar> <ion-navbar>
<ion-title> <ion-title>
Contact Contact
......
src/app/pages/documenti/documenti.page.html
...@@ -38,31 +38,31 @@ ...@@ -38,31 +38,31 @@
</ion-button> </ion-button>
</span> </span>
<ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
</ion-row> </ion-row>
<ion-row> <ion-row>
<div class="search-date-smart"> <div class="search-date-smart">
<ion-row> <!--<ion-row>
<span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }} <span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }}
<input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc"> <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc">
</span> </span>
<ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>-->
<ion-row class="riga-doc"> <ion-row>
<strong>{{ 'cerca' | translate }}</strong> <ion-row class="riga"><span><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }}</span>
{{ 'titolo' | translate }}
<!--<input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc" />--> <!--<input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc" />-->
<ion-select (ionChange)="cercaDocumenti()" value="titolo" [(ngModel)]="titolo" interface="popover" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc"> <ion-select (ionChange)="cercaDocumenti()" value="titolo" [(ngModel)]="titolo" interface="popover" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc">
<ion-select-option value=""></ion-select-option> <ion-select-option value=""></ion-select-option>
<ion-select-option *ngFor="let tit of titoli; let i=index;" value="{{tit}}">{{tit}}</ion-select-option> <ion-select-option *ngFor="let tit of titoli; let i=index;" value="{{tit}}">{{tit}}</ion-select-option>
</ion-select> </ion-select>
</ion-row>
<ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<ion-content *ngIf="platform.is('desktop')"> <ion-content *ngIf="platform.is('desktop')">
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}"> <ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="documenti-title"> <div class="documenti-title">
<ion-title>{{ 'titolo_documenti' | translate }}</ion-title> <ion-title>{{ 'titolo_documenti' | translate }}</ion-title>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
</ion-icon> </ion-icon>
</ion-button> </ion-button>
<ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<ion-row class="riga-doc"> <ion-row class="riga-doc">
...@@ -141,9 +141,11 @@ ...@@ -141,9 +141,11 @@
<ion-select-option value=""></ion-select-option> <ion-select-option value=""></ion-select-option>
<ion-select-option *ngFor="let tit of titoli; let i=index;" value="{{tit}}">{{tit}}</ion-select-option> <ion-select-option *ngFor="let tit of titoli; let i=index;" value="{{tit}}">{{tit}}</ion-select-option>
</ion-select> </ion-select>
<div style="width: 28.7%; margin-right: 0;">
<ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaDocumenti()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div>
</ion-row> </ion-row>
</ion-row> </ion-row>
</div> </div>
......
src/app/pages/documenti/documenti.page.ts
...@@ -51,12 +51,12 @@ export class DocumentiPage implements OnInit { ...@@ -51,12 +51,12 @@ export class DocumentiPage implements OnInit {
eventsIdle() eventsIdle()
{ {
this.translate = this.utilService.translate; this.translate = this.utilService.translate;
setTimeout(() => {
if(EventsService.clienteCambiato) if(EventsService.clienteCambiato)
{ {
this.chiediDocumenti("initial"); this.chiediDocumenti("initial");
this.recuperaTitoli(); this.recuperaTitoli();
} }
setTimeout(() => {
this.eventsIdle(); this.eventsIdle();
}, environment.eventsTime); }, environment.eventsTime);
} }
......
src/app/pages/home/home.page.html
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
'home-height': !isTitolo(), 'home-height': !isTitolo(),
'subpage-height': isTitolo(), 'subpage-height': isTitolo(),
'header-home': true, 'header-home': true,
'background-blu': true 'background-blu': true,
'ion-no-border': true
}" no-border *ngIf="!platform.is('desktop')"> }" no-border *ngIf="!platform.is('desktop')">
<ion-grid class="header-grid"> <ion-grid class="header-grid">
<ion-row justify-content-center> <ion-row justify-content-center>
...@@ -79,7 +80,7 @@ ...@@ -79,7 +80,7 @@
</ion-content> </ion-content>
<ion-menu side="start" menu-id="mainmenu" content-id="content" class="menu" *ngIf="!platform.is('desktop')"> <ion-menu side="start" menu-id="mainmenu" content-id="content" class="menu" *ngIf="!platform.is('desktop')">
<ion-header no-border class="header"> <ion-header no-border class="header ion-no-border">
<ion-toolbar class="menu-toolbar" color="#2b94d1"> <ion-toolbar class="menu-toolbar" color="#2b94d1">
<ion-item class="menu-title item-no-border">{{ 'menu_principale' | translate }}</ion-item> <ion-item class="menu-title item-no-border">{{ 'menu_principale' | translate }}</ion-item>
<ion-buttons (click)="closeSideMenu()" slot="end" title="Chiudi Menu"> <ion-buttons (click)="closeSideMenu()" slot="end" title="Chiudi Menu">
......
src/app/pages/home/home.page.ts
...@@ -46,7 +46,11 @@ export class HomePage { ...@@ -46,7 +46,11 @@ export class HomePage {
this.router.navigate(['login']); this.router.navigate(['login']);
} }
});*/ });*/
if(!this.eventIdleInitilized)
{
this.eventIdleInitilized = true;
this.eventsIdle(); this.eventsIdle();
}
this.lingue = this.utilService.getLanguageList(); this.lingue = this.utilService.getLanguageList();
if(this.utilService.getLingua() == "") { if(this.utilService.getLingua() == "") {
this.linguaSel = this.lingue[0].key; this.linguaSel = this.lingue[0].key;
...@@ -114,7 +118,6 @@ export class HomePage { ...@@ -114,7 +118,6 @@ export class HomePage {
{ {
this.translate = this.utilService.translate; this.translate = this.utilService.translate;
this.titoloPagina = UtilService.titoloPagina; this.titoloPagina = UtilService.titoloPagina;
setTimeout(() => {
if(EventsService.caricaDati) this.caricaDati(false); if(EventsService.caricaDati) this.caricaDati(false);
if(EventsService.startup) if(EventsService.startup)
if(this.clienteSelezionato.id == null) { if(this.clienteSelezionato.id == null) {
...@@ -128,6 +131,7 @@ export class HomePage { ...@@ -128,6 +131,7 @@ export class HomePage {
} }
if(EventsService.redirect.length > 0) this.redirectTo(); if(EventsService.redirect.length > 0) this.redirectTo();
if(EventsService.strutturaSelected) this.strutturaSelected(); if(EventsService.strutturaSelected) this.strutturaSelected();
setTimeout(() => {
this.eventsIdle(); this.eventsIdle();
}, environment.eventsTime); }, environment.eventsTime);
} }
...@@ -227,6 +231,7 @@ export class HomePage { ...@@ -227,6 +231,7 @@ export class HomePage {
titoloPagina: string; titoloPagina: string;
isClienteLoggato: boolean; isClienteLoggato: boolean;
strutturaName: string; strutturaName: string;
eventIdleInitilized : boolean = false;
selectStruttura(struttura:string) selectStruttura(struttura:string)
{ {
......
src/app/pages/index/index.page.ts
...@@ -27,9 +27,9 @@ export class IndexPage implements OnInit { ...@@ -27,9 +27,9 @@ export class IndexPage implements OnInit {
eventsIdle() eventsIdle()
{ {
this.translate = this.utilService.translate; this.translate = this.utilService.translate;
setTimeout(() => {
if(EventsService.strutturaSelected || EventsService.strutturaSelectedHome) this.strutturaSelected(); if(EventsService.strutturaSelected || EventsService.strutturaSelectedHome) this.strutturaSelected();
if(EventsService.updateStrutture) this.setStrutture(); if(EventsService.updateStrutture) this.setStrutture();
setTimeout(() => {
this.eventsIdle(); this.eventsIdle();
}, environment.eventsTime); }, environment.eventsTime);
} }
......
src/app/pages/interviste/interviste.page.html
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</ion-button> </ion-button>
</span> </span>
<ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }} <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc"> <span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }} <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc">
</span> </span>
<ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<ion-label>{{ 'visualizza_archiviati' | translate }}</ion-label> <ion-label>{{ 'visualizza_archiviati' | translate }}</ion-label>
</span> </span>
<ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
{{topic.data}} {{topic.data}}
</div> </div>
<div class="row-download item-no-border"> <div class="row-download item-no-border">
<ion-icon class="button-icon-documenti-smart ios-icon" name="ios-arrow-dropright-circle" (click)="apriTopic(topic.idRichiesta)" tappable title="{{ 'visualizza_dettagli' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" name="caret-forward-circle-outline" (click)="apriTopic(topic.idRichiesta)" tappable title="{{ 'visualizza_dettagli' | translate }}"></ion-icon>
</div> </div>
</div> </div>
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<div *ngSwitchCase="'lista'"> <div *ngSwitchCase="'lista'">
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}"> <ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="pareri-title"> <div class="pareri-title">
<ion-title>{{ 'interviste_titolo' | translate }}</ion-title> <ion-title>{{ 'interviste_titolo' | translate }}</ion-title>
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
</ion-icon> </ion-icon>
</ion-button> </ion-button>
<ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<div class="riga"> <div class="riga">
...@@ -183,14 +183,14 @@ ...@@ -183,14 +183,14 @@
{{ 'titolo' | translate }} {{ 'titolo' | translate }}
<input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc" /> <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc" />
<ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<div class="riga"> <div class="riga">
<ion-checkbox name="privacy" [(ngModel)]="archiviati" class="check"> </ion-checkbox> <ion-checkbox name="privacy" [(ngModel)]="archiviati" class="check"> </ion-checkbox>
<ion-label class="archivio-text"><span class="text">{{ 'visualizza_archiviati' | translate }}</span></ion-label> <ion-label class="archivio-text"><span class="text">{{ 'visualizza_archiviati' | translate }}</span></ion-label>
<ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="caricaRichieste()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<div class="riga riga2" id="buttonsInterviste" style="display:none"> <div class="riga riga2" id="buttonsInterviste" style="display:none">
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
<ion-grid> <ion-grid>
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_interviste' | translate }}"> <ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_interviste' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="pareri-title"> <div class="pareri-title">
<ion-title>{{topicAttivo.titolo}}</ion-title> <ion-title>{{topicAttivo.titolo}}</ion-title>
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
<div *ngIf="platform.is('desktop')" class="grigio riga"> <div *ngIf="platform.is('desktop')" class="grigio riga">
<strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} <input type="date" name="calendar" [(ngModel)]="date1" title="{{ 'seleziona_data' | translate }}"> {{ 'a' | translate }} <input type="date" name="calendar" [(ngModel)]="date2" title="{{ 'seleziona_data' | translate }}"> <strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} <input type="date" name="calendar" [(ngModel)]="date1" title="{{ 'seleziona_data' | translate }}"> {{ 'a' | translate }} <input type="date" name="calendar" [(ngModel)]="date2" title="{{ 'seleziona_data' | translate }}">
<ion-button (click)="caricaTopic()" class="search-arrow" title="{{ 'cerca_interventi' | translate }}"> <ion-button (click)="caricaTopic()" class="search-arrow" title="{{ 'cerca_interventi' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_interventi' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_interventi' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
</ion-row> </ion-row>
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
<div *ngSwitchCase="'new'"> <div *ngSwitchCase="'new'">
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_interviste' | translate }}"> <ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_interviste' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="pareri-title"> <div class="pareri-title">
<ion-title>{{ 'nuova_domanda' | translate }}</ion-title> <ion-title>{{ 'nuova_domanda' | translate }}</ion-title>
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
</div> </div>
</ion-content> </ion-content>
<ion-footer class="footer-parere" no-border *ngIf="bottoneVisibile" id="footer-interviste"> <ion-footer class="footer-parere ion-no-border" no-border *ngIf="bottoneVisibile" id="footer-interviste">
<form #form="ngForm" *ngIf="formInserisciIntervento"> <form #form="ngForm" *ngIf="formInserisciIntervento">
<ion-grid> <ion-grid>
<ion-row> <ion-row>
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
<ion-input class="input-intervento" id= "message" type="text" placeholder="{{ 'digita_msg' | translate }}" name="message" [(ngModel)]="message"></ion-input> <ion-input class="input-intervento" id= "message" type="text" placeholder="{{ 'digita_msg' | translate }}" name="message" [(ngModel)]="message"></ion-input>
</ion-col> </ion-col>
<ion-col size="2"> <ion-col size="2">
<ion-icon class="button-icon-documenti" name="ios-arrow-dropright-circle" (click)="aggiungiIntervento(form)" tappable title="{{ 'inserisci_intervento' | translate }}" [style.color]="'#EEA248'"></ion-icon> <ion-icon class="button-icon-documenti" name="chevron-forward-circle-outline" (click)="aggiungiIntervento(form)" tappable title="{{ 'inserisci_intervento' | translate }}" [style.color]="'#EEA248'"></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>
......
src/app/pages/interviste/interviste.page.ts
...@@ -49,7 +49,6 @@ export class IntervistePage implements OnInit { ...@@ -49,7 +49,6 @@ export class IntervistePage implements OnInit {
eventsIdle() eventsIdle()
{ {
this.translate = this.utilService.translate; this.translate = this.utilService.translate;
setTimeout(() => {
if(EventsService.clienteCambiato) this.loadTopics("initial"); if(EventsService.clienteCambiato) this.loadTopics("initial");
if(EventsService.manageBackButton) if(EventsService.manageBackButton)
{ {
...@@ -69,6 +68,7 @@ export class IntervistePage implements OnInit { ...@@ -69,6 +68,7 @@ export class IntervistePage implements OnInit {
} }
} }
} }
setTimeout(() => {
this.eventsIdle(); this.eventsIdle();
}, environment.eventsTime); }, environment.eventsTime);
} }
......
src/app/pages/notifiche/notifiche.page.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc"> <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc">
</span> </span>
<ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<ion-label>{{ 'visualizza_notifiche_archiviate' | translate }}</ion-label> <ion-label>{{ 'visualizza_notifiche_archiviate' | translate }}</ion-label>
</span> </span>
<ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
<span class="riga"> <span class="riga">
<span class="testo-ricerca"> <span class="testo-ricerca">
<span class="testo-ricerca-select"><strong>{{ 'cerca' | translate }}</strong> {{ 'cliente' | translate }}</span> <span class="testo-ricerca-select"><strong>{{ 'cerca' | translate }}</strong> {{ 'cliente' | translate }}</span>
<ion-select value="clienteSelezionato" class="cerca-titolo-doc testo-ricerca-select" [(ngModel)]="clienteSelezionato" (ionChange)="cambiaCliente()" interface="popover" [placeholder]="clienteSel ? clienteSel.denominazione : 'Seleziona Cliente ...'" title="Seleziona un cliente"> <ion-select value="clienteSelezionato" class="cerca-titolo-doc testo-ricerca-select" [(ngModel)]="clienteSelezionato" (ionChange)="cambiaCliente()" interface="popover" [placeholder]="clienteSel ? clienteSel.denominazione : 'Seleziona cliente ...'" title="Seleziona un cliente">
<ion-select-option value="-1"></ion-select-option> <ion-select-option value="-1"></ion-select-option>
<ion-select-option *ngFor="let cliente of clienti; let i=index;" value="{{cliente.id}}">{{cliente.denominazione}}</ion-select-option> <ion-select-option *ngFor="let cliente of clienti; let i=index;" value="{{cliente.id}}">{{cliente.denominazione}}</ion-select-option>
</ion-select> </ion-select>
</span> </span>
</span> </span>
<ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -54,14 +54,14 @@ ...@@ -54,14 +54,14 @@
<span class="riga"> <span class="riga">
<span class="testo-ricerca"> <span class="testo-ricerca">
<span class="testo-ricerca-select"><strong>{{ 'cerca' | translate }}</strong> {{ 'struttura' | translate }}</span> <span class="testo-ricerca-select"><strong>{{ 'cerca' | translate }}</strong> {{ 'struttura' | translate }}</span>
<ion-select value="strutturaSelezionata" class="cerca-titolo-doc testo-ricerca-select" [(ngModel)]="strutturaSelezionata" (ionChange)="cambiaStruttura()" interface="popover" [placeholder]="strSel.denominazione ? strSel.denominazione : 'Seleziona struttura ...'" title="Seleziona un cliente"> <ion-select value="strutturaSelezionata" class="cerca-titolo-doc testo-ricerca-select" [(ngModel)]="strutturaSelezionata" (ionChange)="cambiaStruttura()" interface="popover" [placeholder]="strSel ? strSel.denominazione : 'Seleziona struttura ...'" title="Seleziona una struttura">
<ion-select-option value="-1"></ion-select-option> <ion-select-option value="-1"></ion-select-option>
<ion-select-option *ngFor="let struttura of strutture; let i=index;" value="{{struttura.id}}">{{struttura.denominazione}}</ion-select-option> <ion-select-option *ngFor="let struttura of strutture; let i=index;" value="{{struttura.id}}">{{struttura.denominazione}}</ion-select-option>
</ion-select> </ion-select>
</span> </span>
</span> </span>
<ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
{{notifica.data}} {{notifica.data}}
</div> </div>
<div class="row-download item-no-border"> <div class="row-download item-no-border">
<ion-icon class="button-icon-documenti-smart ios-icon" name="ios-arrow-dropright-circle" (click)="apriNotifica(notifica.id)" tappable title="{{ 'visualizza_dettagli' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" name="caret-forward-circle-outline" (click)="apriNotifica(notifica.id)" tappable title="{{ 'visualizza_dettagli' | translate }}"></ion-icon>
</div> </div>
</div> </div>
</ion-list> </ion-list>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<div *ngSwitchCase="'lista'"> <div *ngSwitchCase="'lista'">
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}" *ngIf="!isClienteLoggato"> <ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}" *ngIf="!isClienteLoggato">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<ion-buttons class="back-button-desktop" (click)="logout()" title="{{'uscita' | translate}}" *ngIf="isClienteLoggato"> <ion-buttons class="back-button-desktop" (click)="logout()" title="{{'uscita' | translate}}" *ngIf="isClienteLoggato">
<ion-icon name="exit" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="exit" color="#2b94d1" class="back" tappable></ion-icon>
...@@ -129,45 +129,52 @@ ...@@ -129,45 +129,52 @@
</ion-row> </ion-row>
<div class="search-date"> <div class="search-date">
<ion-row> <ion-row>
<div class="riga"> <ion-row class="riga-doc">
<strong>{{ 'cerca' | translate }}</strong> <span class="testo-ricerca-select">
{{ 'titolo' | translate }} <strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }}
</span>
<input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc" /> <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc" />
<div style="width: 27.1%; margin-right: 0;">
<ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<div class="riga" *ngIf="!isClienteLoggato"> </ion-row>
<ion-row class="riga-doc" *ngIf="!isClienteLoggato">
<span class="testo-ricerca-select"> <span class="testo-ricerca-select">
<strong>{{ 'cerca' | translate }}</strong> <strong>{{ 'cerca' | translate }}</strong>
{{ 'cliente' | translate }} {{ 'cliente' | translate }}
</span> </span>
<ion-select value="clienteSelezionato" class=" testo-ricerca-select cerca-titolo-doc" [(ngModel)]="clienteSelezionato" (ionChange)="cambiaCliente()" interface="popover" [placeholder]="clienteSel ? clienteSel.denominazione : 'Tap to select..'" title="Seleziona un cliente"> <ion-select value="clienteSelezionato" class=" testo-ricerca-select cerca-titolo-doc" [(ngModel)]="clienteSelezionato" (ionChange)="cambiaCliente()" interface="popover" [placeholder]="clienteSel ? clienteSel.denominazione : 'Seleziona cliente ...'" title="Seleziona un cliente">
<ion-select-option value="-1"></ion-select-option> <ion-select-option value="-1"></ion-select-option>
<ion-select-option *ngFor="let cliente of clienti; let i=index;" value="{{cliente.id}}">{{cliente.denominazione}}</ion-select-option> <ion-select-option *ngFor="let cliente of clienti; let i=index;" value="{{cliente.id}}">{{cliente.denominazione}}</ion-select-option>
</ion-select> </ion-select>
<div style="width: 25.8%; margin-right: 0;">
<ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<div class="riga"> </ion-row>
<ion-row class="riga-doc">
<span class="testo-ricerca-select"> <span class="testo-ricerca-select">
<strong>{{ 'cerca' | translate }}</strong> <strong>{{ 'cerca' | translate }}</strong>
{{ 'struttura' | translate }} {{ 'struttura' | translate }}
</span> </span>
<ion-select value="strutturaSelezionata" class="testo-ricerca-select cerca-titolo-doc" [(ngModel)]="strutturaSelezionata" (ionChange)="cambiaStruttura()" interface="popover" [placeholder]="strSel.denominazione ? strSel.denominazione : 'Tap to select..'" title="Seleziona un cliente"> <ion-select value="strutturaSelezionata" class="testo-ricerca-select cerca-titolo-doc" [(ngModel)]="strutturaSelezionata" (ionChange)="cambiaStruttura()" interface="popover" [placeholder]="strSel ? strSel.denominazione : 'Seleziona struttura ...'" title="Seleziona una struttura">
<ion-select-option value="-1"></ion-select-option> <ion-select-option value="-1"></ion-select-option>
<ion-select-option *ngFor="let struttura of strutture; let i=index;" value="{{struttura.id}}">{{struttura.denominazione}}</ion-select-option> <ion-select-option *ngFor="let struttura of strutture; let i=index;" value="{{struttura.id}}">{{struttura.denominazione}}</ion-select-option>
</ion-select> </ion-select>
<div style="width: 22.4%; margin-right: 0;">
<ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
</ion-row>
<div class="riga"> <div class="riga">
<ion-checkbox name="privacy" [(ngModel)]="archiviati" class="check"> </ion-checkbox> <ion-checkbox name="privacy" [(ngModel)]="archiviati" class="check"> </ion-checkbox>
<ion-label class="archivio-text"><span class="text">{{ 'visualizza_notifiche_archiviate' | translate }}</span></ion-label> <ion-label class="archivio-text"><span class="text">{{ 'visualizza_notifiche_archiviate' | translate }}</span></ion-label>
<ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaNotifiche()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<div class="riga" id="buttonsNotifiche" style="display:none"> <div class="riga" id="buttonsNotifiche" style="display:none">
...@@ -234,7 +241,7 @@ ...@@ -234,7 +241,7 @@
<span *ngIf="platform.is('desktop')"> <span *ngIf="platform.is('desktop')">
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_pareri' | translate }}"> <ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_pareri' | translate }}">
<ion-icon name="arrow-round-back" color="#232D4B" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#232D4B" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="pareri-title"> <div class="pareri-title">
<ion-title>{{notificaAttiva.titolo}}</ion-title> <ion-title>{{notificaAttiva.titolo}}</ion-title>
...@@ -250,7 +257,7 @@ ...@@ -250,7 +257,7 @@
<span *ngIf="!platform.is('desktop')"> <span *ngIf="!platform.is('desktop')">
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_pareri' | translate }}"> <ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_pareri' | translate }}">
<ion-icon name="arrow-round-back" color="#232D4B" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#232D4B" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="pareri-title-smart2"> <div class="pareri-title-smart2">
<ion-title>{{notificaAttiva.titolo}}</ion-title> <ion-title>{{notificaAttiva.titolo}}</ion-title>
......
src/app/pages/notifiche/notifiche.page.ts
...@@ -47,7 +47,7 @@ export class NotifichePage implements OnInit { ...@@ -47,7 +47,7 @@ export class NotifichePage implements OnInit {
eventsIdle() eventsIdle()
{ {
this.translate = this.utilService.translate; this.translate = this.utilService.translate;
setTimeout(() => { this.clienti = AuthService.clienti;
if(EventsService.clienteCambiato) if(EventsService.clienteCambiato)
{ {
this.isClienteLoggato = AuthService.isClienteLoggato; this.isClienteLoggato = AuthService.isClienteLoggato;
...@@ -73,6 +73,7 @@ export class NotifichePage implements OnInit { ...@@ -73,6 +73,7 @@ export class NotifichePage implements OnInit {
} }
} }
} }
setTimeout(() => {
this.eventsIdle(); this.eventsIdle();
}, environment.eventsTime); }, environment.eventsTime);
} }
......
src/app/pages/parere/parere.page.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<ion-content class="chats"> <ion-content class="chats">
<!--<ion-row class="title-row" *ngIf="!platform.is('desktop')"> <!--<ion-row class="title-row" *ngIf="!platform.is('desktop')">
<ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}"> <ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="pareri-title"> <div class="pareri-title">
<ion-title>{{ 'parere_titolo' | translate }}</ion-title> <ion-title>{{ 'parere_titolo' | translate }}</ion-title>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }} <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc"> <span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }} <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc">
</span> </span>
<ion-button (click)="cercaPareri()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaPareri()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<ion-label>{{ 'visualizza_archiviati' | translate }}</ion-label> <ion-label>{{ 'visualizza_archiviati' | translate }}</ion-label>
</span> </span>
<ion-button (click)="cercaPareri()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaPareri()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
{{parere.data}} {{parere.data}}
</div> </div>
<div class="row-download item-no-border"> <div class="row-download item-no-border">
<ion-icon class="button-icon-documenti-smart ios-icon" name="ios-arrow-dropright-circle" (click)="apriParere(parere.idRichiesta)" tappable title="{{ 'visualizza_dettagli' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" name="caret-forward-circle-outline" (click)="apriParere(parere.idRichiesta)" tappable title="{{ 'visualizza_dettagli' | translate }}"></ion-icon>
</div> </div>
</div> </div>
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<div *ngSwitchCase="'lista'"> <div *ngSwitchCase="'lista'">
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}"> <ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="pareri-title"> <div class="pareri-title">
<ion-title>{{ 'parere_titolo' | translate }}</ion-title> <ion-title>{{ 'parere_titolo' | translate }}</ion-title>
...@@ -213,14 +213,14 @@ ...@@ -213,14 +213,14 @@
{{ 'titolo' | translate }} {{ 'titolo' | translate }}
<input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc" /> <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc" />
<ion-button (click)="cercaPareri()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaPareri()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<div class="riga"> <div class="riga">
<ion-checkbox name="privacy" [(ngModel)]="archiviati" class="check"> </ion-checkbox> <ion-checkbox name="privacy" [(ngModel)]="archiviati" class="check"> </ion-checkbox>
<ion-label class="archivio-text"><span class="text">{{ 'visualizza_archiviati' | translate }}</span></ion-label> <ion-label class="archivio-text"><span class="text">{{ 'visualizza_archiviati' | translate }}</span></ion-label>
<ion-button (click)="cercaPareri()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaPareri()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<div class="riga" id="buttonsPareri" style="display:none"> <div class="riga" id="buttonsPareri" style="display:none">
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
<div *ngSwitchCase="'dettaglio'"> <div *ngSwitchCase="'dettaglio'">
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_pareri' | translate }}"> <ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_pareri' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="pareri-title"> <div class="pareri-title">
<ion-title>{{parereAttivo.titolo}}</ion-title> <ion-title>{{parereAttivo.titolo}}</ion-title>
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
<div *ngSwitchCase="'new'"> <div *ngSwitchCase="'new'">
<ion-row class="title-row"> <ion-row class="title-row">
<ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_pareri' | translate }}"> <ion-buttons class="back-button-desktop" (click)="apriLista()" title="{{ 'back_pareri' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="pareri-title"> <div class="pareri-title">
<ion-title>{{ 'nuovo_parere' | translate }}</ion-title> <ion-title>{{ 'nuovo_parere' | translate }}</ion-title>
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
<!--<div id="content"></div>--> <!--<div id="content"></div>-->
</ion-content> </ion-content>
<ion-footer class="footer-parere" no-border *ngIf="bottoneVisibile"> <ion-footer class="footer-parere ion-no-border" no-border *ngIf="bottoneVisibile">
<div class="foo-button" center> <div class="foo-button" center>
<div class="round-btn-desktop"> <div class="round-btn-desktop">
<a (click)="createNuovoParere()" tappable title="{{ 'aggiungi_richiesta' | translate }}"> <a (click)="createNuovoParere()" tappable title="{{ 'aggiungi_richiesta' | translate }}">
......
src/app/pages/parere/parere.page.ts
...@@ -47,7 +47,6 @@ export class ParerePage implements OnInit { ...@@ -47,7 +47,6 @@ export class ParerePage implements OnInit {
eventsIdle() eventsIdle()
{ {
this.translate = this.utilService.translate; this.translate = this.utilService.translate;
setTimeout(() => {
if(EventsService.clienteCambiato) this.loadPareri("initial"); if(EventsService.clienteCambiato) this.loadPareri("initial");
if(EventsService.manageBackButton) if(EventsService.manageBackButton)
{ {
...@@ -67,6 +66,7 @@ export class ParerePage implements OnInit { ...@@ -67,6 +66,7 @@ export class ParerePage implements OnInit {
} }
} }
} }
setTimeout(() => {
this.eventsIdle(); this.eventsIdle();
}, environment.eventsTime); }, environment.eventsTime);
} }
......
src/app/pages/preview-home/preview-home.page.ts
...@@ -22,13 +22,14 @@ export class PreviewHomePage implements OnInit { ...@@ -22,13 +22,14 @@ export class PreviewHomePage implements OnInit {
) )
{ {
EventsService.setStartUp(); EventsService.setStartUp();
setTimeout(() => {
this.eventsIdle(); this.eventsIdle();
}, 1000);
} }
eventsIdle() eventsIdle()
{ {
this.translate = this.utilService.translate; this.translate = this.utilService.translate;
setTimeout(() => {
if(EventsService.clienteCambiato) this.setStrutture(); if(EventsService.clienteCambiato) this.setStrutture();
if(EventsService.updateStrutture) if(EventsService.updateStrutture)
{ {
...@@ -40,6 +41,7 @@ export class PreviewHomePage implements OnInit { ...@@ -40,6 +41,7 @@ export class PreviewHomePage implements OnInit {
this.utilService.apriPagina("notifiche"); this.utilService.apriPagina("notifiche");
} }
} }
setTimeout(() => {
this.eventsIdle(); this.eventsIdle();
}, environment.eventsTime); }, environment.eventsTime);
} }
......
src/app/pages/privacy/privacy.page.html
<ion-header no-border> <ion-header no-border class="ion-no-border">
<ion-grid> <ion-grid>
<ion-row color="primary" justify-content-center> <ion-row color="primary" justify-content-center>
<ion-col align-self-center size-md="6" size-lg="5" size-xs="12"> <ion-col align-self-center size-md="6" size-lg="5" size-xs="12">
<ion-toolbar class="business-toolbar"> <ion-toolbar class="business-toolbar">
<ion-buttons (click)="back()" slot="start" title="Torna alla pagina precedente"> <ion-buttons (click)="back()" slot="start" title="Torna alla pagina precedente">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
<!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>--> <!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons> </ion-buttons>
<img src="assets/icon/2p2-logo-color.svg" class="immagine-piccola"> <img src="assets/icon/2p2-logo-color.svg" class="immagine-piccola">
......
src/app/pages/segreteria/segreteria.page.html
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</ion-button> </ion-button>
</span> </span>
<ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }} <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc"> <span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }} <input type="text" name="calendar" [(ngModel)]="titolo" title="{{ 'ricerca_titolo' | translate }}" class="cerca-titolo-doc">
</span> </span>
<ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<input *ngIf="!visualizzaProgetti" placeholder="{{ 'cerca_notula' | translate }}" type="text" name="calendar" [(ngModel)]="nNotula" title="{{ 'cerca_notula' | translate }}" class="cerca-notula"> <input *ngIf="!visualizzaProgetti" placeholder="{{ 'cerca_notula' | translate }}" type="text" name="calendar" [(ngModel)]="nNotula" title="{{ 'cerca_notula' | translate }}" class="cerca-notula">
</span> </span>
<ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca' | translate }}"> <ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca' | translate }}">
<ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti-smart ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca' | translate }}"></ion-icon>
</ion-button> </ion-button>
</ion-row> </ion-row>
</div> </div>
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
</div>--> </div>-->
</ion-content> </ion-content>
<ion-footer class="footer-tabs-smart" no-border *ngIf="!platform.is('desktop')"> <ion-footer class="footer-tabs-smart ion-no-border" no-border *ngIf="!platform.is('desktop')">
<div class="contenitore-home footer"> <div class="contenitore-home footer">
<div class="box-footer"> <div class="box-footer">
<ion-tabs class="footer-toolbar"> <ion-tabs class="footer-toolbar">
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<ion-col> <ion-col>
<ion-row> <ion-row>
<ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}"> <ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon> <ion-icon name="arrow-back-outline" color="#2b94d1" class="back" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<div class="documenti-title"> <div class="documenti-title">
<ion-title>{{ 'segreteria_titolo' | translate }}</ion-title> <ion-title>{{ 'segreteria_titolo' | translate }}</ion-title>
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
</ion-icon> </ion-icon>
</ion-button> </ion-button>
<ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
<div class="riga"> <div class="riga">
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
<input *ngIf="visualizzaProgetti" type="text" name="calendar" [(ngModel)]="nProgNotula" title="{{ 'cerca_progetto' | translate }}" class="cerca-titolo-doc" /> <input *ngIf="visualizzaProgetti" type="text" name="calendar" [(ngModel)]="nProgNotula" title="{{ 'cerca_progetto' | translate }}" class="cerca-titolo-doc" />
<input *ngIf="!visualizzaProgetti" type="text" name="calendar" [(ngModel)]="nNotula" title="{{ 'cerca_notula' | translate }}" class="cerca-titolo-doc" /> <input *ngIf="!visualizzaProgetti" type="text" name="calendar" [(ngModel)]="nNotula" title="{{ 'cerca_notula' | translate }}" class="cerca-titolo-doc" />
<ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}"> <ion-button (click)="cercaFatture()" class="search-arrow" title="{{ 'cerca_documenti' | translate }}">
<ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="ios-arrow-dropright-circle" title="{{ 'cerca_documenti' | translate }}"></ion-icon> <ion-icon class="button-icon-documenti ios-icon" slot="icon-only" name="chevron-forward-circle-outline" title="{{ 'cerca_documenti' | translate }}"></ion-icon>
</ion-button> </ion-button>
</div> </div>
......
src/app/pages/segreteria/segreteria.page.ts
...@@ -49,9 +49,9 @@ export class SegreteriaPage implements OnInit { ...@@ -49,9 +49,9 @@ export class SegreteriaPage implements OnInit {
eventsIdle() eventsIdle()
{ {
this.translate = this.utilService.translate; this.translate = this.utilService.translate;
setTimeout(() => {
if(EventsService.clienteCambiato) this.loadData(); if(EventsService.clienteCambiato) this.loadData();
if(EventsService.strutturaSelected) this.loadStrutture(); if(EventsService.strutturaSelected) this.loadStrutture();
setTimeout(() => {
this.eventsIdle(); this.eventsIdle();
}, environment.eventsTime); }, environment.eventsTime);
} }
......
src/app/service/documenti.service.ts
...@@ -30,7 +30,7 @@ export class DocumentiService { ...@@ -30,7 +30,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;
......
src/app/service/segreteria.service.ts
...@@ -9,7 +9,7 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http'; ...@@ -9,7 +9,7 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http';
import { HttpClientDataService } from '../service/http-client-data.service'; import { HttpClientDataService } from '../service/http-client-data.service';
import { ErrorResponse } from '../auth/interface/error-response'; import { ErrorResponse } from '../auth/interface/error-response';
import { UtilService } from './util.service'; import { UtilService } from './util.service';
import { of } from 'rxjs/observable/of'; import { of } from 'rxjs';
@Injectable({ @Injectable({
......
src/app/service/util.service.ts
...@@ -7,7 +7,7 @@ import { FileOpener } from '@ionic-native/file-opener/ngx'; ...@@ -7,7 +7,7 @@ import { FileOpener } from '@ionic-native/file-opener/ngx';
import { Router } from "@angular/router"; import { Router } from "@angular/router";
import { SocialSharing } from '@ionic-native/social-sharing/ngx'; import { SocialSharing } from '@ionic-native/social-sharing/ngx';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { BehaviorSubject, of} from 'rxjs'; import { BehaviorSubject, Observable, of} from 'rxjs';
import { Struttura } from '../interface/struttura'; import { Struttura } from '../interface/struttura';
import { ParereResponse } from '../interface/parere-response'; import { ParereResponse } from '../interface/parere-response';
import { catchError, tap } from 'rxjs/operators'; import { catchError, tap } from 'rxjs/operators';
...@@ -122,7 +122,7 @@ export class UtilService { ...@@ -122,7 +122,7 @@ export class UtilService {
public static strutturaSegreteria:Struttura; public static strutturaSegreteria:Struttura;
public static pushRegistrationId:string; public static pushRegistrationId:string;
public static redirectToNotifiche:boolean = false; public static redirectToNotifiche:boolean = false;
public static startup = true; public startup :boolean = true;
static setStruttura(id:number) static setStruttura(id:number)
{ {
...@@ -137,10 +137,10 @@ export class UtilService { ...@@ -137,10 +137,10 @@ export class UtilService {
getStruttura(id:number): Promise<any> getStruttura(id:number): Promise<any>
{ {
if(UtilService.strutture == null) return; let promiseChain: Promise<any> = Promise.resolve();
if(UtilService.strutture == null) return promiseChain;
if(UtilService.strutture.length > 0) if(UtilService.strutture.length > 0)
{ {
let promiseChain: Promise<any> = Promise.resolve();
UtilService.strutture.forEach(value => { UtilService.strutture.forEach(value => {
if(value.id == id) promiseChain = promiseChain.then( if(value.id == id) promiseChain = promiseChain.then(
() => value () => value
...@@ -713,14 +713,17 @@ export class UtilService { ...@@ -713,14 +713,17 @@ export class UtilService {
firstResume : boolean = true; firstResume : boolean = true;
firstPause : boolean = true; firstPause : boolean = true;
primaRestart: boolean = true; primaRestart: boolean = true;
static isNotificaResume : boolean;
setResume() { setResume() {
this.onResumeSubscription = this.platform.resume.subscribe(async () => { this.onResumeSubscription = this.platform.resume.subscribe(async () => {
if(!this.firstResume) { if(!this.firstResume) {
this.initConfig(true, "notifiche"); this.initConfig(true, "notifiche");
this.onResumeSubscription.unsubscribe(); this.onResumeSubscription.unsubscribe();
this.onResumeSubscription
console.log('resumed'); console.log('resumed');
this.firstPause = true; this.firstPause = true;
UtilService.isNotificaResume = false;
} }
}); });
} }
...@@ -801,12 +804,16 @@ export class UtilService { ...@@ -801,12 +804,16 @@ export class UtilService {
} }
else else
{ {
if(res.autorizzato && !UtilService.startup) this.apriPagina(nextPage); if(res.autorizzato && !this.startup && UtilService.isNotificaResume) this.apriPagina(nextPage);
else{ else{
if(res.autorizzato && UtilService.startup && this.primaRestart) if(!UtilService.isNotificaResume){
UtilService.isNotificaResume = true;
return;
}
if(res.autorizzato && this.startup && this.primaRestart)
{ {
this.primaRestart = false; this.primaRestart = false;
UtilService.startup = false; this.startup = false;
UtilService.redirectToNotifiche = true; UtilService.redirectToNotifiche = true;
this.router.navigate(['home']); this.router.navigate(['home']);
EventsService.setCaricaDati(); EventsService.setCaricaDati();
......
src/desktop.scss
...@@ -1659,7 +1659,7 @@ ion-menu{ ...@@ -1659,7 +1659,7 @@ ion-menu{
height: 20px; height: 20px;
border-right: 20px solid $celeste; border-right: 20px solid $celeste;
border-bottom-left-radius: 16px 14px; border-bottom-left-radius: 16px 14px;
//-webkit-transform: translate(30, -2px); -webkit-transform: translate(30, -2px);
} }
&:after { &:after {
content: ""; content: "";
...@@ -1671,7 +1671,7 @@ ion-menu{ ...@@ -1671,7 +1671,7 @@ ion-menu{
height: 20px; height: 20px;
background: white; background: white;
border-bottom-left-radius: 10px; border-bottom-left-radius: 10px;
//-webkit-transform: translate(-30px, -2px); -webkit-transform: translate(-30px, -2px);
} }
p { p {
margin: 0px; margin: 0px;
...@@ -1701,7 +1701,7 @@ ion-menu{ ...@@ -1701,7 +1701,7 @@ ion-menu{
height: 20px; height: 20px;
border-left: 20px solid $grigio-superlite; border-left: 20px solid $grigio-superlite;
border-bottom-right-radius: 16px 14px; border-bottom-right-radius: 16px 14px;
//-webkit-transform: translate(0, -2px); -webkit-transform: translate(0, -2px);
} }
&:after { &:after {
content: ""; content: "";
...@@ -1713,7 +1713,7 @@ ion-menu{ ...@@ -1713,7 +1713,7 @@ ion-menu{
height: 20px; height: 20px;
background: white; background: white;
border-bottom-right-radius: 10px; border-bottom-right-radius: 10px;
//-webkit-transform: translate(-30px, -2px); -webkit-transform: translate(-30px, -2px);
} }
p { p {
margin: 0px; margin: 0px;
......
src/environments/environment.ts
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
export const environment = { export const environment = {
production: false, production: false,
BASE_ADDRESS: 'https://gestionale2.2p2.it/stman', //BASE_ADDRESS: 'https://gestionale2.2p2.it/stman',
//BASE_ADDRESS: "http://localhost:8080/stman", //BASE_ADDRESS: "http://localhost:8080/stman",
//BASE_ADDRESS: "http://192.168.1.126:8080/stman", BASE_ADDRESS: "http://192.168.1.126:8080/stman",
eventsTime:3000, eventsTime:3000,
P2PTokenUrl: "https://www.2p2.it/auth-request", P2PTokenUrl: "https://www.2p2.it/auth-request",
P2PSingleSignOnUrl: "https://www.2p2.it/?token=", P2PSingleSignOnUrl: "https://www.2p2.it/?token=",
......
src/smartphone.scss
...@@ -206,6 +206,7 @@ $grigio-superlite: #e5e5ea; ...@@ -206,6 +206,7 @@ $grigio-superlite: #e5e5ea;
.titolo-home .titolo-home
{ {
position: static!important; position: static!important;
padding: 0 50px 1px!important;
} }
.menu-show{ .menu-show{
......
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