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 branch 'feature/viewer-attachment' of https://bitbucket.org/equilibriumito/gabinete-digital-fo into feature/viewer-attachment

Browse Source
This commit is contained in:
Equilibrium ITO
2024-03-14 09:10:24 +01:00
parent 8cb9961bad 48d4cd637e
commit 7286c577ae
5 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/chat.page.html
+10 -18
View File
@@ -73,33 +73,25 @@
</div>
<div class="item-date font-13-em" [class.item-date-active]="room.id == idSelected">{{room.duration}}</div>
</div>
<div *ngIf="room.lastMessage" class="item-description" [class.item-description-active]="room.id == idSelected">
<div *ngIf="room.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="room.id ==idSelected">
<div class="item-message font-13-em add-ellipsis white-space-nowrap" *ngIf="room.otherUserType == false"> {{room.lastMessage.msg}} </div>
<div class="font-13-em" *ngIf="room.otherUserType == true">está escrever ...</div>
<p class="font-13-em mb-0 add-ellipsis white-space-nowrap" *ngIf="room.lastMessage && room.otherUserType == false">{{room.lastMessage.msg}}</p>
<p class="font-13-em" *ngIf="room.otherUserType == true">está escrever...</p>
<!-- <ion-label *ngIf="room.lastMessage.file">
<fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
</ion-label> -->
<div *ngIf="room.lastMessage.file">
<fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting' && room.lastMessage.file.type != 'application/img' && room.lastMessage.file.type != 'application/audio'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<div class="item-files add-ellipsis" *ngIf="room.lastMessage.file">
<fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting' && room.lastMessage.file.type != 'application/audio' && room.lastMessage.file.type != 'application/img'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<fa-icon *ngIf="room.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<span class="font-13-em" *ngIf="room.lastMessage.file.type == 'application/audio'"> audio </span>
<span *ngIf="room.lastMessage.file.type == 'application/audio'" class="item-files-title font-13-em"> audio </span>
<fa-icon *ngIf="room.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<span *ngIf="room.lastMessage.file.type != 'application/audio' && room.lastMessage.attachments" class="item-files-title font-13-em add-ellipsis"> {{ room.lastMessage.attachments[0].title }}</span>
<fa-icon *ngIf="room.lastMessage.file.type == 'application/img' " icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<span class="font-13-em"> {{room.lastMessage.file.name || room.lastMessage.file.subject || room.lastMessage.attachments[0].title}}</span>
</div>
<!-- <ion-label *ngIf="room.lastMessage.attachments">
<div *ngIf="room.lastMessage.attachments[0].image_url">
<div class="item-files" *ngIf="room.attachments">
<div *ngIf="room.value.lastMessage.attachments[0].image_url">
<fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
<span class="font-13-em"> Fotografia</span>
</div>
</ion-label> -->
</div>
</div>
</div>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+4 -4
View File
@@ -315,7 +315,7 @@ ion-list {
float: left;
display: inline;
margin: 0 !important;
padding: 2.5px 10.5px 2.5px 10.5px;
padding: 2.5px 10.5px 2.5px 0px;
}
}
@@ -356,7 +356,7 @@ ion-list {
/* border: 1px solid red; */
ion-label {
padding: 2.5px 10.5px 2.5px 10.5px;
padding: 2.5px 10.5px 2.5px 0px;
margin: 0 !important;
}
}
@@ -371,7 +371,7 @@ ion-list {
//border: 1px solid blue;
ion-label {
padding: 2.5px 10.5px 2.5px 10.5px;
padding: 2.5px 10.5px 2.5px 0px;
margin: 0 !important;
}
}
@@ -809,4 +809,4 @@ ion-segment-button {
height: 11px;
min-width: 27px;
min-height: 27px;
}
}
src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
+2 -2
View File
@@ -68,7 +68,7 @@ ion-button{
}
.upper-content-margin {
margin-left: 41px;
margin-left: 20px;
}
@@ -277,7 +277,7 @@ ion-button{
.upper-content {
margin-left: 41px;
margin-left: 20px;
}
.activity-instanceName {
src/app/shared/publication/new-publication/new-publication.page.ts
+4 -1
View File
@@ -411,7 +411,10 @@ export class NewPublicationPage implements OnInit {
if(e.FileType == 'video' && e.blobFile && e.toUpload) {
e.OriginalFileName = e.chucksManager.path.replace(".mp4", "")
e.FileExtension = "mp4"
e.Base64 = ''
}
if(e.FileType == 'video' ) {
e.Base64 = e.url
}
src/app/shared/publication/view-publications/view-publications.page.ts
-1
View File
@@ -246,7 +246,6 @@ export class ViewPublicationsPage implements OnInit {
if(JSON.stringify(a) != JSON.stringify(b)) {
// console.log({a, b})
this.publicationFolderService.publicationList[folderId][findIndex] = publicationDetails
} else {
// console.log({publicationDetails})