mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
merg
This commit is contained in:
@@ -47,17 +47,17 @@
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon font-45-em" src='assets/images/icons-profile.svg'></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="icon font-45-em" src='assets/images/theme/gov/icons-profile.svg'></ion-icon> -->
|
||||
|
||||
<img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="profile-image"
|
||||
<img *ngIf="loggeduser.RoleDescription == 'Presidente da República' " class="icon font-45-em"
|
||||
src='assets/images/presidente.png'>
|
||||
<img *ngIf="loggeduser.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="profile-image"
|
||||
<img *ngIf="loggeduser.RoleDescription == 'Ministro e Director do Gabinete do PR' " class="icon font-45-em"
|
||||
src='assets/images/ministro.png'>
|
||||
<img *ngIf="loggeduser.RoleDescription == 'Secretário Geral' " class="profile-image"
|
||||
<img *ngIf="loggeduser.RoleDescription == 'Secretário Geral' " class="icon font-45-em"
|
||||
src='assets/images/secretaria_geral.png'>
|
||||
|
||||
<ion-icon *ngIf="loggeduser.RoleDescription != 'Presidente da República'&& loggeduser.RoleDescription != 'Ministro e Director do Gabinete do PR' && loggeduser.RoleDescription != 'Secretário Geral' " class="icon font-45-em" src='assets/images/theme/gov/icons-profile.svg'></ion-icon>
|
||||
|
||||
<div class="profile-text">
|
||||
<div *ngIf="notificationLength > 0" class="icon-badge" style="right: -18px;top: -29px;">
|
||||
<div *ngIf="notificationLength > 0" class="icon-badge" style="right: -6px;top: 38px;top: -6px;">
|
||||
{{notificationLength}} </div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -212,7 +212,7 @@
|
||||
|
||||
|
||||
<div class="profile-text">
|
||||
<div *ngIf="notificationLength > 0" class="icon-badge" style="right: -18px;top: -29px;">
|
||||
<div *ngIf="notificationLength > 0" class="icon-badge" style="right: -6px;top: 38px;top: -6px;">
|
||||
{{notificationLength}} </div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
.profile-image {
|
||||
border-radius: 80%; /* Tornar a imagem circular */
|
||||
width: 25.33%;
|
||||
width: 100%;
|
||||
height: 25.33%;
|
||||
overflow: auto;
|
||||
}
|
||||
@@ -88,12 +88,12 @@
|
||||
|
||||
.div-profile {
|
||||
height: fit-content;
|
||||
justify-content: flex-end;
|
||||
display: flex;
|
||||
background-color: transparent;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
overflow: auto;
|
||||
display: flex !important;
|
||||
justify-content: end;
|
||||
max-width: 45px;
|
||||
border-radius: 50px;
|
||||
|
||||
.icon{
|
||||
position: relative;
|
||||
|
||||
File diff suppressed because one or more lines are too long
+9
-23
@@ -9,6 +9,7 @@ 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 { PublicationPipe } from 'src/app/pipes/publication.pipe';
|
||||
@Component({
|
||||
selector: 'app-publication-detail-shared',
|
||||
templateUrl: './publication-detail.page.html',
|
||||
@@ -23,6 +24,7 @@ export class PublicationDetailPage implements OnInit {
|
||||
@Output() addNewPublication = new EventEmitter<any>();
|
||||
@Output() closeDesktopComponent = new EventEmitter<any>();
|
||||
@Output() goBackToViewPublications = new EventEmitter();
|
||||
publicationPipe = new PublicationPipe()
|
||||
|
||||
constructor(
|
||||
private modalController: ModalController,
|
||||
@@ -67,35 +69,18 @@ export class PublicationDetailPage implements OnInit {
|
||||
const folderId = this.folderId
|
||||
const localPublication = this.publicationFolderService.getLocalPublication(folderId, this.publicationId);
|
||||
|
||||
if(localPublication?.DocumentId) {
|
||||
if(localPublication?.ProcessId) {
|
||||
|
||||
this.publication = {
|
||||
DateIndex: localPublication.DateIndex,
|
||||
DocumentId: localPublication.DocumentId,
|
||||
ProcessId:localPublication.ProcessId,
|
||||
Title:localPublication.Title,
|
||||
Message: localPublication.Message,
|
||||
DatePublication: localPublication.DatePublication,
|
||||
FileBase64: localPublication.FileBase64,
|
||||
OriginalFileName: localPublication.OriginalFileName,
|
||||
FileExtension: 'jpeg',
|
||||
}
|
||||
this.publication = localPublication
|
||||
|
||||
} else {
|
||||
|
||||
this.showLoader = true;
|
||||
this.publications.GetPublicationById(this.publicationId).subscribe(res => {
|
||||
|
||||
this.publication = {
|
||||
DateIndex: res.DateIndex,
|
||||
DocumentId: res.DocumentId,
|
||||
ProcessId:res.ProcessId,
|
||||
Title:res.Title,
|
||||
Message: res.Message,
|
||||
DatePublication: res.DatePublication,
|
||||
FileBase64: "data:image/jpg;base64," + res.FileBase64,
|
||||
OriginalFileName: res.OriginalFileName,
|
||||
FileExtension: 'jpeg',
|
||||
}
|
||||
this.publication = this.publicationPipe.itemList(res)
|
||||
|
||||
|
||||
this.showLoader = false;
|
||||
}, (error) => {
|
||||
this.showLoader = false;
|
||||
@@ -165,6 +150,7 @@ export class PublicationDetailPage implements OnInit {
|
||||
});
|
||||
await modal.present();
|
||||
} else {
|
||||
|
||||
this.addNewPublication.emit({
|
||||
publicationType: publicationType,
|
||||
folderId: this.folderId,
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
<p class="item-content-detail">{{publicationFolderService.FolderDetails[folderId].Detail}}</p>
|
||||
|
||||
<ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index"
|
||||
(click)="viewPublicationDetail(publication.DocumentId)">
|
||||
(click)="viewPublicationDetail(publication.DocumentId, publication.ProcessId)">
|
||||
<ion-card-content>
|
||||
<div class="post-img">
|
||||
<img [lazyLoad]="publication.FileBase64">
|
||||
|
||||
@@ -191,7 +191,6 @@ export class ViewPublicationsPage implements OnInit {
|
||||
const found = this.publicationIsPresent(publicationId, folderId)
|
||||
if(!found) {
|
||||
this.publicationFolderService.publicationList[folderId].push(publicationDetails)
|
||||
// PublicationModel.create(publicationDetails)
|
||||
} else {
|
||||
this.publicationFolderService.publicationList[folderId][findIndex] = publicationDetails
|
||||
}
|
||||
@@ -287,9 +286,9 @@ export class ViewPublicationsPage implements OnInit {
|
||||
|
||||
}
|
||||
|
||||
async viewPublicationDetail(publicationId:string) {
|
||||
async viewPublicationDetail(DocumentId:string, ProcessId: string) {
|
||||
|
||||
this.openPublicationDetails.emit(publicationId);
|
||||
this.openPublicationDetails.emit({DocumentId, ProcessId});
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user