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

notification added to chat grup

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-06 15:34:46 +01:00
parent 9f13967ae3 0bf43b629c
commit 9c3cdf2ac5
44 changed files with 244 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+28 -9
View File
@@ -57,11 +57,15 @@ export class EventActionsPopoverPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.toastService.successMessage();
this.toastService._successMessage('Evento aprovar')
this.goBack();
} catch (error) {
this.toastService.badRequest()
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Evento não aprovar')
}
}
finally {
loader.remove()
@@ -77,11 +81,15 @@ export class EventActionsPopoverPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.toastService.successMessage();
this.toastService._successMessage('Evento enviado para revisão');
this.goBack();
} catch (error) {
this.toastService.badRequest()
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Evento não enviado para revisão');
}
}
finally {
loader.remove()
@@ -119,9 +127,15 @@ export class EventActionsPopoverPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise();
this.toastService.successMessage('Pedido enviado');
this.toastService._successMessage('Evento enviado para revisão');
this.goBack();
} catch (error) {
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Evento não enviado para revisão');
}
this.toastService.badRequest();
}
finally {
@@ -140,10 +154,15 @@ export class EventActionsPopoverPage implements OnInit {
const loader = this.toastService.loading();
try {
await this.processes.PostTaskAction(body).toPromise();
await this.toastService.successMessage('Processo rejeitado');
this.toastService._successMessage('Evento rejeitado')
this.goBack();
} catch (error) {
this.toastService.badRequest();
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Evento não rejeitado')
}
}
finally {
loader.remove();
src/app/pages/agenda/new-event/new-event.page.html
-23
View File
@@ -122,7 +122,6 @@
placeholder="Data Inicio*"
[(ngModel)]="postEvent.StartDate"
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -171,28 +170,6 @@
</div>
</div>
<!-- <div class="container-div width-100">
<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" [class.input-error]="Form?.get('dateOccurrence')?.invalid && validateFrom ">
<mat-form-field appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
<mat-select placeholder="Selecione repetição*"
[(ngModel)]="postEvent.EventRecurrence.Type"
(ngModelChange)="onSelectedRecurringChanged($event)">
<mat-option
*ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
>
{{recurring.Description}}
</mat-option>
</mat-select>
</mat-form-field>
</div>
</div>
</div> -->
<div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
<div class="ion-item-class-2 d-flex">
src/app/pages/chat/chat.page.ts
+1 -1
View File
@@ -410,7 +410,7 @@ export class ChatPage implements OnInit {
doRefresh(event) {
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 1000);
}
src/app/pages/events/edit-event/edit-event.page.ts
+2 -2
View File
@@ -211,9 +211,9 @@ export class EditEventPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
event.target.complete();
event?.target?.complete();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
src/app/pages/events/event-detail-modal/event-detail-modal.page.ts
+2 -2
View File
@@ -209,9 +209,9 @@ export class EventDetailModalPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
event.target.complete();
event?.target?.complete();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
src/app/pages/events/event-detail/event-detail.page.ts
+2 -2
View File
@@ -207,9 +207,9 @@ export class EventDetailPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
event.target.complete();
event?.target?.complete();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
src/app/pages/events/events.page.ts
+1 -1
View File
@@ -129,7 +129,7 @@ export class EventsPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
this.RefreshEvents();
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+1 -1
View File
@@ -227,7 +227,7 @@ export class DespachosPrPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
setTimeout(() => {
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+1 -1
View File
@@ -117,7 +117,7 @@ export class DespachosPage implements OnInit {
this.LoadList();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+1 -1
View File
@@ -232,7 +232,7 @@ export class EventListPage implements OnInit {
setTimeout(() => {
this.LoadToApproveEvents();
event.target.complete();
event?.target?.complete();
}, 1000);
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+6 -72
View File
@@ -87,19 +87,8 @@
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid && validateFrom ">
<ion-select placeholder="Selecione tipo de evento*"
class="d-block d-md-none"
[(ngModel)]="postData.Category"
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>
<mat-form-field class="d-none d-md-block" appearance="none" class="width-100" placeholder="Sample Type" required>
<mat-form-field appearance="none" class="width-100" placeholder="Sample Type" required>
<!-- <input matInput type="text" > -->
<mat-select [(ngModel)]="postData.Category" >
<mat-option value="Reunião">
@@ -128,23 +117,11 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
class="d-block d-md-none"
placeholder="Início*"
[(ngModel)]="postData.StartDate"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="{{ionicMinDate}}"
max="2025"
value="2020-11-19T11:06Z">
</ion-datetime>
<mat-form-field appearance="none" class="width-100 date-hour-picker d-md-block">
<mat-form-field appearance="none" class="width-100 date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date*"
[formControl]="dateControlStart"
[min]="minDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
@@ -167,24 +144,13 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
class="d-block d-md-none"
placeholder="Fim*"
[(ngModel)]="postData.EndDate"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="{{ionicMinDate}}"
max="2025"
value="2020-11-19T11:06Z">
</ion-datetime>
<mat-form-field appearance="none" class="date-hour-picker width-100 d-none d-md-block">
<mat-form-field appearance="none" class="date-hour-picker width-100 ">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Fim*"
[formControl]="dateControlEnd"
[min]="endMinDate"
[disabled]="disabled"
[min] = "dateControlStart.value"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
@@ -199,28 +165,6 @@
</div>
</div>
<!-- <div class="container-div width-100">
<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" [class.input-error]="Form?.get('dateOccurrence')?.invalid && validateFrom ">
<mat-form-field appearance="none" floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
<mat-select placeholder="Selecione repetição*"
[(ngModel)]="EventRecurrenceType"
>
<mat-option
*ngFor="let recurring of recurringTypes" value="{{recurring.Code}}"
>
{{recurring.Description}}
</mat-option>
</mat-select>
</mat-form-field>
</div>
</div>
</div> -->
<div *ngIf="EventRecurrenceType != '-1'" class="container-div width-100">
<div class="ion-item-class-2 d-flex">
@@ -228,24 +172,13 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div (click)="openLastOccurrence()" class="ion-input-class flex-grow-1">
<!-- <ion-datetime
placeholder="Última ocorrência"
[(ngModel)]="postEvent.EventRecurrence.LastOccurrence"
displayFormat="DD MMM YYYY"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2021"
max="2045"
>
</ion-datetime> -->
<!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
<!-- [formControl]="dateControlOccurrence" -->
<mat-form-field class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="occurrrence"
placeholder="Choose a date"
[(ngModel)]="Occurrence"
[disabled]="disabled"
[min]="dateStart"
>
<mat-datepicker-toggle id="last-occurrence" matSuffix [for]="occurrrence"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #occurrrence
@@ -254,6 +187,7 @@
[stepHour]="stepHour" [stepMinute]="stepMinute"
[stepSecond]="stepSecond"
[touchUi]="touchUi"
>
</ngx-mat-datetime-picker>
</mat-form-field>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+3 -17
View File
@@ -75,21 +75,11 @@ export class BookMeetingModalPage implements OnInit {
showLoader = false
get dateStart () {
if( window.innerWidth < 801) {
return this.postData.StartDate;
}
else{
return this.dateControlStart.value;
}
return this.dateControlStart.value;
}
get dateEnd () {
if( window.innerWidth < 801) {
return this.postData.EndDate;
}
else{
return this.dateControlEnd.value;
}
return this.dateControlEnd.value;
}
@ViewChild('picker') picker: any;
@@ -234,11 +224,7 @@ export class BookMeetingModalPage implements OnInit {
}
get dateValid() {
if (window.innerWidth <= 800) {
return this.postData.StartDate < this.postData.EndDate? ['ok']: []
} else {
return ['ok']
}
return new Date(this.dateControlStart.value).getTime() < new Date(this.dateControlEnd.value).getTime() ? 'ok': null
}
injectValidation() {
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+1 -1
View File
@@ -103,7 +103,7 @@ export class ExpedientePage implements OnInit {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 1000);
}
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+1 -1
View File
@@ -95,7 +95,7 @@ export class ExpedientesPrPage implements OnInit {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+1 -1
View File
@@ -299,7 +299,7 @@ export class PedidosPage implements OnInit {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+1 -1
View File
@@ -170,7 +170,7 @@ export class PendentesPage implements OnInit {
this.LoadList();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
src/app/pages/publications/new-action/new-action.page.html
+5 -23
View File
@@ -28,17 +28,9 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
[(ngModel)]="folder.DateBegin"
class="d-block d-md-none"
placeholder="Data início*"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
max="2025">
</ion-datetime>
<mat-form-field appearance="none" class="date-hour-picker d-none d-md-block">
<mat-form-field appearance="none" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Data inicio*"
[formControl]="dateControlStart"
@@ -59,28 +51,18 @@
</div>
</div>
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<ion-datetime
class="d-block d-md-none"
[(ngModel)]="folder.DateEnd"
placeholder="Data de fim*"
displayFormat="D MMM YYYY H:mm"
minuteValues="0,5,10,15,20,25,30,35,40,45,50,55"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="{{minDate}}"
max="2025">
</ion-datetime>
<div class="ion-input-class" [class.input-error]="Form?.get('Date')?.invalid && validateFrom">
<mat-form-field appearance="none" class="date-hour-picker d-none d-md-block">
<mat-form-field appearance="none" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Data de fim*"
[formControl]="dateControlEnd"
[min]="endMinDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
src/app/pages/publications/new-action/new-action.page.ts
+6 -21
View File
@@ -75,8 +75,8 @@ export class NewActionPage implements OnInit {
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()
// this.dateControlStart.value = new Date().toISOString()
// this.dateControlEnd.value = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
}
@@ -85,33 +85,18 @@ export class NewActionPage implements OnInit {
// this.setDefaultTime()
}
setDefaultTime() {
this.folder.DateBegin = new Date().toISOString()
this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
}
segmentChanged(ev: any) {
}
get dateValid() {
var validado: boolean;
if (window.innerWidth <= 800) {
if ((this.folder.DateBegin < this.folder.DateEnd)) {
validado = true;
} else {
validado = false;
}
return validado == true ? ['ok']: [];
} else {
return ['ok']
}
return new Date(this.dateStart).getTime() < new Date(this.dateEnd).getTime() ? 'ok': null
}
runValidation() {
this.validateFrom = true;
if(new Date(this.folder.DateBegin).getTime() > new Date(this.folder.DateEnd).getTime()){
if(new Date(this.dateControlStart.value).getTime() > new Date(this.dateControlEnd.value).getTime()){
this.toastService._badRequest("A data de início não pode ser superior a data de fim");
}
}
@@ -144,8 +129,8 @@ export class NewActionPage implements OnInit {
ProcessId: null,
Description: this.folder.Description,
Detail: this.folder.Detail,
DateBegin: this.folder.DateBegin,
DateEnd: this.folder.DateEnd,
DateBegin: this.dateControlStart.value,
DateEnd: this.dateControlEnd.value,
ActionType: this.segment,
}
src/app/pages/publications/publication-detail/publication-detail.page.ts
+1 -1
View File
@@ -54,7 +54,7 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
src/app/pages/publications/publications.page.ts
+1 -1
View File
@@ -124,7 +124,7 @@ export class PublicationsPage implements OnInit {
doRefresh(event) {
this.getActions();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 250);
}
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+1 -1
View File
@@ -63,7 +63,7 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
event.target.complete();
event?.target?.complete();
}, 2000);
}
src/app/pages/publications/view-publications/view-publications.page.ts
+1 -1
View File
@@ -98,7 +98,7 @@ export class ViewPublicationsPage implements OnInit {
//this.testForkJoin()
this.getPublicationDetail();
this.getPublicationsIds();
event.target.complete();
event?.target?.complete();
//}, 3000);
}