Skip to content

I
Intranet
Commit c37aed92 by Matteo
Options

pre-demo

parent 36993a41
Showing with 137 additions and 110 deletions
src/app/auth/pages/change-pwd/change-pwd.page.html
<ion-header>
<ion-header class="header-subpage" no-border>
<ion-toolbar>
<ion-title>Change Password</ion-title>
<ion-title class="titolo-sezione-head">cambia password</ion-title>
</ion-toolbar>
</ion-header>
</ion-header>
<ion-content>
<div class="contenitore-home">
<div class="central-home">
<form #form="ngForm" (ngSubmit)="change(form)" [formGroup]="matching_passwords_group">
<ion-grid>
<ion-row color="primary" justify-content-center>
<ion-col align-self-center size-md="6" size-lg="5" size-xs="12">
<div text-center>
<h3>Change Password</h3>
</div>
<ion-col>
<div padding>
<ion-item>
<ion-input formControlName="oldpassword" type="password" placeholder="old password" ngModel required></ion-input>
<ion-input formControlName="oldpassword" type="password" placeholder="vecchia password" ngModel required></ion-input>
</ion-item>
<ion-item>
<ion-input formControlName="newpassword" type="password" placeholder="new password" ngModel required></ion-input>
<ion-input formControlName="newpassword" type="password" placeholder="nuova password" ngModel required></ion-input>
</ion-item>
<ion-item>
<ion-input formControlName="newpasswordbis" type="password" placeholder="repeat new password" ngModel required></ion-input>
<ion-input formControlName="newpasswordbis" type="password" placeholder="ripeti nuova password" ngModel required></ion-input>
</ion-item>
</div>
<div padding>
<ion-button size="large" type="submit" [disabled]="form.invalid" expand="block">Reset Password</ion-button>
<ion-button size="large" type="submit" [disabled]="form.invalid" expand="block">cambia Password</ion-button>
</div>
</ion-col>
</ion-row>
......@@ -51,4 +51,6 @@
</ion-row>
</ion-grid>
</form>
</div>
</div>
</ion-content>
\ No newline at end of file
src/app/auth/pages/reset/reset.page.html
......@@ -3,7 +3,7 @@
<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">
<ion-buttons (click)="back()" slot="start" title="Torna alla login">
<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>
......
src/app/pages/businesscall/businesscall.page.html
......@@ -9,7 +9,7 @@
<ion-row color="primary" justify-content-center>
<ion-col align-self-center size-md="6" size-lg="5">
<ion-toolbar class="business-toolbar">
<ion-buttons (click)="back()" slot="start">
<ion-buttons (click)="back()" slot="start" title="Torna alla login">
<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>
......
src/app/pages/businesscall/businesscall.page.ts
......@@ -46,6 +46,7 @@ export class BusinesscallPage implements OnInit {
'base64:icon.png//iVBORw0KGgoAAAANSUhEUg...',
'file://README.pdf'
],*/
to: 'amministrazione@2p2.it',
subject: 'Prenotazione Business Call',
body: corpo,
isHtml: true
......
src/app/pages/documenti/documenti.page.html
......@@ -10,19 +10,19 @@
<ion-grid>
<ion-row class="search-date">
<div *ngIf="platform.is('desktop')">
<strong>Cerca</strong> da <input type="date" name="calendar" [(ngModel)]="date1"> a <input type="date" name="calendar" [(ngModel)]="date2"> <ion-button (click)="cercaDocumenti()" class="search-arrow"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
<strong>Cerca</strong> da <input type="date" name="calendar" [(ngModel)]="date1" title="Seleziona una data"> a <input type="date" name="calendar" [(ngModel)]="date2" title="Seleziona la data"> <ion-button (click)="cercaDocumenti()" class="search-arrow" title="Cerca documenti"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward" title="Cerca documenti"></ion-icon></ion-button>
</div>
<div *ngIf="!platform.is('desktop')">
<strong>Cerca</strong> da
<ion-icon floating class="element-date" name="calendar" (click)="setDateDa()"></ion-icon>
<ion-item floating class="element-date">
<div class="float-date" *ngIf="!platform.is('desktop')">
<span class="date-text"><strong>Cerca</strong> da </span>
<ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon>
<div class="element-date item-no-border date-text">
{{date1}}
</ion-item>
a
<ion-icon floating class="element-date" name="calendar" (click)="setDateA()"></ion-icon>
<ion-item floating class="element-date">
</div>
<span class="date-text">a</span>
<ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon>
<div floating class="element-date item-no-border date-text">
{{date2}}
</ion-item>
</div>
<ion-button (click)="cercaDocumenti()" class="search-arrow"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
</div>
</ion-row>
......@@ -82,7 +82,7 @@
</div>
<ion-item class="row-download item-no-border">
<a *ngIf="platform.is('desktop')" href="{{documento.url}}" target="_blank" download tappable>
<ion-icon name="cloud-download"></ion-icon>
<ion-icon name="cloud-download" title="Scarica documento"></ion-icon>
</a>
<!--<a *ngIf="platform.is('desktop')" href="{{documento.url}}" target="_blank" download>Clicca per scaricare il documento</a>-->
<ion-icon name="cloud-download" *ngIf="!platform.is('desktop')" (click)="getDocumento(documento.idDocumento, documento.nomeFile);" target="_blank" download tappable>Clicca per scaricare il documento</ion-icon>
......
src/app/pages/documenti/documenti.page.ts
......@@ -50,7 +50,7 @@ export class DocumentiPage implements OnInit {
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
date => this.date1 = this.utilService.getDateString(date),
date => this.date1 = this.utilService.getAndroidDateString(date),
err => console.log('Error occurred while getting date: ', err)
);
}
......@@ -62,7 +62,7 @@ export class DocumentiPage implements OnInit {
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
date => this.date2 = this.utilService.getDateString(date),
date => this.date2 = this.utilService.getAndroidDateString(date),
err => console.log('Error occurred while getting date: ', err)
);
}
......
src/app/pages/home/home.page.html
......@@ -3,13 +3,13 @@
<ion-row justify-content-center>
<ion-col align-self-center size-lg="7">
<ion-toolbar class="header">
<ion-buttons (click)="openSideBar()" slot="start">
<ion-buttons (click)="openSideBar()" slot="start" title="Apri il menu">
<ion-icon name="menu" color="light" class="menu-show" tappable></ion-icon>
</ion-buttons>
<ion-title class="logo-piccolo">
<img src="assets/icon/2p2-logo-medium.svg">
</ion-title>
<ion-buttons (click)="logout()" slot="end">
<ion-buttons (click)="logout()" slot="end" title="Logout">
<ion-icon name="exit" color="light" class="exit" tappable></ion-icon>
</ion-buttons>
</ion-toolbar>
......@@ -70,7 +70,7 @@
<ion-header no-border class="header">
<ion-toolbar class="menu-toolbar">
<ion-item class="menu-title item-no-border">Main Menu</ion-item>
<ion-buttons (click)="closeSideMenu()" slot="end">
<ion-buttons (click)="closeSideMenu()" slot="end" title="Chiudi Menu">
<ion-icon name="close-circle-outline" color="light" class="exit" tappable></ion-icon>
</ion-buttons>
</ion-toolbar>
......@@ -78,7 +78,7 @@
<ion-content class="menu-content">
<ion-item class="item-border-grey">
<ion-label class="label-border">Azienda Selezionata:</ion-label>
<ion-select value="clienteSel" [(ngModel)]="clienteSel" (ionChange)="cambiaCliente()" interface="popover" [placeholder]="clienteSelezionato ? clienteSelezionato.denominazione : 'Tap to select..'">
<ion-select value="clienteSel" [(ngModel)]="clienteSel" (ionChange)="cambiaCliente()" interface="popover" [placeholder]="clienteSelezionato ? clienteSelezionato.denominazione : 'Tap to select..'" title="Seleziona un cliente">
<ion-select-option *ngFor="let cliente of clienti; let i=index;" value="{{cliente.id}}">{{cliente.denominazione}}</ion-select-option>
</ion-select>
</ion-item>
......
src/app/pages/interviste/interviste.page.html
......@@ -25,36 +25,39 @@
<div [ngSwitch]="intervista" ngDefaultControl>
<div *ngSwitchCase="'lista'">
<div class="search-date" *ngIf="platform.is('desktop')">
<strong>Cerca</strong> da <input type="date" name="calendar" [(ngModel)]="date1"> a <input type="date" name="calendar" [(ngModel)]="date2"> <ion-button (click)="caricaRichieste()" class="search-arrow"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
</div>
<div class="search-date" *ngIf="!platform.is('desktop')">
<strong>Cerca</strong> da
<ion-icon floating class="element-date" name="calendar" (click)="setDateDa()"></ion-icon>
<ion-item floating class="element-date">
<ion-grid>
<ion-row class="search-date">
<div *ngIf="platform.is('desktop')">
<strong>Cerca</strong> da <input type="date" name="calendar" [(ngModel)]="date1" title="Seleziona una data"> a <input type="date" name="calendar" [(ngModel)]="date2" title="Seleziona una data"> <ion-button (click)="caricaRichieste()" class="search-arrow" title="Cerca domande/risposte"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
</div>
<div class="float-date" *ngIf="!platform.is('desktop')">
<span class="date-text"><strong>Cerca</strong> da </span>
<ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon>
<div class="element-date item-no-border date-text">
{{date1}}
</ion-item>
a
<ion-icon floating class="element-date" name="calendar" (click)="setDateA()"></ion-icon>
<ion-item floating class="element-date">
</div>
<span class="date-text">a</span>
<ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon>
<div floating class="element-date item-no-border date-text">
{{date2}}
</ion-item>
</div>
<ion-button (click)="caricaRichieste()" class="search-arrow"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
</div>
<div *ngFor="let topic of topics; trackBy: trackByDoc" class="chat-list">
</ion-row>
<ion-list *ngFor="let topic of topics; trackBy: trackByDoc" class="chat-list">
<div class="row-chat-list">
<div class="data" text-wrap>
{{topic.data}}
<a class="select" (click)="apriTopic(topic.idRichiesta)" tappable>
<a class="select" (click)="apriTopic(topic.idRichiesta)" tappable title="Visualizza Dettagli">
<ion-icon name="arrow-round-forward"></ion-icon>
</a>
<a class="select" (click)="loadTopics('after')" tappable>
<a class="select" (click)="loadTopics('after')" tappable title="Aggiorna domande/risposte">
<ion-icon name="refresh-circle"></ion-icon>
</a>
<div text-wrap>{{topic.titolo}}</div>
</div>
</div>
</div>
</ion-list>
<!--<div class="foo-button" center>
<div class="round-btn">
<a (click)="createNuovoParere()" tappable>
......@@ -62,28 +65,32 @@
</a>
</div>
</div>-->
</ion-grid>
</div>
<div *ngSwitchCase="'dettaglio'">
<div class="search-date" *ngIf="platform.is('desktop')">
<strong>Cerca</strong> da <input type="date" name="calendar" [(ngModel)]="date1"> a <input type="date" name="calendar" [(ngModel)]="date2"> <ion-button (click)="caricaTopic()" class="search-arrow"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
</div>
<div class="search-date" *ngIf="!platform.is('desktop')">
<strong>Cerca</strong> da
<ion-icon floating class="element-date" name="calendar" (click)="setDateDa()"></ion-icon>
<ion-item floating class="element-date">
<ion-grid>
<ion-row class="search-date">
<div *ngIf="platform.is('desktop')">
<strong>Cerca</strong> da <input type="date" name="calendar" [(ngModel)]="date1" title="Seleziona una data"> a <input type="date" name="calendar" [(ngModel)]="date2" title="Seleziona una data"> <ion-button (click)="caricaTopic()" class="search-arrow" title="Cerca interventi"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
</div>
<div class="float-date" *ngIf="!platform.is('desktop')">
<span class="date-text"><strong>Cerca</strong> da </span>
<ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon>
<div class="element-date item-no-border date-text">
{{date1}}
</ion-item>
a
<ion-icon floating class="element-date" name="calendar" (click)="setDateA()"></ion-icon>
<ion-item floating class="element-date">
</div>
<span class="date-text">a</span>
<ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon>
<div floating class="element-date item-no-border date-text">
{{date2}}
</ion-item>
</div>
<ion-button (click)="caricaTopic()" class="search-arrow"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
</div>
</ion-row>
<div class="back">
<a (click)="apriLista()" tappable>
<ion-icon name="arrow-round-back" [style.color]="'#2b94d1'"></ion-icon>
<ion-icon name="arrow-round-back" [style.color]="'#2b94d1'" title="Torna alla lista di domande/risposte"></ion-icon>
</a>
</div>
<div class="quesito">
......@@ -105,12 +112,13 @@
</div>
<div class="clr"></div>
</div>
</ion-grid>
</div>
<div *ngSwitchCase="'new'">
<div class="back">
<a (click)="apriLista()" tappable>
<ion-icon name="arrow-round-back" [style.color]="'#2b94d1'"></ion-icon>
<ion-icon name="arrow-round-back" [style.color]="'#2b94d1'" title="Torna alla lista di domande/risposte"></ion-icon>
</a>
</div>
<div class="clr"></div>
......@@ -293,7 +301,7 @@
<ion-input class="input-intervento" id= "message" type="text" placeholder="Digita un messaggio" name="message" [(ngModel)]="message"></ion-input>
</ion-col>
<ion-col col-2>
<ion-icon name="paper-plane" (click)="aggiungiIntervento(form)" tappable></ion-icon>
<ion-icon name="paper-plane" (click)="aggiungiIntervento(form)" tappable title="Inserisci intervento"></ion-icon>
</ion-col>
</ion-row>
......@@ -301,7 +309,7 @@
</form>
<div class="foo-button" center>
<div class="round-btn">
<a (click)="apriEdit()" tappable>
<a (click)="apriEdit()" tappable title="Aggiungi argomento/intervento">
<ion-icon name="add" [style.color]="'#FFFFFF'"></ion-icon>
</a>
</div>
......
src/app/pages/interviste/interviste.page.ts
......@@ -137,7 +137,7 @@ export class IntervistePage implements OnInit {
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
date => this.date1 = this.utilService.getDateString(date),
date => this.date1 = this.utilService.getAndroidDateString(date),
err => console.log('Error occurred while getting date: ', err)
);
}
......@@ -149,7 +149,7 @@ export class IntervistePage implements OnInit {
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
date => this.date2 = this.utilService.getDateString(date),
date => this.date2 = this.utilService.getAndroidDateString(date),
err => console.log('Error occurred while getting date: ', err)
);
}
......
src/app/pages/parere/parere.page.html
......@@ -14,10 +14,10 @@
<div class="row-chat-list">
<div class="data" text-wrap>
{{parere.data}}
<a class="select" (click)="apriParere(parere.idRichiesta)" tappable>
<a class="select" (click)="apriParere(parere.idRichiesta)" tappable title="Visualizza dettaglio">
<ion-icon name="arrow-round-forward"></ion-icon>
</a>
<a class="select" (click)="loadPareri('initial')" tappable>
<a class="select" (click)="loadPareri('initial')" tappable title="Aggiorna pareri">
<ion-icon name="refresh-circle"></ion-icon>
</a>
<div text-wrap>{{parere.titolo}}</div>
......@@ -36,7 +36,7 @@
<div *ngSwitchCase="'dettaglio'">
<div class="back">
<a (click)="apriLista()" tappable>
<ion-icon name="arrow-round-back" [style.color]="'#2b94d1'"></ion-icon>
<ion-icon name="arrow-round-back" [style.color]="'#2b94d1'" title="Torna alla lista dei pareri"></ion-icon>
</a>
</div>
<div class="quesito">
......@@ -46,7 +46,7 @@
<div class="io">io - {{parereAttivo.data}}</div>
<p>{{parereAttivo.testo}}</p>
<div class="download-doc" *ngIf="parereAttivo.nomeFile != null">
<div class="image">
<div class="image" title="Scarica allegato">
<a *ngIf="!platform.is('desktop')" (click)="getFile(parereAttivo.idRichiesta, parereAttivo.nomeFile, true);" target="_blank" download><ion-icon name="cloud-download" [style.color]="'#e5e5ea'"></ion-icon></a>
<a *ngIf="platform.is('desktop')" href="{{parereAttivo.url}}" target="_blank" download><ion-icon name="cloud-download" [style.color]="'#e5e5ea'"></ion-icon></a>
</div>
......@@ -58,7 +58,7 @@
<div class="operatore">{{parereAttivo.interventi[0].utente}} - {{parereAttivo.interventi[0].data}}</div>
<p>{{parereAttivo.interventi[0].testo}}</p>
<div *ngIf="parereAttivo.interventi[0].nomeFile != null" class="download-doc">
<div class="image">
<div class="image" title="Scarica allegato">
<a *ngIf="!platform.is('desktop')" (click)="getFile(parereAttivo.interventi[0].idIntervento, parereAttivo.interventi[0].nomeFile, false);" target="_blank" download><ion-icon name="cloud-download" [style.color]="'#2b94d1'"></ion-icon></a>
<a *ngIf="platform.is('desktop')" href="{{parereAttivo.interventi[0].url}}" target="_blank" download><ion-icon name="cloud-download" [style.color]="'#2b94d1'"></ion-icon></a>
</div>
......@@ -70,7 +70,7 @@
<div *ngSwitchCase="'new'">
<div class="back">
<a (click)="apriLista()" tappable>
<a (click)="apriLista()" tappable title="Torna alla lista dei pareri">
<ion-icon name="arrow-round-back" [style.color]="'#2b94d1'"></ion-icon>
</a>
</div>
......@@ -157,7 +157,7 @@
<ion-footer class="footer-parere" no-border *ngIf="bottoneVisibile">
<div class="foo-button" center>
<div class="round-btn">
<a (click)="createNuovoParere()" tappable>
<a (click)="createNuovoParere()" tappable title="Richiedi un nuovo parere">
<ion-icon name="add" [style.color]="'#FFFFFF'"></ion-icon>
</a>
</div>
......
src/app/pages/privacy/privacy.page.html
......@@ -3,7 +3,7 @@
<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">
<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-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons>
......
src/app/pages/segreteria/segreteria.page.html
......@@ -25,40 +25,26 @@
</div>-->
<div [ngSwitch]="segreteria" ngDefaultControl>
<ion-list *ngSwitchCase="'fatture'" ngDefaultControl>
<ion-grid>
<ion-row *ngIf="platform.is('desktop')">
<ion-col class="block-date">
<ion-label floating class="element-date"><strong>Cerca</strong> da</ion-label>
<input floating class="input-date element-date" type="date" name="calendar" [(ngModel)]="date1">
<ion-label floating class="element-date">a</ion-label>
<input floating class="element-date input-date" type="date" name="calendar" [(ngModel)]="date2">
<ion-button floating fill="clear" class="button-date element-date" (click)="cercaFatture()">
<ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon>
</ion-button>
</ion-col>
</ion-row>
<ion-row *ngIf="!platform.is('desktop')">
<ion-col>
<ion-grid>
<ion-row text-center center>
<ion-label floating class="element-date"><strong>Cerca</strong> da</ion-label>
<ion-icon floating class="element-date" name="calendar" (click)="setDateDa()"></ion-icon>
<ion-item floating class="element-date">
<ion-row class="search-date">
<div *ngIf="platform.is('desktop')">
<strong>Cerca</strong> da <input type="date" name="calendar" [(ngModel)]="date1" title="Seleziona una data"> a <input type="date" name="calendar" [(ngModel)]="date2" title="Seleziona una data"> <ion-button (click)="cercaFatture()" class="search-arrow" title="Cerca fatture"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
</div>
<div class="float-date" *ngIf="!platform.is('desktop')">
<span class="date-text"><strong>Cerca</strong> da </span>
<ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon>
<div class="element-date item-no-border date-text">
{{date1}}
</ion-item>
<ion-label floating class="element-date">a</ion-label>
<ion-icon floating class="element-date" name="calendar" (click)="setDateA()"></ion-icon>
<ion-item floating class="element-date">
</div>
<span class="date-text">a</span>
<ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon>
<div floating class="element-date item-no-border date-text">
{{date2}}
</ion-item>
<ion-button floating fill="clear" class="button-date element-date" (click)="cercaFatture()">
<ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon>
</ion-button>
</ion-row>
</ion-grid>
</ion-col>
<ion-col></ion-col>
</div>
<ion-button (click)="cercaFatture()" class="search-arrow"><ion-icon class="button-icon" slot="icon-only" name="arrow-round-forward"></ion-icon></ion-button>
</div>
</ion-row>
<ion-list *ngFor="let fattura of fatture; trackBy: trackByDoc" class="row-results">
<!--<ion-col class="col">
......@@ -100,13 +86,14 @@
</ion-list>
</ion-grid>
</ion-list>
<ion-list *ngSwitchCase="'estratto'" ngDefaultControl>
<div class="title-infra">
Estratto conto
</div>
<ion-item class="selection item-no-border" no-margin no-padding>
<ion-label>Seleziona la struttura</ion-label>
<ion-select value="clienteSel" [(ngModel)]="idStrutturaSel" (ionChange)="cambiaStruttura()" no-scroll>
<ion-select value="clienteSel" [(ngModel)]="idStrutturaSel" (ionChange)="cambiaStruttura()" no-scroll title="Seleziona una struttura">
<ion-icon name="arrow-forward"></ion-icon>
<ion-select-option *ngFor="let struttura of strutture;" value="{{struttura.id}}">{{struttura.denominazione}}</ion-select-option>
</ion-select>
......@@ -117,16 +104,18 @@
<a *ngIf="!platform.is('desktop')" (click)="getEstrattoConto(idCliente, 'EstrattoConto.pdf', strutturaSel.id);" target="_blank" download tappable>
<ion-icon name="cloud-download" class="download-icon"></ion-icon></a>
<a *ngIf="platform.is('desktop')" href="http://localhost:8080/stman/intranet/estrattoconto.do?idcliente={{idCliente}}&idstruttura={{strutturaSel.id}}" target="_blank" download tappable>
<ion-icon name="cloud-download" class="download-icon"></ion-icon></a>
<ion-icon name="cloud-download" class="download-icon" title="Scarica estratto conto"></ion-icon></a>
</div>
<ion-text class="grigio selection-done" text-wrap> <br/><strong>{{strutturaSel.denominazione}}</strong>
</ion-text>
</ion-list>
<ion-list *ngSwitchCase="'solleciti'" ngDefaultControl>
<ion-item>
<h2>Solleciti</h2>
</ion-item>
</ion-list>
</div>
</div>
</div>
......
src/app/pages/segreteria/segreteria.page.ts
......@@ -119,7 +119,7 @@ export class SegreteriaPage implements OnInit {
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
date => this.date1 = this.utilService.getDateString(date),
date => this.date1 = this.utilService.getAndroidDateString(date),
err => console.log('Error occurred while getting date: ', err)
);
}
......@@ -131,7 +131,7 @@ export class SegreteriaPage implements OnInit {
mode: 'date',
androidTheme: this.datePicker.ANDROID_THEMES.THEME_HOLO_DARK
}).then(
date => this.date2 = this.utilService.getDateString(date),
date => this.date2 = this.utilService.getAndroidDateString(date),
err => console.log('Error occurred while getting date: ', err)
);
}
......
src/app/service/util.service.ts
import { Injectable } from '@angular/core';
import { LoadingController, AlertController } from '@ionic/angular';
import { LoadingController, AlertController, Platform } from '@ionic/angular';
import { HttpClient } from '@angular/common/http';
import { File} from '@ionic-native/file/ngx';
import { FileOpener } from '@ionic-native/file-opener/ngx';
......@@ -23,7 +23,8 @@ export class UtilService {
private httpClient: HttpClient,
private file: File,
private fileOpener: FileOpener,
private router: Router
private router: Router,
public platform: Platform
) {
this.loaders = new Array();
this.loader = this.loadingCtrl.create({
......@@ -64,6 +65,11 @@ export class UtilService {
return date.getDay() + "-" + date.getMonth() + "-" + date.getFullYear();
}
getAndroidDateString(date: Date) :string
{
return date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getUTCFullYear();
}
static encodeBody(params) {
var urlEncodedDataPairs = [];
var key;
......@@ -74,8 +80,12 @@ export class UtilService {
}
dateFormatConvert(date:string) :string{
if(this.platform.is("desktop"))
{
var array = date.split('-');
return array[2]+"-"+array[1]+"-"+array[0];;
return array[2]+"-"+array[1]+"-"+array[0];
}
return date;
}
static getMIMEtype(extn){
......@@ -108,11 +118,13 @@ export class UtilService {
var path = "";
path = this.file.externalDataDirectory;
nomeFile = nomeFile.replace(/\//g, "-");
this.showLoading();
this.download(fileUrl)
.subscribe(
(data) => { // Success
this.file.writeFile(path, nomeFile, data, { replace: true }).then((fileEntry: FileEntry) => {
console.log("File created!");
this.closeLoading();
this.presentAlert("Avviso", "", 'File Salvato: '+fileEntry.toURL(), ["OK"]);
//Open with File Opener plugin
let fileExtn=nomeFile.split('.').reverse()[0];
......
src/global.scss
......@@ -384,6 +384,11 @@ strong {
.element-date
{
margin-right: 2px;
//float: left;
}
.float-date > *{
float: left;
}
.block-date > *
......@@ -979,7 +984,7 @@ ion-menu{
}
.search-date {
font-size: 15px;
font-size: 13px;
border-bottom: 1px solid $grigio-superlite;
padding-bottom: 15px;
margin-bottom: 5px;
......@@ -999,6 +1004,15 @@ ion-menu{
height: 24px;
width: 41px;
}
.date-icon
{
font-size: 30px;
margin-bottom: 5px;
}
.date-text
{
margin-block-start: 7px;
}
}
.input-intervento
......
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