peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-09 11:54:26 +01:00
parent 3edb765c41 323aebc68d
commit 7bd92ae5d5
50 changed files with 152 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home.page.ts
+2
View File
@@ -1,3 +1,5 @@
/* eslint-disable */
/* tslint:disable */
///<reference path="../../../plugins/cordova-plugin-mfp/typings/worklight.d.ts" />
///<reference path="../../../plugins/cordova-plugin-mfp-push/typings/mfppush.d.ts" />
import { Component, OnInit, NgZone, Inject } from '@angular/core';
src/app/modals/create-process/create-process.page.html
+1 -1
View File
@@ -91,7 +91,7 @@
<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">
<div class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom ">
<div class="list-people">
<ion-item lines="none">
<ion-list>
src/app/modals/create-process/create-process.page.ts
+2 -2
View File
@@ -184,8 +184,8 @@ export class CreateProcessPage implements OnInit {
Priority: new FormControl(this.postData.Priority, [
Validators.required,
]),
participantes: new FormControl(this.taskParticipantsCc, [
// Validators.required
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
selectedTypes: new FormControl(this.selectedTypes, [
Validators.required,
src/app/modals/document-detail/document-detail.page.html
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="main-content d-flex height-100">
<div *ngIf="LoadedDocument" class="content d-flex flex-column">
<div class="main-header">
<div class="title-content">
<div class="title-content width-100">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<ion-label class="title">{{LoadedDocument.Subject}}</ion-label>
src/app/pages/agenda/edit-event/edit-event.page.html
+2 -2
View File
@@ -122,7 +122,7 @@
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="2021"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
@@ -143,7 +143,7 @@
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="2021"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
src/app/pages/agenda/edit-event/edit-event.page.ts
+1
View File
@@ -95,6 +95,7 @@ export class EditEventPage implements OnInit {
}
this.getAttachments(this.postEvent.EventId);
}
ngOnInit() {
src/app/pages/agenda/new-event/new-event.page.html
+9 -9
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="title-content width-100">
<div class="middle">
<ion-label class="title">Novo Evento</ion-label>
</div>
@@ -19,7 +19,7 @@
</div>
<div *ngIf="Form && validateFrom" >
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
<div *ngIf="Form.get('Subject').errors?.required">
Campo obrigatório.
@@ -28,7 +28,7 @@
O campo deve ter pelo menos 4 caracteres.
</div>
</div>
</div>
</div> -->
<div class="container-div">
<div class="ion-item-class-2">
@@ -46,7 +46,7 @@
</div>
<div *ngIf="Form && validateFrom" >
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('Location').invalid " class="input-errror-message">
<div *ngIf="Form.get('Location').errors?.required">
Campo obrigatório.
@@ -55,7 +55,7 @@
O campo deve ter pelo menos 4 caracteres.
</div>
</div>
</div>
</div> -->
<div class="container-div">
<div class="ion-item-class-2">
@@ -75,13 +75,13 @@
</div>
</div>
<div *ngIf="Form && validateFrom" >
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('CalendarName').invalid " class="input-errror-message">
<div *ngIf="Form.get('CalendarName').errors?.required">
Campo obrigatório.
</div>
</div>
</div>
</div> -->
<div class="container-div">
<div class="ion-item-class-2">
@@ -102,14 +102,14 @@
</div>
</div>
<div *ngIf="Form && validateFrom" >
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('Categories').invalid " class="input-errror-message">
{{ postEvent.Categories[0] }}
<div *ngIf="Form.get('Categories').errors?.required">
Campo obrigatório.
</div>
</div>
</div>
</div> -->
<div class="container-div">
<div class="ion-item-class-2">
src/app/pages/agenda/new-event/new-event.page.ts
+4
View File
@@ -78,6 +78,10 @@ export class NewEventPage implements OnInit {
this.selectedSegment = this.navParams.get('segment');
this.selectedDate = this.navParams.get('eventSelectedDate');
this.postEvent.StartDate = new Date()
this.postEvent.EndDate = (new Date(new Date().getTime() + 15 * 60000))
}
ngOnInit() {
src/app/pages/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column width-100">
<div class="main-header d-flex">
<div class="title-content d-flex justify-between width-100">
<div class="title-content d-flex justify-between width-100">
<div class="left">
<button class="btn-no-color d-flex align-center" (click)="goBack()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
src/app/pages/chat/edit-group/edit-group.page.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="title-content width-100">
<div class="left">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="title-content width-100">
<div class="back-icon">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
src/app/pages/chat/messages/contacts/contacts.page.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="title-content width-100">
<div class="back-icon">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
src/app/pages/chat/new-group/contacts/contacts.page.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="title-content width-100">
<div class="back-icon">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
src/app/pages/chat/new-group/new-group.page.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="title-content width-100">
<div class="left">
<button class="btn-no-color" (click)="close()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
src/app/pages/events/event-detail-modal/event-detail-modal.page.ts
+29 -21
View File
@@ -44,14 +44,22 @@ export class EventDetailModalPage implements OnInit {
this.loadedEvent = new Event();
this.loadedEvent.Body = new EventBody();
}
ngOnInit() {
this.loadEvent();
this.loadAttachments();
this.ionicForm = this.formBuilder.group({
subject: ['', [Validators.required]]
})
// this.setDefaultTime()
}
// setDefaultTime() {
// this.loadedEvent.StartDate = new Date()
// this.loadedEvent.EndDate = (new Date(new Date().getTime() + 15 * 60000))
// }
get errorControl() {
return this.ionicForm.controls;
}
@@ -107,7 +115,7 @@ export class EventDetailModalPage implements OnInit {
setEventAttendees(newattendes: EventPerson[])
{
this.loadedEvent.Attendees = newattendes;
this.loadedEvent.Attendees = newattendes;
}
async deleteConfirm()
@@ -211,26 +219,26 @@ export class EventDetailModalPage implements OnInit {
navigateTo(ev){
this.route.navigate(['/home/events',ev]);
}
async openAttachments(){
const modal = await this.modalCtrl.create({
component: AttachmentsPage,
componentProps: {
eventId: this.pageId,
attachments: this.loadedEventAttachments
},
cssClass: 'attachments',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((data) => {
if (data['data'] != null)
{
let newattendees: EventPerson[] = data['data'];
this.loadedEvent.Attendees = newattendees;
}
});
async openAttachments() {
const modal = await this.modalCtrl.create({
component: AttachmentsPage,
componentProps: {
eventId: this.pageId,
attachments: this.loadedEventAttachments
},
cssClass: 'attachments',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((data) => {
if (data['data'] != null)
{
let newattendees: EventPerson[] = data['data'];
this.loadedEvent.Attendees = newattendees;
}
});
}
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+1 -1
View File
@@ -5,7 +5,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content d-flex justify-space-between">
<div class="title-content width-100 d-flex justify-space-between">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content d-flex justify-space-between align-center">
<div class="title-content width-100 d-flex justify-space-between align-center">
<div class=" btn-dismiss font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content d-flex justify-space-between">
<div class="title-content width-100 d-flex justify-space-between">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content d-flex justify-space-between">
<div class="title-content width-100 d-flex justify-space-between">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+1 -1
View File
@@ -206,7 +206,7 @@
<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">
<div class="ion-input-class-no-height" [class.input-error]="Form?.get('participantes')?.invalid && validateFrom ">
<div class="list-people">
<ion-item lines="none">
<ion-list>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+9 -3
View File
@@ -151,6 +151,12 @@ export class BookMeetingModalPage implements OnInit {
this.adding = "intervenient";
console.log(this.task);
this.getAttachments();
this.setDefaultTime()
}
setDefaultTime() {
this.postData.StartDate = new Date()
this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000))
}
getAttachments(){
@@ -197,9 +203,9 @@ export class BookMeetingModalPage implements OnInit {
Date: new FormControl(this.dateValid, [
Validators.required
]),
// participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
// Validators.required
// ]),
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
})
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+2 -2
View File
@@ -34,7 +34,7 @@
</div>
</div>
<div *ngIf="Form && validateFrom" >
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('Location').invalid " class="input-errror-message">
<div *ngIf="Form.get('Location').errors?.required">
Campo obrigatório.
@@ -43,7 +43,7 @@
O campo deve ter pelo menos 4 caracteres.
</div>
</div>
</div>
</div> -->
<div class="container-div width-100">
<div class="ion-item-class-2 width-100">
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+2 -2
View File
@@ -203,13 +203,13 @@ export class ExpedientTaskModalPage implements OnInit {
// IsRecurring: new FormControl(this.postEvent.IsRecurring, [
// Validators.required
// ]),
participantes: new FormControl(this.taskParticipantsCc, [
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
})
}
//
async saveTask(){
if(this.loggeduser.Profile == 'MDGPR') {
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -10,7 +10,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header" style="overflow: unset !important;">
<div class="title-content d-flex justify-between">
<div class="title-content width-100 d-flex justify-between">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+1 -1
View File
@@ -10,7 +10,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header" style="overflow: unset !important;">
<div class="title-content d-flex justify-between">
<div class="title-content width-100 d-flex justify-between">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header ">
<div class="title-content d-flex justify-space-between ">
<div class="title-content width-100 d-flex justify-space-between ">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
src/app/pages/publications/edit-action/edit-action.page.html
+3 -3
View File
@@ -1,5 +1,5 @@
<ion-header class="ion-no-border pt-20 px-20">
<div class="title-content d-flex align-center justify-space-between ">
<div class="title-content width-100 d-flex align-center justify-space-between ">
<div class="div-title">
<ion-label class="title">Editar acção presidencial</ion-label>
</div>
@@ -37,7 +37,7 @@
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"
min="{{minDate}}"
max="2025"
class="d-block d-md-none">
</ion-datetime>
@@ -77,7 +77,7 @@
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"
min="{{minDate}}"
max="2022">
</ion-datetime>
src/app/pages/publications/edit-action/edit-action.page.ts
+1 -1
View File
@@ -22,7 +22,7 @@ export class EditActionPage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate: any;
public minDate = new Date().toISOString().slice(0,10)
public maxDate: any;
public stepHour = 1;
public stepMinute = 5;
src/app/pages/publications/new-action/new-action.page.html
+5 -5
View File
@@ -1,7 +1,7 @@
<ion-content>
<div class="content-container">
<div class="title-content">
<div class="title-content width-100">
<div class="div-title">
<ion-label class="title"> Nova Acção</ion-label>
</div>
@@ -27,7 +27,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class">
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
[(ngModel)]="folder.DateBegin"
class="d-block d-md-none"
@@ -35,7 +35,7 @@
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"
min="{{minDate}}"
max="2025">
</ion-datetime>
@@ -66,7 +66,7 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class">
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
class="d-block d-md-none"
[(ngModel)]="folder.DateEnd"
@@ -74,7 +74,7 @@
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"
min="{{minDate}}"
max="2025">
</ion-datetime>
src/app/pages/publications/new-action/new-action.page.ts
+12
View File
@@ -67,14 +67,26 @@ export class NewActionPage implements OnInit {
private toastService: ToastService
) {
this.folder = new PublicationFolder();
this.dateControlStart = new FormControl(moment(new Date()));
this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
this.folder.DateBegin = new Date().toISOString()
this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
}
ngOnInit() {
this.segment = "Viagem";
this.setDefaultTime()
}
setDefaultTime() {
this.folder.DateBegin = new Date().toISOString()
this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
}
segmentChanged(ev: any) {
src/app/pages/publications/new-publication/new-publication.page.html
+2 -2
View File
@@ -2,12 +2,12 @@
<ion-content>
<div class="content-container">
<div class="title-content">
<div class="title-content width-100">
<div class="div-title">
<ion-label class="title">{{publicationTitle}}</ion-label>
</div>
</div>
<div *ngIf="publicationType!='1'" class="ion-item-container">
<div *ngIf="publicationType!='1'" class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
<ion-input [(ngModel)]="pub.Title" name="title" ngDefaultControl placeholder="Título" ></ion-input>
</div>
src/app/pages/publications/new-publication/new-publication.page.ts
+1 -1
View File
@@ -136,7 +136,7 @@ export class NewPublicationPage implements OnInit {
]),
Message: new FormControl(this.pub.Message, [
Validators.required
// Validators.required
])
})
}
src/app/pages/publications/publications.page.html
+1 -1
View File
@@ -16,7 +16,7 @@
<!-- Header -->
<ion-toolbar >
<div class="main-header">
<div class="title-content d-flex justify-space-between">
<div class="title-content width-100 d-flex justify-space-between">
<div class="div-title flex-grow-1">
<ion-label class="title ">Acções Presidenciais</ion-label>
</div>
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
+2 -2
View File
@@ -6,7 +6,7 @@
<div class="content-container">
<div *ngIf="publication.Title != ''">
<div class="title-content px-20" (click)="goBack()">
<div class="title-content px-20 width-100" (click)="goBack()">
<div class="back-icon">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
@@ -33,7 +33,7 @@
</div>
</div>
<div *ngIf="publication.Title == ''">
<div class="title-content">
<div class="title-content width-100">
<div class="back-icon">
<ion-icon (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
src/app/pages/publications/view-publications/view-publications.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<ion-header class="ion-no-border">
<!-- <ion-toolbar class="bg-blue"> -->
<div class="main-header">
<div class="title-content d-flex">
<div class="title-content d-flex width-100">
<div class="back-icon" (click)="goBack()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
src/app/pages/search/search.page.html
+2 -2
View File
@@ -7,11 +7,11 @@
<div class="d-flex search-input-container ion-justify-content-between" >
<div class="icon">
<button class="btn-no-color" (click)="basicSearch()">
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</button>
</div>
<div class="input-text d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchSubject' class="search-input" type="search" placeholder="Pesquisar"></ion-input>
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' class="search-input" type="search" placeholder="Pesquisar"></ion-input>
</div>
<div (click)="clearSearchInput()" class="d-flex align-center icon">
src/app/pages/search/search.page.ts
+8 -9
View File
@@ -463,15 +463,15 @@ export class SearchPage implements OnInit {
}
}
clearInputRemetente(){
clearInputRemetente() {
this.searchSender = "";
}
clearInputDocumentDate(){
clearInputDocumentDate() {
this.searchDocumentDate = "";
}
clearInputOrganicEntity(){
clearInputOrganicEntity() {
this.searchOrganicEntiry = "";
}
@@ -516,7 +516,6 @@ export class SearchPage implements OnInit {
classs = 'search-desktop-modal search-submodal'
}
const modal = await this.modalController.create({
component: OrganicEntityPage,
cssClass: classs,
@@ -532,10 +531,10 @@ export class SearchPage implements OnInit {
}
async filterDocList(categoryName:string){
async filterDocList(categoryName:string) {
// show all category
if(this. showCategory == categoryName ){
if(this. showCategory == categoryName ) {
this.showSearchDocuments = this.searchDocuments;
@@ -563,12 +562,12 @@ export class SearchPage implements OnInit {
const ApplicationType = searchDocument.ApplicationType.toString()
const Id = searchDocument.Id
if(this.select == false){
if(this.select == false) {
if(this.type == "Agenda") {
const modal = await this.modalCtrl.create({
component: ViewEventPage,
componentProps:{
componentProps: {
eventId: Id
},
cssClass: 'modal modal-desktop',
@@ -576,7 +575,7 @@ export class SearchPage implements OnInit {
await modal.present();
modal.onDidDismiss().then((res)=>{});
} else if(this.type == "AccoesPresidenciais"){
} else if(this.type == "AccoesPresidenciais") {
this.viewPublicationDetail(Id);
}
src/app/services/notifications.service.ts
+2
View File
@@ -1,3 +1,5 @@
/* eslint-disable */
/* tslint:disable */
///<reference path="../../../plugins/cordova-plugin-mfp-push/typings/mfppush.d.ts" />
import { Injectable, NgZone } from '@angular/core';
import { ActivatedRoute } from '@angular/router'
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+3 -3
View File
@@ -102,11 +102,11 @@
<ion-datetime
class="d-block d-md-none"
placeholder="Início"
[(ngModel)]="dateControlEnd"
[(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
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"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
@@ -144,7 +144,7 @@
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"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+4 -3
View File
@@ -37,7 +37,8 @@ export class EditEventToApprovePage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate: any;
public minDate = new Date().toISOString().slice(0,10)
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public maxDate: any;
public stepHour = 1;
public stepMinute = 5;
@@ -219,8 +220,8 @@ export class EditEventToApprovePage implements OnInit {
// IsRecurring: new FormControl(this.postEvent.IsRecurring, [
// Validators.required
// ]),
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
// Validators.required
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
})
src/app/shared/agenda/edit-event/edit-event.page.ts
+4 -3
View File
@@ -38,7 +38,8 @@ export class EditEventPage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate: any;
public minDate = new Date().toISOString().slice(0,10)
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public maxDate: any;
public stepHour = 1;
public stepMinute = 5;
@@ -179,8 +180,8 @@ export class EditEventPage implements OnInit {
IsRecurring: new FormControl(this.postEvent.IsRecurring, [
Validators.required
]),
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
// Validators.required
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
})
src/app/shared/agenda/new-event/new-event.page.ts
+10 -4
View File
@@ -60,7 +60,7 @@ export class NewEventPage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate = new Date();
public minDate = new Date().toISOString().slice(0,10)
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public stepHour = 1;
public stepMinute = 5;
@@ -251,8 +251,8 @@ export class NewEventPage implements OnInit {
IsRecurring: new FormControl(this.postEvent.IsRecurring, [
Validators.required
]),
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
// Validators.required
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
})
@@ -482,6 +482,11 @@ export class NewEventPage implements OnInit {
}
}
/**
*
* @description o pipeline já esta a funcionar tuda vez que nos fazer push na branch master e test o pipeline executa os teste, mas agora os teste temos que melhora para testar a app em tudos os pontos
* o pipeline já está a funcionar toda vez que nos fazer um push na branch master ou teste o pipeline executa os testes, mas agora os testes temos que melhorar para testar a app em todos os pontos
*/
restoreTemporaryData(): boolean {
@@ -505,4 +510,5 @@ export class NewEventPage implements OnInit {
window['temp.path:/home/agenda/new-event.component.ts'] = {}
}
}
}
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+2 -2
View File
@@ -81,7 +81,7 @@
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"
min="{{minDate}}"
max="2022"
>
</ion-datetime>
@@ -119,7 +119,7 @@
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"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+2 -1
View File
@@ -44,7 +44,8 @@ export class EditEventToApproveComponent implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate: any;
public minDate = new Date().toISOString().slice(0,10)
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public maxDate: any;
public stepHour = 1;
public stepMinute = 5;
src/app/shared/header/header.page.html
+1 -1
View File
@@ -71,7 +71,7 @@
<ion-icon class="icon-z" slot="end" name="search"></ion-icon>
</div>
<div class="input-text d-flex ion-align-items-center">
<ion-input [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()" class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()" class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<div class="icon" (click)="clearSearchInput()">
<ion-icon name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
src/app/shared/header/header.page.ts
+1 -1
View File
@@ -41,7 +41,7 @@ export class HeaderPage implements OnInit {
let classs, showSearchInput, type;
if(window.innerWidth < 1366) {
classs = 'modal modal-width-100 modal-padding-top'
classs = 'modal modal-width-100'
showSearchInput = true
} else {
classs = 'modal modal-desktop desktop-search'
src/app/shared/publication/edit-action/edit-action.page.html
+2 -2
View File
@@ -37,7 +37,7 @@
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"
min="{{minDate}}"
max="2025"
class="d-block d-md-none">
</ion-datetime>
@@ -77,7 +77,7 @@
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"
min="{{minDate}}"
max="2022">
</ion-datetime>
src/app/shared/publication/edit-action/edit-action.page.ts
+2 -1
View File
@@ -21,7 +21,8 @@ export class EditActionPage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate: any;
public minDate = new Date().toISOString().slice(0,10)
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public maxDate: any;
public stepHour = 1;
public stepMinute = 5;
src/app/shared/publication/new-action/new-action.page.html
+2 -2
View File
@@ -37,7 +37,7 @@
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"
min="{{minDate}}"
max="2025">
</ion-datetime>
@@ -76,7 +76,7 @@
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"
min="{{minDate}}"
max="2025">
</ion-datetime>
src/app/shared/publication/new-action/new-action.page.ts
+1 -1
View File
@@ -24,7 +24,7 @@ export class NewActionPage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate: any;
public minDate = new Date().toISOString().slice(0,10)
public maxDate: any;
public stepHour = 1;
public stepMinute = 5;