Skip to content

I
Intranet
Commit d3bac197 by Matteo
Options

Pc e Android all'ultima versione della grafica

parent 6527e61a
Showing with 814 additions and 241 deletions
src/app/app-routing.module.ts
...@@ -3,11 +3,12 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; ...@@ -3,11 +3,12 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
const routes: Routes = [ const routes: Routes = [
{ path: '', redirectTo: 'login', pathMatch: 'full' }, { path: '', redirectTo: 'login', pathMatch: 'full' },
{ path: 'home', loadChildren: './pages/home/home.module#HomePageModule' }, { path: 'home', loadChildren: '../app/pages/home/home.module#HomePageModule' },
{ path: 'login', loadChildren: './auth/pages/login/login.module#LoginPageModule' }, { path: 'login', loadChildren: '../app/auth/pages/login/login.module#LoginPageModule' },
{ path: 'reset', loadChildren: './auth/pages/reset/reset.module#ResetPageModule' }, { path: 'reset', loadChildren: '../app/auth/pages/reset/reset.module#ResetPageModule' },
{ path: 'businesscall', loadChildren: './pages/businesscall/businesscall.module#BusinesscallPageModule' }, { path: 'businesscall', loadChildren: '../app/pages/businesscall/businesscall.module#BusinesscallPageModule' },
{ path: 'privacy', loadChildren: './pages/privacy/privacy.module#PrivacyPageModule' } { path: 'privacy', loadChildren: '../app/pages/privacy/privacy.module#PrivacyPageModule' }
]; ];
@NgModule({ @NgModule({
......
src/app/auth/pages/change-pwd/change-pwd.page.html
<ion-header class="header-subpage" no-border> <!--<ion-header class="header-subpage" no-border>
<ion-toolbar> <ion-toolbar>
<ion-title class="titolo-sezione-head">{{ 'change_password' | translate }}</ion-title> <ion-title class="titolo-sezione-head">{{ 'change_password' | translate }}</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>-->
<ion-content> <ion-content>
<div class="contenitore-home"> <ion-grid class="transparent bc-grid">
<div class="central-home"> <ion-row class="transparent">
<form #form="ngForm" (ngSubmit)="change(form)" [formGroup]="matching_passwords_group"> <ion-col align-self-end size-md="6" size-lg="6" size-xs="12" class="transparent">
<ion-grid> <div class="body-form body-img12">
<ion-row color="primary" justify-content-center> <ion-row justify-content-center *ngIf="platform.is('desktop')">
<ion-col> <ion-col>
<div padding> <ion-buttons class="back-button-desktop" (click)="back()" title="{{ 'back_login' | translate }}">
<ion-item> <ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon>
<ion-input formControlName="oldpassword" type="password" placeholder="{{ 'old_pwd' | translate }}" ngModel required></ion-input> <!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-item> </ion-buttons>
<ion-item> </ion-col>
<ion-input formControlName="newpassword" type="password" placeholder="{{ 'new_pwd' | translate }}" ngModel required></ion-input> <ion-col>
</ion-item> <div class="change-title bc-title">
<ion-item> {{ 'change_password' | translate }}
<ion-input formControlName="newpasswordbis" type="password" placeholder="{{ 'repeat_new_pwd' | translate }}" ngModel required></ion-input>
</ion-item>
</div>
<div padding>
<ion-button size="large" type="submit" [disabled]="form.invalid" expand="block" class="form-button giallo">{{ 'change_password' | translate }}</ion-button>
</div>
</ion-col>
</ion-row>
<ion-row color="primary" justify-content-center>
<div class="validation-errors" justify-content-center>
<ng-container *ngFor="let validation of validation_messages.newpassword">
<div class="error-message" *ngIf="matching_passwords_group.get('newpassword').hasError(validation.type) && (matching_passwords_group.get('newpassword').dirty
|| matching_passwords_group.get('newpassword').touched)">
{{ validation.message }}
</div>
</ng-container>
<ng-container *ngFor="let validation of validation_messages.newpasswordbis">
<div class="error-message" *ngIf="matching_passwords_group.get('newpasswordbis').hasError(validation.type) && (matching_passwords_group.get('newpasswordbis').dirty
|| matching_passwords_group.get('newpasswordbis').touched)">
{{ validation.message }}
</div>
</ng-container>
<ng-container *ngFor="let validation of validation_messages.newpasswordbis">
<div class="error-message" *ngIf="matching_passwords_group.hasError('areEqual')">
{{ validation.message }}
</div> </div>
</ng-container> </ion-col>
</div> <ion-col></ion-col>
</ion-row> </ion-row>
</ion-grid> <form #form="ngForm" (ngSubmit)="change(form)" [formGroup]="matching_passwords_group">
</form> <ion-grid>
</div> <ion-row color="primary" justify-content-center>
</div> <ion-col>
</ion-content> <div padding>
\ No newline at end of file <ion-item>
<ion-input formControlName="oldpassword" type="password" placeholder="{{ 'old_pwd' | translate }}" ngModel required></ion-input>
</ion-item>
<ion-item>
<ion-input formControlName="newpassword" type="password" placeholder="{{ 'new_pwd' | translate }}" ngModel required></ion-input>
</ion-item>
<ion-item>
<ion-input formControlName="newpasswordbis" type="password" placeholder="{{ 'repeat_new_pwd' | translate }}" ngModel required></ion-input>
</ion-item>
</div>
<div padding>
<ion-button type="submit" [disabled]="form.invalid" class="bc-invia">{{ 'change_password' | translate }}</ion-button>
</div>
</ion-col>
</ion-row>
<ion-row color="primary" justify-content-center>
<div class="validation-errors" justify-content-center>
<ng-container *ngFor="let validation of validation_messages.newpassword">
<div class="error-message" *ngIf="matching_passwords_group.get('newpassword').hasError(validation.type) && (matching_passwords_group.get('newpassword').dirty
|| matching_passwords_group.get('newpassword').touched)">
{{ validation.message }}
</div>
</ng-container>
<ng-container *ngFor="let validation of validation_messages.newpasswordbis">
<div class="error-message" *ngIf="matching_passwords_group.get('newpasswordbis').hasError(validation.type) && (matching_passwords_group.get('newpasswordbis').dirty
|| matching_passwords_group.get('newpasswordbis').touched)">
{{ validation.message }}
</div>
</ng-container>
<ng-container *ngFor="let validation of validation_messages.newpasswordbis">
<div class="error-message" *ngIf="matching_passwords_group.hasError('areEqual')">
{{ validation.message }}
</div>
</ng-container>
</div>
</ion-row>
</ion-grid>
</form>
</div>
</ion-col>
<ion-col align-self-end size-md="6" size-lg="6" size-xs="12">
<div class="body-blue2"></div>
<div class="body-img22"></div>
</ion-col>
</ion-row>
</ion-grid>
</ion-content>
\ No newline at end of file
src/app/auth/pages/change-pwd/change-pwd.page.ts
...@@ -6,7 +6,7 @@ import { AuthService } from '../../service/auth.service'; ...@@ -6,7 +6,7 @@ import { AuthService } from '../../service/auth.service';
import { ErrorResponse } from '../../interface/error-response'; import { ErrorResponse } from '../../interface/error-response';
import { UtilService } from '../../../service/util.service'; import { UtilService } from '../../../service/util.service';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { Events } from '@ionic/angular'; import { Platform, Events } from '@ionic/angular';
@Component({ @Component({
selector: 'app-change-pwd', selector: 'app-change-pwd',
...@@ -17,7 +17,8 @@ export class ChangePwdPage implements OnInit { ...@@ -17,7 +17,8 @@ export class ChangePwdPage implements OnInit {
constructor( constructor(
private authService: AuthService, private authService: AuthService,
private router: Router, private router: Router,
public platform: Platform,
private utilService: UtilService, private utilService: UtilService,
public translate: TranslateService, public translate: TranslateService,
public events: Events) { public events: Events) {
...@@ -78,6 +79,14 @@ matching_passwords_group = new FormGroup({ ...@@ -78,6 +79,14 @@ matching_passwords_group = new FormGroup({
] ]
} }
back()
{
UtilService.titoloPagina = '';
this.events.publish('functionCall:cambiaTitolo', null);
this.router.navigateByUrl('home');
}
ngOnInit() { ngOnInit() {
} }
......
src/app/auth/pages/login/login.page.html
...@@ -4,16 +4,15 @@ ...@@ -4,16 +4,15 @@
</ion-toolbar> </ion-toolbar>
</ion-header>--> </ion-header>-->
<div class="body-desktop"> <div class="body-desktop" *ngIf="!platform.is('desktop')">
<div class="body-blue"></div> <div class="body-blue"></div>
<div class="body-img1"></div> <div class="body-img1"></div>
<div class="body-img2"></div>
<div class="body-form"> <div class="body-form">
<ion-content *ngIf="!platform.is('desktop')"> <ion-content class="content-login-smartphone">
<div> <div>
<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/img/LogoBianco.svg" />
</div> </div>
<form #form="ngForm" (ngSubmit)="login(form)" class="form"> <form #form="ngForm" (ngSubmit)="login(form)" class="form">
<ion-grid> <ion-grid>
...@@ -29,8 +28,8 @@ ...@@ -29,8 +28,8 @@
<ion-input name="password" type="password" placeholder="{{ 'password' | translate }}" ngModel required></ion-input> <ion-input name="password" type="password" placeholder="{{ 'password' | translate }}" ngModel required></ion-input>
</ion-item> </ion-item>
</div> </div>
<div class="accedi" > <div class="standard-padding">
<ion-button size="large" type="submit" [disabled]="form.invalid" expand="block" tappable>{{ 'accedi' | translate }}</ion-button> <ion-button class="bc-invia" size="large" type="submit" [disabled]="form.invalid" expand="block" tappable>{{ 'accedi' | translate }}</ion-button>
</div> </div>
</ion-col> </ion-col>
</ion-row> </ion-row>
...@@ -39,41 +38,48 @@ ...@@ -39,41 +38,48 @@
<a (click)='reset()' tappable>{{ 'lost_password' | translate }}</a> <a (click)='reset()' tappable>{{ 'lost_password' | translate }}</a>
</div> </div>
</ion-row> </ion-row>
<ion-row color="primary" justify-content-center>
<ion-col align-self-center size-md="6" size-lg="5" size-xs="12">
<div class="business-call">
<div class="non-account">
{{ 'hai_account' | translate }}
</div>
<div class="title-call">
{{ 'prenota_subito' | translate }}<br />{{ 'tua' | translate }} <span class="giallo">{{ 'business_call' | translate }}</span>
</div>
<div class="descr-call">
{{ 'consulenti' | translate }} <strong>{{ 'gratuita' | translate }}</strong> {{ 'su_misura' | translate }}
</div>
<div class="appuntamento">
<a (click)='redirectBusiness()' tappable>{{ 'prenota_app' | translate }}</a>
</div>
</div>
</ion-col>
</ion-row>
<ion-row justify-content-center> <ion-row justify-content-center>
<ion-col align-self-center size-md="6" size-lg="5" size-xs="12" style="color: white"> <ion-col align-self-center size-md="6" size-lg="5" size-xs="12" style="color: white">
<ion-row> <ion-row>
<ion-label class="label-border" style="margin-top: 8px;">{{ 'lingua_selezionata' | translate }}</ion-label> <ion-label class="label-border-desktop" style="margin-top: 8px;">{{ 'lingua_selezionata' | translate }}</ion-label>
<ion-select value="clienteSel" [(ngModel)]="linguaSel" (ionChange)="cambiaLingua()" placeholder="{{linguaSel}}" interface="popover" title="{{ 'seleziona_lingua' | translate }}"> <ion-select placeholder="{{linguaSel}}" (ionChange)="cambiaLingua()" interface="popover" title="{{ 'seleziona_lingua' | translate }}">
<ion-select-option *ngFor="let lingua of lingue; let i=index;" value="{{lingua.key}}">{{lingua.value}}</ion-select-option> <ion-select-option *ngFor="let lingua of lingue; let i=index;" [value]="lingua.key" [selected]="i === 0">{{lingua.value}}</ion-select-option>
</ion-select> </ion-select>
</ion-row> </ion-row>
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row color="primary" justify-content-center>
</ion-row>
</ion-grid> </ion-grid>
</form> </form>
</div> </div>
</div> </div>
</ion-content> </ion-content>
<ion-footer class="footer-smartphone">
<ion-col class="desktop-bcall-col"align-self-center>
<div class="smartphone-bcall">
<div class="bcall-title">
{{ 'bcall_title' | translate }}
</div>
<div>
<a (click)='redirectBusiness()' tappable class="bcall-content">
{{ 'bcall_content' | translate }}
</a>
</div>
<ion-img (click)='redirectBusiness()' src="../../../../assets/img/Risorsa3.png"></ion-img>
</div>
</ion-col>
</ion-footer>
</div>
</div>
<ion-content class="login-desktop-content" *ngIf="platform.is('desktop')"> <div class="body-desktop" *ngIf="platform.is('desktop')">
<div class="body-blue"></div>
<div class="body-img1"></div>
<div class="body-img2"></div>
<div class="body-form">
<ion-content class="login-desktop-content">
<div> <div>
<div class="contenitore-desktop" *ngIf="platform.is('desktop')"> <div class="contenitore-desktop" *ngIf="platform.is('desktop')">
<div class="logo-grande"> <div class="logo-grande">
...@@ -88,9 +94,9 @@ ...@@ -88,9 +94,9 @@
<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">
<ion-col align-self-end size-md="6" size-lg="6" size-xs="12"> <ion-col class="align-self-end" size-md="6" size-lg="6" size-xs="12">
<ion-row> <ion-row>
<ion-col align-self-center size-md="6" size-lg="8" size-xs="12"> <ion-col class="align-self-center" size-md="6" size-lg="8" size-xs="12">
<div> <div>
<ion-row> <ion-row>
<ion-col size-md="8" size-lg="10" size-xs="12"> <ion-col size-md="8" size-lg="10" size-xs="12">
...@@ -115,15 +121,16 @@ ...@@ -115,15 +121,16 @@
</div> </div>
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row color="primary"> <ion-row color="primary">
<div text-center class="forgot"> <div class="text-center" class="forgot">
<a (click)='reset()' tappable>{{ 'lost_password' | translate }}</a> <a (click)='reset()' tappable>{{ 'lost_password' | translate }}</a>
</div> </div>
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-label class="label-border-desktop" style="margin-top: 8px;">{{ 'lingua_selezionata' | translate }}</ion-label> <ion-label class="label-border-desktop" style="margin-top: 8px;">{{ 'lingua_selezionata' | translate }}</ion-label>
<ion-select value="clienteSel" [(ngModel)]="linguaSel" (ionChange)="cambiaLingua()" placeholder="{{linguaSel}}" interface="popover" title="{{ 'seleziona_lingua' | translate }}"> <ion-select placeholder="{{linguaSel}}" (ionChange)="cambiaLingua()" interface="popover" title="{{ 'seleziona_lingua' | translate }}">
<ion-select-option *ngFor="let lingua of lingue; let i=index;" value="{{lingua.key}}">{{lingua.value}}</ion-select-option> <ion-select-option *ngFor="let lingua of lingue; let i=index;" [value]="lingua.key" [selected]="i === 0">{{lingua.value}}</ion-select-option>
</ion-select> </ion-select>
</ion-row> </ion-row>
</ion-col> </ion-col>
......
src/app/auth/pages/login/login.page.ts
...@@ -39,7 +39,7 @@ export class LoginPage implements OnInit { ...@@ -39,7 +39,7 @@ export class LoginPage implements OnInit {
this.events.publish('functionCall:linguaCambiata', null); this.events.publish('functionCall:linguaCambiata', null);
} }
linguaSel: string; linguaSel : string;
lingue : Array<Pair>; lingue : Array<Pair>;
cambiaLingua() cambiaLingua()
...@@ -60,6 +60,8 @@ export class LoginPage implements OnInit { ...@@ -60,6 +60,8 @@ export class LoginPage implements OnInit {
} }
else else
{ {
UtilService.titoloPagina = '';
this.router.navigateByUrl('home'); this.router.navigateByUrl('home');
this.events.publish('functionCall:startup', null); this.events.publish('functionCall:startup', null);
} }
......
src/app/auth/pages/reset/reset.page.html
<ion-header 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="{{ 'back_login' | translate }}">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon>
<!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons>
<ion-title class="logo-piccolo">
<img src="assets/icon/2p2-logo-color.svg">
</ion-title>
</ion-toolbar>
</ion-col>
</ion-row>
</ion-grid>
</ion-header>
<ion-content> <ion-content>
<form #form="ngForm" (ngSubmit)="reset(form)" [formGroup]="matching_email_group"> <ion-grid class="transparent bc-grid">
<ion-grid> <ion-row class="transparent">
<ion-row color="primary" justify-content-center> <ion-col align-self-end size-md="6" size-lg="6" size-xs="12" class="transparent">
<ion-col align-self-center size-md="6" size-lg="5" size-xs="12"> <div class="body-form body-img12">
<div text-center> <form #form="ngForm" (ngSubmit)="reset(form)" [formGroup]="matching_email_group">
<h3>{{ 'reset_pwd' | translate }}</h3> <ion-grid>
</div> <ion-row color="primary" justify-content-center>
<div padding> <ion-col align-self-center>
<ion-item> <ion-row>
<ion-input formControlName="email" type="email" placeholder="{{ 'email' | translate }}" ngModel required></ion-input> <ion-buttons (click)="back()" title="{{ 'back_login' | translate }}" class="back-button-desktop back-button-desktop-reset">
</ion-item> <ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon>
</div> <!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
<div padding> </ion-buttons>
<ion-button size="large" type="submit" [disabled]="form.invalid" expand="block" class="form-button giallo">{{ 'reset_pwd' | translate }}</ion-button> <ion-title class="logo-piccolo">
</div> <img src="assets/icon/2p2-logo-color.svg">
</ion-col> </ion-title>
</ion-row> </ion-row>
<ion-row color="primary" justify-content-center> <div text-center>
<div class="validation-errors" justify-content-center> <h3>{{ 'reset_pwd' | translate }}</h3>
<ng-container *ngFor="let validation of validation_messages.email"> </div>
<div class="error-message" *ngIf="matching_email_group.get('email').hasError(validation.type) && (matching_email_group.get('email').dirty <div padding>
|| matching_email_group.get('email').touched)"> <ion-item>
{{ validation.message }} <ion-input formControlName="email" type="email" placeholder="{{ 'email' | translate }}" ngModel required></ion-input>
</div> </ion-item>
</ng-container> </div>
<div padding>
<ion-button type="submit" [disabled]="form.invalid" class="bc-invia">{{ 'reset_pwd' | translate }}</ion-button>
</div>
</ion-col>
</ion-row>
<ion-row color="primary" justify-content-center>
<div class="validation-errors" justify-content-center>
<ng-container *ngFor="let validation of validation_messages.email">
<div class="error-message" *ngIf="matching_email_group.get('email').hasError(validation.type) && (matching_email_group.get('email').dirty
|| matching_email_group.get('email').touched)">
{{ validation.message }}
</div>
</ng-container>
</div>
</ion-row>
</ion-grid>
</form>
</div> </div>
</ion-row> </ion-col>
</ion-grid> <ion-col align-self-end size-md="6" size-lg="6" size-xs="12">
</form> <div class="body-blue2"></div>
<div class="body-img22"></div>
</ion-col>
</ion-row>
</ion-grid>
</ion-content> </ion-content>
\ No newline at end of file
src/app/pages/documenti/documenti.page.ts
...@@ -161,13 +161,13 @@ export class DocumentiPage implements OnInit { ...@@ -161,13 +161,13 @@ export class DocumentiPage implements OnInit {
showButtons() showButtons()
{ {
var buttons = document.getElementById('buttonsDoc'); var buttons = document.getElementById('buttonsDoc');
buttons.setAttribute("style", "visibility: visible"); buttons.setAttribute("style", "display: block");
} }
hideButtons() hideButtons()
{ {
var buttons = document.getElementById('buttonsDoc'); var buttons = document.getElementById('buttonsDoc');
buttons.setAttribute("style", "visibility: hidden"); buttons.setAttribute("style", "display: none");
} }
docSel: Array<Pair>; docSel: Array<Pair>;
...@@ -238,6 +238,9 @@ export class DocumentiPage implements OnInit { ...@@ -238,6 +238,9 @@ export class DocumentiPage implements OnInit {
back() back()
{ {
UtilService.titoloPagina = '';
this.events.publish('functionCall:cambiaTitolo', null);
this.router.navigateByUrl('home/index'); this.router.navigateByUrl('home/index');
} }
......
src/app/pages/home/home.page.ts
...@@ -29,6 +29,7 @@ export class HomePage { ...@@ -29,6 +29,7 @@ export class HomePage {
public platform: Platform public platform: Platform
) { ) {
this.clienti = []; this.clienti = [];
this.titoloPagina = "";
this.clienteSelezionato = { this.clienteSelezionato = {
denominazione: null, denominazione: null,
id: null id: null
...@@ -62,6 +63,9 @@ export class HomePage { ...@@ -62,6 +63,9 @@ export class HomePage {
this.events.subscribe('functionCall:strutturaSelected', eventData => { this.events.subscribe('functionCall:strutturaSelected', eventData => {
this.strutturaSelected(); this.strutturaSelected();
}); });
this.events.subscribe('functionCall:cambiaTitolo', eventData => {
this.titoloPagina = UtilService.titoloPagina;
});
this.lingue = utilService.getLanguageList(); this.lingue = utilService.getLanguageList();
if(utilService.getLingua() == "") { if(utilService.getLingua() == "") {
this.linguaSel = this.lingue[0].key; this.linguaSel = this.lingue[0].key;
...@@ -120,6 +124,11 @@ export class HomePage { ...@@ -120,6 +124,11 @@ export class HomePage {
}); });
} }
isTitolo()
{
return this.titoloPagina != '';
}
loadStrutture() loadStrutture()
{ {
//this.utilService.showLoading(); //this.utilService.showLoading();
...@@ -149,29 +158,49 @@ export class HomePage { ...@@ -149,29 +158,49 @@ export class HomePage {
mediatoreCreditizio: Struttura; mediatoreCreditizio: Struttura;
realEstateBrokerage: Struttura; realEstateBrokerage: Struttura;
idStrutturaSel: number; idStrutturaSel: number;
titoloPagina: string;
selectStruttura(struttura:String) selectStruttura(struttura:String)
{ {
let ok = false;
switch(struttura) switch(struttura)
{ {
case "servizi": case "servizi":
{ {
this.utilService.setStrutturaSel(this.consultingService); if(this.consultingService != null)
{
this.utilService.setStrutturaSel(this.consultingService);
ok = true;
}
break; break;
} }
case "immobiliare": case "immobiliare":
{ {
this.utilService.setStrutturaSel(this.realEstateBrokerage); if(this.realEstateBrokerage != null)
{
this.utilService.setStrutturaSel(this.realEstateBrokerage);
ok = true;
}
break; break;
} }
case "creditizia": case "creditizia":
{ {
this.utilService.setStrutturaSel(this.mediatoreCreditizio); if(this.mediatoreCreditizio != null)
{
this.utilService.setStrutturaSel(this.mediatoreCreditizio);
ok = true;
}
break; break;
} }
} }
this.strutturaSelected(); if(ok)
this.events.publish('functionCall:strutturaSelectedHome', null); {
this.strutturaSelected();
this.events.publish('functionCall:strutturaSelectedHome', null);
}
else{
this.utilService.stampaAvviso("Struttura non presente in questo profilo");
}
} }
strutturaSelected() strutturaSelected()
...@@ -179,9 +208,15 @@ export class HomePage { ...@@ -179,9 +208,15 @@ export class HomePage {
var struttutaSel = this.utilService.getStrutturaSel(); var struttutaSel = this.utilService.getStrutturaSel();
this.idStrutturaSel = struttutaSel.id; this.idStrutturaSel = struttutaSel.id;
this.showMenuButton = true; this.showMenuButton = true;
if(!this.platform.is("desktop")) this.closeSideMenu();
this.router.navigateByUrl('home/index'); this.router.navigateByUrl('home/index');
} }
gotoPreview()
{
this.router.navigateByUrl('home/preview-home');
}
setStrutture() setStrutture()
{ {
this.utilService.getStruttura(environment.ConsultingServiceId).then(struttura => this.utilService.getStruttura(environment.ConsultingServiceId).then(struttura =>
......
src/app/pages/index/index.page.html
<ion-content class="nothing" *ngIf="!platform.is('desktop')"> <ion-content class="nothing" *ngIf="!platform.is('desktop')">
<div class="contenitore-home"> <!--<div class="contenitore-home">
<div class="central-home"> <div class="central-home">
<div tappable class="box tre-box"> <div tappable class="box tre-box">
<div tappable class="icon" (click)="apriPagina('documenti')"> <div tappable class="icon" (click)="apriPagina('documenti')">
...@@ -51,6 +51,86 @@ ...@@ -51,6 +51,86 @@
I miei risultati I miei risultati
</div> </div>
</div>--> </div>-->
<!--</div>
</div>-->
<div class="content-index-smart">
<div
[ngClass]="{'struttura-servizio-smart': isServizioSelected(),
'struttura-immobiliare-smart': isImmobiliareSelected(),
'struttura-creditizia-smart': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon">
<img src="assets/img/documentiRosso.png" (click)="apriPagina('documenti')" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/documentiGiallo.png" (click)="apriPagina('documenti')" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/documentiVerde.png" (click)="apriPagina('documenti')" tappable *ngIf="isCreditiziaSelected()"/>
</div>
<div tappable class="section-title" (click)="apriPagina('documenti')">
{{ 'documenti' | translate }}
</div>
</div>
<div
[ngClass]="{'struttura-servizio-smart': isServizioSelected(),
'struttura-immobiliare-smart': isImmobiliareSelected(),
'struttura-creditizia-smart': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon">
<img src="assets/img/segreteriaRosso.png" (click)="apriPagina('segreteria')" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/segreteriaGiallo.png" (click)="apriPagina('segreteria')" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/segreteriaVerde.png" (click)="apriPagina('segreteria')" tappable *ngIf="isCreditiziaSelected()"/>
</div>
<div tappable class="section-title" (click)="apriPagina('segreteria')">
{{ 'segreteria' | translate }}
</div>
</div>
<div
[ngClass]="{'struttura-servizio-smart': isServizioSelected(),
'struttura-immobiliare-smart': isImmobiliareSelected(),
'struttura-creditizia-smart': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon">
<img src="assets/img/notificheRosso.png" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/notificheGiallo.png" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/notificheVerde.png" tappable *ngIf="isCreditiziaSelected()"/>
</div>
<div tappable class="section-title">
{{ 'notifiche' | translate }}
</div>
</div>
<div
[ngClass]="{'struttura-servizio-smart': isServizioSelected(),
'struttura-immobiliare-smart': isImmobiliareSelected(),
'struttura-creditizia-smart': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon">
<img src="assets/img/businessRosso.png" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/businessGiallo.png" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/businessVerde.png" tappable *ngIf="isCreditiziaSelected()"/>
</div>
<div tappable class="section-title">
{{ 'business' | translate }}
</div>
</div>
<div
[ngClass]="{'struttura-servizio-smart': isServizioSelected(),
'struttura-immobiliare-smart': isImmobiliareSelected(),
'struttura-creditizia-smart': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon">
<img src="assets/img/parereRosso.png" (click)="apriPagina('pareri')" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/parereGiallo.png" (click)="apriPagina('pareri')" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/parereVerde.png" (click)="apriPagina('pareri')" tappable *ngIf="isCreditiziaSelected()"/>
</div>
<div tappable class="section-title" (click)="apriPagina('pareri')">
{{ 'pareri' | translate }}
</div>
</div>
<div
[ngClass]="{'struttura-servizio-smart': isServizioSelected(),
'struttura-immobiliare-smart': isImmobiliareSelected(),
'struttura-creditizia-smart': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon">
<img src="assets/img/domandeRosso.png" (click)="apriPagina('interviste')" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/domandeGiallo.png" (click)="apriPagina('interviste')" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/domandeVerde.png" (click)="apriPagina('interviste')" tappable *ngIf="isCreditiziaSelected()"/>
</div>
<div tappable class="section-title" (click)="apriPagina('interviste')">
{{ 'interviste' | translate }}
</div>
</div> </div>
</div> </div>
</ion-content> </ion-content>
...@@ -66,7 +146,7 @@ ...@@ -66,7 +146,7 @@
[ngClass]="{'struttura-servizio': isServizioSelected(), [ngClass]="{'struttura-servizio': isServizioSelected(),
'struttura-immobiliare': isImmobiliareSelected(), 'struttura-immobiliare': isImmobiliareSelected(),
'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null"> 'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon" (click)="selectStruttura('servizi')"> <div tappable class="icon">
<img src="assets/img/documentiRosso.png" (click)="apriPagina('documenti')" tappable *ngIf="isServizioSelected()"/> <img src="assets/img/documentiRosso.png" (click)="apriPagina('documenti')" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/documentiGiallo.png" (click)="apriPagina('documenti')" tappable *ngIf="isImmobiliareSelected()"/> <img src="assets/img/documentiGiallo.png" (click)="apriPagina('documenti')" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/documentiVerde.png" (click)="apriPagina('documenti')" tappable *ngIf="isCreditiziaSelected()"/> <img src="assets/img/documentiVerde.png" (click)="apriPagina('documenti')" tappable *ngIf="isCreditiziaSelected()"/>
...@@ -79,7 +159,7 @@ ...@@ -79,7 +159,7 @@
[ngClass]="{'struttura-servizio': isServizioSelected(), [ngClass]="{'struttura-servizio': isServizioSelected(),
'struttura-immobiliare': isImmobiliareSelected(), 'struttura-immobiliare': isImmobiliareSelected(),
'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null"> 'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon" (click)="selectStruttura('servizi')"> <div tappable class="icon">
<img src="assets/img/segreteriaRosso.png" (click)="apriPagina('segreteria')" tappable *ngIf="isServizioSelected()"/> <img src="assets/img/segreteriaRosso.png" (click)="apriPagina('segreteria')" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/segreteriaGiallo.png" (click)="apriPagina('segreteria')" tappable *ngIf="isImmobiliareSelected()"/> <img src="assets/img/segreteriaGiallo.png" (click)="apriPagina('segreteria')" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/segreteriaVerde.png" (click)="apriPagina('segreteria')" tappable *ngIf="isCreditiziaSelected()"/> <img src="assets/img/segreteriaVerde.png" (click)="apriPagina('segreteria')" tappable *ngIf="isCreditiziaSelected()"/>
...@@ -92,7 +172,7 @@ ...@@ -92,7 +172,7 @@
[ngClass]="{'struttura-servizio': isServizioSelected(), [ngClass]="{'struttura-servizio': isServizioSelected(),
'struttura-immobiliare': isImmobiliareSelected(), 'struttura-immobiliare': isImmobiliareSelected(),
'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null"> 'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon" (click)="selectStruttura('servizi')"> <div tappable class="icon">
<img src="assets/img/notificheRosso.png" tappable *ngIf="isServizioSelected()"/> <img src="assets/img/notificheRosso.png" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/notificheGiallo.png" tappable *ngIf="isImmobiliareSelected()"/> <img src="assets/img/notificheGiallo.png" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/notificheVerde.png" tappable *ngIf="isCreditiziaSelected()"/> <img src="assets/img/notificheVerde.png" tappable *ngIf="isCreditiziaSelected()"/>
...@@ -105,7 +185,7 @@ ...@@ -105,7 +185,7 @@
[ngClass]="{'struttura-servizio': isServizioSelected(), [ngClass]="{'struttura-servizio': isServizioSelected(),
'struttura-immobiliare': isImmobiliareSelected(), 'struttura-immobiliare': isImmobiliareSelected(),
'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null"> 'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon" (click)="selectStruttura('servizi')"> <div tappable class="icon">
<img src="assets/img/businessRosso.png" tappable *ngIf="isServizioSelected()"/> <img src="assets/img/businessRosso.png" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/businessGiallo.png" tappable *ngIf="isImmobiliareSelected()"/> <img src="assets/img/businessGiallo.png" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/businessVerde.png" tappable *ngIf="isCreditiziaSelected()"/> <img src="assets/img/businessVerde.png" tappable *ngIf="isCreditiziaSelected()"/>
...@@ -118,7 +198,7 @@ ...@@ -118,7 +198,7 @@
[ngClass]="{'struttura-servizio': isServizioSelected(), [ngClass]="{'struttura-servizio': isServizioSelected(),
'struttura-immobiliare': isImmobiliareSelected(), 'struttura-immobiliare': isImmobiliareSelected(),
'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null"> 'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon" (click)="selectStruttura('servizi')"> <div tappable class="icon">
<img src="assets/img/parereRosso.png" (click)="apriPagina('pareri')" tappable *ngIf="isServizioSelected()"/> <img src="assets/img/parereRosso.png" (click)="apriPagina('pareri')" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/parereGiallo.png" (click)="apriPagina('pareri')" tappable *ngIf="isImmobiliareSelected()"/> <img src="assets/img/parereGiallo.png" (click)="apriPagina('pareri')" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/parereVerde.png" (click)="apriPagina('pareri')" tappable *ngIf="isCreditiziaSelected()"/> <img src="assets/img/parereVerde.png" (click)="apriPagina('pareri')" tappable *ngIf="isCreditiziaSelected()"/>
...@@ -131,7 +211,7 @@ ...@@ -131,7 +211,7 @@
[ngClass]="{'struttura-servizio': isServizioSelected(), [ngClass]="{'struttura-servizio': isServizioSelected(),
'struttura-immobiliare': isImmobiliareSelected(), 'struttura-immobiliare': isImmobiliareSelected(),
'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null"> 'struttura-creditizia': isCreditiziaSelected() }" class="struttura-sel" tappable *ngIf="consultingService != null">
<div tappable class="icon" (click)="selectStruttura('servizi')"> <div tappable class="icon">
<img src="assets/img/domandeRosso.png" (click)="apriPagina('interviste')" tappable *ngIf="isServizioSelected()"/> <img src="assets/img/domandeRosso.png" (click)="apriPagina('interviste')" tappable *ngIf="isServizioSelected()"/>
<img src="assets/img/domandeGiallo.png" (click)="apriPagina('interviste')" tappable *ngIf="isImmobiliareSelected()"/> <img src="assets/img/domandeGiallo.png" (click)="apriPagina('interviste')" tappable *ngIf="isImmobiliareSelected()"/>
<img src="assets/img/domandeVerde.png" (click)="apriPagina('interviste')" tappable *ngIf="isCreditiziaSelected()"/> <img src="assets/img/domandeVerde.png" (click)="apriPagina('interviste')" tappable *ngIf="isCreditiziaSelected()"/>
......
src/app/pages/interviste/interviste.page.ts
...@@ -50,7 +50,13 @@ export class IntervistePage implements OnInit { ...@@ -50,7 +50,13 @@ export class IntervistePage implements OnInit {
this.events.subscribe('functionCall:manageBackButton', eventData => { this.events.subscribe('functionCall:manageBackButton', eventData => {
if(this.router.url == "/home/interviste") if(this.router.url == "/home/interviste")
{ {
if(this.intervista == "lista") this.router.navigateByUrl('home/index'); if(this.intervista == "lista")
{
UtilService.titoloPagina = '';
this.events.publish('functionCall:cambiaTitolo', null);
this.router.navigateByUrl('home/index');
}
else else
{ {
this.apriLista(); this.apriLista();
...@@ -550,6 +556,9 @@ export class IntervistePage implements OnInit { ...@@ -550,6 +556,9 @@ export class IntervistePage implements OnInit {
back() back()
{ {
UtilService.titoloPagina = '';
this.events.publish('functionCall:cambiaTitolo', null);
this.router.navigateByUrl('home/index'); this.router.navigateByUrl('home/index');
} }
......
src/app/pages/notifiche/notifiche.module.ts 0 → 100644
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';
import { NotifichePage } from './notifiche.page';
const routes: Routes = [
{
path: '',
component: NotifichePage
}
];
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
RouterModule.forChild(routes)
],
declarations: [NotifichePage]
})
export class NotifichePageModule {}
src/app/pages/notifiche/notifiche.page.html 0 → 100644
<ion-header>
<ion-toolbar>
<ion-title>notifiche</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
</ion-content>
src/app/pages/notifiche/notifiche.page.spec.ts 0 → 100644
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { NotifichePage } from './notifiche.page';
describe('NotifichePage', () => {
let component: NotifichePage;
let fixture: ComponentFixture<NotifichePage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ NotifichePage ],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(NotifichePage);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/pages/notifiche/notifiche.page.ts 0 → 100644
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-notifiche',
templateUrl: './notifiche.page.html',
styleUrls: ['./notifiche.page.scss'],
})
export class NotifichePage implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/pages/parere/parere.page.ts
...@@ -46,7 +46,13 @@ export class ParerePage implements OnInit { ...@@ -46,7 +46,13 @@ export class ParerePage implements OnInit {
this.events.subscribe('functionCall:manageBackButton', eventData => { this.events.subscribe('functionCall:manageBackButton', eventData => {
if(this.router.url == "/home/parere") if(this.router.url == "/home/parere")
{ {
if(this.parere == "lista") this.router.navigateByUrl('home/index'); if(this.parere == "lista")
{
UtilService.titoloPagina = '';
this.events.publish('functionCall:cambiaTitolo', null);
this.router.navigateByUrl('home/index');
}
else else
{ {
this.apriLista(); this.apriLista();
...@@ -446,6 +452,9 @@ upload(str:any) ...@@ -446,6 +452,9 @@ upload(str:any)
back() back()
{ {
UtilService.titoloPagina = '';
this.events.publish('functionCall:cambiaTitolo', null);
this.router.navigateByUrl('home/index'); this.router.navigateByUrl('home/index');
} }
......
src/app/pages/preview-home/preview-home.page.html
<ion-content> <ion-content *ngIf="platform.is('desktop')" class="content-smart">
<div class="preview-title" *ngIf="pageReady"> <div class="preview-title" *ngIf="pageReady">
<ion-title>{{ 'hello' | translate }} {{name}}! {{ 'titolo_preview' | translate }}</ion-title> <ion-title>{{ 'hello' | translate }} {{name}}! {{ 'titolo_preview' | translate }}</ion-title>
</div> </div>
<div class="content-preview"> <div class="content-preview" *ngIf="pageReady">
<div class="struttura-sel struttura-servizio" tappable *ngIf="consultingService != null"> <div class="struttura-sel struttura-servizio" tappable>
<div tappable class="icon" (click)="selectStruttura('servizi')"> <div tappable class="icon" (click)="selectStruttura('servizi')">
<img src="assets/img/MenuServizi.png" (click)="selectStruttura('servizi')" tappable/> <img src="assets/img/MenuServizi.png" tappable/>
</div> </div>
<div tappable class="section-title" (click)="selectStruttura('servizi')"> <div tappable class="section-title" (click)="selectStruttura('servizi')">
{{ 'servizi' | translate }} {{ 'servizi' | translate }}
</div> </div>
</div> </div>
<div class="struttura-sel struttura-immobiliare" tappable *ngIf="realEstateBrokerage != null"> <div class="struttura-sel struttura-immobiliare" tappable>
<div tappable class="icon" (click)="selectStruttura('immobiliare')"> <div tappable class="icon" (click)="selectStruttura('immobiliare')">
<img src="assets/img/MenuImmobiliare.png" (click)="selectStruttura('immobiliare')" tappable/> <img src="assets/img/MenuImmobiliare.png" tappable/>
</div> </div>
<div tappable class="section-title" (click)="selectStruttura('immobiliare')"> <div tappable class="section-title" (click)="selectStruttura('immobiliare')">
{{ 'immobiliare' | translate }} {{ 'immobiliare' | translate }}
</div> </div>
</div> </div>
<div class="struttura-sel struttura-creditizia" tappable *ngIf="mediatoreCreditizio != null"> <div class="struttura-sel struttura-creditizia" tappable>
<div tappable class="icon" (click)="selectStruttura('creditizia')"> <div tappable class="icon" (click)="selectStruttura('creditizia')">
<img src="assets/img/MenuCreditizia.png" (click)="selectStruttura('creditizia')" tappable/> <img src="assets/img/MenuCreditizia.png" tappable/>
</div> </div>
<div tappable class="section-title" (click)="selectStruttura('creditizia')"> <div tappable class="section-title" (click)="selectStruttura('creditizia')">
{{ 'creditizia' | translate }} {{ 'creditizia' | translate }}
...@@ -29,3 +29,32 @@ ...@@ -29,3 +29,32 @@
</div> </div>
</div> </div>
</ion-content> </ion-content>
<ion-content *ngIf="!platform.is('desktop')">
<div class="content-preview-smart" *ngIf="pageReady">
<ion-row class="struttura-sel-smart struttura-servizio-smart" tappable>
<div tappable class="icon" (click)="selectStruttura('servizi')">
<img src="assets/img/MenuServizi.png" tappable/>
</div>
<div tappable class="section-title-smart" (click)="selectStruttura('servizi')">
{{ 'servizi' | translate }}
</div>
</ion-row>
<ion-row class="struttura-sel-smart struttura-immobiliare-smart" tappable>
<div tappable class="icon" (click)="selectStruttura('immobiliare')">
<img src="assets/img/MenuImmobiliare.png" tappable/>
</div>
<div tappable class="section-title-smart" (click)="selectStruttura('immobiliare')">
{{ 'immobiliare' | translate }}
</div>
</ion-row>
<ion-row class="struttura-sel-smart struttura-creditizia-smart" tappable>
<div tappable class="icon" (click)="selectStruttura('creditizia')">
<img src="assets/img/MenuCreditizia.png" tappable/>
</div>
<div tappable class="section-title-smart" (click)="selectStruttura('creditizia')">
{{ 'creditizia' | translate }}
</div>
</ion-row>
</div>
</ion-content>
\ No newline at end of file
src/app/pages/preview-home/preview-home.page.ts
...@@ -65,25 +65,41 @@ export class PreviewHomePage implements OnInit { ...@@ -65,25 +65,41 @@ export class PreviewHomePage implements OnInit {
selectStruttura(struttura:String) selectStruttura(struttura:String)
{ {
let ok = false;
switch(struttura) switch(struttura)
{ {
case "servizi": case "servizi":
{ {
this.utilService.setStrutturaSel(this.consultingService); if(this.consultingService != null)
{
this.utilService.setStrutturaSel(this.consultingService);
ok = true;
}
break; break;
} }
case "immobiliare": case "immobiliare":
{ {
this.utilService.setStrutturaSel(this.realEstateBrokerage); if(this.realEstateBrokerage != null)
{
this.utilService.setStrutturaSel(this.realEstateBrokerage);
ok = true;
}
break; break;
} }
case "creditizia": case "creditizia":
{ {
this.utilService.setStrutturaSel(this.mediatoreCreditizio); if(this.mediatoreCreditizio != null)
{
this.utilService.setStrutturaSel(this.mediatoreCreditizio);
ok = true;
}
break; break;
} }
} }
this.events.publish('functionCall:strutturaSelected', null); if(ok) this.events.publish('functionCall:strutturaSelected', null);
else{
this.utilService.stampaAvviso("Struttura non presente in questo profilo");
}
} }
} }
src/app/pages/segreteria/segreteria.page.ts
...@@ -46,6 +46,9 @@ export class SegreteriaPage implements OnInit { ...@@ -46,6 +46,9 @@ export class SegreteriaPage implements OnInit {
this.events.subscribe('functionCall:clienteCambiato', eventData => { this.events.subscribe('functionCall:clienteCambiato', eventData => {
this.loadData(); this.loadData();
}); });
this.events.subscribe('functionCall:strutturaSelected', eventData => {
this.loadStrutture();
});
this.events.subscribe('functionCall:linguaCambiata', eventData => { this.events.subscribe('functionCall:linguaCambiata', eventData => {
translate = utilService.translate; translate = utilService.translate;
}); });
...@@ -211,13 +214,13 @@ export class SegreteriaPage implements OnInit { ...@@ -211,13 +214,13 @@ export class SegreteriaPage implements OnInit {
showButtons() showButtons()
{ {
var buttons = document.getElementById('buttons'); var buttons = document.getElementById('buttons');
buttons.setAttribute("style", "visibility: visible"); buttons.setAttribute("style", "display: block");
} }
hideButtons() hideButtons()
{ {
var buttons = document.getElementById('buttons'); var buttons = document.getElementById('buttons');
buttons.setAttribute("style", "visibility: hidden"); buttons.setAttribute("style", "display: none");
} }
changeSel(sel) changeSel(sel)
...@@ -332,8 +335,8 @@ export class SegreteriaPage implements OnInit { ...@@ -332,8 +335,8 @@ export class SegreteriaPage implements OnInit {
id = 1100; id = 1100;
this.segreteriaService.getP2pToken(id).subscribe((res)=>{ this.segreteriaService.getP2pToken(id).subscribe((res)=>{
var token = res.token; var token = res.token;
//window.open(this.httpClientDataService.P2PSingleSignOnUrl+token, "_system"); if(this.platform.is("desktop")) window.open(this.httpClientDataService.P2PSingleSignOnUrl+token, "_system");
const browser = this.iab.create(this.httpClientDataService.P2PSingleSignOnUrl+token, "_blank", this.options); else this.iab.create(this.httpClientDataService.P2PSingleSignOnUrl+token, "_blank", this.options);
}, },
(error: ErrorResponse) => { (error: ErrorResponse) => {
var text = "Errore durante l'sso verso 2P2"; var text = "Errore durante l'sso verso 2P2";
...@@ -355,7 +358,7 @@ export class SegreteriaPage implements OnInit { ...@@ -355,7 +358,7 @@ export class SegreteriaPage implements OnInit {
loadStrutture() loadStrutture()
{ {
//this.utilService.showLoading(); //this.utilService.showLoading();
this.segreteriaService.getStrutture(AuthService.clienteSelezionato.id, this.tipoStruttura).subscribe((res: StruttureResponse)=>{ /*this.segreteriaService.getStrutture(AuthService.clienteSelezionato.id, this.tipoStruttura).subscribe((res: StruttureResponse)=>{
//this.utilService.closeLoading(); //this.utilService.closeLoading();
this.strutture = res.strutture; this.strutture = res.strutture;
if(this.strutture.length > 0) if(this.strutture.length > 0)
...@@ -369,7 +372,9 @@ export class SegreteriaPage implements OnInit { ...@@ -369,7 +372,9 @@ export class SegreteriaPage implements OnInit {
//this.utilService.closeLoading(); //this.utilService.closeLoading();
var text = "Errore durante la richiesta lista strutture"; var text = "Errore durante la richiesta lista strutture";
this.utilService.stampaErrore(text, error); this.utilService.stampaErrore(text, error);
}); });*/
this.strutturaSel = this.utilService.getStrutturaSel();
this.loadFatture('initial');
} }
cercaFatture() cercaFatture()
...@@ -414,6 +419,9 @@ export class SegreteriaPage implements OnInit { ...@@ -414,6 +419,9 @@ export class SegreteriaPage implements OnInit {
back() back()
{ {
UtilService.titoloPagina = '';
this.events.publish('functionCall:cambiaTitolo', null);
this.router.navigateByUrl('home/index'); this.router.navigateByUrl('home/index');
} }
......
src/app/service/util.service.ts
...@@ -93,6 +93,7 @@ export class UtilService { ...@@ -93,6 +93,7 @@ export class UtilService {
private languageSelected:string; private languageSelected:string;
private static strutturaSel:Struttura; private static strutturaSel:Struttura;
public static strutture: Struttura[]; public static strutture: Struttura[];
public static titoloPagina:string = "";
static setStruttura(id:number) static setStruttura(id:number)
{ {
...@@ -401,44 +402,71 @@ export class UtilService { ...@@ -401,44 +402,71 @@ export class UtilService {
stampaErrore(text: string, error) stampaErrore(text: string, error)
{ {
var text = "Errore durante richiesta delle fatture";
if(error != null && error.errorMsg != null) console.log(text+": "+error.errorMsg); if(error != null && error.errorMsg != null) console.log(text+": "+error.errorMsg);
else if(error!=null) console.log(text+": "+error); else if(error!=null) console.log(text+": "+error);
else console.log(text); else console.log(text);
this.presentAlert("Errore", "", text, ["OK"]); this.presentAlert("Errore", "", text, ["OK"]);
} }
stampaAvviso(text: string)
{
this.presentAlert("Avviso", "", text, ["OK"]);
}
download(url) download(url)
{ {
return this.httpClient.get(url, {responseType: "blob"}); return this.httpClient.get(url, {responseType: "blob"});
} }
apriPagina(pagina:string) async apriPagina(pagina:string)
{ {
switch(pagina) switch(pagina)
{ {
case "home": case "home":
{ {
UtilService.titoloPagina = '';
this.events.publish('functionCall:cambiaTitolo', null);
this.router.navigateByUrl('home/index'); this.router.navigateByUrl('home/index');
break; break;
} }
case "documenti": case "documenti":
{ {
this.translate.get('titolo_documenti').subscribe(
value => {
UtilService.titoloPagina = value;
this.events.publish('functionCall:cambiaTitolo', null);
});
this.router.navigateByUrl('home/documenti'); this.router.navigateByUrl('home/documenti');
break; break;
} }
case "interviste": case "interviste":
{ {
this.translate.get('interviste_titolo').subscribe(
value => {
UtilService.titoloPagina = value;
this.events.publish('functionCall:cambiaTitolo', null);
});
this.router.navigateByUrl('home/interviste'); this.router.navigateByUrl('home/interviste');
break; break;
} }
case "pareri": case "pareri":
{ {
this.translate.get('parere_titolo').subscribe(
value => {
UtilService.titoloPagina = value;
this.events.publish('functionCall:cambiaTitolo', null);
});
this.router.navigateByUrl('home/parere'); this.router.navigateByUrl('home/parere');
break; break;
} }
case "segreteria": case "segreteria":
{ {
this.translate.get('segreteria_titolo').subscribe(
value => {
UtilService.titoloPagina = value;
this.events.publish('functionCall:cambiaTitolo', null);
});
this.router.navigateByUrl('home/segreteria'); this.router.navigateByUrl('home/segreteria');
break; break;
} }
...@@ -449,6 +477,11 @@ export class UtilService { ...@@ -449,6 +477,11 @@ export class UtilService {
} }
case "change-password": case "change-password":
{ {
this.translate.get('change_password').subscribe(
value => {
UtilService.titoloPagina = value;
this.events.publish('functionCall:cambiaTitolo', null);
});
this.router.navigateByUrl('home/change-pwd'); this.router.navigateByUrl('home/change-pwd');
break; break;
} }
......
src/assets/i18n/it.json
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
"menu_interviste":"DOMANDA / RISPOSTA", "menu_interviste":"DOMANDA / RISPOSTA",
"menu_pareri":"VOGLIO UN PARERE", "menu_pareri":"VOGLIO UN PARERE",
"menu_segreteria":"LA SEGRETERIA", "menu_segreteria":"LA SEGRETERIA",
"menu_change":"CAMBIO PASSWORD", "menu_change":"Cambio Password",
"menu_home":"Home",
"documenti":"I miei documenti", "documenti":"I miei documenti",
"pareri":"Chiedo un parere", "pareri":"Chiedo un parere",
"interviste":"Domande - risposte", "interviste":"Domande - risposte",
...@@ -93,7 +94,7 @@ ...@@ -93,7 +94,7 @@
"username":"Username *", "username":"Username *",
"password":"Password *", "password":"Password *",
"accedi":"ACCEDI", "accedi":"ACCEDI",
"lost_password":"Hai perso la password?", "lost_password":"Password dimenticata?",
"hai_account":"Non hai ancora un account?", "hai_account":"Non hai ancora un account?",
"prenota_subito":"Prenota subito", "prenota_subito":"Prenota subito",
"tua":"la tua", "tua":"la tua",
...@@ -104,6 +105,8 @@ ...@@ -104,6 +105,8 @@
"refresh":"Aggiorna", "refresh":"Aggiorna",
"apri":"Apri", "apri":"Apri",
"vedi_documento":"Visualizza Documento", "vedi_documento":"Visualizza Documento",
"vedi_notula":"Visualizza Notula",
"vedi_progettonotula":"Visualizza Progetto Notula",
"visualizza_progetti":"Visualizza Progetti", "visualizza_progetti":"Visualizza Progetti",
"text_data_progetto_notula":"Data Progetto Notula:", "text_data_progetto_notula":"Data Progetto Notula:",
"reset_documenti":"Pulisci le date", "reset_documenti":"Pulisci le date",
......
src/assets/img/LogoBianco.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="122" height="119.264" viewBox="0 0 122 119.264"><defs><style>.a{fill:#f8c33c;}.b{fill:#fff;}</style></defs><path class="a" d="M128.027,47.128,90.705,86.122h51.156v5.245H82.8V86.122l41.123-42.491c6.081-6.309,9.654-13.3,9.654-20.371,0-11.706-8.893-18.167-22.12-18.167-14.29,0-22.652,7.069-22.652,20.6v4.1H82.876v-4.1C82.8,8.741,93.518,0,111.381,0c16.723,0,28.049,8.133,28.049,23.184.076,8.893-4.713,17.255-11.4,23.944" transform="translate(-19.862)"/><path class="b" d="M2.28,23.184C2.28,8.133,13.682,0,30.4,0,48.344,0,58.986,8.741,58.986,25.768v4.1H53.057v-4.1c0-13.53-8.361-20.6-22.652-20.6-13.3,0-22.12,6.461-22.12,18.167,0,7.069,3.573,14.062,9.654,20.371L59.062,86.2v5.245H0V86.2H51.156l-37.4-39.07C7.069,40.439,2.28,32.077,2.28,23.184"/><path class="b" d="M75.234,52.1h1.9V62.438h10.11v1.9H77.134V74.6h-1.9V64.338H65.2v-1.9H75.234Z" transform="translate(-15.64 -12.498)"/><path class="b" d="M1,142.338c0-2.812.228-4.029,1.064-4.561a1.99,1.99,0,0,1,1.292-.38,1.642,1.642,0,0,1,1.672,1.064V132h1.14v15.355H5.333l-.152-.912a1.965,1.965,0,0,1-1.824,1.064,2.174,2.174,0,0,1-1.292-.38C1.3,146.518,1,145.606,1,142.338m2.508,3.953a1.424,1.424,0,0,0,1.368-.912,10.6,10.6,0,0,0,.228-3.04,10.316,10.316,0,0,0-.228-3.04,1.265,1.265,0,0,0-1.292-.836c-.76,0-1.14.456-1.292,1.292a43.973,43.973,0,0,0,0,5.169c.076.912.38,1.368,1.216,1.368" transform="translate(-0.24 -31.664)"/><path class="b" d="M17.8,145.737V139.2h1.14v6.385c0,1.9.228,2.356,1.14,2.356s1.52-.532,1.52-2.2V139.2h1.14v9.806h-.912l-.228-1.064a1.669,1.669,0,0,1-1.748,1.216c-1.292,0-2.052-.836-2.052-3.421" transform="translate(-4.27 -33.391)"/><path class="b" d="M34.1,144.017c0-2.736.228-3.725.912-4.409A2.352,2.352,0,0,1,36.76,139a2.466,2.466,0,0,1,1.748.608c.684.608.912,1.6.912,4.637H35.24c0,1.064.076,1.9.076,2.432q.114,1.368,1.368,1.368c1.064,0,1.444-.608,1.444-2.2l1.14.228c-.076,1.748-.608,3.117-2.66,3.117a2.352,2.352,0,0,1-1.748-.608c-.532-.684-.76-1.52-.76-4.561m1.216-.912h2.964c0-.76-.076-1.292-.076-1.6-.076-.608-.3-1.368-1.368-1.368q-1.254,0-1.368,1.368a8.734,8.734,0,0,0-.152,1.6" transform="translate(-8.18 -33.343)"/><path class="b" d="M63.94,148.374v4.257H62.8V139.252h1.14v.988a1.729,1.729,0,0,1,1.748-1.14,1.99,1.99,0,0,1,1.292.38c.836.608,1.064,1.824,1.064,4.561,0,3.345-.38,4.257-1.064,4.713a2.431,2.431,0,0,1-1.368.38,2.065,2.065,0,0,1-1.672-.76m1.52-.38c.76,0,1.14-.456,1.216-1.368a23.031,23.031,0,0,0,.076-2.584,23.768,23.768,0,0,0-.076-2.584c-.076-.836-.456-1.292-1.292-1.292a1.366,1.366,0,0,0-1.292.836,10.6,10.6,0,0,0-.228,3.04,10.315,10.315,0,0,0,.228,3.04,1.357,1.357,0,0,0,1.368.912" transform="translate(-15.064 -33.367)"/><path class="b" d="M79.3,134.3h1.444v1.672H79.3Zm.152,3.725h1.14v9.806h-1.14Z" transform="translate(-19.022 -32.215)"/><path class="b" d="M91.1,144.418v-6.537h1.14v6.385c0,1.9.228,2.356,1.14,2.356s1.52-.532,1.52-2.2v-6.537h1.14v9.806h-.912l-.228-1.064a1.669,1.669,0,0,1-1.748,1.216c-1.368,0-2.052-.836-2.052-3.421m.456-10.718h1.52l.988,2.964H93Z" transform="translate(-21.853 -32.071)"/><path class="b" d="M119.3,142.338c0-2.812.228-4.029,1.064-4.561a1.99,1.99,0,0,1,1.292-.38,1.642,1.642,0,0,1,1.672,1.064V132h1.14v15.355h-.836l-.152-.912a1.965,1.965,0,0,1-1.824,1.064,2.174,2.174,0,0,1-1.292-.38c-.76-.608-1.064-1.52-1.064-4.789m2.508,3.953a1.424,1.424,0,0,0,1.368-.912,10.6,10.6,0,0,0,.228-3.04,10.315,10.315,0,0,0-.228-3.04,1.265,1.265,0,0,0-1.292-.836c-.76,0-1.14.456-1.292,1.292a43.974,43.974,0,0,0,0,5.169c.076.912.38,1.368,1.216,1.368" transform="translate(-28.617 -31.664)"/><path class="b" d="M136.1,145.737V139.2h1.14v6.385c0,1.9.228,2.356,1.14,2.356s1.52-.532,1.52-2.2V139.2h1.14v9.806h-.912l-.228-1.064a1.669,1.669,0,0,1-1.748,1.216c-1.292,0-2.052-.836-2.052-3.421" transform="translate(-32.647 -33.391)"/><path class="b" d="M152.4,144.017c0-2.736.228-3.725.912-4.409A2.352,2.352,0,0,1,155.06,139a2.466,2.466,0,0,1,1.748.608c.684.608.912,1.6.912,4.637h-4.1c0,1.064.076,1.9.076,2.432q.114,1.368,1.368,1.368c1.064,0,1.444-.608,1.444-2.2l1.14.228c-.076,1.748-.608,3.117-2.66,3.117a2.352,2.352,0,0,1-1.748-.608c-.608-.684-.836-1.52-.836-4.561m1.216-.912h2.964c0-.76-.076-1.292-.076-1.6-.076-.608-.3-1.368-1.368-1.368q-1.254,0-1.368,1.368a8.736,8.736,0,0,0-.152,1.6" transform="translate(-36.557 -33.343)"/></svg>
\ No newline at end of file
src/desktop.scss
...@@ -143,6 +143,10 @@ ion-tab-bar{ ...@@ -143,6 +143,10 @@ ion-tab-bar{
color: #2A93D0; color: #2A93D0;
} }
.change-title{
margin-top:30px;
}
.row-content .row-content
{ {
height: 20%; height: 20%;
...@@ -274,6 +278,21 @@ ion-tab-bar{ ...@@ -274,6 +278,21 @@ ion-tab-bar{
background-image:url('assets/img/upImmobiliare.png'); background-image:url('assets/img/upImmobiliare.png');
} }
.struttura-servizio-smart
{
background-image:url('assets/img/cerchioservizi.png');
}
.struttura-creditizia-smart
{
background-image:url('assets/img/cerchiocreditizia.png');
}
.struttura-immobiliare-smart
{
background-image:url('assets/img/cerchioimmobiliare.png');
}
.documento-box .documento-box
{ {
height: 180px; height: 180px;
...@@ -351,6 +370,23 @@ ion-tab-bar{ ...@@ -351,6 +370,23 @@ ion-tab-bar{
bottom: 0; bottom: 0;
} }
} }
.icon3 {
margin:auto;
background: transparent;
min-height: 80px;
padding-top: 25px;
img {
height: 100px;
margin: auto;
display: block;
padding-top: 10px;
background: transparent !important;
top: 0;
left: 0;
right: 0;
bottom: 0;
}
}
.section-title { .section-title {
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
...@@ -449,6 +485,17 @@ ion-tab-bar{ ...@@ -449,6 +485,17 @@ ion-tab-bar{
font-family: Avenir, sans-serif; font-family: Avenir, sans-serif;
color: $grigio; color: $grigio;
} }
.section-title-smart {
font-weight: bold;
text-align: center;
font-size: 16px;
padding-top: 50px;
min-height: 42px;
height: 120px;
font-family: Avenir, sans-serif;
color: $grigio;
width: 40%;
}
} }
} }
...@@ -543,6 +590,16 @@ strong { ...@@ -543,6 +590,16 @@ strong {
width: 100%; width: 100%;
} }
.pareri-title
{
@media (min-width: 600px) {
width:90%;
}
@media (max-width: 600px) {
width:80%;
}
}
.pareri-title > *, .pareri-title > *,
.documenti-title > * .documenti-title > *
{ {
...@@ -552,6 +609,10 @@ strong { ...@@ -552,6 +609,10 @@ strong {
text-align: left; text-align: left;
margin-top: 20px; margin-top: 20px;
font-weight: bold; font-weight: bold;
padding: 0px;
padding-left: 10px;
text-align: center;
width:100%;
} }
.preview-title > * .preview-title > *
...@@ -1024,6 +1085,12 @@ strong { ...@@ -1024,6 +1085,12 @@ strong {
{ {
margin-top: 38px; margin-top: 38px;
color: $celeste; color: $celeste;
margin-left: 25px;
}
.back-button-desktop-reset
{
margin-bottom: 60px;
} }
.back { .back {
...@@ -1195,13 +1262,14 @@ strong { ...@@ -1195,13 +1262,14 @@ strong {
.menu-toolbar .menu-toolbar
{ {
--border-color: transparent!important; --border-color: transparent!important;
--ion-background-color: $celeste!important; --ion-background-color: #2b94d1!important;
color: $bianco; color: $bianco;
} }
.menu{ .menu{
--ion-background-color: $celeste!important; --ion-background-color: #2b94d1!important;
background-color: $celeste!important; background-color: $celeste!important;
--ion-backdrop-color:#2b94d1!important;
} }
.ios{ .ios{
...@@ -1680,36 +1748,46 @@ ion-menu{ ...@@ -1680,36 +1748,46 @@ ion-menu{
min-height: 80px; min-height: 80px;
} }
} }
ion-row {
.send { .send {
ion-button { @media (min-width: 600px) {
margin-top: 10px; width: 20%;
background-color: $giallo; }
--backgroud: $giallo; @media (max-width: 600px) {
color: $grigio; width: 45%;
//padding: 10px 0px; }
width: 20%; ion-button {
margin-left: 40%; margin-top: 10px;
border-radius: 15px; background-color: $giallo;
font-size: 18px; --backgroud: $giallo;
font-weight: bold; color: $grigio;
border:none; //padding: 10px 0px;
//margin: 15px 0px; border-radius: 15px;
font-size: 18px;
font-weight: bold;
border:none;
//margin: 15px 0px;
}
} }
} .undo {
.undo { @media (min-width: 600px) {
ion-button { width: 20%;
margin-top: 10px; }
--background: #e5e5ea; @media (max-width: 600px) {
background-color: #e5e5ea; width: 45%;
color: $grigio; }
//padding: 10px 0px; margin-left: 5%;
width: 20%; ion-button {
margin-left: 40%; margin-top: 10px;
border-radius: 15px; --background: #e5e5ea;
font-size: 18px; background-color: #e5e5ea;
font-weight: bold; color: $grigio;
border:none; //padding: 10px 0px;
border-radius: 15px;
font-size: 18px;
font-weight: bold;
border:none;
}
} }
} }
} }
......
src/environments/environment.ts
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
export const environment = { export const environment = {
production: false, production: false,
BASE_ADDRESS: 'http://aimsviluppo.aimconsulting.it:8085/stman', BASE_ADDRESS: 'https://gestionale2.2p2.it/stman',
//BASE_ADDRESS: 'http://aimsviluppo.aimconsulting.it:8085/stman',
//BASE_ADDRESS: "http://localhost:8080/stman", //BASE_ADDRESS: "http://localhost:8080/stman",
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=",
......
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