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/modals/ask-modal/ask-modal.module.ts b/src/app/modals/ask-modal/ask-modal.module.ts
index d9366c587..484654bff 100644
--- a/src/app/modals/ask-modal/ask-modal.module.ts
+++ b/src/app/modals/ask-modal/ask-modal.module.ts
@@ -15,6 +15,7 @@ import { AskModalPage } from './ask-modal.page';
IonicModule,
AskModalPageRoutingModule
],
- declarations: [AskModalPage]
+ declarations: [AskModalPage],
+ exports: [AskModalPage]
})
export class AskModalPageModule {}
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 08c4404c7..e1ee282ff 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -79,7 +79,7 @@ export class CreateProcessPage implements OnInit {
validateFrom = false;
validateField = false;
- emptyTextDescription = "Sem intervenientes selecionados";
+ emptyTextDescription = "Selecionar intervenientes";
showEmptyContainer = true;
documents: SearchList[] = [];
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
index 06e153184..f6522049b 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
@@ -86,7 +86,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
formLocationSatus: boolean = false;
showAttendees= false;
loggeduser: LoginUserRespose;
- emptyTextDescription = "Sem intervenientes selecionados";
+ emptyTextDescription = "Selecionar intervenientes";
document: SearchFolderDetails | SearchDocumentDetails | any;
subject: string;
diff --git a/src/app/models/publication.ts b/src/app/models/publication.ts
index a042c85f8..f2fa18227 100644
--- a/src/app/models/publication.ts
+++ b/src/app/models/publication.ts
@@ -8,7 +8,7 @@ export class Publication{
Message: string;
DatePublication: Date | string;
OriginalFileName?: string;
- FileBase64?:string;
+ FileBase64?:string = "";
FileExtension?: string;
OrganicEntityId?: number;
}
\ 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/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index fbb84b204..c27a314c5 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -107,7 +107,7 @@ export class BookMeetingModalPage implements OnInit {
formLocationSatus: boolean = false;
showAttendees = false;
- emptyTextDescription = "Sem intervenientes selecionados";
+ emptyTextDescription = "Selecionar intervenientes";
CalendarName
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 5c8b58a64..fa5e03309 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -84,7 +84,7 @@ export class ExpedientTaskModalPage implements OnInit {
adding: "intervenient" | "CC" = "intervenient";
profile: string;
- emptyTextDescription = "Sem intervenientes selecionados";
+ emptyTextDescription = "Selecionar intervenientes";
showEmptyContainer = true;
taskResult: any = {}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index c78e364c8..ff67bfee4 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -725,11 +725,6 @@
TaskService.pendentesstore.newList.length}} correspondência nova
-
- {{TaskService.pendentesstore.count}}
- correspondência
- correspondência
- correspondências
+
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/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html
index 410bce0d0..9a69f55b3 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -28,25 +28,11 @@
-
-
-
-
-
{{publication.OriginalFileName}}.{{publication.FileExtension}}
-
75 Kb
-
-
-
+
+
Fotografia Anexada
-
+
@@ -59,8 +45,23 @@
-
+
+
+
+
+
+
+
+
{{publication.OriginalFileName}}.{{publication.FileExtension}}
+
75 Kb
+
+
+
+
+
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 e6bdccfa4..5671ea3f8 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -42,7 +42,7 @@ export class NewPublicationPage implements OnInit {
guestPicture:any;
capturedImage:any = '';
- capturedImageTitle:any;
+ capturedImageTitle:any = '';
photos: any[] = [];
constructor(
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index 7bf88c525..475a05a4b 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -9,7 +9,6 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { PublicationFolderService } from 'src/app/store/publication-folder.service';
-import { AskModalPage } from 'src/app/modals/ask-modal/ask-modal.page'
@Component({
selector: 'app-publication-detail-shared',
templateUrl: './publication-detail.page.html',
@@ -34,7 +33,6 @@ export class PublicationDetailPage implements OnInit {
public p:PermissionService,
private httpErrorHandle: HttpErrorHandle,
public publicationFolderService: PublicationFolderService,
- public AskModalPage: AskModalPage
) {
/* this.folderId = this.navParams.get('folderIdId'); */
diff --git a/src/plugin/showDateDuration.js b/src/plugin/showDateDuration.js
index 4e8301a3b..93d850d33 100644
--- a/src/plugin/showDateDuration.js
+++ b/src/plugin/showDateDuration.js
@@ -32,7 +32,7 @@ function showDateDuration(start) {
}
}
else{
- let date = addZero(start.getDate()) + "/" + addZero(start.getMonth()+1) + "/" + start.getFullYear();
+ let date = addZero(start.getDate()) + "-" + addZero(start.getMonth()+1) + "-" + start.getFullYear();
return date;
}
}
diff --git a/version/git-version.ts b/version/git-version.ts
index 21e053071..eaee37b0e 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "0f3416cc3",
- "SHA": "0f3416cc3031874f4cd6d4738068d07696ab3190",
+ "shortSHA": "b10dce895",
+ "SHA": "b10dce895a43b0b33f55f51f36a7b713a72d5816",
"branch": "developer",
- "lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Mon Aug 14 12:15:18 2023 +0100'",
- "lastCommitMessage": "fix",
- "lastCommitNumber": "5153",
+ "lastCommitAuthor": "'Eudes Inácio'",
+ "lastCommitTime": "'Mon Aug 14 16:27:57 2023 +0100'",
+ "lastCommitMessage": "Chat title remove dash",
+ "lastCommitNumber": "5154",
"change": "",
- "changeStatus": "On branch developer\nYour branch is up to date with 'origin/developer'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html",
+ "changeStatus": "On branch developer\nYour branch and 'origin/developer' have diverged,\nand have 1 and 4 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tdeleted: index.html\n\tmodified: src/app/modals/ask-modal/ask-modal.module.ts\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/models/publication.ts\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/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.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/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\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\n\tmodified: src/plugin/showDateDuration.js",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file