Skip to content

I
Intranet
Commit 924d6510 by Matteo
Options

Su android funziona

parent 71a3fd61
Showing with 173 additions and 152 deletions
package.json
{
"name": "2P2 App",
"version": "1.0",
"name": "2p2app",
"version": "0.0.1",
"author": "Aim Consulting s.r.l.",
"homepage": "https://www.aimconsulting.it/",
"scripts": {
......@@ -52,6 +52,7 @@
"cordova-plugin-x-socialsharing": "^6.0.3",
"es6-promise-plugin": "^4.2.2",
"ionic-angular": "^3.9.10",
"jetifier": "^2.0.0",
"phonegap-plugin-multidex": "^1.0.0",
"phonegap-plugin-push": "^2.3.0",
"rxjs": "~6.6.0",
......
src/app/app.component.ts
......@@ -31,6 +31,7 @@ export class AppComponent {
this.created = true;
}
this.utilService.loadLingua();
UtilService.isNotificaResume = true;
this.utilService.initConfig(false, 'notifiche');
}
......
src/app/auth/pages/change-pwd/change-pwd.page.html
......@@ -13,7 +13,7 @@
<ion-row justify-content-center *ngIf="platform.is('desktop')">
<ion-col>
<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-buttons>
</ion-col>
......
src/app/auth/pages/login/login.page.html
......@@ -61,7 +61,7 @@
</div>
</div>
</ion-content>
<ion-footer class="footer-smartphone">
<ion-footer class="footer-smartphone ion-no-border">
<ion-col class="desktop-bcall-col"align-self-center>
<div class="smartphone-bcall">
<div class="bcall-title">
......@@ -95,7 +95,7 @@
</div>
</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">
<ion-grid class="login-grid">
<ion-row class="login-row">
......
src/app/auth/pages/registrazione/registrazione.page.html
<ion-header>
<ion-header class="ion-no-border">
<title>2p2</title>
</ion-header>
......@@ -9,7 +9,7 @@
<ion-col align-self-center>
<ion-toolbar class="business-toolbar">
<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-buttons>
<img src="assets/img/LogoBianco.svg" class="immagine-piccola">
......@@ -31,7 +31,7 @@
<ion-col align-self-center>
<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-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-title class="logo-piccolo">
......
src/app/auth/pages/reset/reset.page.html
<ion-header>
<ion-header class="ion-no-border">
<title>2p2</title>
</ion-header>
......@@ -10,7 +10,7 @@
<ion-col align-self-center>
<ion-toolbar class="business-toolbar">
<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-buttons>
<img src="assets/img/LogoBianco.svg" class="immagine-piccola">
......@@ -32,7 +32,7 @@
<ion-col align-self-center>
<ion-row *ngIf="platform.is('desktop')">
<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-title class="logo-piccolo">
......
src/app/pages/about/about.html
<ion-header>
<ion-header class="ion-no-border">
<ion-navbar>
<ion-title>
About
......
src/app/pages/bi/bi.page.html
<ion-header>
<ion-header class="ion-no-border">
<ion-toolbar>
<ion-title>bi</ion-title>
</ion-toolbar>
......
src/app/pages/businesscall/businesscall.page.html
<ion-header>
<ion-header class="ion-no-border">
<title>2p2</title>
</ion-header>
......@@ -12,7 +12,7 @@
<ion-col align-self-center>
<ion-toolbar class="business-toolbar">
<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-buttons>
<img src="assets/img/LogoBianco.svg" class="immagine-piccola">
......@@ -92,7 +92,7 @@
<div class="logo-grande2">
<ion-toolbar class="business-toolbar2">
<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-buttons>
<ion-title class="bc-title2">
......
src/app/pages/contact/contact.html
<ion-header>
<ion-header class="ion-no-border">
<ion-navbar>
<ion-title>
Contact
......
src/app/pages/documenti/documenti.page.html
......@@ -38,31 +38,31 @@
</ion-button>
</span>
<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-row>
</div>
</ion-row>
<ion-row>
<div class="search-date-smart">
<ion-row>
<!--<ion-row>
<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>
<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-row>
<ion-row class="riga-doc">
<strong>{{ 'cerca' | translate }}</strong>
{{ 'titolo' | translate }}
</ion-row>-->
<ion-row>
<ion-row class="riga"><span><strong>{{ 'cerca' | translate }}</strong> {{ 'titolo' | translate }}</span>
<!--<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-option value=""></ion-select-option>
<ion-select-option *ngFor="let tit of titoli; let i=index;" value="{{tit}}">{{tit}}</ion-select-option>
</ion-select>
</ion-row>
<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-row>
</div>
......@@ -110,7 +110,7 @@
<ion-content *ngIf="platform.is('desktop')">
<ion-row class="title-row">
<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>
<div class="documenti-title">
<ion-title>{{ 'titolo_documenti' | translate }}</ion-title>
......@@ -130,7 +130,7 @@
</ion-icon>
</ion-button>
<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>
</div>
<ion-row class="riga-doc">
......@@ -141,9 +141,11 @@
<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>
<div style="width: 28.7%; margin-right: 0;">
<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>
</div>
</ion-row>
</ion-row>
</div>
......
src/app/pages/documenti/documenti.page.ts
......@@ -51,12 +51,12 @@ export class DocumentiPage implements OnInit {
eventsIdle()
{
this.translate = this.utilService.translate;
if(EventsService.clienteCambiato)
{
this.chiediDocumenti("initial");
this.recuperaTitoli();
}
setTimeout(() => {
if(EventsService.clienteCambiato)
{
this.chiediDocumenti("initial");
this.recuperaTitoli();
}
this.eventsIdle();
}, environment.eventsTime);
}
......
src/app/pages/home/home.page.html
......@@ -3,7 +3,8 @@
'home-height': !isTitolo(),
'subpage-height': isTitolo(),
'header-home': true,
'background-blu': true
'background-blu': true,
'ion-no-border': true
}" no-border *ngIf="!platform.is('desktop')">
<ion-grid class="header-grid">
<ion-row justify-content-center>
......@@ -79,7 +80,7 @@
</ion-content>
<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-item class="menu-title item-no-border">{{ 'menu_principale' | translate }}</ion-item>
<ion-buttons (click)="closeSideMenu()" slot="end" title="Chiudi Menu">
......
src/app/pages/home/home.page.ts
......@@ -46,7 +46,11 @@ export class HomePage {
this.router.navigate(['login']);
}
});*/
this.eventsIdle();
if(!this.eventIdleInitilized)
{
this.eventIdleInitilized = true;
this.eventsIdle();
}
this.lingue = this.utilService.getLanguageList();
if(this.utilService.getLingua() == "") {
this.linguaSel = this.lingue[0].key;
......@@ -114,8 +118,7 @@ export class HomePage {
{
this.translate = this.utilService.translate;
this.titoloPagina = UtilService.titoloPagina;
setTimeout(() => {
if(EventsService.caricaDati) this.caricaDati(false);
if(EventsService.caricaDati) this.caricaDati(false);
if(EventsService.startup)
if(this.clienteSelezionato.id == null) {
if(!this.authService.areClientiSalvati())
......@@ -128,6 +131,7 @@ export class HomePage {
}
if(EventsService.redirect.length > 0) this.redirectTo();
if(EventsService.strutturaSelected) this.strutturaSelected();
setTimeout(() => {
this.eventsIdle();
}, environment.eventsTime);
}
......@@ -227,6 +231,7 @@ export class HomePage {
titoloPagina: string;
isClienteLoggato: boolean;
strutturaName: string;
eventIdleInitilized : boolean = false;
selectStruttura(struttura:string)
{
......
src/app/pages/index/index.page.ts
......@@ -27,9 +27,9 @@ export class IndexPage implements OnInit {
eventsIdle()
{
this.translate = this.utilService.translate;
if(EventsService.strutturaSelected || EventsService.strutturaSelectedHome) this.strutturaSelected();
if(EventsService.updateStrutture) this.setStrutture();
setTimeout(() => {
if(EventsService.strutturaSelected || EventsService.strutturaSelectedHome) this.strutturaSelected();
if(EventsService.updateStrutture) this.setStrutture();
this.eventsIdle();
}, environment.eventsTime);
}
......
src/app/pages/interviste/interviste.page.html
......@@ -47,7 +47,7 @@
</ion-button>
</span>
<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-row>
</div>
......@@ -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>
<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-row>
</div>
......@@ -71,7 +71,7 @@
<ion-label>{{ 'visualizza_archiviati' | translate }}</ion-label>
</span>
<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-row>
</div>
......@@ -144,7 +144,7 @@
{{topic.data}}
</div>
<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>
......@@ -156,7 +156,7 @@
<div *ngSwitchCase="'lista'">
<ion-row class="title-row">
<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>
<div class="pareri-title">
<ion-title>{{ 'interviste_titolo' | translate }}</ion-title>
......@@ -175,7 +175,7 @@
</ion-icon>
</ion-button>
<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>
</div>
<div class="riga">
......@@ -183,14 +183,14 @@
{{ 'titolo' | translate }}
<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-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>
</div>
<div class="riga">
<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-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>
</div>
<div class="riga riga2" id="buttonsInterviste" style="display:none">
......@@ -269,7 +269,7 @@
<ion-grid>
<ion-row class="title-row">
<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>
<div class="pareri-title">
<ion-title>{{topicAttivo.titolo}}</ion-title>
......@@ -279,7 +279,7 @@
<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 }}">
<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>
</div>
</ion-row>
......@@ -305,7 +305,7 @@
<div *ngSwitchCase="'new'">
<ion-row class="title-row">
<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>
<div class="pareri-title">
<ion-title>{{ 'nuova_domanda' | translate }}</ion-title>
......@@ -338,7 +338,7 @@
</div>
</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">
<ion-grid>
<ion-row>
......@@ -347,7 +347,7 @@
<ion-input class="input-intervento" id= "message" type="text" placeholder="{{ 'digita_msg' | translate }}" name="message" [(ngModel)]="message"></ion-input>
</ion-col>
<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-row>
......
src/app/pages/interviste/interviste.page.ts
......@@ -49,26 +49,26 @@ export class IntervistePage implements OnInit {
eventsIdle()
{
this.translate = this.utilService.translate;
setTimeout(() => {
if(EventsService.clienteCambiato) this.loadTopics("initial");
if(EventsService.manageBackButton)
if(EventsService.clienteCambiato) this.loadTopics("initial");
if(EventsService.manageBackButton)
{
if(this.router.url == "/home/interviste")
{
if(this.router.url == "/home/interviste")
if(this.intervista == "lista")
{
if(this.intervista == "lista")
{
UtilService.titoloPagina = '';
this.router.navigateByUrl('home/index');
}
else
{
this.apriLista();
this.router.navigateByUrl('home/index');
EventsService.setRedirect('interviste');
}
UtilService.titoloPagina = '';
this.router.navigateByUrl('home/index');
}
else
{
this.apriLista();
this.router.navigateByUrl('home/index');
EventsService.setRedirect('interviste');
}
}
}
setTimeout(() => {
this.eventsIdle();
}, environment.eventsTime);
}
......
src/app/pages/notifiche/notifiche.page.ts
......@@ -47,32 +47,33 @@ export class NotifichePage implements OnInit {
eventsIdle()
{
this.translate = this.utilService.translate;
setTimeout(() => {
if(EventsService.clienteCambiato)
{
this.isClienteLoggato = AuthService.isClienteLoggato;
this.loadNotifiche();
}
if(EventsService.manageBackButton)
this.clienti = AuthService.clienti;
if(EventsService.clienteCambiato)
{
this.isClienteLoggato = AuthService.isClienteLoggato;
this.loadNotifiche();
}
if(EventsService.manageBackButton)
{
if(this.router.url == "/home/parere")
{
if(this.router.url == "/home/parere")
if(this.notifica == "lista")
{
if(this.notifica == "lista")
if(!AuthService.isClienteLoggato)
{
if(!AuthService.isClienteLoggato)
{
UtilService.titoloPagina = '';
this.router.navigateByUrl('home/index');
}
}
else
{
this.apriLista();
UtilService.titoloPagina = '';
this.router.navigateByUrl('home/index');
EventsService.setRedirect('notifiche');
}
}
else
{
this.apriLista();
this.router.navigateByUrl('home/index');
EventsService.setRedirect('notifiche');
}
}
}
setTimeout(() => {
this.eventsIdle();
}, environment.eventsTime);
}
......
src/app/pages/parere/parere.page.html
......@@ -7,7 +7,7 @@
<ion-content class="chats">
<!--<ion-row class="title-row" *ngIf="!platform.is('desktop')">
<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>
<div class="pareri-title">
<ion-title>{{ 'parere_titolo' | translate }}</ion-title>
......@@ -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>
<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-row>
</div>
......@@ -37,7 +37,7 @@
<ion-label>{{ 'visualizza_archiviati' | translate }}</ion-label>
</span>
<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-row>
</div>
......@@ -158,7 +158,7 @@
{{parere.data}}
</div>
<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>
......@@ -200,7 +200,7 @@
<div *ngSwitchCase="'lista'">
<ion-row class="title-row">
<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>
<div class="pareri-title">
<ion-title>{{ 'parere_titolo' | translate }}</ion-title>
......@@ -213,14 +213,14 @@
{{ 'titolo' | translate }}
<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-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>
</div>
<div class="riga">
<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-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>
</div>
<div class="riga" id="buttonsPareri" style="display:none">
......@@ -272,7 +272,7 @@
<div *ngSwitchCase="'dettaglio'">
<ion-row class="title-row">
<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>
<div class="pareri-title">
<ion-title>{{parereAttivo.titolo}}</ion-title>
......@@ -307,7 +307,7 @@
<div *ngSwitchCase="'new'">
<ion-row class="title-row">
<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>
<div class="pareri-title">
<ion-title>{{ 'nuovo_parere' | translate }}</ion-title>
......@@ -394,7 +394,7 @@
<!--<div id="content"></div>-->
</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="round-btn-desktop">
<a (click)="createNuovoParere()" tappable title="{{ 'aggiungi_richiesta' | translate }}">
......
src/app/pages/parere/parere.page.ts
......@@ -47,26 +47,26 @@ export class ParerePage implements OnInit {
eventsIdle()
{
this.translate = this.utilService.translate;
setTimeout(() => {
if(EventsService.clienteCambiato) this.loadPareri("initial");
if(EventsService.manageBackButton)
if(EventsService.clienteCambiato) this.loadPareri("initial");
if(EventsService.manageBackButton)
{
if(this.router.url == "/home/parere")
{
if(this.router.url == "/home/parere")
if(this.parere == "lista")
{
if(this.parere == "lista")
{
UtilService.titoloPagina = '';
this.router.navigateByUrl('home/index');
}
else
{
this.apriLista();
this.router.navigateByUrl('home/index');
EventsService.setRedirect('pareri');
}
UtilService.titoloPagina = '';
this.router.navigateByUrl('home/index');
}
else
{
this.apriLista();
this.router.navigateByUrl('home/index');
EventsService.setRedirect('pareri');
}
}
}
setTimeout(() => {
this.eventsIdle();
}, environment.eventsTime);
}
......
src/app/pages/preview-home/preview-home.page.ts
......@@ -22,24 +22,26 @@ export class PreviewHomePage implements OnInit {
)
{
EventsService.setStartUp();
this.eventsIdle();
setTimeout(() => {
this.eventsIdle();
}, 1000);
}
eventsIdle()
{
this.translate = this.utilService.translate;
if(EventsService.clienteCambiato) this.setStrutture();
if(EventsService.updateStrutture)
{
this.setStrutture();
if(this.startup)
if(UtilService.redirectToNotifiche)
{
UtilService.redirectToNotifiche = false;
this.utilService.apriPagina("notifiche");
}
}
setTimeout(() => {
if(EventsService.clienteCambiato) this.setStrutture();
if(EventsService.updateStrutture)
{
this.setStrutture();
if(this.startup)
if(UtilService.redirectToNotifiche)
{
UtilService.redirectToNotifiche = false;
this.utilService.apriPagina("notifiche");
}
}
this.eventsIdle();
}, environment.eventsTime);
}
......
src/app/pages/privacy/privacy.page.html
<ion-header no-border>
<ion-header no-border class="ion-no-border">
<ion-grid>
<ion-row color="primary" justify-content-center>
<ion-col align-self-center size-md="6" size-lg="5" size-xs="12">
<ion-toolbar class="business-toolbar">
<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-buttons>
<img src="assets/icon/2p2-logo-color.svg" class="immagine-piccola">
......
src/app/pages/segreteria/segreteria.page.html
......@@ -125,7 +125,7 @@
</ion-button>
</span>
<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-row>
</div>
......@@ -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>
<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-row>
</div>
......@@ -149,7 +149,7 @@
<input *ngIf="!visualizzaProgetti" placeholder="{{ 'cerca_notula' | translate }}" type="text" name="calendar" [(ngModel)]="nNotula" title="{{ 'cerca_notula' | translate }}" class="cerca-notula">
</span>
<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-row>
</div>
......@@ -241,7 +241,7 @@
</div>-->
</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="box-footer">
<ion-tabs class="footer-toolbar">
......@@ -273,7 +273,7 @@
<ion-col>
<ion-row>
<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>
<div class="documenti-title">
<ion-title>{{ 'segreteria_titolo' | translate }}</ion-title>
......@@ -327,7 +327,7 @@
</ion-icon>
</ion-button>
<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>
</div>
<div class="riga">
......@@ -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)]="nNotula" title="{{ 'cerca_notula' | translate }}" class="cerca-titolo-doc" />
<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>
</div>
......
src/app/pages/segreteria/segreteria.page.ts
......@@ -49,9 +49,9 @@ export class SegreteriaPage implements OnInit {
eventsIdle()
{
this.translate = this.utilService.translate;
if(EventsService.clienteCambiato) this.loadData();
if(EventsService.strutturaSelected) this.loadStrutture();
setTimeout(() => {
if(EventsService.clienteCambiato) this.loadData();
if(EventsService.strutturaSelected) this.loadStrutture();
this.eventsIdle();
}, environment.eventsTime);
}
......
src/app/service/documenti.service.ts
......@@ -30,7 +30,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;
......
src/app/service/segreteria.service.ts
......@@ -9,7 +9,7 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http';
import { HttpClientDataService } from '../service/http-client-data.service';
import { ErrorResponse } from '../auth/interface/error-response';
import { UtilService } from './util.service';
import { of } from 'rxjs/observable/of';
import { of } from 'rxjs';
@Injectable({
......
src/app/service/util.service.ts
......@@ -7,7 +7,7 @@ import { FileOpener } from '@ionic-native/file-opener/ngx';
import { Router } from "@angular/router";
import { SocialSharing } from '@ionic-native/social-sharing/ngx';
import { TranslateService } from '@ngx-translate/core';
import { BehaviorSubject, of} from 'rxjs';
import { BehaviorSubject, Observable, of} from 'rxjs';
import { Struttura } from '../interface/struttura';
import { ParereResponse } from '../interface/parere-response';
import { catchError, tap } from 'rxjs/operators';
......@@ -122,7 +122,7 @@ export class UtilService {
public static strutturaSegreteria:Struttura;
public static pushRegistrationId:string;
public static redirectToNotifiche:boolean = false;
public static startup = true;
public startup :boolean = true;
static setStruttura(id:number)
{
......@@ -137,10 +137,10 @@ export class UtilService {
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)
{
let promiseChain: Promise<any> = Promise.resolve();
UtilService.strutture.forEach(value => {
if(value.id == id) promiseChain = promiseChain.then(
() => value
......@@ -713,14 +713,17 @@ export class UtilService {
firstResume : boolean = true;
firstPause : boolean = true;
primaRestart: boolean = true;
static isNotificaResume : boolean;
setResume() {
this.onResumeSubscription = this.platform.resume.subscribe(async () => {
if(!this.firstResume) {
this.initConfig(true, "notifiche");
this.onResumeSubscription.unsubscribe();
this.onResumeSubscription
console.log('resumed');
this.firstPause = true;
UtilService.isNotificaResume = false;
}
});
}
......@@ -801,12 +804,16 @@ export class UtilService {
}
else
{
if(res.autorizzato && !UtilService.startup) this.apriPagina(nextPage);
if(res.autorizzato && !this.startup && UtilService.isNotificaResume) this.apriPagina(nextPage);
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;
UtilService.startup = false;
this.startup = false;
UtilService.redirectToNotifiche = true;
this.router.navigate(['home']);
EventsService.setCaricaDati();
......
src/desktop.scss
......@@ -1659,7 +1659,7 @@ ion-menu{
height: 20px;
border-right: 20px solid $celeste;
border-bottom-left-radius: 16px 14px;
//-webkit-transform: translate(30, -2px);
-webkit-transform: translate(30, -2px);
}
&:after {
content: "";
......@@ -1671,7 +1671,7 @@ ion-menu{
height: 20px;
background: white;
border-bottom-left-radius: 10px;
//-webkit-transform: translate(-30px, -2px);
-webkit-transform: translate(-30px, -2px);
}
p {
margin: 0px;
......@@ -1701,7 +1701,7 @@ ion-menu{
height: 20px;
border-left: 20px solid $grigio-superlite;
border-bottom-right-radius: 16px 14px;
//-webkit-transform: translate(0, -2px);
-webkit-transform: translate(0, -2px);
}
&:after {
content: "";
......@@ -1713,7 +1713,7 @@ ion-menu{
height: 20px;
background: white;
border-bottom-right-radius: 10px;
//-webkit-transform: translate(-30px, -2px);
-webkit-transform: translate(-30px, -2px);
}
p {
margin: 0px;
......
src/environments/environment.ts
......@@ -4,9 +4,9 @@
export const environment = {
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://192.168.1.126:8080/stman",
BASE_ADDRESS: "http://192.168.1.126:8080/stman",
eventsTime:3000,
P2PTokenUrl: "https://www.2p2.it/auth-request",
P2PSingleSignOnUrl: "https://www.2p2.it/?token=",
......
src/smartphone.scss
......@@ -206,6 +206,7 @@ $grigio-superlite: #e5e5ea;
.titolo-home
{
position: static!important;
padding: 0 50px 1px!important;
}
.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