+
{{customDate}}
-
- ...\" to unstage)\n\tmodified: src/app/services/task.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts",
+ "lastCommitNumber": "5015",
+ "change": "",
+ "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/pipes/custom-task.pipe.ts\n\tmodified: src/app/pipes/expediente-task.pipe.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\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.ts\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.html\n\tmodified: src/environments/environment.prod.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file
+
-
+
-
+
+
+
+
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 726ebb13e..a9256d5a8 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -4,4 +4,4 @@ import { doneITProd } from './suport/doneIt'
import { DevDev } from './suport/dev'
-export const environment: Environment = oaprProd;
+export const environment: Environment = DevDev;
diff --git a/version/git-version.ts b/version/git-version.ts
index 8a8e5e77c..cd8e54b91 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "d307e5fd1",
- "SHA": "d307e5fd1bd1b9c139fc60f6a5d1866a216189eb",
+ "shortSHA": "64e0760e6",
+ "SHA": "64e0760e62ceed30deb8022c7a95cbc831193e81",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Wed Jun 14 11:06:06 2023 +0100'",
+ "lastCommitTime": "'Wed Jun 14 13:44:26 2023 +0100'",
"lastCommitMessage": "select calendar by default",
- "lastCommitNumber": "5014",
- "change": "diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts\nindex 8fc46150d..0f7a466d0 100644\n--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts\n+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts\n@@ -62,20 +62,25 @@ export class EventListPage implements OnInit {\n if(window.location.pathname.includes('gabinete-digital')) {\n this.showFilter = true\n }\n- \n- if(!this.segment) {\n- if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n- this.segment = 'Meu calendario';\n- } else {\n- this.segment = this.eventService.calendarNamesAry[0].OwnerUserId\n+ \n+\n+ this.eventService.onCalendarFinishLoad.subscribe(() => {\n+ if(!this.segment) {\n+ if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n+ this.segment = 'Meu calendario';\n+ } else {\n+ this.segment = this.eventService.calendarNamesAry[0].OwnerUserId\n+ }\n+ \n+ // select pr by default\n+ const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')\n+ if(pr) {\n+ this.segment = pr.OwnerUserId\n+ }\n }\n+ })\n+\n \n- // select pr by default\n- // const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')\n- // if(pr) {\n- // this.segment = pr.OwnerUserId\n- // }\n- }\n \n const location = window.location\n const pathname = location.pathname + location.search\ndiff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts\nindex 7e283262c..1913a9636 100644\n--- a/src/app/shared/agenda/event-list/event-list.page.ts\n+++ b/src/app/shared/agenda/event-list/event-list.page.ts\n@@ -49,18 +49,21 @@ export class EventListPage implements OnInit {\n }\n \n ngAfterViewInit(): void {\n- if(!this.segment) {\n- if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n- this.segment = 'Meu calendario';\n- } else {\n- this.segment = this.eventService.calendarNamesAry[0].OwnerUserId\n+ this.eventService.onCalendarFinishLoad.subscribe(() => {\n+ if(!this.segment) {\n+ if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n+ this.segment = 'Meu calendario';\n+ } else {\n+ this.segment = this.eventService.calendarNamesAry[0].OwnerUserId\n+ }\n+ \n+ // select pr by default\n+ const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')\n+ if(pr) {\n+ this.segment = pr.OwnerUserId\n+ }\n }\n-\n- // const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')\n- // if(pr) {\n- // this.segment = pr.OwnerUserId\n- // }\n- }\n+ })\n }\n \n ngOnInit() {\ndiff --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\nindex 7aae316e9..60e63ef1b 100644\n--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n@@ -62,18 +62,23 @@ export class EventsToApprovePage implements OnInit {\n {}\n \n ngOnInit() {\n- if(!this.segment) {\n- if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n- this.segment = 'Meu calendario';\n- } else {\n- this.segment = this.eventService.calendarNamesAry[0].OwnerUserId\n+ \n+ this.eventService.onCalendarFinishLoad.subscribe(() => {\n+ if(!this.segment) {\n+ if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n+ this.segment = 'Meu calendario';\n+ } else {\n+ this.segment = this.eventService.calendarNamesAry[0].OwnerUserId\n+ }\n+ \n+ // select pr by default\n+ const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')\n+ if(pr) {\n+ this.segment = pr.OwnerUserId\n+ }\n }\n+ })\n \n- // const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')\n- // if(pr) {\n- // this.segment = pr.OwnerUserId\n- // }\n- }\n this.LoadToApproveEvents()\n \n this.listSubscription = this.eventoaprovacaostore.registerCallback({",
- "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged
+
+
- (`${geturl}`, body, options)
}
}
+
+const token = {
+ eventId: '1',
+ calendarId: '1',
+ calendarName: '1',
+ ownerAuth: 'basic: ou345873845982374598237498572938475987234957239845798345'
+}
+
+
+// decryptept token 873845982739845723987459823ouhfouidskfdjasklhdjfkusdhfliasdhfkljashdfkjhaskfhaskjdhfkasjdfhkjasdf
\ No newline at end of file
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 7e283262c..1913a9636 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -49,18 +49,21 @@ export class EventListPage implements OnInit {
}
ngAfterViewInit(): void {
- if(!this.segment) {
- if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
- this.segment = 'Meu calendario';
- } else {
- this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+ this.eventService.onCalendarFinishLoad.subscribe(() => {
+ if(!this.segment) {
+ if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+ this.segment = 'Meu calendario';
+ } else {
+ this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+ }
+
+ // select pr by default
+ const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
+ if(pr) {
+ this.segment = pr.OwnerUserId
+ }
}
-
- // const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
- // if(pr) {
- // this.segment = pr.OwnerUserId
- // }
- }
+ })
}
ngOnInit() {
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 c3d3ac1a7..3c0966ffd 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -266,9 +266,9 @@
-
+
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 230782d51..d7f012635 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -249,9 +249,9 @@
-
+
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index a3a53c1da..3275c2360 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -1,6 +1,5 @@
import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
import { AnimationController, GestureController, IonRange, ModalController, PopoverController } from '@ionic/angular';
-import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { ToastService } from 'src/app/services/toast.service';
import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
@@ -18,7 +17,6 @@ import { Storage } from '@ionic/storage';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service'
import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service'
import { MessageService } from 'src/app/services/chat/message.service';
-import { AttachmentsService } from 'src/app/services/attachments.service';
import { CameraService } from 'src/app/services/camera.service';
import { FileType } from 'src/app/models/fileType';
import { SearchPage } from 'src/app/pages/search/search.page';
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 4ebb5785a..6b80aed03 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -130,8 +130,8 @@
Correspondências com prazo para hoje
{{ TaskService.deadline }}
+
-
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index e610ac580..d7c7cb401 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -518,19 +518,42 @@ ion-toolbar{
@media only screen and (max-width: 856px) {
- .content, .conteiner-box{
+ .content, .conteiner-box {
height: unset !important;
max-height: unset !important;
}
+ .event-box {
+ display: block;
+ height: unset !important;
+ max-width: unset !important;
+ width: 100% !important;
+ display: flex;
+ }
+
.schedule-1 {
display: none;
}
+ .filters-box {
+ display: block !important;
+ width: 100%;
+ }
+ .box-container {
+ max-width: 400px !important;
+ }
+
+ .showMobile {
+ display: block !important;
+ }
+
+ .hideMobile {
+ display: none !important;
+ }
+
.conteiner-box-mobile {
display: flex !important;
}
-
.box-container {
height: unset !important;
}
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 8fc46150d..0f7a466d0 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -62,20 +62,25 @@ export class EventListPage implements OnInit {
if(window.location.pathname.includes('gabinete-digital')) {
this.showFilter = true
}
-
- if(!this.segment) {
- if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
- this.segment = 'Meu calendario';
- } else {
- this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
- }
+
+
+ this.eventService.onCalendarFinishLoad.subscribe(() => {
+ if(!this.segment) {
+ if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+ this.segment = 'Meu calendario';
+ } else {
+ this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+ }
+
+ // select pr by default
+ const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
+ if(pr) {
+ this.segment = pr.OwnerUserId
+ }
+ }
+ })
+
- // select pr by default
- // const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
- // if(pr) {
- // this.segment = pr.OwnerUserId
- // }
- }
const location = window.location
const pathname = location.pathname + location.search
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 4aa4226b8..9ac517cc5 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -55,7 +55,6 @@ export class LoginPage implements OnInit {
private platform: Platform,
private FirstEnterService: FirstEnterService,
private storage:Storage,
- private httpErrorHandle: HttpErrorHandle
) {}
ngOnInit() {}
diff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts
index 7fa505a87..aaadf91b0 100644
--- a/src/app/pipes/custom-task.pipe.ts
+++ b/src/app/pipes/custom-task.pipe.ts
@@ -16,7 +16,7 @@ export class CustomTaskPipe implements PipeTransform {
"SerialNumber": fullTask.serialNumber,
"Subject": fullTask.workflowInstanceDataFields.Subject,
"Folio": fullTask.workflowInstanceDataFields.Subject,
- "Senders": fullTask.workflowInstanceDataFields.Sender,
+ "Senders": fullTask.workflowInstanceDataFields.Sender || "SEM ENTIDADE",
"CreateDate": taskDate,
"TaskStartDate": fullTask.taskStartDate,
"DocumentURL": fullTask.workflowInstanceDataFields.ViewerRequest,
diff --git a/src/app/pipes/expediente-task.pipe.ts b/src/app/pipes/expediente-task.pipe.ts
index 6e5aba6fe..6e3a07e4e 100644
--- a/src/app/pipes/expediente-task.pipe.ts
+++ b/src/app/pipes/expediente-task.pipe.ts
@@ -17,7 +17,7 @@ export class ExpedienteTaskPipe implements PipeTransform {
"TaskStartDate": fullTask.taskStartDate,
"Subject": fullTask.workflowInstanceDataFields.Subject,
"Folio": fullTask.workflowInstanceDataFields.Subject,
- "Senders": fullTask.workflowInstanceDataFields.Sender,
+ "Senders": fullTask.workflowInstanceDataFields.Sender || "SEM ENTIDADE",
"CreateDate": date,
"DocumentsQty": fullTask.totalDocuments,
"WorkflowName": fullTask.workflowDisplayName,
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index 5206e1409..376962f09 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -299,6 +299,7 @@ export class ChatSystemService {
this.loadingWholeList = false
await this.storage.set('Rooms', rooms);
+ console.log('this._group', this._group)
this.sortRoomList()
@@ -676,7 +677,8 @@ export class ChatSystemService {
return 0;
});
- await this.storage.set('Users',this.users);
+ await this.storage.set('Users', this.users);
+
this.loadingUsers = false
}
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index a6cb6c8f5..9d7e271dc 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -1269,3 +1269,13 @@ export class EventsService {
return this.http.postCorrespondências em atraso
{{ TaskService.overdueTasks }}
-
-
-
- Novas Correspondências
- {{ TaskService.new }} -
+
+
+
+
+
+
Correspondências não lidas
{{ TaskService.unread }}
+
+
+
+ Correspondências com prazo para hoje {{ TaskService.deadline }}
+
+
+
+
+ Correspondências em atraso {{ TaskService.overdueTasks }}
+
+
+
+
Correspondências não lidas {{ TaskService.unread }}
+
- {{task.Senders }}
- {{ task.workflowInstanceDataFields.Sender }}
+ {{task.Senders }}
+ {{ task.workflowInstanceDataFields.Sender }}
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
index 0bf3e7659..d97c358f9 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
@@ -41,6 +41,7 @@ ion-list{
padding: 15px;
.item{
+ height: 78px;
//background-color: var(--white);
margin: 0 auto;
overflow: hidden;
@@ -60,7 +61,7 @@ ion-list{
ion-label{
margin: 0 !important;
- padding: 2.5px 10.5px 2.5px 10.5px;
+ padding: 0px;
}
}
@@ -99,7 +100,7 @@ ion-list{
/* border: 1px solid red; */
ion-label{
- padding: 2.5px 10.5px 2.5px 10.5px;
+ padding: 0px;
margin: 0 !important;
}
}
@@ -136,6 +137,7 @@ ion-list{
background: var(--label-bg-color);
/* font-size: 12px; */
float: right;
+ font-size: 12px;
padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff;
}
@@ -193,3 +195,8 @@ ion-list{
width: 20px;
}
}
+
+
+.sender {
+ font-size: 10px;
+}
\ No newline at end of file
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index 53282f9b3..91f5542e5 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -3,7 +3,6 @@ import { NavigationEnd, Router } from '@angular/router';
import { LoginUserRespose } from 'src/app/models/user.model';
import { ThemeService } from 'src/app/services/theme.service'
import { TaskService } from 'src/app/services/task.service'
-/* import MiniSearch from 'minisearch' */
@Component({
selector: 'app-all-processes',
@@ -83,7 +82,7 @@ export class AllProcessesPage implements OnInit {
}
async closeSearch() {
this.searchSubject = ''
- // this.dynamicSearch()
+ this.dynamicSearch()
}
async basicSearch() {
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 562eb6cc7..190abf8b1 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
@@ -86,11 +86,18 @@
Minha agenda
+ {{ environment.agendaPR}}
+ {{ environment.agendaVP}}
+ Agenda do {{calendars.Fullname}}
+ Minha agenda
{{ environment.agendaPR}}
{{ environment.agendaVP}}
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 7aae316e9..60e63ef1b 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
@@ -62,18 +62,23 @@ export class EventsToApprovePage implements OnInit {
{}
ngOnInit() {
- if(!this.segment) {
- if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
- this.segment = 'Meu calendario';
- } else {
- this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+
+ this.eventService.onCalendarFinishLoad.subscribe(() => {
+ if(!this.segment) {
+ if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+ this.segment = 'Meu calendario';
+ } else {
+ this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+ }
+
+ // select pr by default
+ const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
+ if(pr) {
+ this.segment = pr.OwnerUserId
+ }
}
+ })
- // const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
- // if(pr) {
- // this.segment = pr.OwnerUserId
- // }
- }
this.LoadToApproveEvents()
this.listSubscription = this.eventoaprovacaostore.registerCallback({
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
index 9dbe98acd..1d4959f4c 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
@@ -12,7 +12,7 @@
-
+