diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index d69833445..96c64126c 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, Inject, LOCALE_ID } from '@angular/core'; import { CalendarComponent } from 'ionic2-calendar'; -import { ModalController, Platform } from '@ionic/angular'; +import { ModalController } from '@ionic/angular'; import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../models/event.model'; import { Router, NavigationEnd, NavigationExtras } from '@angular/router'; @@ -8,7 +8,6 @@ import { momentG } from 'src/plugin/momentG'; import { EventPerson } from 'src/app/models/eventperson.model'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js'; -import { Storage } from '@ionic/storage'; // showTimeline import { setHours, setMinutes } from 'date-fns'; @@ -27,7 +26,6 @@ import { CalendarStore } from 'src/app/store/calendar.service'; import { ListBoxService } from 'src/app/services/agenda/list-box.service'; import { ChangeProfileService } from 'src/app/services/change-profile.service'; -import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { SessionStore } from 'src/app/store/session.service'; @@ -179,11 +177,8 @@ export class AgendaPage implements OnInit { private dateAdapter: DateAdapter, private listBoxService: ListBoxService, private changeProfileService: ChangeProfileService, - private sqliteservice: SqliteService, - private platform: Platform, private backgroundservice: BackgroundService, public ThemeService: ThemeService, - private storage:Storage, public p: PermissionService, public RoleIdService: RoleIdService ) { diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index f74dd49c6..90a348845 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -60,13 +60,7 @@ - -
Minha agenda
-
{{ environment.agendaPR}}
-
{{ environment.agendaVP}}
-
Agenda do {{calendars.Fullname}}
-
- +
Minha agenda
{{ environment.agendaPR}}
{{ environment.agendaVP}}
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index f96643093..a773cacc8 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -10,13 +10,7 @@ - -
Minha agenda
-
{{ environment.agendaPR}}
-
{{ environment.agendaVP}}
-
Agenda do {{calendars.Fullname}}
-
- +
Minha agenda
{{ environment.agendaPR}}
{{ environment.agendaVP}}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 0a6442cd9..3c87d8460 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -90,14 +90,7 @@ - - -
Minha agenda
-
{{ environment.agendaPR}}
-
{{ environment.agendaVP}}
-
Agenda do {{calendars.Fullname}}
-
- +
Minha agenda
{{ environment.agendaPR}}
{{ environment.agendaVP}}
diff --git a/version/git-version.ts b/version/git-version.ts index d9797c653..692939ca0 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1f45e0f73", - "SHA": "1f45e0f73378c2e54e7ef6d77cf9c41594d60eeb", + "shortSHA": "cbd54389b", + "SHA": "cbd54389b497e49658135ab02c3222b52b09cfa8", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Tue Jun 13 11:49:58 2023 +0100'", - "lastCommitMessage": "order event to aprove tabs", - "lastCommitNumber": "5017", + "lastCommitTime": "'Tue Jun 13 14:40:22 2023 +0100'", + "lastCommitMessage": "build", + "lastCommitNumber": "5019", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 7 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 8 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html", "changeAuthor": "eudes.inacio" } \ No newline at end of file