peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +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-08-31 16:41:05 +01:00
parent da2918875c 0b21f06a43
commit fe57939a94
32 changed files with 273 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.module.ts
+3 -1
View File
@@ -18,10 +18,11 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import { MAT_DATE_LOCALE } from '@angular/material/core';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatInputModule } from '@angular/material/input';
import { MatDialogModule } from '@angular/material/dialog';
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
@NgModule({
imports: [
@@ -41,6 +42,7 @@ import { MatDialogModule } from '@angular/material/dialog';
MatButtonModule,
ReactiveFormsModule,
MatDialogModule,
AttendeeModalPageModule,
],
declarations: [EditEventToApprovePage],
exports: [EditEventToApprovePage]
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+6 -5
View File
@@ -58,7 +58,7 @@
</div>
<div class="ion-input-class">
<ion-select disabled placeholder="Selecione agenda*"
<ion-select placeholder="Selecione agenda*"
class="d-block d-md-none"
selectedText="{{eventProcess.workflowInstanceDataFields.Agenda}}"
[(ngModel)]="eventProcess.workflowInstanceDataFields.Agenda"
@@ -280,7 +280,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 d-flex">
<div class="ion-input-class-no-height d-flex" (click)="addParticipants()">
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
@@ -289,7 +289,7 @@
</ion-list>
</ion-item>
</div>
<div class="add-people cursor-pointer" (click)="addParticipants()">
<div class="add-people cursor-pointer" >
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
@@ -301,7 +301,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 d-flex">
<div class="ion-input-class-no-height d-flex" (click)="addParticipantsCC()">
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
@@ -310,7 +310,7 @@
</ion-list>
</ion-item>
</div>
<div class="add-people cursor-pointer" (click)="addParticipantsCC()">
<div class="add-people cursor-pointer" >
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
@@ -361,6 +361,7 @@
</div>
</ion-item-sliding>
</div>
</div>
</ion-content>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
-23
View File
@@ -132,9 +132,6 @@ export class EditEventToApprovePage implements OnInit {
ngOnInit() {
console.log('EDITAR');
if(this.restoreTemporaryData()){
this.setOtherData()
} else {
@@ -338,26 +335,6 @@ export class EditEventToApprovePage implements OnInit {
}
// setIntervenient(data){
// this.taskParticipants = data;
// this.postEvent.Attendees = data;
// }
// setIntervenientCC(data) {
// this.taskParticipantsCc = data;
// }
// addParticipants(){
// this.adding = 'intervenient'
// this.openAttendees();
// }
// addParticipantsCC(){
// this.adding = 'CC'
// this.openAttendees();
// }
dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
this.taskParticipants = removeDuplicate(taskParticipants) ;
src/app/shared/agenda/edit-event/edit-event.page.html
+33 -6
View File
@@ -55,7 +55,6 @@
</div>
</div>
123123
<div class="container-div">
<div class="ion-item-class-2 width-100 d-flex">
<div class="ion-icon-class">
@@ -214,13 +213,41 @@
</div>
</div>
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('participantes').invalid " class="input-errror-message">
<div *ngIf="Form.get('participantes').errors?.required">
Adicionar participant.
<div class="container-div width-100">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid && validateFrom ">
<ion-select placeholder="Selecione a repetição*"
[(ngModel)]="postEvent.IsRecurring"
(ngModelChange)="onSelectedRecurringChanged($event)"
interface="action-sheet"
Cancel-text="Cancelar" required>
<ion-select-option *ngFor="let recurring of recurringTypes" value="{{recurring.Code}}">{{recurring.Description}}</ion-select-option>
</ion-select>
</div>
</div>
</div> -->
</div>
<div *ngIf="selectedRecurringType != '-1'" class="container-div width-100">
<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">
<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"
max="2045"
>
</ion-datetime>
<!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
</div>
</div>
</div>
<div class=" d-flex width-100">
<div class="ion-item-class-2 width-100">
src/app/shared/agenda/edit-event/edit-event.page.ts
+4 -1
View File
@@ -31,7 +31,9 @@ export class EditEventPage implements OnInit {
eventAttendees: EventPerson[];
// minDate: string;
loadedEventAttachments: Attachment[]=[];
recurringTypes: any;
recurringTypes = [];
selectedRecurringType: any;
public dateControlOccurrence = new FormControl(moment("DD MM YYYY hh"));
public date: any;
@@ -107,6 +109,7 @@ export class EditEventPage implements OnInit {
ngOnInit() {
this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence));
if(!this.restoreTemporaryData()) {
// clear
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts
+2 -1
View File
@@ -18,10 +18,10 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import { MAT_DATE_LOCALE } from '@angular/material/core';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatInputModule } from '@angular/material/input';
import { MatDialogModule } from '@angular/material/dialog';
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
@NgModule({
imports: [
@@ -41,6 +41,7 @@ import { MatDialogModule } from '@angular/material/dialog';
MatButtonModule,
ReactiveFormsModule,
MatDialogModule,
AttendeeModalPageModule,
],
declarations: [
EditEventToApproveComponent
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+5 -6
View File
@@ -8,7 +8,7 @@
<ion-header>
<div class="title-content">
<div class="middle">
<ion-label class="title">Editar evento por aprovar</ion-label>
<ion-label class="title">Editar evento por aprovar gg</ion-label>
</div>
</div>
</ion-header>
@@ -68,13 +68,12 @@
</div>
</div>
<div class="container-div width-100">
<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('Categories')?.invalid && validateFrom ">
<div class="ion-input-class">
<ion-select placeholder="Selecione tipo de evento*"
class="d-block d-md-none"
@@ -291,12 +290,12 @@
</div>
</div>
<div class="container-div width-100">
<div class="container-div width-100" >
<div class="ion-item-class-2">
<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 d-flex">
<div class="ion-input-class-no-height d-flex" (click)="addParticipantsCC()">
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
@@ -305,7 +304,7 @@
</ion-list>
</ion-item>
</div>
<div class="add-people cursor-pointer" (click)="addParticipantsCC()">
<div class="add-people cursor-pointer" >
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
-2
View File
@@ -259,7 +259,6 @@ export class EditEventToApproveComponent implements OnInit {
Category: this.eventProcess.workflowInstanceDataFields.Category
}
console.log(event);
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
this.toastService.successMessage('Evento editado');
@@ -342,7 +341,6 @@ export class EditEventToApproveComponent implements OnInit {
addParticipants(){
this.adding = 'intervenient'
this.openAttendees();
console.log('LOGS');
}
src/app/shared/header/header.page.ts
-2
View File
@@ -70,8 +70,6 @@ export class HeaderPage implements OnInit {
this.storageservice.get("Notifications").then((value) => {
console.log("Init get store", value)
if(value == 'žée') return false
/* var data = JSON.parse(value); */
this.notificationLength = value.length;
})