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 550366d85..706467ad5 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -60,10 +60,13 @@ export class ViewPublicationsPage implements OnInit {
private publicationVideoManagerService: PublicationVideoManagerService
) {
- setTimeout(()=> {
+
+ setTimeout(() => {
+ // document.querySelector("swiper-container").shadowRoot.querySelector(".swiper-button-next").innerHTML = "ok"
+ // alert("ok")
// console.log("this.VideoManager", this.VideoManager, document.querySelector('.VideoManager'))
/* this.publicationVideoManagerService.setContainer(this.VideoManager.nativeElement) */
- }, 2000)
+ }, 15000)
// this.publicationVideoManagerService.setContainer(this.VideoManager.nativeElement)
this.createPublicationList()
@@ -217,10 +220,27 @@ export class ViewPublicationsPage implements OnInit {
const findIndex = this.publicationFindIndex(publicationId, folderId)
const found = this.publicationIsPresent(publicationId, folderId)
+
if (!found) {
this.publicationFolderService.publicationList[folderId].push(publicationDetails)
} else {
- this.publicationFolderService.publicationList[folderId][findIndex] = publicationDetails
+
+ // console.log("names");
+
+ let a: any = Object.assign({},this.publicationFolderService.publicationList[folderId][findIndex])
+ let b: any = Object.assign({}, publicationDetails)
+
+ a.Files = a.Files.length
+ b.Files = b.Files.length
+
+ if(JSON.stringify(a) != JSON.stringify(b)) {
+
+ // console.log({a, b})
+ this.publicationFolderService.publicationList[folderId][findIndex] = publicationDetails
+ } else {
+ // console.log({publicationDetails})
+ }
+
}
}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index a6da716be..d63946589 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -29,7 +29,7 @@ import { TaskDetailsPage } from './gabinete-digital/generic/task-details/task-de
// HeaderPrPage,
// BtnSeguintePage,
// BtnModalDismissPage,
- // HeaderNoSearchPage,
+ // HeaderNoSearchPage,
// EmptyChatPage,
// BtnCriarPage,
// BtnAdicionarPage,
@@ -47,4 +47,4 @@ import { TaskDetailsPage } from './gabinete-digital/generic/task-details/task-de
// BtnAdicionarPage,
]
})
-export class SharedModule {}
\ No newline at end of file
+export class SharedModule {}
diff --git a/src/app/shared/swiper/swiper-routing.module.ts b/src/app/shared/swiper/swiper-routing.module.ts
new file mode 100644
index 000000000..43002d0c0
--- /dev/null
+++ b/src/app/shared/swiper/swiper-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { SwiperPage } from './swiper.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: SwiperPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class SwiperPageRoutingModule {}
diff --git a/src/app/shared/swiper/swiper.module.ts b/src/app/shared/swiper/swiper.module.ts
new file mode 100644
index 000000000..1fe457e80
--- /dev/null
+++ b/src/app/shared/swiper/swiper.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { SwiperPageRoutingModule } from './swiper-routing.module';
+
+import { SwiperPage } from './swiper.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ SwiperPageRoutingModule
+ ],
+ declarations: [SwiperPage]
+})
+export class SwiperPageModule {}
diff --git a/src/app/shared/swiper/swiper.page.html b/src/app/shared/swiper/swiper.page.html
new file mode 100644
index 000000000..1f9a093c7
--- /dev/null
+++ b/src/app/shared/swiper/swiper.page.html
@@ -0,0 +1,9 @@
+
+
+ swiper
+
+
+
+
+
+
diff --git a/src/app/shared/swiper/swiper.page.scss b/src/app/shared/swiper/swiper.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/shared/swiper/swiper.page.spec.ts b/src/app/shared/swiper/swiper.page.spec.ts
new file mode 100644
index 000000000..d1685ab52
--- /dev/null
+++ b/src/app/shared/swiper/swiper.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { SwiperPage } from './swiper.page';
+
+describe('SwiperPage', () => {
+ let component: SwiperPage;
+ let fixture: ComponentFixture
;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ SwiperPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(SwiperPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/shared/swiper/swiper.page.ts b/src/app/shared/swiper/swiper.page.ts
new file mode 100644
index 000000000..5cd742be3
--- /dev/null
+++ b/src/app/shared/swiper/swiper.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-swiper',
+ templateUrl: './swiper.page.html',
+ styleUrls: ['./swiper.page.scss'],
+})
+export class SwiperPage implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts
index b8aca81a4..7221ea60e 100644
--- a/src/app/store/publication-folder.service.ts
+++ b/src/app/store/publication-folder.service.ts
@@ -21,12 +21,12 @@ export class PublicationFolderService {
publicationPipe = new PublicationPipe()
getpublication = [];
-
+
constructor(
private storage: Storage,
private publications: PublicationsService,
) {}
-
+
createPublicationList(folderId) {
if(!this.publicationList[folderId]) {
@@ -38,10 +38,10 @@ export class PublicationFolderService {
}
getFromDB(folderId: any) {
-
-
+
+
if(!this.restoreFolder[folderId]) {
-
+
this.storage.get(folderId).then((viewPublications) => {
this.publicationList[folderId] = viewPublications
})
@@ -50,7 +50,7 @@ export class PublicationFolderService {
this.FolderDetails[folderId] = viewPublications
})
}
-
+
this.restoreFolder[folderId] = true
}
@@ -85,19 +85,19 @@ export class PublicationFolderService {
}
deletePost(folderId: any, DocumentId: any) {
-
- if(this.publicationList[folderId]) {
-
+
+ if(this.publicationList[folderId]) {
+
this.publicationList[folderId] = this.publicationList[folderId].filter( e => e.DocumentId != DocumentId)
-
+
this.save(folderId)
- }
+ }
}
getPublicationDetail(folderId) {
-
- this.publications.GetPresidentialAction(folderId).subscribe(res => {
+
+ this.publications.GetPresidentialAction(folderId).subscribe(res => {
this.FolderDetails[folderId] = res
this.storage.set(folderId+"name", res)
}, (error) => {
@@ -113,7 +113,7 @@ export class PublicationFolderService {
try {
const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise();
-
+
this.createPublicationList(folderId)
let loadLater = []
for (let publicationId of publicationIds) {
@@ -129,9 +129,9 @@ export class PublicationFolderService {
for( let publicationId of loadLater) {
await this.loadPublication(publicationId, folderId)
}
-
+
this.showLoader = false;
-
+
this.storage.set(folderId, this.publicationList[folderId]);
this.getpublication = this.publicationList[folderId];
} catch(error) {
@@ -144,15 +144,29 @@ export class PublicationFolderService {
async loadPublication(publicationId, folderId) {
let Publication = await this.publications.GetPublicationWithArrayOfFilesById(publicationId).toPromise();
let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
-
+
const findIndex = this.publicationFindIndex(publicationId, folderId)
const found = this.publicationIsPresent(publicationId, folderId)
if(!found) {
this.publicationList[folderId].push(publicationDetails)
} else {
- this.publicationList[folderId][findIndex] = publicationDetails
+
+ let a: any = Object.assign({},this.publicationList[folderId][findIndex])
+ let b: any = Object.assign({}, publicationDetails)
+
+ a.Files = a.Files.length
+ b.Files = b.Files.length
+
+ if(JSON.stringify(a) != JSON.stringify(b)) {
+
+ // console.log({a, b})
+ this.publicationList[folderId][findIndex] = publicationDetails
+ } else {
+ // console.log({publicationDetails})
+ }
+
}
-
+
}
@@ -165,7 +179,7 @@ export class PublicationFolderService {
async setPublication(publicationId, folderId, publicationDetails: Publication) {
-
+
const findIndex = this.publicationFindIndex(publicationId, folderId)
const found = this.publicationIsPresent(publicationId, folderId)
if(!found) {
@@ -173,13 +187,13 @@ export class PublicationFolderService {
} else {
this.publicationList[folderId][findIndex] = publicationDetails
}
-
+
}
async getPublication(publicationId, folderId, publicationDetails: Publication) {
-
+
const findIndex = this.publicationFindIndex(publicationId, folderId)
const found = this.publicationIsPresent(publicationId, folderId)
if(!found) {
@@ -187,7 +201,7 @@ export class PublicationFolderService {
} else {
return this.publicationList[folderId][findIndex]
}
-
+
}
@@ -198,7 +212,7 @@ export class PublicationFolderService {
} else {
}
-
+
}
diff --git a/src/global.scss b/src/global.scss
index 80da4450c..9f4d8163f 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -779,7 +779,7 @@ app-header-no-search .ion-toolbar{
--header-bottom-line-background-image: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important;
--title-text-color: rgb(0, 0, 0);
- --subtitle-text-color: #000
+ --subtitle-text-color: #000;
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 455ff071a..11b2685c4 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -116,8 +116,13 @@ $app-theme: mat-light-theme(
--ion-color-expediente: #dae3f3;
-
+
--ion-color-primary-contrast: black;
+
+
+ --swiper-theme-color: #ffb703;
+ --swiper-navigation-color: #ffb703;
+ --swiper-pagination-color: #ffb703;
}
// dark-mode
@@ -877,7 +882,7 @@ body {
--mat-selected-hover: rgb(216 240 255);
--mat-calendar-body-selected: #42b9fe ;
--monthview-selected: lightskyblue;
- --background-desktop: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important;
+ --background-desktop: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important;
--background-mobile: var(--color) !important;
--PinDots: #44b5ea;
--PinTextColor: #44b5ea;
@@ -994,7 +999,7 @@ body {
--chat-incoming-msg-color: #e4f4fe;
--ion-color-primary: #3880ff;
--ion-color-secondary: #e4e8eb75;
-
+
--button-hover: #69B3E7;
--inicio-open-page-from-box: #69B3E7;
diff --git a/web.config b/web.config
index 166d482b4..1c8a36c6e 100644
--- a/web.config
+++ b/web.config
@@ -27,7 +27,7 @@
-
+