Improve responsiveness

This commit is contained in:
Peter Maquiran
2021-04-23 10:35:53 +01:00
parent 53dff7237d
commit 74bc2a3f2f
31 changed files with 712 additions and 92 deletions
+4 -4
View File
@@ -1,10 +1,10 @@
<ion-header class="ion-no-border bg-blue"> <ion-header class="ion-no-border ">
<app-header class="bg-blue"></app-header> <app-header ></app-header>
</ion-header> </ion-header>
<ion-content id="timeline-conteiner agenda-container" class="timeline bg-blue"> <ion-content id="timeline-conteiner agenda-container" class="timeline ">
<div class="d-flex bg-blue container-wrapper"> <div class="d-flex container-wrapper">
<div class="calendar-timeline d-flex flex-column height-100 bg-blue"> <div class="calendar-timeline d-flex flex-column height-100 bg-blue">
<div class="calendar-wrapper"> <div class="calendar-wrapper">
+1 -1
View File
@@ -516,7 +516,7 @@ export class AgendaPage implements OnInit {
this.showLoader = true; this.showLoader = true;
if(window.innerWidth < 1024){ if(window.innerWidth < 800){
this.showTimeline = false; this.showTimeline = false;
@@ -177,45 +177,42 @@
</div> </div>
</div> </div>
<div (click)="getDoc()" class="d-flex container-div width-100 ion-item-container-no-border" >
</div>
<div class="container-div width-100 pb-20">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height width-100">
<ion-textarea placeholder="Detalhes" [(ngModel)]="postEvent.Body.Text" rows="6" cols="20"></ion-textarea>
</div>
</div>
<div hidden class="ion-item-container-no-border">
<ion-label> <ion-label>
<div class="attach-icon"> <div class="attach-icon">
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon> <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
</div> </div>
<div class="attach-document"> <div class="attach-document">
<ion-label>Anexar Documentos</ion-label> <ion-label>Adicionar documentos</ion-label>
</div> </div>
</ion-label> </ion-label>
</div> </div>
</div> <div class="d-flex container-div width-100" *ngFor="let document of loadedEventAttachments" >
<ion-list class="width-100 list">
<ion-item class="width-100">
<ion-label class="width-100">
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.SourceName}}</span>
<span class="app-name" *ngIf="document.ApplicationId == 8"> Correspondencia </span>
<span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
<span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
<span class="close-button text-black" (click)="deleteAttachment(document.Id)" >
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span>
<div hidden> </p>
<ion-item> <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
<ion-label>Documentos Anexados</ion-label>
</ion-item>
<ion-list>
<ion-item>
<ion-label>
<h4 class="attach-title-item">Text</h4>
<p><span class="span-left">Text</span><span class="span-right"> Text </span></p>
</ion-label> </ion-label>
</ion-item> </ion-item>
</ion-list> </ion-list>
</div> </div>
</div>
</ion-item-sliding> </ion-item-sliding>
</div> </div>
@@ -164,3 +164,38 @@
overflow: auto; overflow: auto;
} }
.app-name{
background: #42b9f2;
border-radius: 18px;
text-align: center;
display: flex;
align-items: center;
padding: 0px 5px;
color: white;
font-size: 9pt;
font-weight: 500;
height: 19px;
-webkit-border-radius: 18px;
-moz-border-radius: 18px;
-ms-border-radius: 18px;
-o-border-radius: 18px;
}
.close-button {
display: none;
}
.list:hover {
.app-name {
display: none;
}
.close-button {
display: block !important;
}
}
@@ -1,11 +1,14 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { AlertController, ModalController, NavParams } from '@ionic/angular'; import { AlertController, ModalController, NavParams } from '@ionic/angular';
import { Attachment } from 'src/app/models/attachment.model';
import { EventBody } from 'src/app/models/eventbody.model'; import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service'; import { EventsService } from 'src/app/services/events.service';
import { Event } from '../../../models/event.model'; import { Event } from '../../../models/event.model';
import { AttendeesPage } from '../../events/attendees/attendees.page'; import { AttendeesPage } from '../../events/attendees/attendees.page';
import { SearchPage } from '../../search/search.page';
@Component({ @Component({
selector: 'app-edit-event', selector: 'app-edit-event',
@@ -27,6 +30,7 @@ export class EditEventPage implements OnInit {
minDate: string; minDate: string;
loadedEventAttachments: Attachment[];
taskParticipants: any = []; taskParticipants: any = [];
taskParticipantsCc: any = []; taskParticipantsCc: any = [];
adding: "intervenient" | "CC" = "intervenient"; adding: "intervenient" | "CC" = "intervenient";
@@ -39,12 +43,18 @@ export class EditEventPage implements OnInit {
private navParams: NavParams, private navParams: NavParams,
private eventsService: EventsService, private eventsService: EventsService,
public alertController: AlertController, public alertController: AlertController,
private attachmentsService: AttachmentsService,
) { ) {
this.isEventEdited = false; this.isEventEdited = false;
this.postEvent = this.navParams.get('event'); this.postEvent = this.navParams.get('event');
if(this.postEvent){ if(this.postEvent){
if( this.postEvent.Body){
if(typeof(this.postEvent.Body.Text) == 'string'){
this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, ''); this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
} }
}
}
if(this.postEvent.Attendees == null){ if(this.postEvent.Attendees == null){
this.taskParticipants = [] this.taskParticipants = []
@@ -67,6 +77,8 @@ export class EditEventPage implements OnInit {
this.isRecurring = "Repete"; this.isRecurring = "Repete";
} }
this.profile = this.navParams.get('profile'); this.profile = this.navParams.get('profile');
this.getAttachments(this.postEvent.EventId);
} }
ngOnInit() { ngOnInit() {
@@ -157,4 +169,52 @@ export class EditEventPage implements OnInit {
this.taskParticipantsCc = taskParticipantsCc; this.taskParticipantsCc = taskParticipantsCc;
} }
getAttachments(eventId: string){
this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{
this.loadedEventAttachments = res;
console.log('res', res);
});
}
deleteAttachment(attachmentID: string) {
this.attachmentsService.deleteEventAttachmentById(attachmentID).subscribe(
res=>{
this.loadedEventAttachments = this.loadedEventAttachments.filter(e=> e.Id.toString() != attachmentID);
})
}
async getDoc() {
const modal = await this.modalController.create({
component: SearchPage,
cssClass: 'modal-width-100-width-background modal',
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect'
}
});
await modal.present();
modal.onDidDismiss().then( async (res)=>{
if(res){
const data = res.data;
//data.selected
const DocumentToSave = {
SourceTitle: data.selected.Assunto,
ParentId: this.postEvent.EventId,
Source: '1',
SourceId: data.selected.Id,
ApplicationId: data.selected.ApplicationType.toString(),
Id: '0',
Link: '',
SerialNumber: '',
};
await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{
this.getAttachments(this.postEvent.EventId);
});
}
});
}
} }
@@ -194,26 +194,29 @@
</div> </div>
</div> </div>
<div hidden class="ion-item-container-no-border"> <div class="ion-item-container-no-border" (click)="getDoc()">
<ion-label> <ion-label>
<div class="attach-icon"> <div class="attach-icon">
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon> <ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
</div> </div>
<div class="attach-document"> <div class="attach-document">
<ion-label>Anexar Documentos</ion-label> <ion-label>Adicionar documentos</ion-label>
</div> </div>
</ion-label> </ion-label>
</div> </div>
<div hidden> <div class="list " *ngFor="let document of documents; let i = index" >
<ion-item>
<ion-label>Documentos Anexados</ion-label>
</ion-item>
<ion-list> <ion-list>
<ion-item> <ion-item>
<ion-label> <ion-label>
<h4 class="attach-title-item">Text</h4> <p class="d-flex ion-justify-content-between">
<p><span class="span-left">Text</span><span class="span-right"> Text </span></p> <span class="attach-title-item">{{document.Assunto}}</span>
<span class="app-name">{{document.appName}}</span>
<span class="close-button text-black" (click)="removeAttachment(i)" >
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span>
</p>
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
</ion-label> </ion-label>
</ion-item> </ion-item>
</ion-list> </ion-list>
@@ -1,7 +1,10 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular'; import { ModalController, NavParams } from '@ionic/angular';
import { EventAttachment } from 'src/app/models/attachment.model';
import { EventBody } from 'src/app/models/eventbody.model'; import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model'; import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service'; import { EventsService } from 'src/app/services/events.service';
import { Event } from '../../../models/event.model'; import { Event } from '../../../models/event.model';
import { AttendeesPage } from '../../events/attendees/attendees.page'; import { AttendeesPage } from '../../events/attendees/attendees.page';
@@ -28,10 +31,13 @@ export class NewEventPage implements OnInit {
taskParticipants: any = []; taskParticipants: any = [];
taskParticipantsCc: any = []; taskParticipantsCc: any = [];
documents:SearchDocument[] = [];
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
private navParams: NavParams, private navParams: NavParams,
private eventService: EventsService, private eventService: EventsService,
private attachmentsService: AttachmentsService
) { ) {
this.postEvent = new Event(); this.postEvent = new Event();
this.eventBody = { BodyType : "1", Text : ""}; this.eventBody = { BodyType : "1", Text : ""};
@@ -105,17 +111,42 @@ export class NewEventPage implements OnInit {
close(){ close(){
this.modalController.dismiss(); this.modalController.dismiss();
} }
save(){ async save(){
/* console.log(this.postEvent); /* console.log(this.postEvent);
console.log(this.profile); */ console.log(this.profile); */
if(this.documents.length >= 0) {
this.postEvent.HasAttachments = true;
}
let eventId: string;
if(this.profile=='mdgpr'){ if(this.profile=='mdgpr'){
this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe(); eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise();
} }
else if(this.profile=='pr'){ else if(this.profile=='pr'){
this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe(); eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise();
} }
const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
return {
SourceTitle: e.Assunto,
ParentId: eventId,
Source: '1',
SourceId: e.Id,
ApplicationId: e.ApplicationType.toString(),
Id: '',
Link: '',
SerialNumber: ''
};
});
await DocumentToSave.forEach( async (attachments, i) => {
this.attachmentsService.setEventAttachmentById(attachments).toPromise();
});
this.modalController.dismiss(this.postEvent); this.modalController.dismiss(this.postEvent);
} }
@@ -168,4 +199,30 @@ export class NewEventPage implements OnInit {
this.openAttendees(); this.openAttendees();
} }
async getDoc(){
const modal = await this.modalController.create({
component: SearchPage,
cssClass: 'modal-width-100-width-background modal',
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect'
}
});
await modal.present();
modal.onDidDismiss().then((res)=>{
if(res){
const data = res.data;
this.documents.push(data.selected);
}
});
}
removeAttachment(index: number){
this.documents = this.documents.filter( (e, i) => index != i);
}
} }
@@ -9,6 +9,7 @@ import { Event } from '../../../models/event.model';
import { EditEventPage } from '../edit-event/edit-event.page'; import { EditEventPage } from '../edit-event/edit-event.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
@Component({ @Component({
selector: 'app-view-event', selector: 'app-view-event',
@@ -116,6 +117,20 @@ export class ViewEventPage implements OnInit {
profile: this.profile, profile: this.profile,
}, },
cssClass: 'modal modal-desktop', cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res) => {
console.log(res);
if(res){
setTimeout(() => {
/* this.loadEvent(); */
this.loadEvent()
this.getAttachments();
}, 250);
this.isEventEdited = true;
}
}); });
} }
@@ -162,4 +177,35 @@ export class ViewEventPage implements OnInit {
}); });
} }
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: ExpedientTaskModalPage,
componentProps: {
taskAction: taskAction,
task: task,
profile: this.profile,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then(res=>{
console.log(res['data']);
if(res['data']=='openDiscart'){
console.log('open discart');
// this.distartExpedientModal();
}
});
}
} }
+1 -1
View File
@@ -2,7 +2,7 @@ ion-content{
--background: transparent; --background: transparent;
} }
:host{ :host{
background: #0782c9; // background: #0782c9;
} }
.title-content{ .title-content{
+4 -4
View File
@@ -1,8 +1,8 @@
<ion-header class="ion-no-border "> <ion-header class="ion-no-border ">
<app-header-no-search></app-header-no-search> <app-header-no-search></app-header-no-search>
</ion-header> </ion-header>
<ion-header class="ion-no-border"> <ion-header class="ion-no-border text-white">
<ion-toolbar class="bg-blue">
<ion-label> <ion-label>
<p class="time ion-text-center">{{customDate}}</p> <p class="time ion-text-center">{{customDate}}</p>
</ion-label> </ion-label>
@@ -15,12 +15,12 @@
<div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div> <div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div>
<div *ngIf="currentEvent" class="meeting-description"> "{{currentEvent}}"</div> <div *ngIf="currentEvent" class="meeting-description"> "{{currentEvent}}"</div>
</div> </div>
</ion-toolbar>
</ion-header> </ion-header>
<!-- Default Refresher --> <!-- Default Refresher -->
<ion-content class="main bg-blue" ng-controller="AppController"> <ion-content class="main " ng-controller="AppController">
<ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content> <ion-refresher-content>
</ion-refresher-content> </ion-refresher-content>
+2 -3
View File
@@ -321,8 +321,6 @@ export class EventsPage implements OnInit {
} else { } else {
classs = 'modal modal-desktop showAsideOptions' classs = 'modal modal-desktop showAsideOptions'
} }
/* console.log(this.profile);
console.log(serialNumber); */
const modal = await this.modalController.create({ const modal = await this.modalController.create({
component: ExpedienteDetailPage, component: ExpedienteDetailPage,
@@ -335,7 +333,7 @@ export class EventsPage implements OnInit {
await modal.present(); await modal.present();
modal.onDidDismiss().then((res)=>{ modal.onDidDismiss().then((res)=>{
if(res){ if(res){
console.log(res); /* console.log(res); */
this.RefreshEvents(); this.RefreshEvents();
} }
}); });
@@ -357,6 +355,7 @@ export class EventsPage implements OnInit {
} }
async openExpedientList(){ async openExpedientList(){
let classs; let classs;
if( window.innerWidth <= 800){ if( window.innerWidth <= 800){
classs = 'modal' classs = 'modal'
@@ -63,7 +63,11 @@ export class ExpedientTaskModalPage implements OnInit {
private authService: AuthService) { private authService: AuthService) {
this.user = environment.defaultuser +'@'+ environment.domain; this.user = environment.defaultuser +'@'+ environment.domain;
this.task = this.navParams.get('task'); this.task = this.navParams.get('task');
console.log('task', this.task)
this.taskType = this.navParams.get('taskAction'); this.taskType = this.navParams.get('taskAction');
this.postData = new Despacho(); this.postData = new Despacho();
this.participants = this.participants = new Array(); this.participants = this.participants = new Array();
this.dispatchFolder = { this.dispatchFolder = {
@@ -181,7 +185,7 @@ export class ExpedientTaskModalPage implements OnInit {
} }
async addParticipants(){ async addParticipants(){
console.log('HERES'); /* console.log('HERES'); */
this.adding = "intervenient"; this.adding = "intervenient";
@@ -330,7 +334,7 @@ export class ExpedientTaskModalPage implements OnInit {
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then((res)=>{ modal.onDidDismiss().then((res)=>{
console.log('!refresh list'); /* console.log('!refresh list'); */
}); });
} }
@@ -51,7 +51,7 @@
</ion-list> </ion-list>
</ion-content> </ion-content>
</ion-menu> </ion-menu>
<div class="ion-page" id="main-content"> <div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button> <ion-menu-button></ion-menu-button>
</div> </div>
@@ -85,7 +85,7 @@ export class ExpedienteDetailPage implements OnInit {
"DocId": res.workflowInstanceDataFields.DocId, "DocId": res.workflowInstanceDataFields.DocId,
} }
this.fulltask = res; this.fulltask = res;
console.log(res); console.log('GetTask', res);
let thedate = new Date(this.task.CreateDate); let thedate = new Date(this.task.CreateDate);
this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]);
@@ -7,7 +7,7 @@ ion-content{
--background: transparent; --background: transparent;
} }
:host{ :host{
background: #0782c9; // background: #0782c9;
ion-card-title{ ion-card-title{
text-align: center; text-align: center;
} }
@@ -89,7 +89,6 @@ ion-content{
background:#ecf8ff; background:#ecf8ff;
overflow:auto; overflow:auto;
padding: 0 !important; padding: 0 !important;
margin: 0 !important;
border-top-left-radius: 25px; border-top-left-radius: 25px;
border-top-right-radius: 25px; border-top-right-radius: 25px;
@@ -0,0 +1,226 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="middle">
<ion-label class="title">Novo Evento</ion-label>
</div>
</div>
</div>
</ion-toolbar>
</ion-header>
<ion-content>
<div class="main-content">
<div class="ion-item-container">
<ion-input type="text" placeholder="Assunto" ></ion-input>
</div>
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1">
<ion-input type="text" placeholder="Localização" ></ion-input>
</div>
</div>
<!-- Error messages -->
<!-- <span class="error ion-padding" >
Campo obrigatório
</span> -->
</div>
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1">
<ion-select placeholder="Selecione agenda"
interface="action-sheet" Cancel-text="Cancelar"
required>
<ion-select-option value="Oficial">Oficial</ion-select-option>
<ion-select-option value="Pessoal">Pessoal</ion-select-option>
</ion-select>
</div>
</div>
</div>
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1">
<ion-select placeholder="Selecione tipo"
interface="action-sheet"
Cancel-text="Cancelar" required>
<ion-select-option value="Reunião">Reunião</ion-select-option>
<ion-select-option value="Viagem">Viagem</ion-select-option>
<ion-select-option value="Conferência">Conferência</ion-select-option>
<ion-select-option value="Encontro">Encontro</ion-select-option>
</ion-select>
</div>
</div>
</div>
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1">
<ion-datetime
placeholder="Início"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,15,30,45"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2018"
max="2022"
>
</ion-datetime>
<!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
</div>
</div>
</div>
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1">
<ion-datetime
placeholder="Fim"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,15,30,45"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2018"
max="2022"
>
</ion-datetime>
<!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
</div>
</div>
</div>
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1">
<ion-select placeholder="Selecione repetição" value="false" interface="action-sheet" Cancel-text="Cancelar" required>
<ion-select-option value="false">Não se repete</ion-select-option>
<ion-select-option value="true">Repete</ion-select-option>
</ion-select>
</div>
</div>
</div>
<!-- <div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height flex-grow-1">
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length ==0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
</div>
<div class="add-people" >
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
</div> -->
<!-- <div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height flex-grow-1">
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc.length ==0" class="list-people-title">Com conhecimento</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
</div>
<div class="add-people" >
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
</div>
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height flex-grow-1">
<ion-textarea placeholder="Detalhes" ></ion-textarea>
</div>
</div>
</div> -->
<!-- <div class="ion-item-container-no-border" >
<ion-label>
<div class="attach-icon">
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Adicionar documentos</ion-label>
</div>
</ion-label>
</div>
<div class="list " *ngFor="let document of documents; let i = index" >
<ion-list>
<ion-item>
<ion-label>
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.Assunto}}</span>
<span class="app-name">{{document.appName}}</span>
<span class="close-button text-black" >
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span>
</p>
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
</ion-label>
</ion-item>
</ion-list>
</div> -->
</div>
</ion-content>
<ion-footer class="ion-no-border px-20">
<ion-toolbar class="d-flex justify-space-between">
<ion-buttons slot="start">
<ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
<ion-label>Cancelar</ion-label>
</ion-button>
</ion-buttons>
<ion-title></ion-title>
<ion-buttons slot="end">
<ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Gravar</ion-label>
</ion-button>
</ion-buttons>
</ion-toolbar>
</ion-footer>
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { RequestToAppearComponent } from './request-to-appear.component';
describe('RequestToAppearComponent', () => {
let component: RequestToAppearComponent;
let fixture: ComponentFixture<RequestToAppearComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ RequestToAppearComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(RequestToAppearComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,14 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-request-to-appear',
templateUrl: './request-to-appear.component.html',
styleUrls: ['./request-to-appear.component.scss'],
})
export class RequestToAppearComponent implements OnInit {
constructor() { }
ngOnInit() {}
}
+4 -4
View File
@@ -1,15 +1,15 @@
<ion-content class="bg-blue"> <ion-content class="text-white">
<div class="wrapper"> <div class="wrapper">
<div class="div-logo"> <div class="div-logo">
<img src='assets/images/logo-no-bg.png' alt='logo'> <img src='assets/images/logo-no-bg.png' alt='logo'>
</div> </div>
<h3 class="center">Inicie a sessão</h3> <h3 class="center text-white">Inicie a sessão</h3>
<form class="form"> <form class="form">
<p class="form-label">Nome de utilizador</p> <p class="form-label text-white">Nome de utilizador</p>
<ion-item class="form-input"> <ion-item class="form-input">
<ion-input type="text" [(ngModel)]="username" name="input-username"></ion-input> <ion-input type="text" [(ngModel)]="username" name="input-username"></ion-input>
</ion-item> </ion-item>
<p class="form-label">Palavra-passe</p> <p class="form-label text-white">Palavra-passe</p>
<ion-item class="form-input"> <ion-item class="form-input">
<ion-input type="password" [(ngModel)]="password" name="input-password" ></ion-input> <ion-input type="password" [(ngModel)]="password" name="input-password" ></ion-input>
</ion-item> </ion-item>
+7
View File
@@ -43,3 +43,10 @@ ion-item{
background-color: #42b9fe; background-color: #42b9fe;
color: #ffffff !important; color: #ffffff !important;
} }
:host, app-login{
ion-content{
background: linear-gradient(180deg, #42B9FE 0%, #0782C9 100%) !important;
}
}
@@ -1,5 +1,5 @@
:host{ :host{
background: #0782c9; // background: #0782c9;
} }
ion-content{ ion-content{
--background: transparent; --background: transparent;
@@ -41,7 +41,7 @@ ion-toolbar{
} }
ion-content{ ion-content{
--background:#0782c9; // --background:#0782c9;
--border: none; --border: none;
} }
.main-header{ .main-header{
@@ -1,3 +1,46 @@
<ion-menu autoHide="false" side="end" content-id="main-content" >
<ion-header>
<ion-toolbar translucent>
<ion-title>Menu</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>
<ion-item (click)="openExpedientActionsModal('0',fulltask)">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('1',fulltask)">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('2',fulltask)">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<ion-item (click)="openBookMeetingModal(task)">
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
<ion-item (click)="deleteEvent()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item (click)="editEvent()">
<ion-icon name="create-outline" slot="start"></ion-icon>
<ion-label>Editar</ion-label>
</ion-item>
<ion-item hidden disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
</ion-item>
</ion-list>
</ion-content>
</ion-menu>
<div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div>
<ion-header class="ion-no-border"> <ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar"> <ion-toolbar class="header-toolbar">
<div class="main-header px-20"> <div class="main-header px-20">
@@ -10,14 +53,21 @@
<div class="middle flex-grow-1"> <div class="middle flex-grow-1">
<ion-label class="title">{{loadedEvent.Subject}}</ion-label> <ion-label class="title">{{loadedEvent.Subject}}</ion-label>
</div> </div>
<div class="div-icon">
<div class="div-icon d-none">
<button class="btn-no-color" (click)="editEvent()"> <button class="btn-no-color" (click)="editEvent()">
<ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon> <ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
</button> </button>
<button class="btn-no-color" (click)="deleteEvent()"> <button class="btn-no-color" (click)="deleteEvent()">
<ion-icon class="delete" name="trash-sharp"></ion-icon> <ion-icon class="delete" name="trash-sharp"></ion-icon>
</button> </button>
</div> </div>
<ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
</div> </div>
</div> </div>
</ion-toolbar> </ion-toolbar>
@@ -6,7 +6,7 @@ ion-content{
font-size: 18px; font-size: 18px;
} }
ion-menu{ ion-menu{
--height: 225px;
} }
.header-toolbar{ .header-toolbar{
--background:transparent; --background:transparent;
@@ -8,6 +8,7 @@ import { Event } from 'src/app/models/event.model';
import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page'; import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
@Component({ @Component({
selector: 'app-view-event', selector: 'app-view-event',
@@ -46,6 +47,7 @@ export class ViewEventPage implements OnInit {
public alertController: AlertController, public alertController: AlertController,
private iab: InAppBrowser, private iab: InAppBrowser,
private processes: ProcessesService, private processes: ProcessesService,
private modalController: ModalController,
) )
{ {
this.isEventEdited = false; this.isEventEdited = false;
@@ -127,4 +129,35 @@ export class ViewEventPage implements OnInit {
}); });
} }
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: ExpedientTaskModalPage,
componentProps: {
taskAction: taskAction,
task: task,
profile: this.profile,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then(res=>{
console.log(res['data']);
if(res['data']=='openDiscart'){
console.log('open discart');
// this.distartExpedientModal();
}
});
}
} }
+1 -1
View File
@@ -1,4 +1,4 @@
<ion-toolbar class="bg-blue"> <ion-toolbar>
<div class="div-top-header"> <div class="div-top-header">
<div class="div-search"> <div class="div-search">
<ion-icon src='assets/images/icons-search.svg'></ion-icon> <ion-icon src='assets/images/icons-search.svg'></ion-icon>
+2 -2
View File
@@ -1,4 +1,4 @@
<ion-toolbar class="bg-blue pb-10"> <div class=" pb-10 ion-toolbar text-white">
<div class="mobile d-flex div-top-header justify-space-between"> <div class="mobile d-flex div-top-header justify-space-between">
@@ -89,5 +89,5 @@
</div> </div>
</ion-toolbar> </div>
+1 -1
View File
@@ -2,7 +2,7 @@
.div-top-header{ .div-top-header{
margin: 0 em(20px); margin: 0 em(20px);
background-color: #0782c9; // background-color: #0782c9;
padding-top: em(15px); padding-top: em(15px);
border: 0!important; border: 0!important;
} }
@@ -1,4 +1,4 @@
<ion-toolbar class="bg-blue pb-10"> <div class=" pb-10 ion-toolbar text-white">
<div class="mobile d-flex div-top-header justify-space-between"> <div class="mobile d-flex div-top-header justify-space-between">
@@ -64,5 +64,5 @@
</div> </div>
</ion-toolbar> </div>
@@ -2,7 +2,7 @@
.div-top-header{ .div-top-header{
margin: 0 em(20px); margin: 0 em(20px);
background-color: #0782c9; // background-color: #0782c9;
padding-top: em(15px); padding-top: em(15px);
border: 0!important; border: 0!important;
} }
+67 -1
View File
@@ -433,7 +433,8 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
} }
@media only screen and (min-width: 1024px) {
@media only screen and (min-width: 1366px) {
.search-modal-to-desktop{ .search-modal-to-desktop{
padding-top: 0px; padding-top: 0px;
top: 75px; top: 75px;
@@ -448,6 +449,12 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
} }
} }
}
@media only screen and (min-width: 1024px) {
.timeline-mobile{ .timeline-mobile{
.timeline-box { .timeline-box {
position: relative; position: relative;
@@ -553,3 +560,62 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.btn-no-color:focus{ .btn-no-color:focus{
outline: 0; outline: 0;
} }
// center
app-gabinete-digital ion-content .main-content{
max-width: 1366px !important;
margin: 0px auto !important;
}
app-publications ion-content .main-content{
max-width: 1366px !important;
margin: 0px auto !important;
}
app-agenda ion-content .container-wrapper{
max-width: 1366px !important;
margin: 0px auto !important;
}
app-chat ion-content .main-content{
max-width: 1366px !important;
margin: 0px auto !important;
}
app-header .ion-toolbar{
max-width: 1366px;
margin: 0px auto;
}
app-header-no-search .ion-toolbar{
max-width: 1366px;
margin: 0px auto;
}
body, .blue-background{ background: #0782C9;}
@media only screen and (min-width: 1365px) {
body{
background: linear-gradient(270deg, #45BAFF 0%, #0782C9 23.44%, rgba(7, 130, 201, 0.9425) 78.13%, #45BAFF 100%);
}
.blue-background {
background: linear-gradient(270deg, #45BAFF 0%, #0782C9 23.44%, rgba(7, 130, 201, 0.9425) 78.13%, #45BAFF 100%);
}
}
:host {
ion-content {
--background:none;
}
--background:none;
}
ion-content {
--background:none;
}