diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index c49bc6570..0a6339a93 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -136,6 +136,7 @@ export class PublicationsPage implements OnInit { DateEnd: this.theEndDate.getDate() +" de " + ( this.months[this.theEndDate.getMonth()])+" de " +this.theEndDate.getFullYear(), ActionType: data.ActionType, } + if(data.ActionType == "Evento") { this.publicationsEventFolderList.push(folder); } @@ -209,6 +210,8 @@ export class PublicationsPage implements OnInit { } goToPublicationsList(folderId: string){ + this.folderId = folderId + if( window.innerWidth <= 800){ this.router.navigate(['/home/publications',folderId]); } else { @@ -220,6 +223,7 @@ export class PublicationsPage implements OnInit { } async viewPublications(folderId: string) { + this.folderId = folderId const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 679a5a061..f68f121d4 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -33,7 +33,7 @@
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index 4995b61bb..ad9fa0fa1 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -6,6 +6,8 @@ import { PublicationFolder } from 'src/app/models/publicationfolder'; import { LoadingService } from 'src/app/services/loading.service'; import { PublicationsService } from 'src/app/services/publications.service'; import { PresidentialActionsStore } from 'src/app/store/presidential-actions-store.service'; +import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service'; +import { PublicationListStorage } from 'src/app/store/publication-list.service'; import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service'; import { NewPublicationPage } from '../new-publication/new-publication.page'; import { PublicationDetailPage } from './publication-detail/publication-detail.page'; @@ -24,9 +26,11 @@ export class ViewPublicationsPage implements OnInit { folderId:string; error: any; - presidentialActionsStore = PresidentialActionsStore - publicationTravelFolderStore = PublicationTravelFolderStore - + publicationListStorage = PublicationListStorage + // + publicationEventFolderStorage = PublicationEventFolderStorage + publicationTravelFolderService = PublicationTravelFolderStore + constructor( private loadingController: LoadingService, private modalController: ModalController, private publications: PublicationsService, @@ -71,7 +75,6 @@ export class ViewPublicationsPage implements OnInit { this.getPublications(); setTimeout(() => { - this.getPublications(); this.getPublicationDetail(); event.target.complete(); }, 3000); @@ -89,20 +92,18 @@ export class ViewPublicationsPage implements OnInit { } getPublicationDetail() { - this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{ - console.log(res); - this.item = res; - }); + let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list) + this.item = allActions.find((e)=> e.ProcessId == this.folderId) } getPublications() { this.showLoader = true; - + const folderId = this.folderId this.publications.GetPublications(this.folderId).subscribe(res=>{ console.log(res); let data = []; - + res.forEach(element => { let itemImage = { title: 'Title', @@ -126,7 +127,8 @@ export class ViewPublicationsPage implements OnInit { data.push(item) }); - this.presidentialActionsStore.reset(data) + + this.publicationListStorage.add(folderId, this.publicationList) this.showLoader = false; }, diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts index 9b5b4da46..f89044eaf 100644 --- a/src/app/services/publications.service.ts +++ b/src/app/services/publications.service.ts @@ -87,7 +87,6 @@ export class PublicationsService { params: params }; return this.http.get(`${geturl}`, options) - .pipe(catchError(this.handleError)); } GetPublicationById( publicationId:any){ diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 4a8950b02..b8b4f2aa0 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -34,7 +34,7 @@
image diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 433f2dff6..3b7e8a522 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -6,7 +6,9 @@ import { LoadingService } from 'src/app/services/loading.service'; import { PublicationsService } from 'src/app/services/publications.service'; import { PublicationDetailPage } from 'src/app/pages/publications/publication-detail/publication-detail.page'; import { NewPublicationPage } from 'src/app/pages/publications/new-publication/new-publication.page'; - +import { PublicationListStorage } from 'src/app/store/publication-list.service' +import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service'; +import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service'; @Component({ selector: 'app-view-publications', templateUrl: './view-publications.page.html', @@ -28,6 +30,13 @@ export class ViewPublicationsPage implements OnInit { @Output() closeDesktopComponent = new EventEmitter(); @Output() goBacktoPublicationDetails = new EventEmitter(); + + + publicationListStorage = PublicationListStorage + // + publicationEventFolderStorage = PublicationEventFolderStorage + publicationTravelFolderService = PublicationTravelFolderStore + constructor( private loadingController: LoadingService, private modalController: ModalController, @@ -48,43 +57,47 @@ export class ViewPublicationsPage implements OnInit { } ngOnChanges(changes: any): void { - console.log(this.folderId) if(typeof(this.folderId) == 'object') { this.folderId = this.folderId['ProcessId'] } - this.getPublications(); - this.getPublicationDetail(); + setTimeout(()=>{ + this.getPublications(); + this.getPublicationDetail(); + }, 100) + + } doRefresh(event) { this.getPublications(); setTimeout(() => { - this.getPublications(); this.getPublicationDetail(); event.target.complete(); }, 3000); } - close(){ + close() { this.closeDesktopComponent.emit(); } getPublicationDetail() { - this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{ - console.log(res); - this.item = res; - }); + + let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list) + this.item = allActions.find((e)=> e.ProcessId == this.folderId) + } getPublications() { this.showLoader = true; - this.publications.GetPublications(this.folderId).subscribe(res=>{ + const folderId = this.folderId + + this.publications.GetPublications(folderId).subscribe(res=> { this.publicationList = new Array(); - console.log(res); + res.forEach(element => { let itemImage = { title: 'Title', @@ -105,13 +118,15 @@ export class ViewPublicationsPage implements OnInit { } this.publicationList.push(item); }); - console.log(this.publicationList); + + this.publicationListStorage.add(folderId, this.publicationList) + this.showLoader = false; }, (error)=>{ - if(error.status == '404'){ + if(error.status == '404') { this.error = 'Sem publicações disponíveis!'; - this.publicationList=null; + // this.publicationList = null; } this.showLoader = false; diff --git a/src/app/store/publication-list.service.ts b/src/app/store/publication-list.service.ts index 3dc061079..cd507450b 100644 --- a/src/app/store/publication-list.service.ts +++ b/src/app/store/publication-list.service.ts @@ -9,34 +9,38 @@ import { SHA1 } from 'crypto-js' export class PublicationListService { // main data - private _list: Publication[] = [] + private _document: Publication[] = [] // local storage keyName private keyName: string; constructor() { - this.keyName = (SHA1(this.constructor.name+ ' PublicationTravelFolder/local')).toString() + this.keyName = (SHA1(this.constructor.name+ 'view-publication-list/local')).toString() setTimeout(()=>{ let restore = localstoreService.get(this.keyName, []) - this._list = restore + this._document = restore }, 10) } - get list() { - return this._list + get documents() { + return this._document } - reset(list: Publication[]) { - this._list = list - - this.save(this._list) + getDocument(folderId: string) { + return this._document[folderId] } - private save(list: Publication[]) { + add(folderId, document) { + this._document[folderId] = document + setTimeout(()=> { - localstoreService.set(this.keyName, list) - }, 10) + localstoreService.set(this.keyName, this._document) + }, 100) } + } + + +export const PublicationListStorage = new PublicationListService() \ No newline at end of file