diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 0b7bb5111..e70e4aaf6 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -19,9 +19,11 @@ .monthview-selected { background-color: lightskyblue !important; } - /* .item{ - background: red !important; - } */ + .item{ + /* background: red !important; */ + text-transform: capitalize; + + } .input-wrapper{ border-left: red !important; /* background: red; */ @@ -34,10 +36,6 @@ border-radius: 15px; } -.capitaliseText{ - text-transform: capitalize; -} - /* TOGGLE button */ diff --git a/src/app/pages/events/attachments/attachments.page.ts b/src/app/pages/events/attachments/attachments.page.ts index 34c3db1aa..6ed399924 100644 --- a/src/app/pages/events/attachments/attachments.page.ts +++ b/src/app/pages/events/attachments/attachments.page.ts @@ -14,7 +14,11 @@ export class AttachmentsPage implements OnInit { loadedEventAttachments: Attachment[]; pageId: string; - constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser, private route: Router) { } + constructor( + private attachamentsService: AttachmentsService, + private activatedRoute: ActivatedRoute, + private iab: InAppBrowser, + private route: Router) { } ngOnInit() { /* Emit new data when something changes */ @@ -43,8 +47,8 @@ export class AttachmentsPage implements OnInit { } navigateBack(){ - console.log(this.pageId); this.route.navigate(['/home/events',this.pageId]); } + } diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.html b/src/app/pages/events/attendee-modal/attendee-modal.page.html index 2ca594b80..60a73dc46 100644 --- a/src/app/pages/events/attendee-modal/attendee-modal.page.html +++ b/src/app/pages/events/attendee-modal/attendee-modal.page.html @@ -31,7 +31,7 @@ - Gravar + Adicionar diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index 2e58fbda1..1be3f6046 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -49,7 +49,7 @@ - Gravar + OK diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html index f35246d9e..51671f993 100644 --- a/src/app/pages/events/event-detail/event-detail.page.html +++ b/src/app/pages/events/event-detail/event-detail.page.html @@ -18,8 +18,8 @@
- Assunto - + Assunto + @@ -28,15 +28,15 @@ Descrição - + Localização - + Calendário - + Pessoal Oficial @@ -101,7 +101,7 @@ - {{attendee.Name}} + {{attendee.Name}} @@ -137,7 +137,7 @@
-
diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss index 542a7d5fb..b94403c90 100644 --- a/src/app/pages/events/event-detail/event-detail.page.scss +++ b/src/app/pages/events/event-detail/event-detail.page.scss @@ -92,3 +92,4 @@ ion-card{ text-transform: initial; font-size: 16px; } + diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts index 86d36e8c2..d23df4533 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -40,6 +40,7 @@ export class EventDetailPage implements OnInit { private modalCtrl: ModalController, private alertService: AlertService, private attachamentsService: AttachmentsService, + private route: Router, private iab: InAppBrowser) { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); @@ -204,4 +205,7 @@ export class EventDetailPage implements OnInit { }, 2000); } + navigateTo(ev){ + this.route.navigate(['/home/events',ev]); + } } diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 72bfa3c5d..109550f72 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -72,7 +72,7 @@
-

{{event.Subject}}

+

{{event.Subject}}

{{event.StartDate | date: 'hh:mm'}} - {{event.EndDate| date: 'hh:mm'}}

@@ -81,7 +81,7 @@
-

{{event.Location}}

+

{{event.Location}}

@@ -105,7 +105,7 @@
-

{{event.Subject}}

+

{{event.Subject}}

{{event.StartDate | date: 'hh:mm'}} - {{event.EndDate | date: 'hh:mm'}}

@@ -114,7 +114,7 @@
-

{{event.Location}}

+

{{event.Location}}

@@ -138,7 +138,7 @@
-

{{event.Subject}}

+

{{event.Subject}}

{{event.StartDate | date: 'hh:mm' }} - {{event.EndDate | date: 'hh:mm'}}

@@ -147,7 +147,7 @@
-

{{event.Location}}

+

{{event.Location}}

diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 5154c732c..2c2589081 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -249,4 +249,7 @@ --height: 80%; --border-radius: 10px; padding: 25px; -} */ \ No newline at end of file +} */ +.capitalizeText{ + text-transform: capitalize; +} \ No newline at end of file