diff --git a/index.html b/index.html
deleted file mode 100644
index a564f3577..000000000
--- a/index.html
+++ /dev/null
@@ -1 +0,0 @@
-https://wetransfer.com/downloads/48a9320a9b41c4b3bef97cfc0c42941620230803122443/778a91?utm_campaign=TRN_TDL_05&utm_source=sendgrid&utm_medium=email&trk=TRN_TDL_05
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 0b043777d..5d392ec15 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -1037,6 +1037,66 @@ $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/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 5e083bb19..b2c974144 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -101,10 +101,10 @@
{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}
-
+
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
index a65f432b0..8dee2d862 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -87,9 +87,8 @@ export class ContactsPage implements OnInit {
username: username,
}
this.chatService.createRoom(body).subscribe(async(res) => {
-
this.room = res['room'];
- await this.ChatSystemService.getAllRooms();
+ this.ChatSystemService.getAllRooms();
this.getDirectMessage(this.room._id);
});
}
@@ -102,7 +101,7 @@ export class ContactsPage implements OnInit {
async openModal(roomId:any){
this.close();
-
+ console.log('open chat')
const modal = await this.modalController.create({
component: MessagesPage,
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 7f965076b..25653055c 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -301,8 +301,8 @@ export class DespachoPrPage implements OnInit {
async concluir(note: string, documents: any) {
let body = {
"serialNumber": this.serialNumber,
- "action": "Executado",
- "ActionTypeId": 104,
+ "action": "Arquivo",
+ "ActionTypeId": 95,
"dataFields": {
"ReviewUserComment": note,
},
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index 645b07068..65e0af8fa 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -128,11 +128,11 @@
{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}
-
+
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index 5963701f3..4a7168408 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -68,7 +68,7 @@ export class ContactsPage implements OnInit {
username: username,
}
this.chatService.createRoom(body).subscribe(res => {
-
+ this.ChatSystemService.getAllRooms();
this.room = res['room'];
this.openMessage.emit(this.room._id);
});
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 36c9c312c..2a6756e82 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -13,6 +13,7 @@ import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { environment } from 'src/environments/environment';
+import { TaskService } from 'src/app/services/task.service'
@Component({
selector: 'app-despachos-options',
@@ -36,6 +37,7 @@ export class DespachosOptionsPage implements OnInit {
public ThemeService: ThemeService,
private RouteService: RouteService,
private httpErrorHandle: HttpErrorHandle,
+ public TaskService: TaskService
) {
this.task = this.navParams.get('task')
this.fulltask = this.navParams.get('fulltask')
@@ -249,7 +251,7 @@ export class DespachosOptionsPage implements OnInit {
await this.generateDiploma(res.data.note, docs);
}
else if(actionName == 'Concluido') {
- //this.concluir(res.data.note, docs);
+ this.concluir(res.data.note, docs);
}
else if(actionName == 'Reexecução') {
await this.reexecutar(res.data.note, docs);
@@ -261,6 +263,34 @@ export class DespachosOptionsPage implements OnInit {
});
}
+
+
+ async concluir(note: string, documents: any) {
+ let body = {
+ "serialNumber": this.serialNumber,
+ "action": "Arquivo",
+ "ActionTypeId": 95,
+ "dataFields": {
+ "ReviewUserComment": note,
+ },
+ "AttachmentList": documents,
+ }
+
+ const loader = this.toastService.loading()
+
+ try {
+ await this.processes.CompleteTask(body).toPromise()
+ this.httpErrorHandle.httpsSucessMessagge('Concluir Despacho')
+ this.TaskService.loadDiplomas()
+ } catch (error) {
+ this.httpErrorHandle.httpStatusHandle(error)
+ }
+ finally {
+ loader.remove()
+ }
+
+ }
+
async arquivar(note:string, documents:any) {
let body = {
"serialNumber": this.serialNumber,
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 bdbed6a30..75aab4181 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
@@ -311,8 +311,8 @@ export class DespachosPrOptionsPage implements OnInit {
async concluir(note:string, documents:any){
let body = {
"serialNumber": this.serialNumber,
- "action": "Executado",
- "ActionTypeId": 104,
+ "action": "Arquivo",
+ "ActionTypeId": 95,
"dataFields": {
"ReviewUserComment": note,
},
diff --git a/version/git-version.ts b/version/git-version.ts
index d71e61411..717604bf2 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "0f3416cc3",
- "SHA": "0f3416cc3031874f4cd6d4738068d07696ab3190",
+ "shortSHA": "4ae2e7cfa",
+ "SHA": "4ae2e7cfa89f34727d2ee71260e2d6d3a45934c9",
"branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Mon Aug 14 12:15:18 2023 +0100'",
+ "lastCommitTime": "'Mon Aug 14 14:11:15 2023 +0100'",
"lastCommitMessage": "fix",
- "lastCommitNumber": "5153",
+ "lastCommitNumber": "5154",
"change": "",
- "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/ask-modal/ask-modal.module.ts\n\tmodified: src/app/models/publication.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\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: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts",
+ "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tdeleted: index.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file