This commit is contained in:
Peter Maquiran
2023-11-10 14:58:33 +01:00
parent e21c39d5d9
commit 99d21a716b
16 changed files with 94 additions and 40 deletions
+3 -4
View File
@@ -87,7 +87,7 @@ import { CreateProcessPageModule } from './modals/create-process/create-process.
import { CreateProcessPage } from './modals/create-process/create-process.page';
import { LoggingInterceptorService } from './services/logging-interceptor.service';
import { PopupQuestionPipe } from './modals/popup-question.pipe';
import { InputFilterDirective } from './services/directives/input-filter.directive';
// import { ServiceWorkerModule } from '@angular/service-worker';
// import { AngularFireModule } from '@angular/fire';
@@ -117,7 +117,7 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
SentrySibling.init
);
@NgModule({
declarations: [AppComponent, PopupQuestionPipe],
declarations: [AppComponent, PopupQuestionPipe, InputFilterDirective],
imports: [BrowserModule,
CommonModule,
FormsModule,
@@ -171,8 +171,7 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
EditorModule,
// options
DeplomaOptionsPageModule,
CreateProcessPageModule
CreateProcessPageModule,
],
entryComponents: [
DiplomaOptionsPage,
@@ -871,7 +871,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
} else {
this.toastService._badRequest("ficheiro invalido")
this.toastService._badRequest("Ficheiro inválido")
}
}
+1 -1
View File
@@ -890,7 +890,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
});
} else {
this.toastService._badRequest("ficheiro invalido")
this.toastService._badRequest("Ficheiro inválido")
}
}
@@ -153,7 +153,7 @@ export class NewPublicationPage implements OnInit {
} else if(validation.isError) {
validation.error
this.toastService._badRequest("imagem invalida")
this.toastService._badRequest("Imagem inválida")
}
}
@@ -182,7 +182,7 @@ export class NewPublicationPage implements OnInit {
this.capturedImage = picture
});
} else {
this.toastService._badRequest("imagem invalida")
this.toastService._badRequest("Imagem inválida")
}
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { MiddlewareRemoteDatasourcecService } from "src/app/datasource/middleware/remote/middleware-remote-datasourcec.service"
import { MiddlewareRemoteDatasourcecService } from "src/app/datasource/middleware/remote/middleware-remote-datasourcec.service";
@Injectable({
providedIn: 'root'
})
@@ -14,5 +14,3 @@ export class MiddlewareRepositoryService {
}
}
+1 -1
View File
@@ -64,7 +64,7 @@ export class AuthService {
const data = SessionStore.getDataFromLocalStorage();
if (!data?.user?.Authorization && SessionStore?.user?.Authorization) {
// window.location.reload();
window.location.reload();
}
if (window['all-process-gabinete']) {
@@ -0,0 +1,8 @@
import { InputFilterDirective } from './input-filter.directive';
describe('InputFilterDirective', () => {
it('should create an instance', () => {
const directive = new InputFilterDirective();
expect(directive).toBeTruthy();
});
});
@@ -0,0 +1,31 @@
import { Directive, ElementRef, HostListener, Input, SecurityContext } from '@angular/core';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
@Directive({
selector: '[appInputFilter]'
})
export class InputFilterDirective {
@Input() isAlphaNumeric: boolean;
constructor(private el: ElementRef, private sanitizer: DomSanitizer) {}
removeTags(inputValue) {
const div = document.createElement("div");
div.innerHTML = inputValue;
var text = div.textContent || div.innerText || "";
return text
}
filter(inputValue) {
this.el.nativeElement.value = this.removeTags(inputValue)
}
@HostListener('keypress', ['$event']) onInput(event: any): void {
const inputValue: string = event.target.value;
// Notify the subject when the input changes
this.filter(inputValue);
}
}
@@ -14,9 +14,9 @@ import { MatInputModule } from '@angular/material/input';
import { MatNativeDateModule } from '@angular/material/core';
import {
NgxMatDatetimePickerModule,
NgxMatNativeDateModule,
NgxMatTimepickerModule
NgxMatDatetimePickerModule,
NgxMatNativeDateModule,
NgxMatTimepickerModule
} from '@angular-material-components/datetime-picker';
import { ReactiveFormsModule } from '@angular/forms';
@@ -24,13 +24,14 @@ import { MatButtonModule } from '@angular/material/button';
import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import {
import {
MAT_MOMENT_DATE_FORMATS,
MomentDateAdapter,
MAT_MOMENT_DATE_ADAPTER_OPTIONS
} from '@angular/material-moment-adapter';
import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core';
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
import { InputFilterDirective } from 'src/app/services/directives/input-filter.directive';
@NgModule({
@@ -47,7 +48,7 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att
NgxMatDatetimePickerModule,
NgxMatTimepickerModule,
NgxMatNativeDateModule,
//
//
NgxMatMomentModule,
// BrowserAnimationsModule,
@@ -16,20 +16,20 @@
<div class="main-content">
<div class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" type="text" placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
<ion-input appInputFilter autocomplete="on" autocorrect="on" spellcheck="true" type="text" placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
</div>
<div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
<div *ngIf="Form.get('Subject').errors?.required">
</div>
<div *ngIf="Form.get('Subject').errors?.minlength">
O campo deve ter pelo menos 4 caracteres.
</div>
</div>
</div>
<div class="container-div" (click)="changeAgenda()">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
@@ -44,7 +44,7 @@
<div *ngIf="calendars != 'Meu calendario' && calendars == 'Presidente da República'"> {{ environment.agendaPR}} </div>
<div *ngIf="calendars != 'Meu calendario' && calendars == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
<div *ngIf="calendars != 'Meu calendario' && calendars != 'Ministro e Director do Gabinete do PR' && calendars != 'Presidente da República'"> Agenda do {{calendars}} </div>
<div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div> -->
<mat-option *ngFor="let calendars of eventService.calendarNamesAry" value="{{calendars.Fullname || calendars}}">
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
@@ -138,7 +138,7 @@
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
<ngx-mat-datetime-picker #picker1
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute"
@@ -293,7 +293,7 @@
</div>
<div class="ion-input-class-no-height flex-grow-1">
<ion-textarea class="heigh-200" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text" placeholder="Detalhes" autoGrow="true" ></ion-textarea>
<ion-textarea appInputFilter class="heigh-200" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text" placeholder="Detalhes" autoGrow="true" ></ion-textarea>
</div>
</div>
@@ -329,10 +329,10 @@
</ion-item>
</ion-list>
</div>
</div>
@@ -343,7 +343,7 @@
</ion-content>
<ion-footer class="ion-no-border">
<ion-toolbar class="footer-toolbar">
<ion-buttons slot="start">
<button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>Gravar</ion-label>
@@ -355,7 +355,7 @@
<ion-label>Cancelar</ion-label>
</button>
</ion-buttons>
<!-- <app-new-event
[loggedAttend]="loggedAttend"
@@ -951,7 +951,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
}
})
} else {
this.toastService._badRequest("ficheiro invalido")
this.toastService._badRequest("Ficheiro inválido")
}
@@ -890,7 +890,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
}
})
} else {
this.toastService._badRequest("ficheiro invalido")
this.toastService._badRequest("Ficheiro inválido")
}
@@ -131,7 +131,7 @@ export class NewPublicationPage implements OnInit {
this.capturedImage = picture
});
} else {
this.toastService._badRequest("imagem invalida")
this.toastService._badRequest("Imagem inválida")
}
}
@@ -161,7 +161,7 @@ export class NewPublicationPage implements OnInit {
this.capturedImage = picture
});
} else {
this.toastService._badRequest("imagem invalida")
this.toastService._badRequest("Imagem inválida")
}