mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
some changes
This commit is contained in:
Generated
+6
-7
@@ -13029,10 +13029,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/core-js": {
|
"node_modules/core-js": {
|
||||||
"version": "3.18.1",
|
"version": "3.33.2",
|
||||||
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.1.tgz",
|
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz",
|
||||||
"integrity": "sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA==",
|
"integrity": "sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ==",
|
||||||
"deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
|
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"funding": {
|
"funding": {
|
||||||
"type": "opencollective",
|
"type": "opencollective",
|
||||||
@@ -53635,9 +53634,9 @@
|
|||||||
"integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
|
"integrity": "sha512-dTBxYaX/RGzH6+pp49o4sb3FuHCvhrssaKn1XMJ4LL3f9dnvz3rhFK2LdcWrdFkhOLOndnW/azUkbzZd+WWhRA=="
|
||||||
},
|
},
|
||||||
"core-js": {
|
"core-js": {
|
||||||
"version": "3.18.1",
|
"version": "3.33.2",
|
||||||
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.1.tgz",
|
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz",
|
||||||
"integrity": "sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA=="
|
"integrity": "sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ=="
|
||||||
},
|
},
|
||||||
"core-js-compat": {
|
"core-js-compat": {
|
||||||
"version": "3.26.1",
|
"version": "3.26.1",
|
||||||
|
|||||||
@@ -420,7 +420,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
AttachmentList: docs
|
AttachmentList: docs
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.postData.DispatchFolder.Message) {
|
/* if (this.postData.DispatchFolder.Message) { */
|
||||||
try {
|
try {
|
||||||
await this.despachoService.createDespacho(this.postData).toPromise();
|
await this.despachoService.createDespacho(this.postData).toPromise();
|
||||||
await this.despachoService.CompleteTask({ serialNumber: this.task.serialNumber, note: this.dispatchFolder.Message }).toPromise();
|
await this.despachoService.CompleteTask({ serialNumber: this.task.serialNumber, note: this.dispatchFolder.Message }).toPromise();
|
||||||
@@ -432,11 +432,11 @@ export class CreateProcessPage implements OnInit {
|
|||||||
} finally {
|
} finally {
|
||||||
loader.remove();
|
loader.remove();
|
||||||
}
|
}
|
||||||
}
|
/* }
|
||||||
else {
|
else {
|
||||||
this.validateField = true;
|
this.validateField = true;
|
||||||
this.toastService._badRequest('Por favor adicione uma descrição');
|
this.toastService._badRequest('Por favor adicione uma descrição');
|
||||||
}
|
} */
|
||||||
loader.remove();
|
loader.remove();
|
||||||
break;
|
break;
|
||||||
case '1': // Pedido de Parecer
|
case '1': // Pedido de Parecer
|
||||||
|
|||||||
+3
-3
@@ -461,7 +461,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.postData.DispatchFolder.Message){
|
/* if(this.postData.DispatchFolder.Message){ */
|
||||||
try {
|
try {
|
||||||
this.taskResult = await this.despachoService.createDespacho(this.postData).toPromise();
|
this.taskResult = await this.despachoService.createDespacho(this.postData).toPromise();
|
||||||
await this.httpErroHandle.httpsSucessMessagge('Efetuar Despacho')
|
await this.httpErroHandle.httpsSucessMessagge('Efetuar Despacho')
|
||||||
@@ -471,11 +471,11 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
} finally {
|
} finally {
|
||||||
//loader.remove()
|
//loader.remove()
|
||||||
}
|
}
|
||||||
}
|
/* }
|
||||||
else{
|
else{
|
||||||
this.validateField = true;
|
this.validateField = true;
|
||||||
this.toastService._badRequest('Por favor adicione uma descrição');
|
this.toastService._badRequest('Por favor adicione uma descrição');
|
||||||
}
|
} */
|
||||||
loader.remove();
|
loader.remove();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngIf="capturedImage != '' " class="ion-item-container-no-border mb-20">
|
<div *ngIf="filecontent" class="ion-item-container-no-border mb-20">
|
||||||
<ion-label class="attached-title pb-10">Fotografia Anexada</ion-label>
|
<ion-label class="attached-title pb-10">Fotografia Anexada</ion-label>
|
||||||
|
|
||||||
<div class="d-flex justify-content-between">
|
<div class="d-flex justify-content-between">
|
||||||
@@ -36,8 +36,8 @@
|
|||||||
|
|
||||||
<ion-img *ngIf="fileType == 'image/jpeg'" [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage" (click)="imageSize(capturedImage)" ></ion-img>
|
<ion-img *ngIf="fileType == 'image/jpeg'" [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage" (click)="imageSize(capturedImage)" ></ion-img>
|
||||||
|
|
||||||
<video *ngIf="fileType == 'video/mp4'" controls>
|
<video *ngIf="fileType == 'video/mp4'" height="80px" width="80px" playsinline controls preload="auto">
|
||||||
<source type="video/mp4" src="{{capturedVideo}}">
|
<source src="{{capturedVideo}}" type="video/mp4" >
|
||||||
</video>
|
</video>
|
||||||
|
|
||||||
</ion-thumbnail>
|
</ion-thumbnail>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import { formatDate } from 'src/plugin/momentG.js'
|
|||||||
import { ThemeService } from 'src/app/services/theme.service';
|
import { ThemeService } from 'src/app/services/theme.service';
|
||||||
import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera';
|
import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera';
|
||||||
|
|
||||||
import { Filesystem, Directory } from '@capacitor/filesystem';
|
import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
|
||||||
import { NgxImageCompressService } from "ngx-image-compress";
|
import { NgxImageCompressService } from "ngx-image-compress";
|
||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
import { PublicationFolderService } from 'src/app/store/publication-folder.service';
|
import { PublicationFolderService } from 'src/app/store/publication-folder.service';
|
||||||
@@ -27,6 +27,7 @@ import { FilePicker } from '@capawesome/capacitor-file-picker';
|
|||||||
import { CapacitorVideoPlayer } from 'capacitor-video-player';
|
import { CapacitorVideoPlayer } from 'capacitor-video-player';
|
||||||
import { VideoRecorder, VideoRecorderCamera, VideoRecorderPreviewFrame } from '@teamhive/capacitor-video-recorder';
|
import { VideoRecorder, VideoRecorderCamera, VideoRecorderPreviewFrame } from '@teamhive/capacitor-video-recorder';
|
||||||
import { CaptureImageOptions, MediaCapture } from '@awesome-cordova-plugins/media-capture/ngx';
|
import { CaptureImageOptions, MediaCapture } from '@awesome-cordova-plugins/media-capture/ngx';
|
||||||
|
import { Capacitor } from '@capacitor/core';
|
||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
quality: 0.5,
|
quality: 0.5,
|
||||||
@@ -108,6 +109,7 @@ export class NewPublicationPage implements OnInit {
|
|||||||
video: any;
|
video: any;
|
||||||
photoOrVideo: boolean = false;
|
photoOrVideo: boolean = false;
|
||||||
fileType = "";
|
fileType = "";
|
||||||
|
filecontent: boolean;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
@@ -172,6 +174,7 @@ export class NewPublicationPage implements OnInit {
|
|||||||
0.9 // quality
|
0.9 // quality
|
||||||
).then((picture) => {
|
).then((picture) => {
|
||||||
console.log('taked: ', picture)
|
console.log('taked: ', picture)
|
||||||
|
this.filecontent = true;
|
||||||
this.capturedImage = picture
|
this.capturedImage = picture
|
||||||
this.photoOrVideo = false;
|
this.photoOrVideo = false;
|
||||||
|
|
||||||
@@ -207,15 +210,27 @@ export class NewPublicationPage implements OnInit {
|
|||||||
this.video = data[0];
|
this.video = data[0];
|
||||||
console.log(this.video)
|
console.log(this.video)
|
||||||
this.fileType = "video/mp4"
|
this.fileType = "video/mp4"
|
||||||
let resultUrl = decodeURIComponent(data[0].localURL);
|
await Filesystem.writeFile({
|
||||||
Filesystem.readFile({ path: resultUrl })
|
path: data[0].name,
|
||||||
|
data: data[0].fullPath,
|
||||||
|
directory: Directory.Data,
|
||||||
|
}).then((dir) => {
|
||||||
|
console.log('DIR ', dir)
|
||||||
|
let resultUrl = decodeURIComponent(dir.uri);
|
||||||
|
Filesystem.readFile({ path: resultUrl, encoding: Encoding.UTF8, })
|
||||||
|
|
||||||
.then(async (content) => {
|
.then(async (content) => {
|
||||||
console.log(content)
|
console.log(JSON.stringify(content))
|
||||||
|
const base64Data = btoa(content.data);
|
||||||
|
|
||||||
|
console.log(base64Data);
|
||||||
|
/* this.filecontent = true;
|
||||||
this.capturedVideo = "data:video/mp4;base64," + content.data;
|
this.capturedVideo = "data:video/mp4;base64," + content.data;
|
||||||
this.photoOrVideo = false;
|
this.photoOrVideo = false; */
|
||||||
})
|
})
|
||||||
.catch((err) => console.error(err));
|
.catch((err) => console.error(err));
|
||||||
|
});
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log('record video error: ', error)
|
console.log('record video error: ', error)
|
||||||
}
|
}
|
||||||
@@ -236,6 +251,7 @@ export class NewPublicationPage implements OnInit {
|
|||||||
.then(async (content) => {
|
.then(async (content) => {
|
||||||
console.log(result)
|
console.log(result)
|
||||||
console.log(content)
|
console.log(content)
|
||||||
|
this.filecontent = true;
|
||||||
if (this.fileType == "video/mp4") {
|
if (this.fileType == "video/mp4") {
|
||||||
this.capturedVideo = "data:video/mp4;base64," + content.data;
|
this.capturedVideo = "data:video/mp4;base64," + content.data;
|
||||||
} else if (this.fileType == "image/jpg") {
|
} else if (this.fileType == "image/jpg") {
|
||||||
|
|||||||
@@ -3,18 +3,27 @@
|
|||||||
<div class="main-header viewport-font-size">
|
<div class="main-header viewport-font-size">
|
||||||
<div class="title-content d-flex width-100">
|
<div class="title-content d-flex width-100">
|
||||||
<div class="cursor-pointer viewport-font-size" (click)="goBack()">
|
<div class="cursor-pointer viewport-font-size" (click)="goBack()">
|
||||||
<ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
|
<ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'default' " slot="end"
|
||||||
<ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
|
src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
|
||||||
<ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
|
<ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'doneIt' "
|
||||||
|
src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
|
||||||
|
<ion-icon class="font-35-em" *ngIf="ThemeService.currentTheme == 'gov' " slot="end"
|
||||||
|
src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="publicationFolderService.FolderDetails[folderId]?.DateBegin != null" class="div-title flex-grow-1">
|
<div *ngIf="publicationFolderService.FolderDetails[folderId]?.DateBegin != null" class="div-title flex-grow-1">
|
||||||
<p class="title font-25-em mb-10-em">{{publicationFolderService.FolderDetails[folderId].Description}}</p>
|
<p class="title font-25-em mb-10-em">{{publicationFolderService.FolderDetails[folderId].Description}}</p>
|
||||||
<p class="item-content-date font-13-em" >{{publicationFolderService.FolderDetails[folderId].DateBegin | date: 'dd-MM-yyyy HH:mm'}}</p>
|
<p class="item-content-date font-13-em">{{publicationFolderService.FolderDetails[folderId].DateBegin | date:
|
||||||
|
'dd-MM-yyyy HH:mm'}}</p>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="p.userPermission([p.permissionList.Actions.createPost]) && publicationFolderService.FolderDetails[folderId]" class="cursor-pointer font-35-em" (click)="AddPublication('2',publicationFolderService.FolderDetails[folderId].ProcessId)">
|
<div
|
||||||
|
*ngIf="p.userPermission([p.permissionList.Actions.createPost]) && publicationFolderService.FolderDetails[folderId]"
|
||||||
|
class="cursor-pointer font-35-em"
|
||||||
|
(click)="AddPublication('2',publicationFolderService.FolderDetails[folderId].ProcessId)">
|
||||||
<!-- <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
|
<!-- <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
|
||||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-add.svg'></ion-icon>
|
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end"
|
||||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-add.svg'></ion-icon>
|
src='assets/images/icons-add.svg'></ion-icon>
|
||||||
|
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end"
|
||||||
|
src='assets/images/theme/gov/icons-add.svg'></ion-icon>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -34,8 +43,14 @@
|
|||||||
|
|
||||||
<ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index">
|
<ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index">
|
||||||
<ion-card-content>
|
<ion-card-content>
|
||||||
<div class="post-img" (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)">
|
<div class="post-img" >
|
||||||
<img [lazyLoad]="publication.FileBase64">
|
<img *ngIf="publication.FileExtension == 'jpeg'" (click)="goToPublicationDetail(publication.DocumentId, publication.ProcessId)" [lazyLoad]="publication.FileBase64">
|
||||||
|
|
||||||
|
<video *ngIf="publication.FileExtension == 'mp4'" playsinline controls
|
||||||
|
preload="auto">
|
||||||
|
<source [src]="'data:video/mp4;base64,'+publication.FileBase6" type="video/mp4">
|
||||||
|
</video>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="post-content">
|
<div class="post-content">
|
||||||
<div class="post-title-time">
|
<div class="post-title-time">
|
||||||
@@ -46,9 +61,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="post-description ">
|
<div class="post-description ">
|
||||||
<!-- <pre class="text font-14-em">{{publication.Message}}</pre> -->
|
<!-- <pre class="text font-14-em">{{publication.Message}}</pre> -->
|
||||||
<app-show-more
|
<app-show-more [text]=publication.Message></app-show-more>
|
||||||
[text]=publication.Message
|
|
||||||
></app-show-more>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ion-card-content>
|
</ion-card-content>
|
||||||
|
|||||||
@@ -89,6 +89,8 @@ export class ViewPublicationsPage implements OnInit {
|
|||||||
//this.testForkJoin()
|
//this.testForkJoin()
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
console.log(this.publicationFolderService.publicationList[this.folderId])
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnChanges() {
|
ngOnChanges() {
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ import { doneITProd } from './suport/doneIt'
|
|||||||
import { DevDev } from './suport/dev'
|
import { DevDev } from './suport/dev'
|
||||||
|
|
||||||
|
|
||||||
export const environment: Environment = DevDev;
|
export const environment: Environment = oaprProd;
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt'
|
|||||||
import { DevDev } from './suport/dev'
|
import { DevDev } from './suport/dev'
|
||||||
|
|
||||||
|
|
||||||
export const environment: Environment = DevDev
|
export const environment: Environment = oaprDev
|
||||||
Reference in New Issue
Block a user