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

change text, fixe create and edit event

Browse Source
This commit is contained in:
Peter Maquiran
2023-09-20 20:25:48 +01:00
parent be3f1e8f15
commit c674ec0bca
11 changed files with 149 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/edit-event/edit-event.page.ts
+27 -27
View File
@@ -117,7 +117,7 @@ export class EditEventPage implements OnInit {
}
for(const index in this._postEvent.Attendees) {
const user = this._postEvent.Attendees[index]
@@ -127,7 +127,7 @@ export class EditEventPage implements OnInit {
} else {
console.log('user not set')
}
}
if (this._postEvent.Attendees != null) {
@@ -149,7 +149,7 @@ export class EditEventPage implements OnInit {
setTimeout(() => {
this._postEvent.EventRecurrence.Type = this._postEvent.EventRecurrence.Type.toString();
}, 500);
@@ -188,7 +188,7 @@ export class EditEventPage implements OnInit {
getRecurrenceTypes() {
this.eventsService.getRecurrenceTypes().subscribe(res=>{
this.recurringTypes = res;
});
}
@@ -234,7 +234,7 @@ export class EditEventPage implements OnInit {
openInicio() {
let input: any = document.querySelector('#new-inicio')
if(input) {
input.click()
}
}
@@ -259,7 +259,7 @@ export class EditEventPage implements OnInit {
date.setSeconds(0);
if(minutes % 15 != 0) {
if (minutes > 45) {
date.setMinutes(60)
} else if (minutes > 30) {
@@ -270,7 +270,7 @@ export class EditEventPage implements OnInit {
date.setMinutes(15)
}
}
}
return date
}
@@ -279,15 +279,15 @@ export class EditEventPage implements OnInit {
const _date = new Date(date);
const minutes = _date .getMinutes();
_date .setMinutes(minutes + 15)
return _date
return _date
}
onSelectedRecurringChanged(ev:any){
this.calculetedLastOccurrence(ev);
if(ev.length > 1){
this._postEvent.EventRecurrence.Type = ev.filter(data => data != '-1');
}
if(ev.length == 0){
@@ -296,7 +296,7 @@ export class EditEventPage implements OnInit {
}
calculetedLastOccurrence(type:number){
var valor;
var valor;
var opcao: boolean;
if (type == 0) {
valor = 7;
@@ -322,15 +322,15 @@ export class EditEventPage implements OnInit {
this._postEvent.EventRecurrence.LastOccurrence = time;
} else {
time = new Date(
time.getFullYear() + valor,
time.getMonth(),
time.getDate(),
time.getHours(),
time.getFullYear() + valor,
time.getMonth(),
time.getDate(),
time.getHours(),
time.getMinutes()
);
this._postEvent.EventRecurrence.LastOccurrence = time;
}
}
@@ -358,14 +358,14 @@ export class EditEventPage implements OnInit {
this.showLoader = true;
try {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
await this.eventsService.editEvent(this._postEvent, 2, 3).toPromise()
if(this.initCalendarName != this._postEvent.CalendarName) {
let body = {
"EventId": this._postEvent.EventId,
"CalendarDestinationName": this._postEvent.CalendarName,
}
try {
await this.eventsService.changeAgenda(body).toPromise();
} catch (e) {}
@@ -379,7 +379,7 @@ export class EditEventPage implements OnInit {
"EventId": this._postEvent.EventId,
"CalendarDestinationName": this._postEvent.CalendarName,
}
try {
await this.eventsService.changeAgenda(body).toPromise();
} catch (e) {}
@@ -397,7 +397,7 @@ export class EditEventPage implements OnInit {
this.clearPostEvent.emit();
this.deleteTemporaryData();
/* await this.saveDocument() */
await this.saveDocument()
this.close();
}
@@ -407,7 +407,7 @@ export class EditEventPage implements OnInit {
try {
for( let e of this.loadedEventAttachments) {
const id: any = e.Id
const remove = e['remove']
@@ -425,7 +425,7 @@ export class EditEventPage implements OnInit {
SerialNumber: '',
};
await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
// await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
} else if(remove) {
await this.attachmentsService.deleteEventAttachmentById(e.Id).toPromise()
@@ -527,7 +527,7 @@ export class EditEventPage implements OnInit {
}
});
modal.onDidDismiss().then( async (res) => {
modal.onDidDismiss().then( async (res) => {
if(res) {
const data = res.data;
@@ -559,17 +559,17 @@ export class EditEventPage implements OnInit {
setTimeout(() => {
if(this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial'] && this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) {
this.CalendarNamesOptions = ['Oficial', 'Pessoal']
} else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial']) {
this.CalendarNamesOptions = ['Oficial']
this._postEvent.CalendarName = 'Oficial'
} else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) {
this.CalendarNamesOptions = ['Pessoal']
this._postEvent.CalendarName = 'Pessoal'
} else {
this.CalendarNamesOptions = ['Oficial', 'Pessoal']
}
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+1 -1
View File
@@ -2,7 +2,7 @@
<app-task-list-header
class="width-100 height-100"
[goBackButton] = false
[headerName] = environment.dispatchPR
[headerName] = headerName
[ordinance] = ordinance
[loading] = skeletonLoader
[loaderTop] = true
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+17 -8
View File
@@ -8,7 +8,7 @@ import { SessionStore } from 'src/app/store/session.service';
import { environment } from 'src/environments/environment';
import { TaskService } from 'src/app/services/task.service'
import { ThemeService } from 'src/app/services/theme.service'
import { PermissionService } from 'src/app/services/permission.service';
@Component({
selector: 'app-despachos-pr',
@@ -24,7 +24,7 @@ export class DespachosPrPage implements OnInit {
despachosprstore = DespachosprStore;
environment = environment
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
//
//
showSearch = false
searchSubject = ''
list = []
@@ -34,14 +34,23 @@ export class DespachosPrPage implements OnInit {
delete(): void;
}
routerSubscription;
headerName = ''
constructor (
private router: Router,
public TaskService: TaskService,
public ThemeService: ThemeService,
public p: PermissionService,
) {
this.loggeduser = SessionStore.user;
if(this.p.userPermission([this.p.permissionList.Gabinete.md_tasks])) {
this.headerName = `Despachos ${ environment.despachoLabel }`
} else {
this.headerName = "Despachos criados por mim"
}
}
ngOnInit() {
@@ -52,9 +61,9 @@ constructor (
this.listSubscription = this.despachosprstore.registerCallback({
id: import.meta.url,
funx:() => {
this.dynamicSearch()
}
})
@@ -103,7 +112,7 @@ constructor (
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
const list = this.despachosprstore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
@@ -142,14 +151,14 @@ constructor (
doRefresh(event) {
if (event) {
setTimeout(() => {
try {
event?.target?.complete();
} catch(error) {}
}, 2000);
}
setTimeout(() => {
this.LoadList();
try {
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+16 -15
View File
@@ -1,7 +1,8 @@
<ion-header class="ion-no-border">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div class="title">
<div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
<div class="thetitle"><ion-label *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" >Diplomas por Assinar PR</ion-label></div>
<div class="thetitle"><ion-label *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" >Diplomas para assinar PR</ion-label></div>
<div class="theicon d-flex align-center">
<!-- <div>
<div title="Pesquisa" *ngIf="!hideSearchBtn" class="mr-20 d-flex align-center cursor-pointer">
@@ -22,24 +23,24 @@
<ion-input (keyup.enter)="basicSearch()" [(ngModel)]='searchSubject' (ngModelChange)="dynamicSearch()"
class="search-input text-black" type="search" placeholder="Pesquisar"></ion-input>
</div>
<div (click)="basicSearch()" class="d-flex align-center icon">
<ion-icon class="icon-z" slot="end" src="assets/images/theme/gov/search.svg"></ion-icon>
</div>
</div>
</div>
</div>
</div> -->
<div>
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/crescente.svg" ></ion-icon>
</div>
<div class="d-flex" (click)="reorderList('recent')" *ngIf="ordinance != 'recent' ">
<ion-icon class="mr-10 font-25" src="assets/images/theme/gov/decrescente.svg" ></ion-icon>
</div>
@@ -48,33 +49,33 @@
<div>
<mat-form-field class="task-filter-input" appearance="none" color="ion-color-secondary" placeholder="Selecione agenda">
<mat-select [(value)]="filterName">
<mat-option value="Para hoje" >
Para hoje
</mat-option>
<mat-option value="Novos" >
Novas
</mat-option>
<mat-option value="Lidos" >
Lidas
</mat-option>
<mat-option value="Não lidos" >
Não lidas
</mat-option>
<mat-option value="OverdueTasks">
Em atraso
</mat-option>
<mat-option value="Todos" >
Todas
</mat-option>
</mat-select>
</mat-form-field>
</div>
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+8 -9
View File
@@ -1,12 +1,10 @@
import { Component, OnInit } from '@angular/core';
import { NavigationStart, Router } from '@angular/router';
import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { DeplomasStore } from 'src/app/store/deplomas.service';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { SortService } from 'src/app/services/functions/sort.service';
import { ThemeService } from 'src/app/services/theme.service'
import { TaskService } from 'src/app/services/task.service'
import { PermissionService } from 'src/app/services/permission.service';
@Component({
selector: 'app-diplomas-assinar',
@@ -21,7 +19,7 @@ export class DiplomasAssinarPage implements OnInit {
deplomasStore = DeplomasStore
customTaskPipe = new CustomTaskPipe()
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
//
//
showSearch = false
searchSubject = ''
list = []
@@ -36,7 +34,8 @@ export class DiplomasAssinarPage implements OnInit {
constructor(
private router: Router,
public ThemeService: ThemeService,
public TaskService: TaskService
public TaskService: TaskService,
public p: PermissionService,
) {}
ngOnInit() {
@@ -48,9 +47,9 @@ export class DiplomasAssinarPage implements OnInit {
this.listSubscription = this.deplomasStore.registerCallback({
id: import.meta.url,
funx:() => {
this.dynamicSearch()
}
})
@@ -69,7 +68,7 @@ export class DiplomasAssinarPage implements OnInit {
ngOnDestroy() {
this.listSubscription.delete()
this.routerSubscription?.unsubscribe();
}
@@ -84,7 +83,7 @@ export class DiplomasAssinarPage implements OnInit {
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
const list = this.deplomasStore.diplomasParaAssinarList.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();