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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-08 09:43:26 +01:00
parent 834840fc41
commit 67a69d2e47
27 changed files with 153 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/new-event/new-event.page.ts
+1 -1
View File
@@ -333,7 +333,7 @@ export class NewEventPage implements OnInit {
CalendarName: new FormControl(this.postEvent.CalendarName, [
Validators.required
]),
Date: new FormControl(new Date(this.postEvent.StartDate).getTime() <= new Date(this.postEvent.EndDate).getTime()? 'ok': null,[
Date: new FormControl(new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime()? 'ok': null,[
Validators.required
]),
Categories: new FormControl(this.postEvent.Category, [
src/app/pages/chat/chat.page.ts
+2 -1
View File
@@ -290,7 +290,7 @@ export class ChatPage implements OnInit {
this.selectContact();
}
else {
this.showEmptyComponent = false;
this.showContacts = true;
}
}
@@ -301,6 +301,7 @@ export class ChatPage implements OnInit {
}
else {
this.closeAllDesktopComponents();
this.showEmptyComponent = false;
this.showNewGroup = true;
}
}
src/app/pages/chat/edit-group/edit-group.page.scss
-1
View File
@@ -49,7 +49,6 @@ ion-content{
transform: translate3d(0, 1px, 0);
.title-content{
width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
src/app/pages/chat/group-messages/group-messages.page.html
+3 -3
View File
@@ -11,7 +11,7 @@
</div>
<div class="middle-container" *ngIf="!showMessageOptions">
<div class="middle add-ellipsis">
<ion-label class="title">{{groupNameFormart}}</ion-label>
<ion-label class="title">{{ ChatSystemService.getGroupRoom(roomId).name }}</ion-label>
</div>
</div>
<div class="middle-container-options" *ngIf="showMessageOptions">
@@ -29,8 +29,8 @@
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/icon/icons-user.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
</div>
<div class="header-bottom-contacts">
<ion-label class="contacts-list" *ngFor="let member of members" >
<div class="header-bottom-contacts" *ngIf="ChatSystemService.getGroupRoom(roomId)">
<ion-label class="contacts-list" *ngFor="let member of ChatSystemService.getGroupRoom(roomId).membersExcludeMe" >
{{member.name}},
</ion-label>
</div>
src/app/pages/chat/group-messages/group-messages.page.ts
+6 -2
View File
@@ -523,7 +523,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
await modal.present();
modal.onDidDismiss().then(res => {
if (res.data == 'leave') {
this.close()
this.ChatSystemService.deleteRoom(this.roomId)
//this.ChatSystemService.subscribeToRoomUpdate(this.roomId, this.room);
}
else if (res.data == 'cancel') {
@@ -534,7 +535,10 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
} else if (res.data == 'addUser') {
this.addContacts();
}
} else if (res.data == 'delete') {
this.close()
this.ChatSystemService.deleteRoom(this.roomId)
}
});
}
src/app/pages/events/events.page.html
+3 -3
View File
@@ -110,7 +110,7 @@
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent"
(click)="goToEvent(event)"
>
<div class="d-flex event-box-content content-{{sessoStore.user.Profile}}-{{event.CalendarName}}">
<div class="d-flex event-box-content content-{{agendaColor}}-{{event.CalendarName}}">
<div class="schedule-time">
<div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
@@ -229,12 +229,12 @@
</button>
</div>
<div class="content overflow-y-auto flex-grow-1 height-100">
<ion-list>
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor="let event of listToPresent"
(click)="goToEvent(event)"
>
<div class="d-flex content-{{sessoStore.user.Profile}}-{{event.CalendarName}}">
<div class="d-flex content-{{agendaColor}}-{{event.CalendarName}}">
<div class="schedule-time">
<div *ngIf="!event.IsAllDayEvent" class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
src/app/pages/events/events.page.ts
+7
View File
@@ -66,6 +66,8 @@ export class EventsPage implements OnInit {
showCorrespondenciasLoader = false
loadingAllTask = false
agendaColor = ''
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Não lidos'
showSearch = true;
@@ -104,6 +106,11 @@ export class EventsPage implements OnInit {
this.listToPresentexpediente = []
})
if(this.agendaColor != "PR") {
this.agendaColor = "MDGPR"
}
}
ngAfterViewInit(): void {
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+5 -1
View File
@@ -482,7 +482,11 @@ export class DespachoPage implements OnInit {
await this.distartExpedientModal();
}
this.goBack();
if(res.data?.action != 'cancel') {
this.goBack();
}
}, (error) => {
console.log(error)
});
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+1 -1
View File
@@ -209,7 +209,7 @@ export class DiplomasGerarPage implements OnInit {
this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes')
this.TaskService.loadDiplomas()
loader.remove()
},
},
error => {
loader.remove()
this.httpErroHandle.httpStatusHandle(error)
src/app/pages/gabinete-digital/gabinete-digital.page.html
+1 -1
View File
@@ -713,7 +713,7 @@
Pendentes<br>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=2">{{
TaskService.pendentesstore.newList.length}} correspondências novas</span>
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length >=1">{{
<span class="new-task-count" *ngIf="TaskService.pendentesstore.newList.length ==1">{{
TaskService.pendentesstore.newList.length}} correspondência nova</span>
</p>
<p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Meus
src/app/pages/login/login.page.ts
-1
View File
@@ -18,7 +18,6 @@ import { ChatService } from 'src/app/services/chat.service';
import { Platform } from '@ionic/angular';
import { FirstEnterService } from '../../services/first-enter.service';
import { Storage } from '@ionic/storage';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { CPSession } from 'src/app/store/documentManagement';
@Component({
selector: 'app-login',
src/app/pages/publications/new-action/new-action.page.html
+5 -5
View File
@@ -23,7 +23,7 @@
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="folder.Description" placeholder="Assunto*" ></ion-input>
</div>
<div class="container-div">
<div class="container-div overflow-hidden">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
@@ -34,7 +34,7 @@
<mat-form-field appearance="none" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Data inicio*"
[formControl]="dateControlStart"
[(ngModel)]="dateControlStart"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
@@ -53,7 +53,7 @@
</div>
<div class="container-div">
<div class="container-div overflow-hiddens">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
@@ -63,9 +63,9 @@
<mat-form-field appearance="none" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Data de fim*"
[formControl]="dateControlEnd"
[(ngModel)]="dateControlEnd"
[disabled]="disabled"
[min]="dateControlStart.value"
[min]="dateControlStart"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
src/app/pages/publications/new-action/new-action.page.scss
-1
View File
@@ -74,7 +74,6 @@ font-size: rem(25);
}
.container-div{
margin-bottom: rem(15);
overflow: auto;
}
.ion-item-container{
margin: rem(15) auto;
src/app/pages/publications/new-action/new-action.page.ts
+8 -9
View File
@@ -1,7 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { ModalController } from '@ionic/angular';
import * as moment from 'moment';
import { PublicationFolder } from 'src/app/models/publicationfolder';
import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -56,11 +55,11 @@ export class NewActionPage implements OnInit {
showLoader = false
get dateStart () {
return this.dateControlStart.value
return this.dateControlStart
}
get dateEnd () {
return this.dateControlEnd.value
return this.dateControlEnd
}
constructor(
@@ -74,8 +73,8 @@ export class NewActionPage implements OnInit {
this.folder = new PublicationFolder();
this.dateControlStart = new FormControl(this.roundTimeQuarterHour());
this.dateControlEnd = new FormControl(this.roundTimeQuarterHourPlus15(this.dateControlStart.value));
this.dateControlStart = this.roundTimeQuarterHour()
this.dateControlEnd = this.roundTimeQuarterHourPlus15(this.dateControlStart)
}
@@ -96,7 +95,7 @@ export class NewActionPage implements OnInit {
runValidation() {
this.validateFrom = true;
if(new Date(this.dateControlStart.value).getTime() > new Date(this.dateControlEnd.value).getTime()){
if(new Date(this.dateControlStart).getTime() > new Date(this.dateControlEnd).getTime()){
this.toastService._badRequest("A data de início não pode ser superior a data de fim");
}
}
@@ -108,7 +107,7 @@ export class NewActionPage implements OnInit {
Validators.required,
// Validators.minLength(4)
]),
Date: new FormControl(this.dateValid, [
Date: new FormControl( this.dateValid,[
Validators.required
]),
Detail: new FormControl(this.folder.Detail, [
@@ -129,8 +128,8 @@ export class NewActionPage implements OnInit {
ProcessId: null,
Description: this.folder.Description,
Detail: this.folder.Detail,
DateBegin: this.dateControlStart.value,
DateEnd: this.dateControlEnd.value,
DateBegin: this.dateControlStart,
DateEnd: this.dateControlEnd,
ActionType: this.segment,
}
src/app/pages/publications/publications.page.scss
+1 -1
View File
@@ -189,7 +189,7 @@ ion-toolbar{
}
.item:hover{
background-color: var(--box-hover-background-color) !important;
background-color: var(--box-hover-background-color);
}
ion-item-options{