diff --git a/src/app/modals/dar-parecer/dar-parecer.page.html b/src/app/modals/dar-parecer/dar-parecer.page.html index fc0f56259..c6603602d 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.html +++ b/src/app/modals/dar-parecer/dar-parecer.page.html @@ -56,8 +56,8 @@
- +
diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index 598195891..d3fb2452a 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -92,8 +92,8 @@
- +
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 76305c092..a9a166e9b 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -143,12 +143,14 @@ export class DocumentSetUpMeetingPage implements OnInit { } if(this.taskParticipants.length == 0) { - this.taskParticipants = [{ - EmailAddress: SessionStore.user.Email, - IsRequired: true, - Name: SessionStore.user.FullName, - UserType: "GD" - }] + this.taskParticipants = [ + // { + // EmailAddress: SessionStore.user.Email, + // IsRequired: true, + // Name: SessionStore.user.FullName, + // UserType: "GD" + // } + ] } this.changeAgenda() diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index d011f4cc2..52c9892ab 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -77,8 +77,9 @@
- + +
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index 926e82416..0f303add4 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -37,6 +37,26 @@
+
+ + + + + + + + +
+
{{SessionStore.user.FullName}}
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss index f0029c55c..148df11d2 100644 --- a/src/app/modals/profile/profile.page.scss +++ b/src/app/modals/profile/profile.page.scss @@ -80,6 +80,14 @@ //color: var(--profile-text-color) !important; } +.profile-pic{ + width: 150px; + height: 150px; + border-radius: 50%; + margin: 0 auto; + border-color: transparent !important; +} + .icon { font-size: rem(40); } diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index 150600c25..fd3a8b7cd 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -22,7 +22,8 @@
- + +
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 48acf5568..dea1c19bc 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -154,12 +154,14 @@ export class BookMeetingModalPage implements OnInit { } if (this.taskParticipants.length == 0) { - this.taskParticipants = [{ - EmailAddress: SessionStore.user.Email, - IsRequired: true, - Name: SessionStore.user.FullName, - UserType: "GD" - }] + this.taskParticipants = [ + // { + // EmailAddress: SessionStore.user.Email, + // IsRequired: true, + // Name: SessionStore.user.FullName, + // UserType: "GD" + // } + ] } this.changeAgenda(); diff --git a/version/git-version.ts b/version/git-version.ts index 70ff8dda2..587c79187 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "578797e01", - "SHA": "578797e0197b3d219921fc73a25f6184c6b67395", + "shortSHA": "188e1033b", + "SHA": "188e1033b8d59e6029218c54edfc506d78e1a960", "branch": "developer-prod", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Tue Aug 22 15:47:47 2023 +0100'", - "lastCommitMessage": "pul made", - "lastCommitNumber": "5206", + "lastCommitTime": "'Tue Aug 22 17:51:32 2023 +0100'", + "lastCommitMessage": "bug fixed", + "lastCommitNumber": "5208", "change": "", - "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 4 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/modals/add-note/add-note.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pipes/publication.pipe.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/store/publication-folder.service.ts", + "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 5 and 3 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/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file