diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index 89d801ddf..2f317d4d6 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -1,12 +1,13 @@ import { Injectable } from '@angular/core'; import { customTask, fullTask, fullTaskList } from '../models/dailyworktask.model'; import { AttachmentList } from '../models/Excludetask'; -import { PermissionService } from '../OtherService/permission.service'; import { CustomTaskPipe } from '../pipes/custom-task.pipe'; import { ProcessesService } from '../services/processes.service'; import { DespachoStore } from '../store/despacho-store.service'; import { LoaderService } from 'src/app/store/loader.service' import { SessionStore } from '../store/session.service'; +import { PermissionService } from '../services/worker/permission.service'; + @Injectable({ providedIn: 'root' }) diff --git a/src/app/Rules/pedido.service.ts b/src/app/Rules/pedido.service.ts index ec71d9af3..b2dc88092 100644 --- a/src/app/Rules/pedido.service.ts +++ b/src/app/Rules/pedido.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { PermissionService } from '../OtherService/permission.service'; import { ProcessesService } from '../services/processes.service'; +import { PermissionService } from '../services/worker/permission.service'; @Injectable({ providedIn: 'root' diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index cf94333dd..62c569fbe 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -9,8 +9,6 @@ import { WebNotificationsService } from '../services/webnotifications.service'; import { AlertController, Platform } from '@ionic/angular'; import { Router, ActivatedRoute } from '@angular/router'; import { ToDayEventStorage } from '../store/to-day-event-storage.service'; -import { DocumentCounterService } from 'src/app/OtherService/document-counter.service' -import { PermissionService } from '../OtherService/permission.service'; import { TotalDocumentStore } from '../store/total-document.service'; import { synchro } from '../services/socket/synchro.service'; import { DespachoService } from '../Rules/despacho.service'; @@ -21,6 +19,8 @@ import { StorageService } from '../services/storage.service'; import { Media, MediaObject } from '@ionic-native/media/ngx'; import { File } from '@ionic-native/file/ngx'; import { WebNotificationPopupService } from '../services/notification/web-notification-popup.service'; +import { DocumentCounterService } from '../services/worker/document-counter.service'; +import { PermissionService } from '../services/worker/permission.service'; @Component({ selector: 'app-home', diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index ddb43255c..10185d587 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -16,7 +16,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; -import { PermissionService } from 'src/app/OtherService/permission.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { PedidoService } from 'src/app/Rules/pedido.service' import { fullTask } from 'src/app/models/dailyworktask.model'; diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 702fee697..6f5923d84 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -7,9 +7,8 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page'; import { SearchDocumentDetails, SearchFolderDetails } from 'src/app/models/search-document'; import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; -import { PermissionService } from 'src/app/OtherService/permission.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; import { SearchedDocumentOptionsPage } from 'src/app/shared/popover/searched-document-options/searched-document-options.page'; -import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { Location } from '@angular/common'; @Component({ diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 66fa05267..312e7c5fa 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -29,6 +29,7 @@ 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'; + @Component({ selector: 'app-agenda', templateUrl: './agenda.page.html', @@ -260,13 +261,14 @@ export class AgendaPage implements OnInit { this.myCal.update(); } //Go to the previous view of the calendar - back(){ + back() { this.myCal.slidePrev(); this.myCal.loadEvents(); this.myCal.update(); } + //Shows the title of your view - onViewTitleChanged(title){ + onViewTitleChanged(title) { this.viewTitle = title; } 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 ec09e5028..493a39586 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -10,7 +10,7 @@
-
+
{{roomName}}
@@ -66,14 +66,14 @@
- - +
+ - {{file.title}} - + {{file.title}} +
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 a348a3cb9..869649154 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -28,14 +28,21 @@ } .middle-container{ + display: flex; overflow: auto; height: auto; - width:calc(100% - 57px); + width:calc(100% - 47px); float: left; + /* white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; */ + .middle{ + width: 100%; padding: 0!important; margin: 0 0 0 10px; + font-size: 25px; } } .middle-container-options{ @@ -95,13 +102,6 @@ } } - .title{ - font-size: 25px; - white-space: nowrap; - overflow: hidden !important; - text-overflow: ellipsis !important; - float: left; - } .div-icon{ width: 40px; float: right; @@ -217,28 +217,7 @@ float: right; } } - .message{ - .message-attachments{ - .file{ - align-items: center; - .file-details{ - width: 100%; - - .file-title{ - color: #000; - text-decoration: underline; - white-space: nowrap; - overflow: hidden !important; - text-overflow: ellipsis !important; - } - .file-title:hover{ - color: #0782c9; - } - } - } - } - } .online{ color:#99e47b !important; } diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 60186cd69..dedb43f07 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -64,14 +64,14 @@
- - +
+ - {{file.title}} - + {{file.title}} +
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 10253ef3e..3a67b82e1 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -16,7 +16,7 @@ import { DespachoService } from 'src/app/Rules/despacho.service' import { Location } from '@angular/common' import { fullTask } from 'src/app/models/dailyworktask.model'; import { AttachmentList } from 'src/app/models/Excludetask'; -import { PermissionService } from 'src/app/OtherService/permission.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; import { synchro } from 'src/app/services/socket/synchro.service'; import { SqliteService } from 'src/app/services/sqlite.service'; diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 81bf54351..07e931ebc 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -17,12 +17,13 @@ import { Location } from '@angular/common'; import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchList } from 'src/app/models/search-document'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; -import { PermissionService } from 'src/app/OtherService/permission.service'; import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; import { ExpedienteService } from 'src/app/Rules/expediente.service'; import { expedienteTask } from 'src/app/models/dailyworktask.model'; import { TaskService } from 'src/app/Rules/task.service'; import { DocumentViewerPage } from 'src/app/modals/document-viewer/document-viewer.page'; +import { PermissionService } from 'src/app/services/worker/permission.service'; + import { SqliteService } from 'src/app/services/sqlite.service'; import { Platform } from '@ionic/angular'; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index b55769b8c..0a3f41ac8 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -13,7 +13,7 @@ import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { PendentesStore } from 'src/app/store/pendestes-store.service'; import { PedidosStore } from 'src/app/store/pedidos-store.service'; import { DespachosprStore } from 'src/app/store/despachospr-store.service'; -import { PermissionService } from 'src/app/OtherService/permission.service'; + import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service'; import { TotalDocumentStore } from 'src/app/store/total-document.service'; @@ -22,6 +22,8 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { NotificationsService } from 'src/app/services/notifications.service'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { ChangeProfileService } from 'src/app/services/change-profile.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; + import { SqliteService } from '../../services/sqlite.service'; import { synchro } from '../../services/socket/synchro.service'; diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 447443c1e..94732556b 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -16,13 +16,14 @@ import { AuthService } from 'src/app/services/auth.service'; import { LoginUserRespose } from 'src/app/models/user.model'; import { ToastService } from 'src/app/services/toast.service'; import { ForwardPage } from 'src/app/modals/forward/forward.page'; -import { PermissionService } from 'src/app/OtherService/permission.service'; + import { Location } from '@angular/common'; import { PedidoService } from 'src/app/Rules/pedido.service'; import { SqliteService } from 'src/app/services/sqlite.service'; import { synchro } from 'src/app/services/socket/synchro.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; @Component({ selector: 'app-pedido', diff --git a/src/app/OtherService/permission.service.spec.ts b/src/app/services/permission.service.spec.ts similarity index 83% rename from src/app/OtherService/permission.service.spec.ts rename to src/app/services/permission.service.spec.ts index 1a77304d8..8ddccabff 100644 --- a/src/app/OtherService/permission.service.spec.ts +++ b/src/app/services/permission.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { PermissionService } from './permission.service'; +import { PermissionService } from './worker/permission.service'; describe('PermissionService', () => { let service: PermissionService; diff --git a/src/app/services/rules/event.service.ts b/src/app/services/rules/event.service.ts index 2e4616658..c066e5223 100644 --- a/src/app/services/rules/event.service.ts +++ b/src/app/services/rules/event.service.ts @@ -1,7 +1,9 @@ import { Injectable } from '@angular/core'; -import { PermissionService } from 'src/app/OtherService/permission.service'; import { AttachmentsService } from '../attachments.service'; import { EventsService } from '../events.service'; +import { PermissionService } from '../worker/permission.service'; + + @Injectable({ providedIn: 'root' diff --git a/src/app/OtherService/document-counter.service.spec.ts b/src/app/services/worker/document-counter.service.spec.ts similarity index 100% rename from src/app/OtherService/document-counter.service.spec.ts rename to src/app/services/worker/document-counter.service.spec.ts diff --git a/src/app/OtherService/document-counter.service.ts b/src/app/services/worker/document-counter.service.ts similarity index 96% rename from src/app/OtherService/document-counter.service.ts rename to src/app/services/worker/document-counter.service.ts index 6891c3cfa..eafc6e6db 100644 --- a/src/app/OtherService/document-counter.service.ts +++ b/src/app/services/worker/document-counter.service.ts @@ -5,7 +5,8 @@ import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { PendentesStore } from 'src/app/store/pendestes-store.service'; import { PedidosStore } from 'src/app/store/pedidos-store.service'; import { DespachosprStore } from 'src/app/store/despachospr-store.service'; -import { DeplomasStore } from '../store/deplomas.service'; +import { DeplomasStore } from 'src/app/store/deplomas.service'; + @Injectable({ providedIn: 'root' diff --git a/src/app/OtherService/permission.service.ts b/src/app/services/worker/permission.service.ts similarity index 90% rename from src/app/OtherService/permission.service.ts rename to src/app/services/worker/permission.service.ts index 7323fc6d4..e093625c9 100644 --- a/src/app/OtherService/permission.service.ts +++ b/src/app/services/worker/permission.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { SessionStore } from '../store/session.service'; +import { SessionStore } from '../../store/session.service'; @Injectable({ providedIn: 'root' diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 26b7b88e3..e8a8bc4ab 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -59,14 +59,14 @@
- - +
+ - {{file.title}} - + {{file.title}} +
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index fa24adbf2..d722ff16d 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -51,14 +51,15 @@
- - +
+ + - {{file.title}} - + {{file.title}} +
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 5741824b9..6b5a011da 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -9,7 +9,7 @@ import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { ToastService } from 'src/app/services/toast.service'; import { customTask, fullTask } from 'src/app/models/dailyworktask.model'; -import { PermissionService } from 'src/app/OtherService/permission.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; @Component({ diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index 843591d9e..a210f4ae9 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -9,7 +9,7 @@ import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { ToastService } from 'src/app/services/toast.service'; import { Location } from '@angular/common' -import { PermissionService } from 'src/app/OtherService/permission.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; @Component({ selector: 'app-despachos-pr-options', diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 8cea8c836..8557e1ac8 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -4,7 +4,6 @@ import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { expedienteTask } from 'src/app/models/dailyworktask.model'; import { SearchList } from 'src/app/models/search-document'; -import { PermissionService } from 'src/app/OtherService/permission.service'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; @@ -16,6 +15,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { Location } from '@angular/common'; import { TaskService } from 'src/app/Rules/task.service' import { ExpedienteService } from 'src/app/Rules/expediente.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; + @Component({ selector: 'app-opts-expediente', templateUrl: './opts-expediente.page.html', diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index 074609703..ed59e7c99 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -5,11 +5,11 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; -import { PermissionService } from 'src/app/OtherService/permission.service'; import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; import { PedidoService } from 'src/app/Rules/pedido.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; @Component({ diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts index f8b237e14..fa131f75f 100644 --- a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts +++ b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { PermissionService } from 'src/app/OtherService/permission.service'; +import { PermissionService } from 'src/app/services/worker/permission.service'; @Component({ selector: 'app-searched-document-options', diff --git a/src/assets/www/pdfjs/build/pdf.worker.js b/src/assets/www/pdfjs/build/pdf.worker.js index 6b07e439e..92615e53e 100644 --- a/src/assets/www/pdfjs/build/pdf.worker.js +++ b/src/assets/www/pdfjs/build/pdf.worker.js @@ -56297,6 +56297,8 @@ function () { _createClass(PDFWorkerStream, [{ key: "getFullReader", value: function getFullReader() { + + console.log('getFullReader') (0, _util.assert)(!this._fullRequestReader); this._fullRequestReader = new PDFWorkerStreamReader(this._msgHandler); return this._fullRequestReader; @@ -56304,6 +56306,8 @@ function () { }, { key: "getRangeReader", value: function getRangeReader(begin, end) { + + console.log('getRangeReader') var reader = new PDFWorkerStreamRangeReader(begin, end, this._msgHandler); this._rangeRequestReaders.push(reader); diff --git a/src/global.scss b/src/global.scss index 13a3b12f4..a837a721a 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1103,6 +1103,12 @@ ngx-mat-datetime-content{ } } +.add-ellipsis{ + white-space: nowrap; + overflow: hidden !important; + text-overflow: ellipsis !important; +} + .menuButton{ font-size: 14px; width: 100%; @@ -1119,22 +1125,29 @@ ngx-mat-datetime-content{ background-color: #42b9fe13; padding: 1px; .file{ + width: 100%; + align-items: center; + overflow: auto; + color: #000; + ion-thumbnail{ --size: 20px; } .file-details{ - max-width: calc(100% - 20px); + max-width: 100%; padding-left: 5px; + /* .file-title{ + padding-left: 5px; + } */ + .file-title:hover{ color: #0782c9; text-decoration: underline; } span{ - white-space: nowrap; - overflow: hidden !important; - text-overflow: ellipsis !important; + padding-right: 5px; } } }