From 30aba9b182c15ea7321fc807156acacacc2d383e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 15 Aug 2023 10:15:08 +0100 Subject: [PATCH 1/7] improve --- .../chat/messages/contacts/contacts.page.ts | 10 ++- .../new-publication/new-publication.page.html | 48 +++++++------ .../new-publication/new-publication.page.scss | 4 +- .../new-publication/new-publication.page.ts | 67 ++----------------- src/app/services/chat/chat-system.service.ts | 8 ++- .../chat/messages/contacts/contacts.page.html | 2 +- .../chat/messages/contacts/contacts.page.ts | 14 +++- .../new-publication/new-publication.page.html | 62 +++++++++-------- .../new-publication/new-publication.page.ts | 11 ++- version/git-version.ts | 10 +-- 10 files changed, 107 insertions(+), 129 deletions(-) diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts index 9955b6bc1..c4ddf258b 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.ts +++ b/src/app/pages/chat/messages/contacts/contacts.page.ts @@ -95,9 +95,13 @@ export class ContactsPage implements OnInit { } this.chatService.createRoom(body).subscribe(async(res) => { this.room = res['room']; - await this.ChatSystemService.getAllRooms(); - this.getDirectMessage(this.room._id); - this.loading = false + + this.ChatSystemService.getAllRooms(() => { + this.getDirectMessage(this.room._id); + this.loading = false + }, this.room._id); + + }, ()=> { this.loading = false }); diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 2e89f18df..4c245deb2 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -1,15 +1,15 @@
-
-
+
+
{{publicationTitle}}
Campos marcados com * são obrigatórios
-
+
@@ -25,41 +25,39 @@
-
- Fotografia Anexada +
+ Fotografia Anexada - - +
+
+ - - - - - - - -

{{capturedImageTitle}}

- - -
+ + + +

{{capturedImageTitle}}

+ + +
+ +
- - - +
-
+ +
image
{{publication.OriginalFileName}}.{{publication.FileExtension}}
-
75 Kb
+
-
-
X
+
+
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss index 2a9427312..2fa8e3f03 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.scss +++ b/src/app/pages/publications/new-publication/new-publication.page.scss @@ -55,9 +55,11 @@ ion-toolbar{ background: #ffffff; height: 100%; box-shadow: 0px 0px 18px rgba(0, 0, 0, 0.6); - padding: 25px 20px 0 20px; overflow: auto; } +.padding{ + padding: 25px 20px 0 20px; +} .title-content{ margin: 0px auto; padding: 0 !important; diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 51acf78e0..b9e15b1cc 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -125,6 +125,7 @@ export class NewPublicationPage implements OnInit { this.convertBlobToBase64Worker.postMessage(blob); this.convertBlobToBase64Worker.onmessage = async (oEvent)=> { this.capturedImage = oEvent.data + this.capturedImageTitle = 'foto' } } @@ -186,6 +187,7 @@ export class NewPublicationPage implements OnInit { this.convertBlobToBase64Worker.postMessage(blob); this.convertBlobToBase64Worker.onmessage = async (oEvent)=> { this.capturedImage = oEvent.data + this.capturedImageTitle = 'foto' } @@ -357,6 +359,7 @@ export class NewPublicationPage implements OnInit { } clear() { + this.capturedImageTitle = ''; this.capturedImage = ''; } @@ -375,30 +378,6 @@ export class NewPublicationPage implements OnInit { } } - /* async openGallery() { - const modal = await this.modalController.create({ - component: GalleryPage, - componentProps:{ - }, - cssClass: 'new-publication', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - } */ - - /* async takePicture(){ - const image = await Plugins.Camera.getPhoto({ - quality: 100, - allowEditing: false, - resultType: CameraResultType.DataUrl, - source: CameraSource.Camera - }); - - - this.photo = this.sanitizer.bypassSecurityTrustResourceUrl(image && (image.dataUrl)); - } */ - async selectImage() { const image = await Camera.getPhoto({ quality: 90, @@ -453,26 +432,6 @@ export class NewPublicationPage implements OnInit { }); await loading.present(); - /* Filesystem.readdir({ - path: `${IMAGE_DIR}/${fileName}`, - directory: Directory.Data, - }).then(result => { - - let lastphoto = result.files[result.files.length - 1] - this.loadFileData(lastphoto); - }, - async (err) => { - - // Folder does not yet exists! - await Filesystem.mkdir({ - path: IMAGE_DIR, - directory: Directory.Data, - recursive: true - }); - } - ).then(_ => { - loading.dismiss(); - }); */ } async loadFileData(fileName: string) { @@ -506,22 +465,6 @@ export class NewPublicationPage implements OnInit { } - /* compressImage() { - let image = this.capturedImage; - this.imageCompress.compressFile(image, orientation, 50, 50,).then(() => { - - this.imgResultBeforeCompress = image; - - - this.imageCompress.compressFile(image, orientation, 50, 50).then( - result => { - this.imgResultAfterCompress = result; - - } - ); - }) - } */ - compressFile() { //this.imgResultBeforeCompress = image;s @@ -538,5 +481,7 @@ export class NewPublicationPage implements OnInit { } - + deletePublicationImage() { + this.publication.FileBase64 = "" + } } diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index de3410cf0..6c5c85cc7 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -199,7 +199,7 @@ export class ChatSystemService { } } - async getAllRooms () { + async getAllRooms (callback:Function = () =>{} , roomIdCallback = "") { this.loadingWholeList = true var rooms; @@ -295,7 +295,13 @@ export class ChatSystemService { rooms.result.update[index]['membersExcludeMe'] = users await this.prepareRoom(roomData); } + } + + if(roomId == roomIdCallback) { + callback() + } + index++; } diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index 1622ef118..3c8d597c7 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -22,7 +22,7 @@ - + diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts index 4a7168408..681b0ff0f 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.ts +++ b/src/app/shared/chat/messages/contacts/contacts.page.ts @@ -21,6 +21,7 @@ export class ContactsPage implements OnInit { room:any; dm:any; sessionStore = SessionStore + loading = false @Input() roomId: string; @Output() openMessage:EventEmitter = new EventEmitter(); @@ -67,10 +68,19 @@ export class ContactsPage implements OnInit { let body = { username: username, } + + this.loading = true this.chatService.createRoom(body).subscribe(res => { - this.ChatSystemService.getAllRooms(); this.room = res['room']; - this.openMessage.emit(this.room._id); + + this.ChatSystemService.getAllRooms(() => { + this.openMessage.emit(this.room._id); + + this.loading = false + }, this.room._id); + + }, ()=> { + this.loading = false }); } } diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index 9a69f55b3..c0eac9b78 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -29,39 +29,47 @@
- +
- Fotografia Anexada - - - - - - -

{{capturedImageTitle}}

- - + Fotografia Anexada +
+
+ + + + + +

{{capturedImageTitle}}

+ + +
- +
+
+ + + +
+ +
+
+ + + + + +

{{publication.OriginalFileName}}.{{publication.FileExtension}}

+ + +
+ +
- -
-
- image -
-
-
{{publication.OriginalFileName}}.{{publication.FileExtension}}
-
75 Kb
-
-
-
X
-
-
- -
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 5671ea3f8..89f89425f 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -93,7 +93,7 @@ export class NewPublicationPage implements OnInit { }); this.capturedImage = 'data:image/jpeg;base64,' +capturedImage.base64String; - this.capturedImageTitle = capturedImage.path; + this.capturedImageTitle = 'foto'; // } @@ -105,7 +105,7 @@ export class NewPublicationPage implements OnInit { }); this.capturedImage = 'data:image/jpeg;base64,' +capturedImage.base64String; - this.capturedImageTitle = capturedImage.path; + this.capturedImageTitle = 'foto'; } @@ -272,10 +272,15 @@ export class NewPublicationPage implements OnInit { this.goBack(); } - clear(){ + clear() { + this.capturedImageTitle = ''; this.capturedImage = ''; } + deletePublicationImage() { + this.publication.FileBase64 = "" + } + setTitle(){ if(this.publicationType == '1') { this.publicationTitle = 'Nova Publicação Rápida'; diff --git a/version/git-version.ts b/version/git-version.ts index 420f1e1d1..f0dc8c63b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "3dae0db03", - "SHA": "3dae0db03e713f2a8fa728ca8f12cb59195075ef", + "shortSHA": "4f4381a6d", + "SHA": "4f4381a6d7f9fb23cc31a0a57d4d1bcce86bb204", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Aug 14 21:26:23 2023 +0100'", + "lastCommitTime": "'Mon Aug 14 21:43:52 2023 +0100'", "lastCommitMessage": "fix errors", - "lastCommitNumber": "5156", + "lastCommitNumber": "5157", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.scss\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 20c53993bfe98bcea0e84b80dbede56f84a267a5 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 15 Aug 2023 12:03:37 +0100 Subject: [PATCH 2/7] update --- src/app/pages/agenda/agenda.page.ts | 4 +++ .../agenda/edit-event/edit-event.page.ts | 8 +++++ .../group-contacts/group-contacts.page.ts | 27 ++++++++++++++--- .../new-publication/new-publication.page.html | 5 +--- .../group-contacts/group-contacts.page.ts | 29 +++++++++++++++---- .../new-publication/new-publication.page.html | 2 +- src/global.scss | 21 +++++++------- version/git-version.ts | 12 ++++---- 8 files changed, 78 insertions(+), 30 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index bd019d5ad..a409d91e3 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -235,6 +235,10 @@ export class AgendaPage implements OnInit { this.tigerUpdate() + window['reloadCalendar'] = () => { + this.reloadCalendar() + } + } diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index a6a5f8e58..517b498b9 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -353,6 +353,10 @@ export class EditEventPage implements OnInit { if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { + if(window['reloadCalendar']) { + window['reloadCalendar']() + } + if(this.initCalendarName != this.postEvent.CalendarName) { let body = { @@ -375,6 +379,10 @@ export class EditEventPage implements OnInit { } else { this.eventsService.editEvent(this.postEvent, 2, 3, this.postEvent.CalendarId).subscribe(async () => { + if(window['reloadCalendar']) { + window['reloadCalendar']() + } + if(this.initCalendarName != this.postEvent.CalendarName) { let body = { diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts index 5636f9a4f..90eab93a4 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts @@ -147,18 +147,37 @@ export class GroupContactsPage implements OnInit { this.modalController.dismiss(); } - onChange(event){ + onChange(event) { this.textSearch = event.detail.value; - this.users = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { - if(a.name < b.name){ + const users = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { + if(a.name < b.name) { return -1; } - if(a.name > b.name){ + if(a.name > b.name) { return 1; } return 0; }); + + const selectedUsers = this.users.filter( e => e?.isChecked == true) + + users.forEach( (user, index) => { + if(user[index]) { + console.log({user, index}) + const isCheck = selectedUsers.find( e => e._id == user._id)?.isChecked + if(isCheck) { + user[index].isChecked = isCheck + } + + // if(user[index].isChecked) { + // console.log('user[index].isChecked', user[index].isChecked) + // } + } + + }) + + this.users = users } diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 4c245deb2..8376f7878 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -99,10 +99,7 @@ - - diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts index 77e4c4d77..7dd8027bb 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts @@ -235,20 +235,39 @@ export class GroupContactsPage implements OnInit { } } - onChange(event){ + onChange(event) { this.textSearch = event.detail.value; - this.users = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { - if(a.name < b.name){ + const users: any[] = this.contacts.filter( e => e.name.toLowerCase().includes(this.textSearch.toLowerCase())).sort((a,b) => { + if(a.name < b.name) { return -1; } - if(a.name > b.name){ + if(a.name > b.name) { return 1; } return 0; }); - + const selectedUsers = this.users.filter( e => e?.isChecked == true) + + users.forEach( (user, index) => { + if(user[index]) { + console.log({user, index}) + const isCheck = selectedUsers.find( e => e._id == user._id)?.isChecked + if(isCheck) { + user[index].isChecked = isCheck + } + + // if(user[index].isChecked) { + // console.log('user[index].isChecked', user[index].isChecked) + // } + } + + }) + + this.users = users + + // console.log('this.users', this.users) } clicked(){ diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index c0eac9b78..e3981897d 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -107,7 +107,7 @@ diff --git a/src/global.scss b/src/global.scss index cf0d964c4..58ec95c9c 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1143,14 +1143,6 @@ background: rgb(92, 92, 92); } } -ngx-mat-datetime-content{ - .actions { - .mat-button-disabled { - background-color: #ff5a5a59 !important; - } - } - -} // angular material inputs @@ -1491,7 +1483,6 @@ ngx-mat-datetime-content .actions { } } - ngx-mat-datetime-content .ngx-mat-timepicker { z-index: 111; } @@ -1499,10 +1490,20 @@ ngx-mat-datetime-content .ngx-mat-timepicker { display: none !important; } - ngx-mat-datetime-content .mat-input-element { padding: 0px !important; } + +ngx-mat-datetime-content{ + .actions { + .mat-button-disabled { + background-color: #ff5a5a59 !important; + } + } + +} + + pre { font-family: 'Roboto' !important; font-size: rem(16) !important; diff --git a/version/git-version.ts b/version/git-version.ts index f0dc8c63b..ac6604b5e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "4f4381a6d", - "SHA": "4f4381a6d7f9fb23cc31a0a57d4d1bcce86bb204", + "shortSHA": "30aba9b18", + "SHA": "30aba9b182c15ea7321fc807156acacacc2d383e", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Aug 14 21:43:52 2023 +0100'", - "lastCommitMessage": "fix errors", - "lastCommitNumber": "5157", + "lastCommitTime": "'Tue Aug 15 10:15:08 2023 +0100'", + "lastCommitMessage": "improve", + "lastCommitNumber": "5158", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.scss\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 08f51343fa8b4dd628fdb9a06cb25c662fb9886a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 15 Aug 2023 15:17:27 +0100 Subject: [PATCH 3/7] fix --- src/app/pages/agenda/agenda.page.scss | 1 - .../despachos/despacho/despacho.page.html | 4 ++ .../new-publication/new-publication.page.html | 2 +- src/app/services/task.service.ts | 3 - .../event-details-documents-options.page.html | 6 +- src/global.scss | 72 ++++++++++--------- version/git-version.ts | 12 ++-- 7 files changed, 54 insertions(+), 46 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 5d392ec15..a2a0eeaa5 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -931,7 +931,6 @@ $font-size: rem(15); margin-left: -100%; button { - // top: -35px; position: relative; color: transparent; background-color: transparent; diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html index 6c4cdbb55..4d187459b 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -10,6 +10,10 @@
{{ task.Folio }} + Para hoje + Nova
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 8376f7878..b332563d8 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -48,7 +48,7 @@
-
+
image
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 85ea6cd63..12283484b 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -108,9 +108,6 @@ export class TaskService { return false } - const deadline = new Date(isoDateString) - const plusOneDeadline = deadline.getDate() + 1 - deadline.setDate(plusOneDeadline) return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(isoDateString), 'dd MMMM yyyy') } diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html index c36c0dbfd..2f6b4d610 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html @@ -1,5 +1,5 @@ - -
+ +
@@ -7,7 +7,7 @@
-
+
diff --git a/src/global.scss b/src/global.scss index 58ec95c9c..99cd58892 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1144,13 +1144,6 @@ background: rgb(92, 92, 92); } - -// angular material inputs - -.mat-form-field-infix, .mat-form-field-wrapper { - padding: 0px !important; -} - .select-calendar { .mat-form-field-infix { width: unset !important; @@ -1472,36 +1465,51 @@ $font-size: rem(15); width: 100%; } // date picker -ngx-mat-datetime-content .actions { - z-index: 1; - position: relative; - top: -66px; - margin-bottom: -44px; +// ngx-mat-datetime-content .actions { +// z-index: 1; +// position: relative; +// top: -66px; +// margin-bottom: -44px; - button { - z-index: 11111111; - } -} +// button { +// z-index: 11111111; +// } +// } -ngx-mat-datetime-content .ngx-mat-timepicker { - z-index: 111; -} -.mat-form-field-underline { - display: none !important; -} -ngx-mat-datetime-content .mat-input-element { - padding: 0px !important; -} +// ngx-mat-datetime-content .ngx-mat-timepicker { +// z-index: 111; +// } +// .mat-form-field-underline { +// display: none !important; +// } -ngx-mat-datetime-content{ - .actions { - .mat-button-disabled { - background-color: #ff5a5a59 !important; - } - } -} +// ngx-mat-datetime-content .mat-input-element { +// padding: 0px !important; +// } + + +// ngx-mat-datetime-content{ +// .actions { +// .mat-button-disabled { +// background-color: #ff5a5a59 !important; +// } +// } + +// } + + +// // angular material inputs + +// .mat-form-field-infix, .mat-form-field-wrapper { +// padding: 0px !important; +// } + + +// .mat-form-field-infix input { + +// } pre { diff --git a/version/git-version.ts b/version/git-version.ts index ac6604b5e..d6baf191d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "30aba9b18", - "SHA": "30aba9b182c15ea7321fc807156acacacc2d383e", + "shortSHA": "20c53993b", + "SHA": "20c53993bfe98bcea0e84b80dbede56f84a267a5", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 15 10:15:08 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "5158", + "lastCommitTime": "'Tue Aug 15 12:03:37 2023 +0100'", + "lastCommitMessage": "update", + "lastCommitNumber": "5159", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/global.scss", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 403c8c954371c03710d1dc700cbea0639e3922f9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 15 Aug 2023 15:19:23 +0100 Subject: [PATCH 4/7] improves --- .../new-publication/new-publication.page.html | 2 +- version/git-version.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index e3981897d..c56c31771 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -51,7 +51,7 @@ -
+
diff --git a/version/git-version.ts b/version/git-version.ts index d6baf191d..366a8b12e 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "20c53993b", - "SHA": "20c53993bfe98bcea0e84b80dbede56f84a267a5", + "shortSHA": "08f51343f", + "SHA": "08f51343fa8b4dd628fdb9a06cb25c662fb9886a", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 15 12:03:37 2023 +0100'", - "lastCommitMessage": "update", - "lastCommitNumber": "5159", + "lastCommitTime": "'Tue Aug 15 15:17:27 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "5160", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/global.scss", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file From bf62fc083401e82ea99e93f4d309f52c0468860c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 15 Aug 2023 15:28:24 +0100 Subject: [PATCH 5/7] improves --- .../despachos/despacho/despacho.page.html | 4 ---- version/git-version.ts | 12 ++++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html index 4d187459b..6c4cdbb55 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -10,10 +10,6 @@
{{ task.Folio }} - Para hoje - Nova
diff --git a/version/git-version.ts b/version/git-version.ts index 366a8b12e..d3d65a1be 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "08f51343f", - "SHA": "08f51343fa8b4dd628fdb9a06cb25c662fb9886a", + "shortSHA": "403c8c954", + "SHA": "403c8c954371c03710d1dc700cbea0639e3922f9", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 15 15:17:27 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "5160", + "lastCommitTime": "'Tue Aug 15 15:19:23 2023 +0100'", + "lastCommitMessage": "improves", + "lastCommitNumber": "5161", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file From d6f9db53ca9c5aae688301cf06fc630e92418ed1 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 15 Aug 2023 17:12:50 +0100 Subject: [PATCH 6/7] fix --- src/app/pages/agenda/agenda.page.scss | 61 +--------------- .../agenda/new-event/new-event.module.ts | 5 +- .../agenda/new-event/new-event.page.html | 14 ++-- src/global.scss | 71 +++++++++---------- version/git-version.ts | 10 +-- 5 files changed, 47 insertions(+), 114 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index a2a0eeaa5..0b043777d 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -931,6 +931,7 @@ $font-size: rem(15); margin-left: -100%; button { + // top: -35px; position: relative; color: transparent; background-color: transparent; @@ -1036,66 +1037,6 @@ $font-size: rem(15); } - -@media only screen and (min-width: 398px) { - .week-5 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 323px; - } - } - - .week-6 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 371px; - } - } - -} - -@media only screen and (min-width: 415px) { - .week-5 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 319px; - } - } - - .week-6 { - .calendar-title-container { - font-size: 16px; - } - .height-75 { - height: 75px; - } - - .height-356 { - height: 360px; - } - } - -} - - @media only screen and (min-width: 500px) { .week-5 { .calendar-title-container { diff --git a/src/app/pages/agenda/new-event/new-event.module.ts b/src/app/pages/agenda/new-event/new-event.module.ts index 76e2100d3..2dbd0de42 100644 --- a/src/app/pages/agenda/new-event/new-event.module.ts +++ b/src/app/pages/agenda/new-event/new-event.module.ts @@ -23,6 +23,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatSelectModule } from '@angular/material/select'; import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MatDialogModule } from '@angular/material/dialog'; @NgModule({ imports: [ @@ -30,6 +31,7 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' FormsModule, IonicModule, NewEventPageRoutingModule, + // MatDatepickerModule, MatInputModule, MatNativeDateModule, @@ -39,7 +41,8 @@ import { NgxMatMomentModule } from '@angular-material-components/moment-adapter' NgxMatMomentModule, MatSelectModule, MatButtonModule, - ReactiveFormsModule + ReactiveFormsModule, + MatDialogModule, ], declarations: [NewEventPage] }) diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 7d63fce78..6a5f4e8fe 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -129,11 +129,9 @@ > @@ -162,10 +160,8 @@ > diff --git a/src/global.scss b/src/global.scss index 99cd58892..b04fe890e 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1144,6 +1144,13 @@ background: rgb(92, 92, 92); } + +// angular material inputs + +.mat-form-field-infix, .mat-form-field-wrapper { + padding: 0px !important; +} + .select-calendar { .mat-form-field-infix { width: unset !important; @@ -1465,52 +1472,38 @@ $font-size: rem(15); width: 100%; } // date picker -// ngx-mat-datetime-content .actions { -// z-index: 1; -// position: relative; -// top: -66px; -// margin-bottom: -44px; +ngx-mat-datetime-content .actions { + z-index: 1; + position: relative; + top: -66px; + margin-bottom: -44px; -// button { -// z-index: 11111111; -// } -// } + button { + z-index: 11111111; + } +} -// ngx-mat-datetime-content .ngx-mat-timepicker { -// z-index: 111; -// } -// .mat-form-field-underline { -// display: none !important; -// } +ngx-mat-datetime-content .ngx-mat-timepicker { + z-index: 111; +} +.mat-form-field-underline { + display: none !important; +} -// ngx-mat-datetime-content .mat-input-element { -// padding: 0px !important; -// } +ngx-mat-datetime-content .mat-input-element { + padding: 0px !important; +} +ngx-mat-datetime-content{ + .actions { + .mat-button-disabled { + background-color: #ff5a5a59 !important; + } + } -// ngx-mat-datetime-content{ -// .actions { -// .mat-button-disabled { -// background-color: #ff5a5a59 !important; -// } -// } - -// } - - -// // angular material inputs - -// .mat-form-field-infix, .mat-form-field-wrapper { -// padding: 0px !important; -// } - - -// .mat-form-field-infix input { - -// } - +} pre { font-family: 'Roboto' !important; diff --git a/version/git-version.ts b/version/git-version.ts index d3d65a1be..8f732347a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "403c8c954", - "SHA": "403c8c954371c03710d1dc700cbea0639e3922f9", + "shortSHA": "bf62fc083", + "SHA": "bf62fc083401e82ea99e93f4d309f52c0468860c", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 15 15:19:23 2023 +0100'", + "lastCommitTime": "'Tue Aug 15 15:28:24 2023 +0100'", "lastCommitMessage": "improves", - "lastCommitNumber": "5161", + "lastCommitNumber": "5162", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/new-event/new-event.module.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file From e4bcb0f975769972c4f50a4cb0e178c35a81ae2a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 15 Aug 2023 17:32:57 +0100 Subject: [PATCH 7/7] improve --- src/app/pages/agenda/agenda.page.scss | 4 ++-- .../pages/chat/messages/contacts/contacts.page.html | 6 +++--- .../shared/chat/messages/contacts/contacts.page.html | 3 +-- version/git-version.ts | 12 ++++++------ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 0b043777d..484293ee1 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -376,7 +376,7 @@ td.monthview-primary-with-event { .calendar-tool-tip{ - padding: 30px 10px 20px 10px; + padding: 37px 10px 20px 10px; //border: 1px solid orange; } @@ -962,7 +962,7 @@ $font-size: rem(15); position: absolute; float: right; right: 15px; - top: 1px; + top: 4px; background: transparent; color: transparent; diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index 0817a687c..21cce9129 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -24,16 +24,16 @@ - +
- + - +
{{header}}
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index 3c8d597c7..d43a49411 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -22,7 +22,6 @@ - @@ -30,7 +29,7 @@
- +
diff --git a/version/git-version.ts b/version/git-version.ts index 8f732347a..0671b68a6 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "bf62fc083", - "SHA": "bf62fc083401e82ea99e93f4d309f52c0468860c", + "shortSHA": "d6f9db53c", + "SHA": "d6f9db53ca9c5aae688301cf06fc630e92418ed1", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 15 15:28:24 2023 +0100'", - "lastCommitMessage": "improves", - "lastCommitNumber": "5162", + "lastCommitTime": "'Tue Aug 15 17:12:50 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "5163", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/new-event/new-event.module.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/global.scss", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file