diff --git a/package-lock.json b/package-lock.json index 29e8a38a2..b2cf97abc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4738,6 +4738,15 @@ "tslib": "^1.9.3" }, "dependencies": { + "@ionic/core": { + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.5.4.tgz", + "integrity": "sha512-IjbGN8vh3XuJ2ulo3BMlMflcWlUhvEGEexr29JKFvb+O4bWKP5sC2fkqSrswrIstOmv7axm7CeIi2MNRkwYwVA==", + "requires": { + "ionicons": "^5.1.2", + "tslib": "^1.10.0" + } + }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -5020,9 +5029,9 @@ } }, "@ionic/core": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.7.0.tgz", - "integrity": "sha512-5GunAeZWDhjbo4/gFCYjA4vXP3V+8PEoGa9C+ZEojurpk7IBuAtI36KalCukrHLPoIbfUCywTXoZubfC1S6lHQ==", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.1.tgz", + "integrity": "sha512-twAPHhrGMYvHW0NgebMBfN70xDUkFxW+Zcxeus7jrhuJh1uWp/3MwawLi4InCwpyuFQiBo8yAaqC1hB1wTZmLA==", "requires": { "@stencil/core": "^2.4.0", "ionicons": "^5.5.3", @@ -6557,6 +6566,11 @@ } } }, + "@pdftron/pdfjs-express": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@pdftron/pdfjs-express/-/pdfjs-express-8.1.0.tgz", + "integrity": "sha512-YKH2M8ZVXQgFpxVKD48mtDcVwjdLkibp4j9gCMkywSwDc1lQv2jzGmRSBQzsq5QKVx54MHHVWIr5hG21KduACw==" + }, "@rkusa/linebreak": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@rkusa/linebreak/-/linebreak-1.0.0.tgz", @@ -6621,9 +6635,9 @@ } }, "@stencil/core": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.0.tgz", - "integrity": "sha512-WazFGUMnbumg8ePNvej8cIOEcxvuZ0ugKQkkE1xFbDYcl7DgJd62MiG+bIqCcQlIdLEfhjAdoixxlFdJgrgjyA==" + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz", + "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==" }, "@szmarczak/http-timer": { "version": "1.1.2", diff --git a/package.json b/package.json index a4dc341cd..257484597 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,8 @@ "@ionic-native/sqlite-porter": "^5.31.1", "@ionic-native/status-bar": "^5.0.0", "@ionic-native/wheel-selector": "^5.31.1", - "@ionic/angular": "^5.7.0", + "@ionic/angular": "^5.5.4", + "@ionic/core": "^5.8.1", "@ionic/pwa-elements": "^3.0.2", "@ionic/storage": "^2.3.1", "@logisticinfotech/ionic4-datepicker": "^1.4.4", @@ -84,7 +85,7 @@ "duration": "^0.2.2", "faker": "^5.5.3", "global": "^4.4.0", - "http-proxy-middleware": "^2.0.1", + "hammerjs": "^2.0.8", "http-server": "^0.12.3", "ibm-mfp-web-push": "^8.0.2020052213", "ibm-mfp-web-sdk": "^8.0.2021021706", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 32f783e8d..b4eb8c106 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,5 +1,5 @@ import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; +import { BrowserModule, HammerModule } from '@angular/platform-browser'; import { RouteReuseStrategy } from '@angular/router'; import { IonicModule, IonicRouteStrategy } from '@ionic/angular'; @@ -92,6 +92,7 @@ import { SQLite } from '@ionic-native/sqlite/ngx'; MatDialogModule, // PdfViewerModule, + HammerModule, ], providers: [ { provide: MAT_DATE_LOCALE, useValue: 'pt' }, diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index c150a6229..66fa05267 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -283,7 +283,6 @@ export class AgendaPage implements OnInit { this.viewingEventObject = event; - this.eventSelectedDate = event.start; this.selectedEventId = event.id; this.cloneAllmobileComponent(); @@ -482,6 +481,9 @@ export class AgendaPage implements OnInit { loadRangeEvents(startTime: Date, endTime: Date) { + this.rangeStartDate = startTime + this.rangeEndDate = endTime + this.showLoader = true; if(window.innerWidth < 800){ @@ -920,7 +922,7 @@ export class AgendaPage implements OnInit { // }); this.myCal.update(); this.myCal.loadEvents(); - this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); + // this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); } this.cloneAllmobileComponent(); diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 17c526c67..ec09e5028 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -2,13 +2,25 @@
- -
- {{roomName}} + +
+ +
+
+
+ {{roomName}} +
+
+
+
@@ -34,13 +46,13 @@ -
+
Esta conversa passou a grupo
A conversa original mantêm-se como chat individual
-
-
+
+
{{msg.u.name}} {{showDateDuration(msg._updatedAt)}} diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index 2bf46c1ae..a348a3cb9 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -19,18 +19,49 @@ overflow: auto; padding: 0 !important; background: #fff; - .middle{ + + .left{ + width: fit-content; + float: left; + //font-size: 35px; + overflow: hidden; + } + + .middle-container{ + overflow: auto; + height: auto; + width:calc(100% - 57px); + float: left; + + .middle{ + padding: 0!important; + margin: 0 0 0 10px; + } + } + .middle-container-options{ padding: 0!important; float: left; - width:calc(100% - 77px); - margin: 2.5px 0 0 5px; + width: calc(100% - 67px); + text-align: right; + + .middle-container-options-icons{ + color: #0782c9; + font-size: 23px; + } } .right{ padding: 0!important; float: right; font-size: 25px; color: #0782c9; - margin: 5px 0 0 0; + } + .header-top-btn{ + background: transparent; + font-size: 25px !important; + font-weight: 100 !important; + /* color: #0782c9; */ + color: #42b9fe; + padding: 0 5px 0 5px; } } .header-bottom{ @@ -145,6 +176,18 @@ word-wrap: break-word; -webkit-overflow-scrolling: touch; + .messages-list-item-wrapper{ + overflow: auto; + } + .messages-list-item-wrapper-active{ + background: #e6f6ff75 !important; + } + + .message-container{ + //border: 1px solid red; + } + + .incoming-true, .incoming-false{ width: 305px; padding: 15px 20px; diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 55fa7f263..7a3b4781d 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -51,6 +51,10 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { attendees: EventPerson[] = []; scrollToBottomBtn = false; + longPressActive = false; + showMessageOptions = false; + selectedMsgId:string; + @ViewChild('scrollMe') private myScrollContainer: ElementRef; constructor( @@ -99,11 +103,37 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { }) } + deleteMessage(msgId:string){ + let body = { + "roomId": this.roomId, + "msgId": msgId, + "asUser": false, + } + if(msgId){ + this.alertService.confirmDeleteMessage(body); + } + else{ + this.toastService.badRequest('Não foi possível apagar'); + } + this.showMessageOptions = false; + this.selectedMsgId = ""; + } + ngAfterViewInit() { this.scrollChangeCallback = () => this.onContentScrolled(event); window.addEventListener('scroll', this.scrollChangeCallback, true); } + handlePress(id?:string){ + this.selectedMsgId = id; + this.showMessageOptions = true; + } + + handleClick(){ + this.showMessageOptions = false; + this.selectedMsgId = ""; + } + onContentScrolled(e) { this.startPosition = e.srcElement.scrollTop; let scroll = e.srcElement.scrollTop; diff --git a/src/app/pages/chat/messages/messages.module.ts b/src/app/pages/chat/messages/messages.module.ts index a6e1c19f6..5580cc15c 100644 --- a/src/app/pages/chat/messages/messages.module.ts +++ b/src/app/pages/chat/messages/messages.module.ts @@ -10,6 +10,7 @@ import { MessagesPage } from './messages.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { BtnModalDismissPage } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { MatMenuModule } from '@angular/material/menu'; @NgModule({ @@ -18,7 +19,8 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; FormsModule, IonicModule, FontAwesomeModule, - MessagesPageRoutingModule + MessagesPageRoutingModule, + MatMenuModule, ], declarations: [MessagesPage] }) diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index e68add79b..60186cd69 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -1,15 +1,25 @@ +
-
- {{users.name}} - +
+
+ {{users.name}} + +
+
+
+ +