Skip to content

I
Intranet
Commit e230c8fe by Matteo
Options

Aggiunti bottone reset date e versione grafica interviste

parent e8ad702c
Showing with 117 additions and 61 deletions
config.xml
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="it.aimconsulting.intranet.app" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="it.aimconsulting.intranet" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Intranet</name> <name>Intranet</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author> <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
......
src/app/pages/documenti/documenti.page.html
...@@ -21,20 +21,25 @@ ...@@ -21,20 +21,25 @@
<div class="central-doc grigio"> <div class="central-doc grigio">
<ion-grid> <ion-grid>
<ion-row class="search-date"> <ion-row class="search-date">
<div *ngIf="platform.is('desktop')"> <div class="search-date" *ngIf="platform.is('desktop')">
<strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} <input type="date" name="calendar" [(ngModel)]="date1" title="{{ 'seleziona_data' | translate }}"> {{ 'a' | translate }} <input type="date" name="calendar" [(ngModel)]="date2" title="{{ 'seleziona_data' | translate }}"> <span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} <input type="date" name="calendar" [(ngModel)]="date1" title="{{ 'seleziona_data' | translate }}"> {{ 'a' | translate }} <input type="date" name="calendar" [(ngModel)]="date2" title="{{ 'seleziona_data' | translate }}">
<ion-button (click)="resetDate()" class="search-arrow-red" title="{{ 'reset_documenti' | translate }}"><ion-icon class="button-icon" slot="icon-only" name="close" title="{{ 'cerca_documenti' | translate }}"></ion-icon></ion-button></span>
</div> </div>
<ion-row class="float-date" *ngIf="!platform.is('desktop')"> <ion-row class="search-date" *ngIf="!platform.is('desktop')">
<span class="date-text"><strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} </span> <span class="riga">
<ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon> <span class="float-date">
<div class="element-date item-no-border date-text"> <span class="date-text"><strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} </span>
{{date1}} <ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon>
</div> <div class="element-date item-no-border date-text">
<span class="date-text">{{ 'a' | translate }}</span> {{date1}}
<ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon> </div>
<div floating class="element-date item-no-border date-text"> <span class="date-text">{{ 'a' | translate }}</span>
{{date2}} <ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon>
</div> <div floating class="element-date item-no-border date-text">
{{date2}}
</div>
</span>
<ion-button (click)="resetDate()" class="search-arrow-red search-arrow-dev" title="{{ 'reset_documenti' | translate }}"><ion-icon class="button-icon" slot="icon-only" name="close" title="{{ 'cerca_documenti' | translate }}"></ion-icon></ion-button></span>
</ion-row> </ion-row>
</ion-row> </ion-row>
<ion-row class="search-date"> <ion-row class="search-date">
......
src/app/pages/documenti/documenti.page.ts
...@@ -150,7 +150,11 @@ export class DocumentiPage implements OnInit { ...@@ -150,7 +150,11 @@ export class DocumentiPage implements OnInit {
if(!documento.checked && documento.idDocumento == this.documentoId) this.showButtons(); if(!documento.checked && documento.idDocumento == this.documentoId) this.showButtons();
} }
resetDate()
{
this.date1 = "";
this.date2 = "";
}
showButtons() showButtons()
{ {
......
src/app/pages/interviste/interviste.page.html
...@@ -27,26 +27,31 @@ ...@@ -27,26 +27,31 @@
<div *ngSwitchCase="'lista'"> <div *ngSwitchCase="'lista'">
<ion-grid> <ion-grid>
<ion-row class="search-date"> <ion-row class="search-date">
<div *ngIf="platform.is('desktop')" class="grigio"> <div *ngIf="platform.is('desktop')" class="grigio all-row">
<strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} <input type="date" name="calendar" [(ngModel)]="date1" title="{{ 'seleziona_data' | translate }}"> {{ 'a' | translate }} <input type="date" name="calendar" [(ngModel)]="date2" title="{{ 'seleziona_data' | translate }}"> <strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} <input type="date" name="calendar" [(ngModel)]="date1" title="{{ 'seleziona_data' | translate }}"> {{ 'a' | translate }} <input type="date" name="calendar" [(ngModel)]="date2" title="{{ 'seleziona_data' | translate }}">
<input type="text" name="calendar" [(ngModel)]="titolo" placeholder="Cerca titolo" title="{{ 'cerca' | translate }}" class="cerca-titolo">
<ion-button (click)="resetDate()" class="search-arrow-red" title="{{ 'reset_documenti' | translate }}"><ion-icon class="button-icon" slot="icon-only" name="close" title="{{ 'cerca_documenti' | translate }}"></ion-icon></ion-button>
</div> </div>
<ion-row class="float-date" *ngIf="!platform.is('desktop')" class="grigio"> <ion-row class="search-date" *ngIf="!platform.is('desktop')">
<span class="date-text"><strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} </span> <span class="riga">
<ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon> <span class="float-date">
<div class="element-date item-no-border date-text"> <span class="date-text"><strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} </span>
{{date1}} <ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon>
</div> <div class="element-date item-no-border date-text">
<span class="date-text">{{ 'a' | translate }}</span> {{date1}}
<ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon> </div>
<div floating class="element-date item-no-border date-text"> <span class="date-text">{{ 'a' | translate }}</span>
{{date2}} <ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon>
</div> <div floating class="element-date item-no-border date-text">
</ion-row> {{date2}}
<div> </div>
<input *ngIf="!platform.is('desktop')" type="text" name="calendar" [(ngModel)]="titolo" placeholder="Cerca titolo" title="{{ 'cerca' | translate }}" class="cerca-titolo-cel"> </span>
<input *ngIf="platform.is('desktop')" type="text" name="calendar" [(ngModel)]="titolo" placeholder="Cerca titolo" title="{{ 'cerca' | translate }}" class="cerca-titolo"> <ion-button (click)="resetDate()" class="search-arrow-red search-arrow-dev" title="{{ 'reset_documenti' | translate }}"><ion-icon class="button-icon" slot="icon-only" name="close" title="{{ 'cerca_documenti' | translate }}"></ion-icon></ion-button></span>
</div> </ion-row>
</ion-row> </ion-row>
<div *ngIf="!platform.is('desktop')">
<input type="text" name="calendar" [(ngModel)]="titolo" placeholder="Cerca titolo" title="{{ 'cerca' | translate }}" class="cerca-titolo-cel">
</div>
<ion-row class="date-div"> <ion-row class="date-div">
<div class="search-date float-date riga"> <div class="search-date float-date riga">
<ion-checkbox name="privacy" [(ngModel)]="archiviati" class="check"> </ion-checkbox> <ion-checkbox name="privacy" [(ngModel)]="archiviati" class="check"> </ion-checkbox>
...@@ -71,25 +76,25 @@ ...@@ -71,25 +76,25 @@
(press)="selectItem(topic.idRichiesta)" [ngStyle]="{'background-color': topic.checked ? '#c3ddec' : '#ffffff'}"> (press)="selectItem(topic.idRichiesta)" [ngStyle]="{'background-color': topic.checked ? '#c3ddec' : '#ffffff'}">
<ion-checkbox name="privacy" [(ngModel)]="topic.checked" class="check" (click)="checkSelected(topic.idRichiesta)"> </ion-checkbox> <ion-checkbox name="privacy" [(ngModel)]="topic.checked" class="check" (click)="checkSelected(topic.idRichiesta)"> </ion-checkbox>
<div class="table-row"> <div class="table-row">
<div class="row-download-special">
<div class="group-icon">
<ion-icon name="arrow-round-forward" (click)="apriTopic(topic.idRichiesta)" tappable title="{{ 'visualizza_dettagli' | translate }}"></ion-icon>
<ion-label>{{ 'apri' | translate }}</ion-label>
</div>
<div class="group-icon" >
<ion-icon name="refresh-circle" (click)="loadTopics('after')" tappable title="{{ 'aggiorna' | translate }}"></ion-icon>
<ion-label>{{ 'refresh' | translate }}</ion-label>
</div>
</div>
<div class="row-text data" text-wrap> <div class="row-text data" text-wrap>
{{topic.data}} {{topic.data}}
<div text-wrap>{{topic.titolo}}</div> <div text-wrap>{{topic.titolo}}</div>
</div> </div>
<div class="richieste-button group-icon2 row-download-special">
<div class="group-icon2"><!--<a class="select" (click)="apriTopic(topic.idRichiesta)" tappable title="{{ 'visualizza_dettagli' | translate }}">-->
<ion-icon name="arrow-round-forward" (click)="apriTopic(topic.idRichiesta)" tappable title="{{ 'visualizza_dettagli' | translate }}"></ion-icon> </div>
<ion-label>{{ 'apri' | translate }}</ion-label>
<!--</a>--></div>
<!--<ion-label>{{ 'apri' | translate }}</ion-label>-->
</div>
<div class="richieste-button group-icon3 row-download-special">
<div class="group-icon3"><!--<a class="select" (click)="loadTopics('after')" tappable title="{{ 'aggiorna' | translate }}">-->
<ion-icon name="refresh-circle" (click)="loadTopics('after')" tappable title="{{ 'aggiorna' | translate }}"></ion-icon>
<ion-label>{{ 'refresh' | translate }}</ion-label>
<!--</a>--></div>
<!--<ion-label>{{ 'refresh' | translate }}</ion-label>-->
</div>
</div>
</ion-list> </ion-list>
<!--<ion-list *ngFor="let topic of topics; trackBy: trackByDoc" class="chat-list table-row">--> <!--<ion-list *ngFor="let topic of topics; trackBy: trackByDoc" class="chat-list table-row">-->
<!--<ion-checkbox name="privacy" [(ngModel)]="topic.checked" class="check" (click)="checkSelected(topic.idRichiesta)"> </ion-checkbox> <!--<ion-checkbox name="privacy" [(ngModel)]="topic.checked" class="check" (click)="checkSelected(topic.idRichiesta)"> </ion-checkbox>
......
src/app/pages/interviste/interviste.page.ts
...@@ -76,6 +76,12 @@ export class IntervistePage implements OnInit { ...@@ -76,6 +76,12 @@ export class IntervistePage implements OnInit {
archiviati: boolean; archiviati: boolean;
titolo: string; titolo: string;
resetDate()
{
this.date1 = "";
this.date2 = "";
}
initPage() initPage()
{ {
var interventi = new Array(); var interventi = new Array();
......
src/app/pages/segreteria/segreteria.page.html
...@@ -62,20 +62,25 @@ ...@@ -62,20 +62,25 @@
</div> </div>
</ion-row> </ion-row>
<ion-row class="search-date"> <ion-row class="search-date">
<div *ngIf="platform.is('desktop')" class="grigio"> <div *ngIf="platform.is('desktop')" class="search-date grigio">
<strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} <input type="date" name="calendar" [(ngModel)]="date1" title="{{ 'seleziona_data' | translate }}" class="grigio"> {{ 'a' | translate }} <input type="date" name="calendar" [(ngModel)]="date2" title="{{ 'seleziona_data' | translate }}" class="grigio"> <span class="riga"><strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} <input type="date" name="calendar" [(ngModel)]="date1" title="{{ 'seleziona_data' | translate }}" class="grigio"> {{ 'a' | translate }} <input type="date" name="calendar" [(ngModel)]="date2" title="{{ 'seleziona_data' | translate }}" class="grigio">
<ion-button (click)="resetDate()" class="search-arrow-red" title="{{ 'reset_documenti' | translate }}"><ion-icon class="button-icon" slot="icon-only" name="close" title="{{ 'cerca_documenti' | translate }}"></ion-icon></ion-button></span>
</div> </div>
<ion-row class="float-date" *ngIf="!platform.is('desktop')" class="grigio"> <ion-row *ngIf="!platform.is('desktop')" class=" search-date grigio">
<span class="date-text"><strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} </span> <span class="riga">
<ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon> <span class="float-date">
<div class="element-date item-no-border date-text"> <span class="date-text"><strong>{{ 'cerca' | translate }}</strong> {{ 'da' | translate }} </span>
{{date1}} <ion-icon class="element-date date-icon" name="calendar" (click)="setDateDa()"></ion-icon>
</div> <div class="element-date item-no-border date-text">
<span class="date-text">{{ 'a' | translate }}</span> {{date1}}
<ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon> </div>
<div floating class="element-date item-no-border date-text"> <span class="date-text">{{ 'a' | translate }}</span>
{{date2}} <ion-icon floating class="element-date date-icon" name="calendar" (click)="setDateA()"></ion-icon>
</div> <div floating class="element-date item-no-border date-text">
{{date2}}
</div>
</span>
<ion-button (click)="resetDate()" class="search-arrow-red search-arrow-dev" title="{{ 'reset_documenti' | translate }}"><ion-icon class="button-icon" slot="icon-only" name="close" title="{{ 'cerca_documenti' | translate }}"></ion-icon></ion-button></span>
</ion-row> </ion-row>
</ion-row> </ion-row>
<ion-row class="search-date"> <ion-row class="search-date">
......
src/app/pages/segreteria/segreteria.page.ts
...@@ -288,6 +288,12 @@ export class SegreteriaPage implements OnInit { ...@@ -288,6 +288,12 @@ export class SegreteriaPage implements OnInit {
); );
} }
resetDate()
{
this.date1 = "";
this.date2 = "";
}
getNotula(idNotula, nomeFile, isProgNotula) getNotula(idNotula, nomeFile, isProgNotula)
{ {
var tipo = ""; var tipo = "";
......
src/assets/i18n/it.json
...@@ -101,5 +101,6 @@ ...@@ -101,5 +101,6 @@
"apri":"Apri", "apri":"Apri",
"vedi_documento":"Visualizza Documento", "vedi_documento":"Visualizza Documento",
"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"
} }
\ No newline at end of file
src/global.scss
...@@ -1122,6 +1122,11 @@ ion-menu{ ...@@ -1122,6 +1122,11 @@ ion-menu{
clear:both; clear:both;
} }
.all-row
{
width: 100%;
}
.foo-button { .foo-button {
//position: ; //position: ;
bottom: 0; bottom: 0;
...@@ -1235,6 +1240,24 @@ ion-menu{ ...@@ -1235,6 +1240,24 @@ ion-menu{
border-bottom: 1px solid $grigio-superlite; border-bottom: 1px solid $grigio-superlite;
width: 50px; width: 50px;
} }
.search-arrow-red
{
margin-left: 10px;
margin-top: 0px;
background: red;
--background: red;
border: 0px;
height: 24px;
width: 41px;
float: right;
font-size: 0px;
--border-radius:0px;
--box-shadow: 0;
}
.search-arrow-dev
{
margin-top: 5px;
}
.search-arrow { .search-arrow {
margin-left: 10px; margin-left: 10px;
margin-top: 0px; margin-top: 0px;
......
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