- Documentos
+
-
-
-
-
-
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index c5c899c6f..6e3d67c10 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -516,7 +516,7 @@ export class AgendaPage implements OnInit {
this.showLoader = true;
- if(window.innerWidth < 1024){
+ if(window.innerWidth < 800){
this.showTimeline = false;
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 7718d0c99..2e6c320f3 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -177,45 +177,42 @@
-
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss
index a7675581b..de650114b 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.scss
+++ b/src/app/pages/agenda/edit-event/edit-event.page.scss
@@ -163,4 +163,39 @@
padding: 20px;
overflow: auto;
}
-
\ No newline at end of file
+
+
+
+ .app-name{
+ background: #42b9f2;
+ border-radius: 18px;
+ text-align: center;
+ display: flex;
+ align-items: center;
+ padding: 0px 5px;
+ color: white;
+ font-size: 9pt;
+ font-weight: 500;
+ height: 19px;
+ -webkit-border-radius: 18px;
+ -moz-border-radius: 18px;
+ -ms-border-radius: 18px;
+ -o-border-radius: 18px;
+ }
+
+
+.close-button {
+ display: none;
+}
+
+
+.list:hover {
+
+ .app-name {
+ display: none;
+ }
+
+ .close-button {
+ display: block !important;
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index ef0829112..4348e5135 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -1,11 +1,14 @@
import { Component, OnInit } from '@angular/core';
import { AlertController, ModalController, NavParams } from '@ionic/angular';
+import { Attachment } from 'src/app/models/attachment.model';
import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model';
import { AlertService } from 'src/app/services/alert.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { Event } from '../../../models/event.model';
import { AttendeesPage } from '../../events/attendees/attendees.page';
+import { SearchPage } from '../../search/search.page';
@Component({
selector: 'app-edit-event',
@@ -27,6 +30,7 @@ export class EditEventPage implements OnInit {
minDate: string;
+ loadedEventAttachments: Attachment[];
taskParticipants: any = [];
taskParticipantsCc: any = [];
adding: "intervenient" | "CC" = "intervenient";
@@ -39,11 +43,17 @@ export class EditEventPage implements OnInit {
private navParams: NavParams,
private eventsService: EventsService,
public alertController: AlertController,
+ private attachmentsService: AttachmentsService,
) {
this.isEventEdited = false;
this.postEvent = this.navParams.get('event');
+
if(this.postEvent){
- this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
+ if( this.postEvent.Body){
+ if(typeof(this.postEvent.Body.Text) == 'string'){
+ this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
+ }
+ }
}
if(this.postEvent.Attendees == null){
@@ -67,6 +77,8 @@ export class EditEventPage implements OnInit {
this.isRecurring = "Repete";
}
this.profile = this.navParams.get('profile');
+
+ this.getAttachments(this.postEvent.EventId);
}
ngOnInit() {
@@ -157,4 +169,52 @@ export class EditEventPage implements OnInit {
this.taskParticipantsCc = taskParticipantsCc;
}
+
+ getAttachments(eventId: string){
+ this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{
+ this.loadedEventAttachments = res;
+ console.log('res', res);
+ });
+ }
+
+ deleteAttachment(attachmentID: string) {
+
+ this.attachmentsService.deleteEventAttachmentById(attachmentID).subscribe(
+ res=>{
+ this.loadedEventAttachments = this.loadedEventAttachments.filter(e=> e.Id.toString() != attachmentID);
+ })
+ }
+
+ async getDoc() {
+ const modal = await this.modalController.create({
+ component: SearchPage,
+ cssClass: 'modal-width-100-width-background modal',
+ componentProps: {
+ type: 'AccoesPresidenciais & ArquivoDespachoElect'
+ }
+ });
+ await modal.present();
+ modal.onDidDismiss().then( async (res)=>{
+ if(res){
+ const data = res.data;
+ //data.selected
+ const DocumentToSave = {
+ SourceTitle: data.selected.Assunto,
+ ParentId: this.postEvent.EventId,
+ Source: '1',
+ SourceId: data.selected.Id,
+ ApplicationId: data.selected.ApplicationType.toString(),
+ Id: '0',
+ Link: '',
+ SerialNumber: '',
+ };
+
+ await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{
+ this.getAttachments(this.postEvent.EventId);
+ });
+
+ }
+ });
+ }
+
}
\ No newline at end of file
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index f0d73ed20..1f0665295 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -194,30 +194,33 @@
-
-
-
-
-
-
+
-
+
- Anexar Documentos
+ Adicionar documentos
+
+
+
+
+
+
+
+
- + {{document.SourceName}} + Correspondencia + AccoesPresidenciais + ArquivoDespachoElect + + +
+{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yy'}}
+
-
- Documentos Anexados
-
-
-
-
-
-
-
+
+
+
Text
-Text Text
-
+
-
- Anexar Documentos
+ Adicionar documentos
-
- Documentos Anexados
-
+
-
-
+
Text
-Text Text
++ {{document.Assunto}} + {{document.appName}} + +
+{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}
{{customDate}}
-{{totalEvent}} evento agendado para hoje
-{{totalEvent}} eventos agendados para hoje
-{{customDate}}
+{{totalEvent}} evento agendado para hoje
+{{totalEvent}} eventos agendados para hoje
+
+
-
+
{{count_desp_dailywork}}Documentos
+
{{count_par_dailywork}} Documentos
+
{{count_def_dailywork}} Documentos
-
+
-
- Expediente Presidente
-- Documentos
-
@@ -85,28 +79,21 @@
- - Documentos
-
-
-
-
+ Expediente Presidente
-- Documentos
-
+
-
+
+ Expediente Presidente
+- Documentos
-
-
-
-
+
+ Despacho do Presidente da República
-- Documentos
-
+
+
+ Despacho do Presidente da República
+- Documentos
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 0b5a60046..47d34a555 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -7,7 +7,7 @@ ion-content{
--background: transparent;
}
:host{
- background: #0782c9;
+ // background: #0782c9;
ion-card-title{
text-align: center;
}
@@ -89,7 +89,6 @@ ion-content{
background:#ecf8ff;
overflow:auto;
padding: 0 !important;
- margin: 0 !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
@@ -107,9 +106,10 @@ ion-content{
padding: 30px 5px 30px 5px;
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+ background: white;
//border: solid 1px #e9e9e9;
/* --background-color: #ffffff !important; */
- background-color: #ffffff !important;
+ // background-color: #ffffff !important;
float: left;
//border: 1px solid red;
//justify-content: center;
@@ -118,7 +118,7 @@ ion-content{
width: 360px;
margin: 7px 20px;
border-radius: 15px;
- background-color: #ffffff !important;
+ // background-color: #ffffff !important;
padding: 7px;
border: blue !important;
@@ -296,7 +296,7 @@ ion-content{
width: 100%;
padding: 10px 17px 10px 17px;
height: unset !important;
- box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+ //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
.exp-card-title{
flex: 1;
@@ -315,15 +315,6 @@ ion-content{
margin-top: 0px !important;
}
}
- .exp-card:visited{
- background: blue;
- }
- .exp-card:hover{
- background: blue;
- }
-}
-.btn-refresh:visited{
- background: blue !important;
}
@media only screen and (min-width: 1024px){
.content{
@@ -348,6 +339,9 @@ ion-content{
.active {
- border: 1px solid green;
+ background: #42b9fe !important;
box-sizing: border-box;
+ .exp-card-title {
+ color: white !important;
+ }
}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.html b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.html
new file mode 100644
index 000000000..90e793e08
--- /dev/null
+++ b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.html
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
+
+ Cancelar
+
+
+
+
+ Gravar
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.scss b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.spec.ts b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.spec.ts
new file mode 100644
index 000000000..2120b0b0f
--- /dev/null
+++ b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { RequestToAppearComponent } from './request-to-appear.component';
+
+describe('RequestToAppearComponent', () => {
+ let component: RequestToAppearComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ RequestToAppearComponent ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(RequestToAppearComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.ts b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.ts
new file mode 100644
index 000000000..2ed6012c0
--- /dev/null
+++ b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-request-to-appear',
+ templateUrl: './request-to-appear.component.html',
+ styleUrls: ['./request-to-appear.component.scss'],
+})
+export class RequestToAppearComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {}
+
+}
diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index e0ad1a2e6..a410b5639 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -1,15 +1,15 @@
-
+
-
+
+
+
+
+ Novo Evento
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Oficial
+ Pessoal
+
+
+
+
+
+
+
+
+
+
+ Reunião
+ Viagem
+ Conferência
+ Encontro
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Não se repete
+ Repete
+
+
+