diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss index b3a81fcf2..5cc7061c9 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.scss +++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss @@ -146,6 +146,7 @@ border-radius: 50%; margin: 0 auto; border-color: transparent !important; + object-fit: cover; } .ion-icon-class-theme { diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss index 148df11d2..29909cc5f 100644 --- a/src/app/modals/profile/profile.page.scss +++ b/src/app/modals/profile/profile.page.scss @@ -86,6 +86,7 @@ border-radius: 50%; margin: 0 auto; border-color: transparent !important; + object-fit: cover; } .icon { diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 004a6b4ca..d44521415 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -140,7 +140,7 @@ -
+
-
diff --git a/src/app/pages/publications/edit-action/edit-action.page.html b/src/app/pages/publications/edit-action/edit-action.page.html index 3572ad8b9..4aa50f747 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.html +++ b/src/app/pages/publications/edit-action/edit-action.page.html @@ -20,30 +20,18 @@
-
- - +
- - + @@ -58,30 +46,19 @@
-
- - +
- + diff --git a/src/app/pages/publications/edit-action/edit-action.page.ts b/src/app/pages/publications/edit-action/edit-action.page.ts index 23465dc22..e94c27dbf 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.ts +++ b/src/app/pages/publications/edit-action/edit-action.page.ts @@ -6,11 +6,28 @@ import { PublicationFolder } from 'src/app/models/publicationfolder'; import { PublicationsService } from 'src/app/services/publications.service'; import { ToastService } from 'src/app/services/toast.service'; import { HttpErrorHandle} from 'src/app/services/http-error-handle.service'; +import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; + +const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { + parse: { + dateInput: "YYYY-MMMM-DD HH:mm" + }, + display: { + dateInput: "DD MMM YYYY H:mm", + monthYearLabel: "MMM YYYY", + dateA11yLabel: "LL", + monthYearA11yLabel: "MMMM YYYY" + } +} @Component({ selector: 'app-edit-action', templateUrl: './edit-action.page.html', styleUrls: ['./edit-action.page.scss'], + providers: [ + { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS }, + ] }) export class EditActionPage implements OnInit { @@ -28,8 +45,6 @@ export class EditActionPage implements OnInit { public stepHour = 1; public stepMinute = 15; public stepSecond = 5; - public dateControlStart = new FormControl(moment("DD MM YYYY hh")); - public dateControlEnd = new FormControl(moment("DD MM YYYY hh")); currentDate = new Date(); folder: PublicationFolder; @@ -71,26 +86,12 @@ export class EditActionPage implements OnInit { getPublicationDetail() { this.publicationsService.GetPresidentialAction(this.folderId).subscribe( res => { this.folder = res; - - this.dateControlStart = new FormControl(moment(new Date(this.folder.DateBegin))); - this.dateControlEnd = new FormControl(moment(new Date(this.folder.DateEnd))); }); } get dateValid() { - var validado: boolean; - - if (window.innerWidth <= 800) { - if ((this.folder.DateBegin < this.folder.DateEnd) && (new Date(this.folder.DateBegin).getTime() > this.currentDate.getTime())) { - validado = true; - }else{ - validado = false; - } - return validado == true ? ['ok']: []; - } else { - return ['ok'] - } + return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateEnd).getTime()? 'ok': null } runValidation() { diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index f9a0d1615..4bbde9b92 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -28,7 +28,7 @@
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index 4673ecb8d..5b9747fca 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -7,6 +7,8 @@ import { DateService } from '../date.service'; }) export class ListBoxService { + height = "unset" + constructor( private dateService: DateService ){} diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index d6ef06ae1..068542df7 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -318,7 +318,7 @@ export class TaskService { for(let calendar of this.eventService.calendarNamesAry) { if(calendar == 'Meu calendario') { // color - let genericEvents = await this.processesbackend.GetTasksList('Agendar Evento', false).toPromise(); + let genericEvents = await this.processesbackend.eventsToApprove(SessionStore.user.UserId, false).toPromise(); let eventsList try { eventsList = genericEvents diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 0514803d9..345422ef7 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -106,7 +106,12 @@ export class EventListPage implements OnInit { if(this.segment == 'Meu calendario') { // color - this.color = 'mdgpr' + + if(SessionStore.user.Profile == 'PR') { + this.color = 'pr' + } else { + this.color = 'mdgpr' + } let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise() try { diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index cc6e8fc44..46cff50d9 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -117,7 +117,7 @@ ion-content{ background: var(--label-bg-color); float: right !important; padding: 5px 13.5px 5px 13.5px; - color: #fff; + color: black; font-size: rem(14); } } 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 da030c116..6eaa521f1 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 @@ -106,7 +106,7 @@ >
-
+

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}

@@ -120,6 +120,9 @@ Para hoje Nova
+
+
{{ event.activityInstanceName }}
+
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss index abc4123d5..303219235 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss @@ -258,3 +258,15 @@ width: 20px; } } + + + + +.label-event-type { + padding: 1px 7px; + display: inline-block; + background: #ffb703; + border-radius: 17px; + color: black; + font-size: rem(13); +} diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 596d312d2..2609fa03d 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -176,14 +176,17 @@ export class EventsToApprovePage implements OnInit { this.showLoader = true; const segment = this.segment - if(SessionStore.user.Profile == 'PR') { - return false - } - + if(this.segment == 'Meu calendario') { // color - this.color = 'mdgpr' + + if(SessionStore.user.Profile == 'PR') { + this.color = 'pr' + } else { + this.color = 'mdgpr' + } + let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise() try { diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 83c670c64..42cc46118 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -16,7 +16,7 @@
diff --git a/src/assets/icon/theme/gov/icons-chat-record-audio.svg b/src/assets/icon/theme/gov/icons-chat-record-audio.svg index 6e90079a1..3b6693b3d 100644 --- a/src/assets/icon/theme/gov/icons-chat-record-audio.svg +++ b/src/assets/icon/theme/gov/icons-chat-record-audio.svg @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/src/assets/icon/theme/gov/icons-chat-send.svg b/src/assets/icon/theme/gov/icons-chat-send.svg index ab4457c38..341923384 100644 --- a/src/assets/icon/theme/gov/icons-chat-send.svg +++ b/src/assets/icon/theme/gov/icons-chat-send.svg @@ -1,7 +1,7 @@ - - + + - - + + diff --git a/src/assets/icon/theme/gov/icons-most-searched-words-open.svg b/src/assets/icon/theme/gov/icons-most-searched-words-open.svg index f26180425..0f6762a85 100644 --- a/src/assets/icon/theme/gov/icons-most-searched-words-open.svg +++ b/src/assets/icon/theme/gov/icons-most-searched-words-open.svg @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/src/assets/images/icons-menu.svg b/src/assets/images/icons-menu.svg deleted file mode 100644 index b56583239..000000000 --- a/src/assets/images/icons-menu.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/assets/images/icons-nav-agenda-active.svg b/src/assets/images/icons-nav-agenda-active.svg deleted file mode 100644 index 351f44834..000000000 --- a/src/assets/images/icons-nav-agenda-active.svg +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/images/icons-profile-calendar-md.svg b/src/assets/images/icons-profile-calendar-md.svg deleted file mode 100644 index 50467ae8d..000000000 --- a/src/assets/images/icons-profile-calendar-md.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/images/icons-received-event.svg b/src/assets/images/icons-received-event.svg index 28399319e..b1261e0b8 100644 --- a/src/assets/images/icons-received-event.svg +++ b/src/assets/images/icons-received-event.svg @@ -4,17 +4,17 @@ - - + + - - - - - + + + + + diff --git a/src/assets/images/theme/gov/advance-search-show-modal.svg b/src/assets/images/theme/gov/advance-search-show-modal.svg index f26180425..0f6762a85 100644 --- a/src/assets/images/theme/gov/advance-search-show-modal.svg +++ b/src/assets/images/theme/gov/advance-search-show-modal.svg @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/src/assets/images/theme/gov/icon-reload.svg b/src/assets/images/theme/gov/icon-reload.svg new file mode 100644 index 000000000..174629823 --- /dev/null +++ b/src/assets/images/theme/gov/icon-reload.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/theme/gov/icons-add.svg b/src/assets/images/theme/gov/icons-add.svg index 7881dd435..f67b1e5b6 100644 --- a/src/assets/images/theme/gov/icons-add.svg +++ b/src/assets/images/theme/gov/icons-add.svg @@ -1,7 +1,7 @@ - - - + + + - - + + diff --git a/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg index 7773657f0..e45c347bb 100644 --- a/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg +++ b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg @@ -1,4 +1,4 @@ - + diff --git a/src/assets/images/theme/gov/icons-attach-doc.svg b/src/assets/images/theme/gov/icons-attach-doc.svg index 249413b3e..261e27856 100644 --- a/src/assets/images/theme/gov/icons-attach-doc.svg +++ b/src/assets/images/theme/gov/icons-attach-doc.svg @@ -1,6 +1,6 @@ - - + + - + diff --git a/src/assets/images/theme/gov/icons-chat-new-conversation.svg b/src/assets/images/theme/gov/icons-chat-new-conversation.svg index 5503bda7d..149a478ff 100644 --- a/src/assets/images/theme/gov/icons-chat-new-conversation.svg +++ b/src/assets/images/theme/gov/icons-chat-new-conversation.svg @@ -1,6 +1,6 @@ - - - + + + diff --git a/src/assets/images/theme/gov/icons-chat-new-group.svg b/src/assets/images/theme/gov/icons-chat-new-group.svg index 7b439345a..1e983ba34 100644 --- a/src/assets/images/theme/gov/icons-chat-new-group.svg +++ b/src/assets/images/theme/gov/icons-chat-new-group.svg @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/src/assets/images/theme/gov/icons-chat-record-audio.svg b/src/assets/images/theme/gov/icons-chat-record-audio1.svg similarity index 87% rename from src/assets/images/theme/gov/icons-chat-record-audio.svg rename to src/assets/images/theme/gov/icons-chat-record-audio1.svg index 48eb285e7..5c13ef594 100644 --- a/src/assets/images/theme/gov/icons-chat-record-audio.svg +++ b/src/assets/images/theme/gov/icons-chat-record-audio1.svg @@ -1,4 +1,6 @@ - + - + + + diff --git a/src/assets/images/theme/gov/icons-chat-send.svg b/src/assets/images/theme/gov/icons-chat-send.svg index ab4457c38..341923384 100644 --- a/src/assets/images/theme/gov/icons-chat-send.svg +++ b/src/assets/images/theme/gov/icons-chat-send.svg @@ -1,7 +1,7 @@ - - + + - - + + diff --git a/src/assets/images/theme/gov/icons-collaps-down.svg b/src/assets/images/theme/gov/icons-collaps-down.svg index e2930614e..2f63a7b0d 100644 --- a/src/assets/images/theme/gov/icons-collaps-down.svg +++ b/src/assets/images/theme/gov/icons-collaps-down.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/src/assets/images/theme/gov/icons-collaps-up.svg b/src/assets/images/theme/gov/icons-collaps-up.svg index f7678ebca..e971dff07 100644 --- a/src/assets/images/theme/gov/icons-collaps-up.svg +++ b/src/assets/images/theme/gov/icons-collaps-up.svg @@ -1,3 +1,11 @@ - + + + + + + + + + diff --git a/src/assets/images/theme/gov/icons-edit.svg b/src/assets/images/theme/gov/icons-edit.svg index e71901278..be875b108 100644 --- a/src/assets/images/theme/gov/icons-edit.svg +++ b/src/assets/images/theme/gov/icons-edit.svg @@ -1,8 +1,8 @@ - - + + - - - + + + diff --git a/src/assets/images/theme/gov/icons-received-event.svg b/src/assets/images/theme/gov/icons-received-event.svg index 3912abc68..e5eb14e83 100644 --- a/src/assets/images/theme/gov/icons-received-event.svg +++ b/src/assets/images/theme/gov/icons-received-event.svg @@ -1,10 +1,10 @@ - - + + - - - - - + + + + + diff --git a/src/assets/images/theme/gov/icons-search-close.svg b/src/assets/images/theme/gov/icons-search-close.svg index 97dcbe0c6..5eadffda3 100644 --- a/src/assets/images/theme/gov/icons-search-close.svg +++ b/src/assets/images/theme/gov/icons-search-close.svg @@ -1,7 +1,7 @@ - - + + - - + + diff --git a/src/assets/images/theme/gov/icons-search.svg b/src/assets/images/theme/gov/icons-search.svg index 6a62127b8..11da39760 100644 --- a/src/assets/images/theme/gov/icons-search.svg +++ b/src/assets/images/theme/gov/icons-search.svg @@ -1,7 +1,7 @@ - - + + - - + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 50e56fda6..455ff071a 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -115,6 +115,9 @@ $app-theme: mat-light-theme( --ion-color-light-tint: #f5f6f9; --ion-color-expediente: #dae3f3; + + + --ion-color-primary-contrast: black; } // dark-mode @@ -1089,4 +1092,5 @@ body { .chat-aside { top: -31px; -} \ No newline at end of file +} + diff --git a/version/git-version.ts b/version/git-version.ts index e0154fe9f..b5fce608b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "71ab74974", - "SHA": "71ab74974dba34ac084234c233e2a2be76d51241", + "shortSHA": "79b0c76cf", + "SHA": "79b0c76cfda2ff8acb74704aac5f0b3bfb133d4e", "branch": "developer-prod", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Wed Aug 30 17:07:08 2023 +0100'", - "lastCommitMessage": "add picture from gallery on chat grup solved", - "lastCommitNumber": "5238", + "lastCommitTime": "'Wed Aug 30 18:41:13 2023 +0100'", + "lastCommitMessage": "try to solved add file", + "lastCommitNumber": "5239", "change": "", - "changeStatus": "On branch developer-prod\nYour branch is behind 'origin/developer-prod' by 7 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/messages/messages.page.ts", + "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 1 and 9 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/modals/profile/edit-profile/edit-profile.page.scss\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/services/agenda/list-box.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/assets/icon/theme/gov/icons-chat-record-audio.svg\n\tmodified: src/assets/icon/theme/gov/icons-chat-send.svg\n\tmodified: src/assets/icon/theme/gov/icons-most-searched-words-open.svg\n\tdeleted: src/assets/images/icons-menu.svg\n\tdeleted: src/assets/images/icons-nav-agenda-active.svg\n\tdeleted: src/assets/images/icons-profile-calendar-md.svg\n\tmodified: src/assets/images/icons-received-event.svg\n\tmodified: src/assets/images/theme/gov/advance-search-show-modal.svg\n\tnew file: src/assets/images/theme/gov/icon-reload.svg\n\tmodified: src/assets/images/theme/gov/icons-add.svg\n\tmodified: src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg\n\tmodified: src/assets/images/theme/gov/icons-attach-doc.svg\n\tmodified: src/assets/images/theme/gov/icons-chat-new-conversation.svg\n\tmodified: src/assets/images/theme/gov/icons-chat-new-group.svg\n\trenamed: src/assets/images/theme/gov/icons-chat-record-audio.svg -> src/assets/images/theme/gov/icons-chat-record-audio1.svg\n\tmodified: src/assets/images/theme/gov/icons-chat-send.svg\n\tmodified: src/assets/images/theme/gov/icons-collaps-down.svg\n\tmodified: src/assets/images/theme/gov/icons-collaps-up.svg\n\tmodified: src/assets/images/theme/gov/icons-edit.svg\n\tmodified: src/assets/images/theme/gov/icons-received-event.svg\n\tmodified: src/assets/images/theme/gov/icons-search-close.svg\n\tmodified: src/assets/images/theme/gov/icons-search.svg\n\tmodified: src/theme/variables.scss", "changeAuthor": "eudes.inacio" } \ No newline at end of file