git pull made and peter chnages recived

This commit is contained in:
Eudes Inácio
2023-03-09 16:58:34 +01:00
74 changed files with 296 additions and 274 deletions
@@ -37,7 +37,7 @@ export class PublicationDetailPage implements OnInit {
/* this.folderId = this.navParams.get('folderIdId'); */
this.publication = {
DateIndex: null,
DocumentId: '',
DocumentId: null,
ProcessId:'',
Title:'',
Message: '',
@@ -12,7 +12,6 @@ import { ViewPublicationsPageModule } from 'src/app/shared/publication/view-publ
import { NewPublicationPageModule } from 'src/app/shared/publication/new-publication/new-publication.module';
import { NewActionPageModule } from 'src/app/shared/publication/new-action/new-action.module';
import { PublicationDetailPageModule } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { EditActionPageModule } from 'src/app/shared/publication/edit-action/edit-action.module';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { LazyLoadImageModule } from 'ng-lazyload-image'; // <-- import it
@@ -24,7 +23,6 @@ import { LazyLoadImageModule } from 'ng-lazyload-image'; // <-- import it
IonicModule,
FontAwesomeModule,
PublicationsPageRoutingModule,
HeaderPageModule,
ViewPublicationsPageModule,
NewPublicationPageModule,
PublicationDetailPageModule,
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="container-wrapper">
<div class="d-md-none" *ngIf="hideRefreshBtn">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -16,6 +16,7 @@ import { BackgroundService } from 'src/app/services/background.service';
import { ThemeService } from 'src/app/services/theme.service'
import { Storage } from '@ionic/storage';
import { PermissionService } from 'src/app/services/permission.service';
import { ActionModel, PublicationModel } from 'src/app/models/beast-orm';
@Component({
@@ -146,7 +147,10 @@ export class PublicationsPage implements OnInit {
this.publications.GetPublicationFolderList().subscribe(async res => {
this.showLoader = false;
const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
// let publications = await ActionModel.create(folders)
// console.log('publications', publications)
this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
@@ -7,15 +7,12 @@ import { IonicModule } from '@ionic/angular';
import { PublicationDetailPageRoutingModule } from './publication-detail-routing.module';
import { PublicationDetailPage } from './publication-detail.page';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
PublicationDetailPageRoutingModule,
HeaderPageModule,
],
declarations: [PublicationDetailPage]
})
@@ -46,7 +46,7 @@ export class PublicationDetailPage implements OnInit {
this.publication = {
DateIndex: null,
DocumentId: '',
DocumentId: null,
ProcessId:'',
Title:'',
Message: '',
@@ -8,8 +8,6 @@ import { ViewPublicationsPageRoutingModule } from './view-publications-routing.m
import { ViewPublicationsPage } from './view-publications.page';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { Attributes, IntersectionObserverHooks, LazyLoadImageModule, LAZYLOAD_IMAGE_HOOKS } from 'ng-lazyload-image';
export class LazyLoadImageHooks extends IntersectionObserverHooks {
@@ -28,7 +26,6 @@ setup(attributes: Attributes) {
IonicModule,
ViewPublicationsPageRoutingModule,
HeaderPageModule,
LazyLoadImageModule
],
exports: [ViewPublicationsPage],
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header > </app-header>
</ion-header>
<ion-header class="ion-no-border">
<!-- <ion-toolbar class="bg-blue"> -->
<div class="main-header">
@@ -14,7 +10,7 @@
<div *ngIf="publicationItem[folderId]" class="div-title flex-grow-1">
<ion-label class="title">{{publicationItem[folderId].Description}}</ion-label>
<p class="item-content-detail">{{publicationItem[folderId].Detail}}</p>
<p class="item-content-date">{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy HH:mm'}}</p>
<p class="item-content-date" *ngIf="publicationItem[folderId].DateBegin != null">{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy HH:mm'}}</p>
</div>
<div *ngIf="p.userPermission([p.permissionList.Actions.createPost]) && publicationItem[folderId]" class="actions-icon cursor-pointer" (click)="AddPublication('2',publicationItem[folderId].ProcessId)">
<!-- <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
@@ -15,6 +15,7 @@ import { ToastService } from 'src/app/services/toast.service';
import { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { Storage } from '@ionic/storage';
import { PublicationModel } from 'src/app/models/beast-orm';
@Component({
selector: 'app-view-publications',
@@ -136,7 +137,7 @@ export class ViewPublicationsPage implements OnInit {
getPublicationDetail() {
this.showLoader = true;
const folderId = this.folderId
this.publications.GetPresidentialAction(folderId).subscribe(res=>{
this.publications.GetPresidentialAction(folderId).subscribe(res =>{
this.showLoader = false;
this.publicationItem[folderId] = res
this.storage.set(folderId+"name", res)
@@ -162,20 +163,24 @@ export class ViewPublicationsPage implements OnInit {
const folderId = this.folderId
try {
const res = await this.publications.GetPublicationsImages(folderId).toPromise();
let publicationList = []
const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise();
for (let element of res) {
let ress = await this.publications.GetPublicationById(element).toPromise();
let item: Publication = this.publicationPipe.itemList(ress)
publicationList.push(item);
for (let publicationId of publicationIds) {
let Publication = await this.publications.GetPublicationById(publicationId).toPromise();
let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
const found = this.publicationList[folderId].find( e => e.DocumentId == publicationId )
if(!found) {
PublicationModel.create(publicationDetails)
this.publicationList[folderId].push(publicationDetails)
}
}
this.showLoader = false;
this.publicationList[folderId] = publicationList
this.storage.set(folderId, publicationList);
this.getpublication = publicationList;
this.storage.set(folderId, this.publicationList[folderId]);
this.getpublication = this.publicationList[folderId];
} catch(error) {
this.showLoader = false;
}