Commit 87e57069 by Matteo

Testato per webapp

parent 84726ff9
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
<preference name="SplashShowOnlyFirstTime" value="false" /> <preference name="SplashShowOnlyFirstTime" value="false" />
<preference name="SplashScreen" value="screen" /> <preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="3000" /> <preference name="SplashScreenDelay" value="3000" />
<platform name="browser">
<preference name="ShowSplashScreen" value="false" />
</platform>
<platform name="android"> <platform name="android">
<allow-intent href="market:*" /> <allow-intent href="market:*" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" /> <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
......
...@@ -31,7 +31,9 @@ export class ChangePwdPage implements OnInit { ...@@ -31,7 +31,9 @@ export class ChangePwdPage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la procedura di cambio password", ["OK"]);
}); });
}); });
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="body"> <div class="body">
<div class="contenitore"> <div class="contenitore">
<div class="logo-grande"> <div class="logo-grande">
<img src="../../../../assets/icon/2p2-logo-color.svg" /> <img src="assets/icon/2p2-logo-color.svg" />
</div> </div>
<form #form="ngForm" (ngSubmit)="login(form)" class="form"> <form #form="ngForm" (ngSubmit)="login(form)" class="form">
<ion-grid> <ion-grid>
......
...@@ -3,7 +3,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; ...@@ -3,7 +3,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core';
import { Router } from "@angular/router"; import { Router } from "@angular/router";
import { AuthService } from '../../service/auth.service'; import { AuthService } from '../../service/auth.service';
import { UtilService } from '../../../service/util.service'; import { UtilService } from '../../../service/util.service';
import { Events } from '@ionic/angular'; import { Platform, Events } from '@ionic/angular';
@Component({ @Component({
selector: 'app-login', selector: 'app-login',
...@@ -13,7 +13,7 @@ import { Events } from '@ionic/angular'; ...@@ -13,7 +13,7 @@ import { Events } from '@ionic/angular';
}) })
export class LoginPage implements OnInit { export class LoginPage implements OnInit {
constructor(private authService: AuthService, private router: Router, private utilService: UtilService, public events: Events,) { } constructor(private authService: AuthService, private router: Router, private utilService: UtilService, public events: Events,public platform: Platform) { }
async login(form){ async login(form){
await this.utilService.showLoading(); await this.utilService.showLoading();
...@@ -31,7 +31,9 @@ export class LoginPage implements OnInit { ...@@ -31,7 +31,9 @@ export class LoginPage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la procedura di login", ["OK"]);
} }
); );
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<!--<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="logo-piccolo"> <ion-title class="logo-piccolo">
<img src="../../../../assets/icon/2p2-logo-color.svg"> <img src="assets/icon/2p2-logo-color.svg">
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-col> </ion-col>
......
...@@ -29,7 +29,9 @@ export class ResetPage implements OnInit { ...@@ -29,7 +29,9 @@ export class ResetPage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la procedura di reset password", ["OK"]);
}); });
} }
......
...@@ -30,6 +30,7 @@ export class AuthService { ...@@ -30,6 +30,7 @@ export class AuthService {
error: true, error: true,
errorMsg: "" errorMsg: ""
}; };
this.clientiSalvati = false;
AuthService.clienti = []; AuthService.clienti = [];
AuthService.clienteSelezionato = { AuthService.clienteSelezionato = {
denominazione: null, denominazione: null,
...@@ -121,9 +122,16 @@ export class AuthService { ...@@ -121,9 +122,16 @@ export class AuthService {
); );
} }
clientiSalvati: boolean;
areClientiSalvati() : boolean
{
return this.clientiSalvati;
}
login(value) : Observable<ErrorResponse>{ login(value) : Observable<ErrorResponse>{
var param = UtilService.encodeBody({utente: value.username, password: value.password}); var param = UtilService.encodeBody({utente: value.username, password: value.password});
//return this.httpClient.post<ErrorResponse>('https://www.google.com/', param, this.httpClientDataService.httpOptions) this.clientiSalvati = false;
return this.httpClient.post<ErrorResponse>(this.httpClientDataService.BASE_ADDRESS+'/autenticazione/login.do', param, this.httpClientDataService.httpOptions) return this.httpClient.post<ErrorResponse>(this.httpClientDataService.BASE_ADDRESS+'/autenticazione/login.do', param, this.httpClientDataService.httpOptions)
.pipe( .pipe(
catchError(this.handleError), catchError(this.handleError),
...@@ -136,7 +144,9 @@ export class AuthService { ...@@ -136,7 +144,9 @@ export class AuthService {
console.log(successData); console.log(successData);
}); });
this.storage.set("name",res.nome); this.storage.set("name",res.nome);
this.storage.set("clienti", res.clienti); this.storage.set("clienti", res.clienti).then((successData)=>{
this.clientiSalvati = true;
});
this.storage.set("logged",true); this.storage.set("logged",true);
} }
else else
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<!--<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="logo-piccolo"> <ion-title class="logo-piccolo">
<img src="../../../assets/icon/2p2-logo-color.svg"> <img src="assets/icon/2p2-logo-color.svg">
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-col> </ion-col>
......
...@@ -95,7 +95,9 @@ export class DocumentiPage implements OnInit { ...@@ -95,7 +95,9 @@ export class DocumentiPage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la richiesta dei documenti", ["OK"]);
}); });
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<ion-icon name="menu" color="light" class="menu-show" tappable></ion-icon> <ion-icon name="menu" color="light" class="menu-show" tappable></ion-icon>
</ion-buttons> </ion-buttons>
<ion-title class="logo-piccolo"> <ion-title class="logo-piccolo">
<img src="../../../assets/icon/2p2-logo-medium.svg"> <img src="assets/icon/2p2-logo-medium.svg">
</ion-title> </ion-title>
<ion-buttons (click)="logout()" slot="end"> <ion-buttons (click)="logout()" slot="end">
<ion-icon name="exit" color="light" class="exit" tappable></ion-icon> <ion-icon name="exit" color="light" class="exit" tappable></ion-icon>
......
...@@ -5,6 +5,8 @@ import { Events, MenuController } from '@ionic/angular'; ...@@ -5,6 +5,8 @@ import { Events, MenuController } from '@ionic/angular';
import { AuthService } from '../../auth/service/auth.service'; import { AuthService } from '../../auth/service/auth.service';
import { UtilService } from '../../service/util.service'; import { UtilService } from '../../service/util.service';
@Component({ @Component({
selector: 'app-home', selector: 'app-home',
templateUrl: 'home.page.html', templateUrl: 'home.page.html',
...@@ -19,7 +21,16 @@ export class HomePage { ...@@ -19,7 +21,16 @@ export class HomePage {
}; };
this.events.subscribe('functionCall:startup', eventData => { this.events.subscribe('functionCall:startup', eventData => {
if(this.clienteSelezionato.id == null) { if(this.clienteSelezionato.id == null) {
if(!authService.areClientiSalvati())
{
UtilService.wait();
}
/*{
setTimeout(function () {
this.loadClienti(); this.loadClienti();
}, 3000);
}
else*/ this.loadClienti();
} }
}); });
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="central-home"> <div class="central-home">
<div tappable class="box"> <div tappable class="box">
<div tappable class="icon" (click)="apriPagina('documenti')"> <div tappable class="icon" (click)="apriPagina('documenti')">
<img src="../../../assets/img/consulto-documenti.svg" (click)="apriPagina('documenti')" tappable/> <img src="assets/img/consulto-documenti.svg" (click)="apriPagina('documenti')" tappable/>
</div> </div>
<div tappable class="section-title" (click)="apriPagina('documenti')"> <div tappable class="section-title" (click)="apriPagina('documenti')">
Consulto i miei documenti Consulto i miei documenti
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<div class="box" tappable> <div class="box" tappable>
<div class="icon" tappable> <div class="icon" tappable>
<img src="../../../assets/img/chiedo-parere.svg" (click)="apriPagina('pareri')" tappable/> <img src="assets/img/chiedo-parere.svg" (click)="apriPagina('pareri')" tappable/>
</div> </div>
<div class="section-title" (click)="apriPagina('pareri')" tappable> <div class="section-title" (click)="apriPagina('pareri')" tappable>
Chiedo un parere al consulente Chiedo un parere al consulente
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</div> </div>
<div class="box" tappable> <div class="box" tappable>
<div class="icon" tappable> <div class="icon" tappable>
<img src="../../../assets/img/domande-risposte.svg" (click)="apriPagina('interviste')" tappable/> <img src="assets/img/domande-risposte.svg" (click)="apriPagina('interviste')" tappable/>
</div> </div>
<div class="section-title" (click)="apriPagina('interviste')" tappable> <div class="section-title" (click)="apriPagina('interviste')" tappable>
Domande e risposte Domande e risposte
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
<div class="box" tappable> <div class="box" tappable>
<div class="icon" tappable> <div class="icon" tappable>
<img src="../../../assets/img/segreteria.svg" (click)="apriPagina('segreteria')" tappable/> <img src="assets/img/segreteria.svg" (click)="apriPagina('segreteria')" tappable/>
</div> </div>
<div class="section-title" (click)="apriPagina('segreteria')" tappable> <div class="section-title" (click)="apriPagina('segreteria')" tappable>
La mia segreteria La mia segreteria
......
...@@ -82,7 +82,9 @@ export class IntervistePage implements OnInit { ...@@ -82,7 +82,9 @@ export class IntervistePage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante il caricamento del Topic", ["OK"]);
}); });
return true; return true;
} }
...@@ -129,7 +131,9 @@ export class IntervistePage implements OnInit { ...@@ -129,7 +131,9 @@ export class IntervistePage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la procedura di apertura del Topic", ["OK"]);
}); });
if(fase == "after") this.intervisteService.getListaTopics(AuthService.clienteSelezionato.id).subscribe((res: RichiesteResponse)=>{ if(fase == "after") this.intervisteService.getListaTopics(AuthService.clienteSelezionato.id).subscribe((res: RichiesteResponse)=>{
this.utilService.closeLoading(); this.utilService.closeLoading();
...@@ -231,7 +235,9 @@ export class IntervistePage implements OnInit { ...@@ -231,7 +235,9 @@ export class IntervistePage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la procedura di aggiunta Intervento", ["OK"]);
}); });
return true; return true;
} }
...@@ -252,7 +258,9 @@ export class IntervistePage implements OnInit { ...@@ -252,7 +258,9 @@ export class IntervistePage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la procedura di creazione nuovo topic", ["OK"]);
}); });
} }
......
...@@ -79,7 +79,9 @@ export class ParerePage implements OnInit { ...@@ -79,7 +79,9 @@ export class ParerePage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la procedura di richiesta Topic", ["OK"]);
}); });
} }
...@@ -121,7 +123,9 @@ export class ParerePage implements OnInit { ...@@ -121,7 +123,9 @@ export class ParerePage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la procedura di creazione nuovo Topic", ["OK"]);
}); });
/* <input type="file" name="file" (change)="upload($event)" /> /* <input type="file" name="file" (change)="upload($event)" />
...@@ -168,7 +172,9 @@ upload(str:any) ...@@ -168,7 +172,9 @@ upload(str:any)
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la richiesta di limite Pareri superato", ["OK"]);
}); });
return true; return true;
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<!--<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="logo-piccolo"> <ion-title class="logo-piccolo">
<img src="../../../assets/icon/2p2-logo-color.svg"> <img src="assets/icon/2p2-logo-color.svg">
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-col> </ion-col>
......
...@@ -117,7 +117,9 @@ export class SegreteriaPage implements OnInit { ...@@ -117,7 +117,9 @@ export class SegreteriaPage implements OnInit {
window.open(this.httpClientDataService.P2PSingleSignOnUrl+token, "_system"); window.open(this.httpClientDataService.P2PSingleSignOnUrl+token, "_system");
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante l'sso verso 2P2", ["OK"]);
}); });
} }
...@@ -133,21 +135,20 @@ export class SegreteriaPage implements OnInit { ...@@ -133,21 +135,20 @@ export class SegreteriaPage implements OnInit {
loadStrutture() loadStrutture()
{ {
//this.utilService.showLoading(); this.utilService.showLoading();
this.segreteriaService.getStrutture(AuthService.clienteSelezionato.id).subscribe((res: StruttureResponse)=>{ this.segreteriaService.getStrutture(AuthService.clienteSelezionato.id).subscribe((res: StruttureResponse)=>{
//this.utilService.closeLoading(); this.utilService.closeLoading();
this.strutture = res.strutture; this.strutture = res.strutture;
if(this.strutture.length > 0) this.strutturaSel = this.strutture[0]; if(this.strutture.length > 0) this.strutturaSel = this.strutture[0];
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
//this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante la richiesta lista strutture", ["OK"]);
}); });
} }
downloadEstrattoConto()
{}
cercaFatture() cercaFatture()
{ {
this.loadFatture("ricerca"); this.loadFatture("ricerca");
...@@ -172,7 +173,9 @@ export class SegreteriaPage implements OnInit { ...@@ -172,7 +173,9 @@ export class SegreteriaPage implements OnInit {
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
this.utilService.closeLoading(); this.utilService.closeLoading();
this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]); if(error != null && error.errorMsg != null) this.utilService.presentAlert("Errore", "", error.errorMsg, ["OK"]);
else if(error!=null) this.utilService.presentAlert("Errore", "", error, ["OK"]);
else this.utilService.presentAlert("Errore", "", "Errore durante richiesta delle fatture", ["OK"]);
}); });
} }
......
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { HttpHeaders} from '@angular/common/http'; import { HttpHeaders} from '@angular/common/http';
import { environment } from '../../environments/environment';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class HttpClientDataService { export class HttpClientDataService {
//LocalHost constructor() {
//BASE_ADDRESS: string = 'http://localhost:8080/stman'; this.BASE_ADDRESS = environment.BASE_ADDRESS;
this.P2PSingleSignOnUrl = environment.P2PSingleSignOnUrl;
this.P2PTokenUrl = environment.P2PTokenUrl;
}
//Test BASE_ADDRESS: string = '';
BASE_ADDRESS: string = 'http://aimsviluppo.aimconsulting.it:8085/stman';
//Produzione P2PTokenUrl: string = "";
//BASE_ADDRESS: string = 'http://5.8.104.230:8080/stman';
P2PTokenUrl: string = "https://www.2p2.it/auth-request"; P2PSingleSignOnUrl: string = "";
P2PSingleSignOnUrl: string = "https://www.2p2.it/?token=";
httpFormData = { httpFormData = {
headers: new HttpHeaders({ headers: new HttpHeaders({
...@@ -37,5 +37,4 @@ export class HttpClientDataService { ...@@ -37,5 +37,4 @@ export class HttpClientDataService {
}) })
}; };
constructor() { }
} }
...@@ -5,6 +5,13 @@ import { File} from '@ionic-native/file/ngx'; ...@@ -5,6 +5,13 @@ import { File} from '@ionic-native/file/ngx';
import { FileOpener } from '@ionic-native/file-opener/ngx'; import { FileOpener } from '@ionic-native/file-opener/ngx';
import { Router } from "@angular/router"; import { Router } from "@angular/router";
const delay = ms => new Promise(res => setTimeout(res, ms));
const wait = async () => {
await delay(3000);
console.log("Waited 3s");
}
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
...@@ -86,6 +93,11 @@ export class UtilService { ...@@ -86,6 +93,11 @@ export class UtilService {
return MIMETypes[ext]; return MIMETypes[ext];
} }
static wait()
{
wait();
}
downloadDocumento(fileUrl: string, nomeFile: string) downloadDocumento(fileUrl: string, nomeFile: string)
{ {
var path = ""; var path = "";
......
export const environment = { export const environment = {
production: true production: true,
BASE_ADDRESS: 'http://5.8.104.230:8080/stman',
P2PTokenUrl: "https://www.2p2.it/auth-request",
P2PSingleSignOnUrl: "https://www.2p2.it/?token="
}; };
...@@ -3,9 +3,14 @@ ...@@ -3,9 +3,14 @@
// The list of file replacements can be found in `angular.json`. // The list of file replacements can be found in `angular.json`.
export const environment = { export const environment = {
production: false production: false,
BASE_ADDRESS: 'http://aimsviluppo.aimconsulting.it:8085/stman',
//BASE_ADDRESS: 'http://localhost:8080/stman,
P2PTokenUrl: "https://www.2p2.it/auth-request",
P2PSingleSignOnUrl: "https://www.2p2.it/?token="
}; };
/* /*
* For easier debugging in development mode, you can import the following file * For easier debugging in development mode, you can import the following file
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`. * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
......
...@@ -240,17 +240,6 @@ strong { ...@@ -240,17 +240,6 @@ strong {
--color:#2b94d1 !important; --color:#2b94d1 !important;
} }
.back {
position:absolute;
@media (min-width: 1024px) {
top:48 px;
}
/*@media (max-width: 1024px) {
top:20 px;
}*/
width: 30px;
height: 30px;
}
.logo-piccolo img { .logo-piccolo img {
max-width: 100px; max-width: 100px;
} }
...@@ -395,7 +384,7 @@ strong { ...@@ -395,7 +384,7 @@ strong {
.menu-show{ .menu-show{
@media (min-width: 1024px) { @media (min-width: 1024px) {
zoom: 4.0; top:48 px;
} }
width: 34px; width: 34px;
height: 34px; height: 34px;
...@@ -411,7 +400,7 @@ strong { ...@@ -411,7 +400,7 @@ strong {
} }
.exit { .exit {
@media (min-width: 1024px) { @media (min-width: 1024px) {
zoom: 4.0; top:48 px;
} }
width: 34px; width: 34px;
height: 34px; height: 34px;
...@@ -419,6 +408,18 @@ strong { ...@@ -419,6 +408,18 @@ strong {
} }
} }
.back {
position:absolute;
@media (min-width: 1024px) {
top:48 px;
}
/*@media (max-width: 1024px) {
top:20 px;
}*/
width: 30px;
height: 30px;
}
/*.toolbar-md-primary, .toolbar-ios-primary { /*.toolbar-md-primary, .toolbar-ios-primary {
color: #2b94d1 !important; color: #2b94d1 !important;
--color:#2b94d1 !important; --color:#2b94d1 !important;
......
...@@ -5,6 +5,11 @@ ...@@ -5,6 +5,11 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Intranet</title> <title>Intranet</title>
<!--In caso di deploy per Desktop-->
<!--<base href="/" />-->
<!--In tutti gli altri casi-->
<base href="/" /> <base href="/" />
<!--<link href="css/awesome.scss" rel="stylesheet"> <!--<link href="css/awesome.scss" rel="stylesheet">
<link href="css/styles.scss" rel="stylesheet"> <link href="css/styles.scss" rel="stylesheet">
......
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