peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge with Peter changes

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-09 17:04:59 +01:00
parent 3e2d797c90 07b958651a
commit d46b8a34bc
7 changed files with 764 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+694 -1053
View File
File diff suppressed because it is too large Load Diff
package.json
+1
View File
@@ -111,6 +111,7 @@
"base64-js": "^1.5.1",
"beast-orm": "^1.1.2",
"bootstrap": "^4.5.0",
"browser-image-resizer": "^2.4.1",
"build": "0.1.4",
"capacitor-voice-recorder": "^4.0.1",
"ci": "^2.1.1",
src/app/models/dailyworktask.model.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import * as internal from "stream";
export class DailyWorkTask{
export class DailyWorkTask {
SerialNumber: string;
Folio: string;
Senders: string;
src/app/pages/gabinete-digital/gabinete-digital.page.html
+1 -3
View File
@@ -46,9 +46,7 @@
<div class="item-top-detail">
<div class="item-subject">
<!-- ... {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName }} {{ task.activityInstanceName }} -->
<ion-label *ngIf="task.Folio">{{ task.Folio }}</ion-label>
<ion-label *ngIf="task.Subject">{{ task.Subject }}</ion-label>
<ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Subject }}</ion-label>
<ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
</div>
<div *ngIf="task.DocumentsQty != 0" class="item-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/pages/publications/new-publication/new-publication.page.ts
+60 -16
View File
@@ -18,6 +18,8 @@ import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera
import { Filesystem, Directory } from '@capacitor/filesystem';
import { NgxImageCompressService } from "ngx-image-compress";
import { readAndCompressImage } from 'browser-image-resizer';
import { environment } from 'src/environments/environment';
const IMAGE_DIR = 'stored-images';
@@ -108,7 +110,7 @@ export class NewPublicationPage implements OnInit {
}
async takePicture() {
alert('take')
const capturedImage = await Camera.getPhoto({
quality: 90,
// allowEditing: true,
@@ -119,11 +121,30 @@ export class NewPublicationPage implements OnInit {
const response = await fetch(capturedImage.webPath!);
const blob = await response.blob();
this.convertBlobToBase64Worker.postMessage(blob);
this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
this.capturedImage = oEvent.data
const config = {
quality: 0.5,
maxWidth: 800,
debug: true
};
var file = new File([blob], "camera.jpg");
// Note: A single file comes from event.target.files on <input>
readAndCompressImage(file, config)
.then(resizedImage => {
console.log('resizedImage', resizedImage);
this.convertBlobToBase64Worker.postMessage(resizedImage);
this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
this.capturedImage = oEvent.data
}
})
.then(result => {
// TODO: Handle the result
console.log('result', result);
});
}
}
imageSize(image) {
@@ -179,12 +200,35 @@ export class NewPublicationPage implements OnInit {
const response = await fetch(capturedImage.webPath!);
const blob = await response.blob();
const config = {
quality: 0.9,
maxWidth: 800,
debug: !environment.production
};
var file = new File([blob], "camera.jpg");
// Note: A single file comes from event.target.files on <input>
readAndCompressImage(file, config)
.then(resizedImage => {
console.log('resizedImage', resizedImage);
this.convertBlobToBase64Worker.postMessage(resizedImage);
this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
this.capturedImage = oEvent.data
}
})
.then(result => {
// TODO: Handle the result
// console.log('result', result);
});
this.convertBlobToBase64Worker.postMessage(blob);
this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
this.capturedImage = oEvent.data
}
}
@@ -198,7 +242,7 @@ export class NewPublicationPage implements OnInit {
this.Form = new FormGroup({
Subject: new FormControl(this.pub.Title, [
//Validators.required,
Validators.required,
// Validators.minLength(4)
]),
capturedImage: new FormControl(this.capturedImage, [
@@ -269,11 +313,11 @@ export class NewPublicationPage implements OnInit {
try {
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.toastService.successMessage("Publicação criado")
this.toastService._successMessage("Publicação criado")
this.close();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
this.toastService._badRequest("Publicação não criado")
} finally {
loader.remove()
}
@@ -297,11 +341,11 @@ export class NewPublicationPage implements OnInit {
try {
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.toastService.successMessage("Publicação criado")
this.toastService._successMessage("Publicação criado")
this.close();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
this.toastService._badRequest("Publicação não criado")
} finally {
loader.remove()
}
@@ -333,12 +377,12 @@ export class NewPublicationPage implements OnInit {
await this.publications.CreatePublication(this.folderId, this.publication).toPromise();
this.close();
this.toastService.successMessage("Publicação criado")
this.toastService._successMessage("Publicação criado")
this.close();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
this.toastService._badRequest("Publicação não criado")
} finally {
loader.remove()
}
src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+1 -3
View File
@@ -37,9 +37,7 @@
<!-- {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName || task.workflowDisplayName }} {{ task.activityInstanceName }} -->
<ion-label *ngIf="task.Folio">{{ task.Folio }}</ion-label>
<ion-label *ngIf="task.Subject">{{ task.Subject }}</ion-label>
<ion-label *ngIf="task.workflowInstanceDataFields">{{ task.workflowInstanceDataFields.Subject }}</ion-label>
<ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
</div>
<div *ngIf="task.DocumentsQty != 0" class="item-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "ec475c76b",
"SHA": "ec475c76beabb561946c54be10244bdc854900bd",
"shortSHA": "3e2d797c9",
"SHA": "3e2d797c908bc1e109cf519adaad36d02f043cf8",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Thu Feb 9 11:25:57 2023 +0100'",
"lastCommitMessage": "Required fields description added to forms",
"lastCommitNumber": "4751",
"lastCommitTime": "'Thu Feb 9 17:03:26 2023 +0100'",
"lastCommitMessage": "changed xcalendario to agenda",
"lastCommitNumber": "4760",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 10 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\tmodified: src/app/home/home.page.html\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/create-process/create-process.page.html\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.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pipes/expediente-task.pipe.ts\n\tnew file: src/app/services/active-tab.service.spec.ts\n\tnew file: src/app/services/active-tab.service.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.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/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/plugin/src/connection/indexedDb/connector.d.ts\n\tmodified: src/plugin/src/connection/indexedDb/connector.js\n\tmodified: src/plugin/src/connection/indexedDb/indexedb.d.ts\n\tmodified: src/plugin/src/connection/indexedDb/indexedb.js\n\tmodified: src/plugin/src/connection/intreface.d.ts\n\tmodified: src/plugin/src/connection/worker.js\n\tmodified: src/plugin/src/index.d.ts\n\tmodified: src/plugin/src/index.js\n\tmodified: src/plugin/src/models/model.d.ts\n\tmodified: src/plugin/src/models/model.js\n\tmodified: src/plugin/src/models/model.reader.d.ts\n\tmodified: src/plugin/src/models/model.reader.js\n\tmodified: src/plugin/src/models/register-model.d.ts\n\tmodified: src/plugin/src/models/register-model.js",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 2 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\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: version/git-version.ts",
"changeAuthor": "eudes.inacio"
}