diff --git a/src/app/models/deferimento.modal.ts b/src/app/models/deferimento.modal.ts
new file mode 100644
index 000000000..2fda66850
--- /dev/null
+++ b/src/app/models/deferimento.modal.ts
@@ -0,0 +1,12 @@
+import { Folder } from "./folder.model";
+import { Participant } from "./participant.model";
+
+export class Despacho{
+ DistributionType: string;
+ CountryCode: string;
+ Priority: string;
+ SubjectTypeId:string;
+ UserEmail: string;
+ UsersSelected: Participant[];
+ DispatchFolder: Folder;
+}
\ No newline at end of file
diff --git a/src/app/models/participant.model.ts b/src/app/models/participant.model.ts
index f8e12bd1d..899ecea92 100644
--- a/src/app/models/participant.model.ts
+++ b/src/app/models/participant.model.ts
@@ -1,6 +1,8 @@
export class Participant{
- UserEmail: string;
+ UserEmail: string ;
+ UserId?: string ;
UserType: string;
+ DeadLine?: string
/* Deadline: Date; */
}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.html b/src/app/pages/gabinete-digital/create-task/create-task.component.html
new file mode 100644
index 000000000..e2489f74b
--- /dev/null
+++ b/src/app/pages/gabinete-digital/create-task/create-task.component.html
@@ -0,0 +1,237 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Anexar Documentos
+
+
+
+
+
+
+ Documentos Anexados
+
+
+
+
+ Text
+ Text Text
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.scss b/src/app/pages/gabinete-digital/create-task/create-task.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts b/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts
new file mode 100644
index 000000000..22f9769b0
--- /dev/null
+++ b/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { CreateTaskComponent } from './create-task.component';
+
+describe('CreateTaskComponent', () => {
+ let component: CreateTaskComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ CreateTaskComponent ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(CreateTaskComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.ts b/src/app/pages/gabinete-digital/create-task/create-task.component.ts
new file mode 100644
index 000000000..19dbd3db8
--- /dev/null
+++ b/src/app/pages/gabinete-digital/create-task/create-task.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-create-task',
+ templateUrl: './create-task.component.html',
+ styleUrls: ['./create-task.component.scss'],
+})
+export class CreateTaskComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {}
+
+}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index a2d758010..a78e5fe3d 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -66,7 +66,7 @@ export class GabineteDigitalPage implements OnInit {
this.openEventsToApprovePage("MDGPR");
this.selectedElement='approval'
- } else {
+ } else if (window.innerWidth >= 800) {
this.openEventsToApprovePage('MDGPR');
this.selectedElement='approval'
}
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts
index fb4932087..10f1a0806 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.component.ts
@@ -205,7 +205,7 @@ export class EditEventComponent implements OnInit {
async getDoc() {
const modal = await this.modalController.create({
component: SearchPage,
- cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+ cssClass: 'modal-width-100-width-background modal',
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect'
}
diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts
index b2468a3a9..60c1d9836 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/src/app/shared/agenda/new-event/new-event.component.ts
@@ -130,7 +130,7 @@ export class NewEventPage implements OnInit {
async getDoc(){
const modal = await this.modalController.create({
component: SearchPage,
- cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+ cssClass: 'modal-width-100-width-background modal',
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect'
}
@@ -186,12 +186,18 @@ export class NewEventPage implements OnInit {
this.attachmentsService.setEventAttachmentById(attachments).subscribe((res) =>{
if(DocumentToSave.length == (i+1)){
- this.close();
+ this.afterSave();
}
});
});
+
+ if(DocumentToSave.length == 0){
+
+ this.afterSave();
+ }
+
});
}
else if(this.profile=='pr') {
@@ -217,17 +223,33 @@ export class NewEventPage implements OnInit {
this.attachmentsService.setEventAttachmentById(attachments).subscribe((res) =>{
if(DocumentToSave.length == (i+1)){
- this.close();
+ this.afterSave();
}
});
});
+ if(DocumentToSave.length == 0){
+
+ this.afterSave();
+ }
+
});
}
- this.close();
+
+ }
+
+
+ afterSave(){
+ this.deleteTemporaryData();
+
+ this.onAddEvent.emit(this.postEvent);
+ this.GoBackEditOrAdd.emit();
+
+ this.setIntervenient.emit([]);
+ this.setIntervenientCC.emit([]);
}
removeAttachment(index: number){
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
index 0fecef51e..3913f5ea7 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
@@ -38,6 +38,11 @@ export class AttendeeModalPage implements OnInit {
}
+ ngOnChanges(){
+ this.LtaskParticipants = this.taskParticipants;
+ this.LtaskParticipantsCc = this.taskParticipantsCc;
+ }
+
currentPath = window.location.pathname;
@Input() adding: "intervenient" | "CC";
@@ -56,11 +61,9 @@ export class AttendeeModalPage implements OnInit {
}
- ngOnChanges(event){
-
- }
save(){
+
this.setIntervenient.emit(this.LtaskParticipants);
this.setIntervenientCC.emit(this.LtaskParticipantsCc);
@@ -77,8 +80,8 @@ export class AttendeeModalPage implements OnInit {
/* console.log('data', this.LtaskParticipants, this.LtaskParticipantsCc ); */
this.dynamicSetIntervenient.emit({
- LtaskParticipants: this.LtaskParticipants,
- LtaskParticipantsCc: this.LtaskParticipantsCc
+ taskParticipants: this.LtaskParticipants,
+ taskParticipantsCc: this.LtaskParticipantsCc
})
}
diff --git a/src/app/shared/headers/header-no-search/profile/profile.component.html b/src/app/shared/headers/header-no-search/profile/profile.component.html
index c5fa37c07..883feecf4 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.component.html
+++ b/src/app/shared/headers/header-no-search/profile/profile.component.html
@@ -1,26 +1,24 @@
+
-
-
-
-
-
-
-