diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 4a5df9b76..5567fe84d 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -6,7 +6,7 @@
-
+
@@ -42,8 +42,8 @@ - - + + @@ -83,11 +83,12 @@ -
- {{ view.dates[row*7+col].label }} -
- -
+
+ +
+ {{ view.dates[row*7+col].label }} +
+
@@ -230,10 +231,10 @@ - + - + Hoje,   {{ timelineDate }} @@ -250,11 +251,23 @@ + +
+
+
Prória
+
+
+
+
Presidente da Republica
+
+
+
+
-
+
@@ -262,24 +275,44 @@ -
- - - -
- - +
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
@@ -299,7 +332,6 @@ diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index e71c616e2..0f61d69fc 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -501,7 +501,6 @@ td.monthview-primary-with-event { .container-wrapper{ height: 100%; .calendar-timeline{ - flex-wrap: wrap; border-top-right-radius: 24px; width: calc(100%); @@ -535,10 +534,14 @@ td.monthview-primary-with-event { height: 100%; .calendar-timeline{ - flex-wrap: wrap; border-top-right-radius: 0px; width: calc(100% - 40%); border-right: 1px solid #d8d8d8; + + display: flex; + flex-direction: column; + height: 100%; + flex-wrap: unset; } } .event-details{ @@ -600,4 +603,5 @@ app-approve-event{ display: flex; align-items: center; height: 100%; -} \ No newline at end of file +} + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 3046e9671..3fbb353a0 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -58,10 +58,16 @@ export class AgendaPage implements OnInit { // for timeline events: CalendarEvent[] = []; + TimelinePR: CalendarEvent[] = []; + TimelineMD: CalendarEvent[] = []; + + showTimelinePR = false; + showTimelineMD = false; + // timeline filter timelineFilterState: string = 'Todos'; showTimelineFilterState: boolean; - showTimeline: boolean; + showTimeline=true; /* List of events of our calendar */ eventSource = []; @@ -117,7 +123,7 @@ export class AgendaPage implements OnInit { saveData: {} } - constructor( + constructor( private alertCtrl: AlertController, @Inject(LOCALE_ID) private locale: string, private modalCtrl: ModalController, @@ -127,7 +133,7 @@ export class AgendaPage implements OnInit { private sanitizer: DomSanitizer ) { - this.calendarHeight = "347px"; + this.calendarHeight = "333px"; this.showCalendar = true; this.timelineDate = momentG(new Date(),'dd MMMM yyyy'); @@ -135,7 +141,7 @@ export class AgendaPage implements OnInit { this.showTimelineFilterState = false; this.showTimeline = false; - } + } ngOnInit() { this.profile = "mdgpr"; @@ -274,27 +280,27 @@ export class AgendaPage implements OnInit { // for calendar currentDayEventDisplayBorder(day: any, id: any){ - + const events = day[id].events; + if (events.length == 0) { - return ""; - } else if (events.length >= 1) { - /** @description store all event type */ - let eventType = {}; - let eventTypeNum: number; + return ""; + + } else if (events.length >= 1) { + + let classs = []; events.forEach(element => { - eventType[element.calendarName] = 1; + + const profile_ = element.profile == 'md'? 'mdgpr': 'pr'; + const eventtype = element.event.CalendarName; + + classs.push(`calendar-event-border calendar-${profile_}-event-type-${eventtype}`); + }); - eventTypeNum = (Object.keys(eventType)).length - - if (eventTypeNum == 2) { - return ` calendar-event-border calendar-${this.profile}-event-type-both`; - } else { - return ` calendar-event-border calendar-${this.profile}-event-type-`+(Object.keys(eventType))[0]; - } + return classs.join(' '); } return ""; @@ -326,7 +332,7 @@ export class AgendaPage implements OnInit { } // for timeline - timeLineTemplate(startTime: string, eventlocation: string, eventDiscription: any, calendarName: string, subject: string, startTimeWisthS: string, endTime: string, eventIndex: number): string{ + timeLineTemplate(startTime: string, eventlocation: string, eventDiscription: any, calendarName: string, subject: string, startTimeWisthS: string, endTime: string, eventIndex: number, profile: string): string{ const startHours = parseInt(startTimeWisthS.split(':')[0]); const startMinutos = parseInt(startTimeWisthS.split(':')[1]); @@ -342,8 +348,13 @@ export class AgendaPage implements OnInit { } } + console.log(profile); + + const profile_ = profile == 'md'? 'mdgpr': 'pr'; + + return ` -
+
${startTimeWisthS}${eventlocation}
@@ -366,7 +377,26 @@ export class AgendaPage implements OnInit { var minutes = ((endEvent.getTime() - startEvent.getTime()) / 1000) / 60; const top = (startEvent.getTime() - (new Date(2020, 1, 3)).getTime()) /60; - document.querySelectorAll('.timeline-box').forEach(ele => { + document.querySelectorAll('.fs-timeline .timeline-box').forEach(ele => { + + if(ele.className.indexOf(`timeline-box-event-${eventIndex}`)>=0){ + ele.setAttribute('style',`height:${minutes}px`); + } + }); + + }); + },timeout) + + setTimeout(()=>{ + this.TimelinePR.forEach((el, eventIndex)=>{ + + const startEvent = new Date(el['startTime']); + const endEvent = new Date(el['endTime']); + + var minutes = ((endEvent.getTime() - startEvent.getTime()) / 1000) / 60; + const top = (startEvent.getTime() - (new Date(2020, 1, 3)).getTime()) /60; + + document.querySelectorAll('.sd-timeline .timeline-box').forEach(ele => { if(ele.className.indexOf(`timeline-box-event-${eventIndex}`)>=0){ ele.setAttribute('style',`height:${minutes}px`); @@ -379,14 +409,18 @@ export class AgendaPage implements OnInit { // for timeline - timelineFilter(calendarName){ + timelineFilter(calendarName, eventsList, profile){ this.timelineFilterState = calendarName; // remove all event - this.events = []; + let events = []; - this.eventsList.forEach((element, eventIndex) => { + console.log(eventsList); + + this.showTimelineFilterState = false; + + eventsList.forEach((element, eventIndex) => { // timeline start const startHours = new Date(element.StartDate).getHours().toLocaleString(); @@ -395,207 +429,274 @@ export class AgendaPage implements OnInit { const startHoursOtherFormate = new Date(element.StartDate).getHours().toLocaleString()+':'+new Date(element.StartDate).getMinutes().toLocaleString(); const EndHoursOtherFormate = formatDate(new Date(element.EndDate), 'HH:mm', 'pt'); - if (element.CalendarName == calendarName) { - this.events.push({ - title: this.timeLineTemplate(startHours, element.Location, element.Body, element.CalendarName, element.Subject,startHoursOtherFormate,EndHoursOtherFormate, eventIndex), - start: setHours(setMinutes(new Date(element.StartDate), 0), parseInt(startHours)), - end: setHours(setMinutes(new Date(element.EndDate), 0), parseInt(EndHours)), - color: { - primary: 'white', - secondary: 'white' - }, - id: element.EventId - }); - } else if (calendarName == 'Todos'){ - this.events.push({ - title: this.timeLineTemplate(startHours, element.Location, element.Body, element.CalendarName, element.Subject,startHoursOtherFormate,EndHoursOtherFormate, eventIndex), - start: setHours(setMinutes(new Date(element.StartDate), 0), parseInt(startHours)), - end: setHours(setMinutes(new Date(element.EndDate), 0), parseInt(EndHours)), - color: { - primary: 'white', - secondary: 'white' - }, - id: element.EventId - }); - } - + events.push({ + title: this.timeLineTemplate(startHours, element.Location, element.Body, element.CalendarName, element.Subject,startHoursOtherFormate,EndHoursOtherFormate, eventIndex, profile), + start: setHours(setMinutes(new Date(element.StartDate), 0), parseInt(startHours)), + end: setHours(setMinutes(new Date(element.EndDate), 0), parseInt(EndHours)), + color: { + primary: 'white', + secondary: 'white' + }, + id: element.EventId, + }); + }); this.onCurrentChanged(this.eventSelectedDate); - // - this.showTimelineFilterState = false; + + return events; } loadRangeEvents(startTime: Date, endTime: Date){ - this.showTimeline = false; this.showLoader = true; - switch (this.segment) - { - case "Combinada": - //Inicializa o array eventSource - this.eventSource=[]; - + if(window.innerWidth < 1024){ + + this.showTimeline = false; - if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe( - response => { - - this.eventSource=[]; - - this.eventsList = response; - // loop - this.eventsList.forEach((element, eventIndex) => { - - this.eventSource.push({ - title: element.Subject, - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element, - calendarName: element.CalendarName + switch (this.segment) { + case "Combinada": + //Inicializa o array eventSource + this.eventSource=[]; + + + if(this.profile == "mdgpr"){ + this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe( + response => { + + this.eventSource=[]; + + this.eventsList = response; + // loop + this.eventsList.forEach((element, eventIndex) => { + + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element, + calendarName: element.CalendarName, + profile: 'md' + }); }); + + this.events = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); + + this.myCal.update(); + this.myCal.loadEvents(); + + this.showLoader = false; + this.showTimeline = true; + + this.timelineBoxCorrectHeight(500); + this.centralizeTimeline(500); + }); - - this.timelineFilter(this.timelineFilterState); - - this.myCal.update(); - this.myCal.loadEvents(); - - this.showLoader = false; - this.showTimeline = true; - - this.timelineBoxCorrectHeight(500); - this.centralizeTimeline(500); - - }); - - } - else{ - this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe( - response => { - - this.eventSource=[]; - - this.eventsList = response; - this.eventsList.forEach((element, eventIndex) => { - this.eventSource.push({ - title: element.Subject, - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element, - calendarName: element.CalendarName + + } + else{ + this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe( + response => { + + this.eventSource=[]; + + this.eventsList = response; + this.eventsList.forEach((element, eventIndex) => { + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element, + calendarName: element.CalendarName, + profile: 'pr' + }); + }); - + + this.events = this.timelineFilter(this.timelineFilterState, this.eventsList, 'pr'); + + this.myCal.update(); + this.myCal.loadEvents(); + this.showLoader = false; + this.showTimeline = true; + + this.timelineBoxCorrectHeight(500); + this.centralizeTimeline(500); + }); - - this.timelineFilter(this.timelineFilterState); - - this.myCal.update(); - this.myCal.loadEvents(); - this.showLoader = false; - this.showTimeline = true; - - this.timelineBoxCorrectHeight(500); - this.centralizeTimeline(500); - - }); - } - break; - - case "Pessoal": - //Inicializa o array eventSource - this.eventSource=[]; - if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { - - this.eventSource=[]; - this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); - this.eventsListPessoal.forEach(element => { - - this.eventSource.push({ - title: element.Subject, - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element - }); - }); - this.myCal.update(); - this.myCal.loadEvents(); - this.showLoader = false; - }); - - } - else{ - this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { - this.eventSource=[]; - - this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); - this.eventsListPessoal.forEach(element => { - this.eventSource.push({ - title: element.Subject, - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element - }); - }); - this.myCal.update(); - this.myCal.loadEvents(); - this.showLoader = false; - }); - } + } break; - - case "Oficial": - //Inicializa o array eventSource - this.eventSource=[]; - if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => { - this.eventSource=[]; - this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); + + case "Pessoal": + //Inicializa o array eventSource + this.eventSource=[]; + if(this.profile == "mdgpr"){ + this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { + + this.eventSource=[]; + this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); + this.eventsListPessoal.forEach(element => { + + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element, + profile: 'md' + }); + }); + this.myCal.update(); + this.myCal.loadEvents(); + this.showLoader = false; + }); + + } + else{ + this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { + this.eventSource=[]; + + this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal"); + this.eventsListPessoal.forEach(element => { + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element, + profile: 'pr' + }); + }); + this.myCal.update(); + this.myCal.loadEvents(); + this.showLoader = false; + }); + } + break; + + case "Oficial": + //Inicializa o array eventSource + this.eventSource=[]; + if(this.profile == "mdgpr"){ + this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => { + this.eventSource=[]; + this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); + this.eventsListOficial.forEach(element => { + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element, + profile: 'md' + }); + }); + this.myCal.update(); + this.myCal.loadEvents(); + this.showLoader = false; + }); + }else{ + this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => { + this.eventSource=[]; + this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); this.eventsListOficial.forEach(element => { this.eventSource.push({ title: element.Subject, startTime: new Date(element.StartDate), endTime: new Date(element.EndDate), allDay: false, - event: element + event: element, + profile: 'pr' }); }); this.myCal.update(); this.myCal.loadEvents(); this.showLoader = false; }); - }else{ - this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => { - this.eventSource=[]; - this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); - this.eventsListOficial.forEach(element => { - this.eventSource.push({ - title: element.Subject, - startTime: new Date(element.StartDate), - endTime: new Date(element.EndDate), - allDay: false, - event: element - }); - }); - this.myCal.update(); - this.myCal.loadEvents(); - this.showLoader = false; - }); - } - break; + } + break; + + } + } else { + + this.showTimelinePR = false; + this.showTimelineMD = false; + this.eventSource=[]; + + this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe( + response => { + + this.eventsList = response; + // loop + this.eventsList.forEach((element, eventIndex) => { + + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element, + calendarName: element.CalendarName, + profile: 'md' + }); + }); + + + this.TimelineMD = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); + this.events = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); + + this.myCal.update(); + this.myCal.loadEvents(); + + this.showTimelineMD = true; + + this.timelineBoxCorrectHeight(500); + this.centralizeTimeline(500); + + }); + + this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe( + response => { + + this.eventsList = response; + this.eventsList.forEach((element, eventIndex) => { + this.eventSource.push({ + title: element.Subject, + startTime: new Date(element.StartDate), + endTime: new Date(element.EndDate), + allDay: false, + event: element, + calendarName: element.CalendarName, + profile:'pr' + }); + + }); + + this.TimelinePR = this.timelineFilter(this.timelineFilterState, this.eventsList, 'pr'); + + console.log(this.TimelinePR); + + this.myCal.update(); + this.myCal.loadEvents(); + + this.showTimelinePR = true; + + this.timelineBoxCorrectHeight(500); + this.centralizeTimeline(500); + + this.showLoader = false; + }); + + } - } } actions(){ - } + } doRefresh(ev: any){ this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 9f435f677..bcf14acdb 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -55,7 +55,6 @@
-
  • diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 18305e427..c565c6809 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -107,7 +107,8 @@ export class PublicationsPage implements OnInit { async AddPublicationFolder(item:any) { this.closeDesktopComponent(); - if(window.innerHeight >= 1024){ + if(window.innerWidth <= 1024){ + const modal = await this.modalController.create({ component: NewActionPage, componentProps:{ @@ -179,31 +180,42 @@ export class PublicationsPage implements OnInit { } } - // called from view publications + + // called from publications details + // Emittter goBackToViewPublications(){ this.closeDesktopComponent(); this.desktopComponent.showViewPublication = true; } + // called from publications details + // Emitters goBackToPubications(){ this.closeDesktopComponent(); this.desktopComponent.showViewPublication = true; } + // called from edit publication (Emitters only) + // Emitters async goBacktoPublicationDetails(){ this.closeDesktopComponent(); this.desktopComponent.showPublicationDetail = true; } + // add new publication or edit publicaton async addNewPublication({publicationType, folderId, publication}){ this.closeDesktopComponent(); // propr to add new publication this.publicationType = publicationType; - this.folderId = folderId; + // edit publication will send null + if (folderId != undefined) { + this.folderId = folderId; + } + this.publication = publication; this.desktopComponent.showAddNewPublication = true; diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.component.html index 3dd5efff9..7223e8b49 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.html +++ b/src/app/shared/agenda/approve-event/approve-event.component.html @@ -1,9 +1,9 @@ - -
    + +
    -
    +
    @@ -37,7 +37,7 @@
    -
    +
    {{loadedEvent.workflowInstanceDataFields.Location}}
    diff --git a/src/app/shared/agenda/approve-event/approve-event.component.scss b/src/app/shared/agenda/approve-event/approve-event.component.scss index 581501c9b..b33b2cc3d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.scss +++ b/src/app/shared/agenda/approve-event/approve-event.component.scss @@ -8,8 +8,6 @@ ion-content{ --height: 225px; } .header-content{ - width: 360px; - overflow: auto; margin: 25px auto; } .header-icon-left{ @@ -19,7 +17,6 @@ ion-content{ float: left; } .header-title{ - width: 264px; font-family: Roboto; font-size: 25px; margin: 0 5px 0 5px; @@ -31,18 +28,14 @@ ion-content{ width: 45px; font-size: 45px; float: left; - overflow: auto; } .upper-content{ margin-left: 50px; - overflow: auto; font-size: 18px; .content-location{ - width: 360px; margin: 0 auto; padding: 0; - overflow: auto; } .location-detail{ diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.component.html index fb5a3b5a0..a04c7eb08 100644 --- a/src/app/shared/agenda/event-list/event-list.component.html +++ b/src/app/shared/agenda/event-list/event-list.component.html @@ -1,4 +1,4 @@ - +
    @@ -59,7 +59,7 @@
    -
    diff --git a/src/app/shared/agenda/event-list/event-list.component.scss b/src/app/shared/agenda/event-list/event-list.component.scss index cc474d78f..a3ed3e1e0 100644 --- a/src/app/shared/agenda/event-list/event-list.component.scss +++ b/src/app/shared/agenda/event-list/event-list.component.scss @@ -1,17 +1,15 @@ .header-content{ - width: 360px; overflow: auto; margin: 0 auto; padding-top: 25px; } .header-icon-left{ - width: 36px; font-size: 33px; color: #42b9fe; float: left; } .header-title{ - width: 300px; + font-family: Roboto; font-size: 25px; margin: 0 5px 0 5px; @@ -23,36 +21,30 @@ margin-top: 5px; } .Rectangle { - width: 360px; border-radius: 15px; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); border: solid 1px #e9e9e9; background-color: var(--white); - margin: 0 auto; padding: 10px; margin-bottom: 10px; overflow: auto; } .content-mdgpr-Oficial{ - width: 340px; border-radius: 5px; border-right: 5px solid #99e47b; overflow: auto; } .content-mdgpr-Pessoal{ - width: 340px; border-radius: 5px; border-right: 5px solid #958bfc; overflow: auto; } .content-pr-Oficial{ - width: 340px; border-radius: 5px; border-right: 5px solid #ffb703; overflow: auto; } .content-pr-Pessoal{ - width: 340px; border-radius: 5px; border-right: 5px solid #f05d5e; overflow: auto; @@ -79,7 +71,6 @@ margin-left: 10px; } .approve-event-detail p{ - width: 250px; font-family: Roboto; font-size: 13px; font-weight: normal; @@ -92,7 +83,6 @@ padding: 0; } .approve-event-detail h3{ - width: 250px; font-family: Roboto; font-size: 15px; font-weight: bold; diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index a293c6218..b6242aa70 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -16,11 +16,11 @@
    -
    +
    -
    +
    @@ -32,11 +32,11 @@
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    Não se repete Repete @@ -125,11 +125,11 @@
    -
    +
    -
    +
    @@ -146,11 +146,11 @@