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

some changes

Browse Source
This commit is contained in:
Equilibrium ITO
2024-03-21 17:06:36 +01:00
parent 04c3288f98
commit ca25c55c23
10 changed files with 211 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/document-detail/document-detail.page.html
+1 -1
View File
@@ -51,7 +51,7 @@
>
<div class="attach-title-item">
{{LoadedDocument.Assunto}}
{{LoadedDocument.Assunto || 'Sem título'}}
</div>
<div class="d-flex justify-between" style="justify-content: space-between">
<span class="span-left">{{ LoadedDocument.Sender }}</span>
src/app/modals/forward/forward.page.html
+1 -1
View File
@@ -52,7 +52,7 @@
<ion-list>
<ion-item *ngFor="let attachment of loadedAttachments">
<ion-label>
<h4 class="attach-title-item">{{attachment.Description}}</h4>
<h4 class="attach-title-item">{{attachment.Description || 'Sem título'}}</h4>
<p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right"> {{ attachment.CreateDate | date: 'dd-MM-yyyy' }}</span></p>
</ion-label>
</ion-item>
src/app/modals/view-event/view-event.page.html
+1 -1
View File
@@ -98,7 +98,7 @@
<ion-item *ngFor="let attach of loadedEvent.Attachments; let i = index" class="width-100" class="ion-no-margin ion-no-padding">
<ion-label class="width-100 d-flex " (click)="docIndex(i);LoadDocumentDetails()">
<p class="flex-grow-1" >
<span class="attach-title-item d-block">{{attach.SourceName}}</span>
<span class="attach-title-item d-block">{{attach.SourceName || 'Sem título'}}</span>
<span class="span-left d-block">{{attach.Stakeholders}}</span>
</p>
src/app/pages/agenda/view-event/view-event.page.html
+2 -1
View File
@@ -95,7 +95,8 @@
<ion-item *ngFor="let attach of loadedEvent.Attachments; let i = index" class="width-100" class="ion-no-margin ion-no-padding">
<ion-label class="width-100 d-flex " (click)="docIndex(i);LoadDocumentDetails()">
<p class="flex-grow-1" >
<span class="attach-title-item d-block">{{attach.SourceName}}</span>
<span class="attach-title-item d-block">{{attach.SourceName || 'Sem título'}}</span>
<span class="span-left d-block">{{attach.Stakeholders}}</span>
</p>
src/app/pages/agenda/view-event/view-event.page.ts
+2 -1
View File
@@ -193,6 +193,7 @@ export class ViewEventPage implements OnInit {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
this.eventsService.getEvent(this.eventId).subscribe(res => {
console.log('Loaded Event', res)
res = this.dateService.fixDate(res as any)
this.loadedEvent = res;
this.setTimeZone()
@@ -217,7 +218,7 @@ export class ViewEventPage implements OnInit {
if(this.CalendarId) {
this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
console.log('Loaded Event', res)
/* const div = document.createElement("div")
div.innerHTML = res.Body.Text
res.Body.Text = div.innerText */
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+1 -1
View File
@@ -96,7 +96,7 @@
(click)="viewDocument(document.SourceId, document.ApplicationId)"
class="width-100 d-block list">
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.SourceName}}</span>
<span class="attach-title-item">{{document.SourceName || 'Sem título'}}</span>
<span class="app-name" *ngIf="document.ApplicationId == 8"> Correspondencia </span>
<span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
<span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+1 -1
View File
@@ -95,7 +95,7 @@
*ngFor="let attachment of loadedAttachments"
(click)="viewDocument(attachment.DocId, attachment)">
<ion-label>
<p class="attach-title-item d-block">{{attachment.Description}}</p>
<p class="attach-title-item d-block">{{attachment.Description || 'Sem título'}}</p>
<p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right">{{ attachment.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
</ion-label>
</ion-item>
src/app/pages/publications/new-publication/new-publication.page.ts
+41 -13
View File
@@ -194,7 +194,7 @@ export class NewPublicationPage implements OnInit {
this.capturedImage = 'data:image/jpeg;base64,' + capturedImage.base64String;
this.capturedImageTitle = 'foto';
if (this.fileSizeToMB(capturedImage.base64String.length) <= 20) {
if (this.canAddFile(this.fileSizeToMB(capturedImage.base64String.length))) {
const compressedImage = await this.compressImageBase64(
this.capturedImage,
800, // maxWidth
@@ -207,7 +207,8 @@ export class NewPublicationPage implements OnInit {
let fileObject = {
FileBase64: this.removeTextBeforeSlash(picture, ','),
FileExtension: capturedImage.format,
OriginalFileName: 'image'
OriginalFileName: 'image',
FileSize: this.fileSizeToMB(capturedImage.base64String.length)
}
this.seletedContent.push(fileObject)
@@ -251,13 +252,13 @@ export class NewPublicationPage implements OnInit {
console.log('video record', data)
data.forEach(async element => {
this.filesSizeSum = this.filesSizeSum + element.size
if (this.fileSizeToMB(this.filesSizeSum) <= 20) {
if (this.canAddFile(this.fileSizeToMB(element.size))) {
try {
if (this.platform.is('ios')) {
this.recordevideoIos(element.fullPath)
this.recordevideoIos(element.fullPath,element.size)
} else {
this.recordVideoAndroid(element.fullPath)
this.recordVideoAndroid(element.fullPath,element.size)
}
} catch (e) {
@@ -282,12 +283,12 @@ export class NewPublicationPage implements OnInit {
console.log(result.files)
result.files.forEach(async element => {
this.filesSizeSum = this.filesSizeSum + element.size
if (this.fileSizeToMB(this.filesSizeSum) <= 20) {
if (this.canAddFile( this.fileSizeToMB(element.size))) {
console.log('pass size verificartion')
if (this.checkFileType.checkFileType(element.mimeType) == 'video' && this.platform.is('ios')) {
let resultUrl = decodeURIComponent(element.path); console.log('pass type verification ', resultUrl)
try {
this.recordevideoIos(resultUrl)
this.recordevideoIos(resultUrl,element.size)
} catch (error) {
console.log('upload video error: ', error)
}
@@ -806,7 +807,7 @@ console.log(stringGerada);
}
async recordevideoIos(fullPath) {
async recordevideoIos(fullPath,size) {
console.log('fullpath', fullPath)
try {
const directory = await Filesystem.getUri({
@@ -827,7 +828,8 @@ console.log(stringGerada);
fileObject = {
FileBase64: 'data:video/mp4;base64,' + content.data,
FileExtension: 'mp4',
OriginalFileName: stringGerada
OriginalFileName: stringGerada,
FileSize: this.fileSizeToMB(size)
}
console.log('what do we have', fileObject)
this.seletedContent.push(fileObject)
@@ -854,7 +856,7 @@ console.log(stringGerada);
}
}
async recordVideoAndroid(fullPath) {
async recordVideoAndroid(fullPath,size) {
try {
const savedFile = await Filesystem.copy({
@@ -870,7 +872,8 @@ console.log(stringGerada);
let fileObject = {
FileBase64: 'data:video/mp4;base64,' + content.data,
FileExtension: 'mp4',
OriginalFileName: 'video'
OriginalFileName: 'video',
FileSize: this.fileSizeToMB(size)
}
this.seletedContent.push(fileObject)
})
@@ -896,13 +899,15 @@ console.log(stringGerada);
fileObject = {
FileBase64: 'data:video/mp4;base64,' + content.data,
FileExtension: this.removeTextBeforeSlash(element.mimeType, '/'),
OriginalFileName: 'video'
OriginalFileName: 'video',
FileSize:element.size
}
} else {
fileObject = {
FileBase64: 'data:image/jpeg;base64,' + content.data,
FileExtension: this.removeTextBeforeSlash(element.mimeType, '/'),
OriginalFileName: 'image'
OriginalFileName: 'image',
FileSize: this.fileSizeToMB(element.size)
}
}
@@ -1023,5 +1028,28 @@ console.log(stringGerada);
}
canAddFile(fileToAddsize) {
console.log('File size to add', fileToAddsize)
console.log(this.seletedContent)
// Calculate the total size of files in the list
var totalSize = this.seletedContent.reduce((total, {FileSize}) => total + FileSize, 0);
console.log('Totoal size',totalSize)
console.log('fileAddsize',fileToAddsize)
// Check if adding the file would exceed the individual file size limit (20 MB)
if (fileToAddsize >= 20) {
console.log("File size exceeds individual file size limit (20 MB)");
return false;
}
// Check if adding the file would exceed the total size limit (20 MB)
if (totalSize + fileToAddsize >= 20) {
console.log("Total file size exceeds total size limit (20 MB)");
return false;
}
// If neither condition is met, it's safe to add the file
return true;
}
}
src/app/shared/agenda/approve-event/approve-event.page.html
+1 -1
View File
@@ -106,7 +106,7 @@
*ngFor="let attachment of loadedAttachments"
(click)="viewDocument(attachment.DocId, attachment)">
<ion-label>
<p class="attach-title-item d-block">{{attachment.Description}}</p>
<p class="attach-title-item d-block">{{attachment.Description || 'Sem título'}}</p>
<p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right">{{ attachment.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
</ion-label>
</ion-item>
src/app/shared/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -121,7 +121,7 @@
class="ion-no-margin ion-no-padding pa-0">
<ion-label class="width-100 d-flex align-center">
<p class="flex-grow-1 cursor-pointer" (click)="docIndex(i);LoadDocumentDetails()">
<span class="attach-title-item d-block">{{attach.SourceName}}</span>
<span class="attach-title-item d-block">{{attach.SourceName || 'Sem título'}}</span>
<span class="span-left d-block">{{attach.Stakeholders}}</span>
</p>