diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 6f0284e42..4d545495e 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -11,12 +11,7 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; -<<<<<<< HEAD -import { Directory, Filesystem } from '@capacitor/filesystem'; - -======= import { StorageService } from 'src/app/services/storage.service'; ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { @@ -48,22 +43,18 @@ export class AppComponent { private screenOrientation: ScreenOrientation, private sqliteservice: SqliteService, private backgroundservice: BackgroundService, -<<<<<<< HEAD - -======= private storageservice: StorageService ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 ) { - this.createCacheFolder() + // this.createCacheFolder() this.initializeApp(); } - async createCacheFolder(){ - await Filesystem.mkdir({ - directory: Directory.Cache, - path: `CACHED-IMG` - }) - } + // async createCacheFolder(){ + // await Filesystem.mkdir({ + // directory: Directory.Cache, + // path: `CACHED-IMG` + // }) + // } initializeApp() { this.platform.ready().then(() => { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index cb5711f8f..9b2c367a6 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -65,14 +65,8 @@ import { MediaCapture } from '@ionic-native/media-capture/ngx'; import { Media } from '@ionic-native/media/ngx'; import { StreamingMedia } from '@ionic-native/streaming-media/ngx'; import { PhotoViewer } from '@ionic-native/photo-viewer/ngx'; -<<<<<<< HEAD -import { CustomImageCachePageRoutingModule } from './services/file/custom-image-cache/custom-image-cache-routing.module'; - - - -======= import {NgxImageCompressService} from 'ngx-image-compress'; ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 +import { CustomImageCachePageRoutingModule } from './services/file/custom-image-cache/custom-image-cache-routing.module'; /* import { FCM } from '@ionic-native/fcm/ngx'; import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */ diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 682cc6a9e..a322ac46c 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -395,22 +395,13 @@ export class NewPublicationPage implements OnInit { this.photo = this.sanitizer.bypassSecurityTrustResourceUrl(image && (image.dataUrl)); } */ - - async selectImage() { const image = await Camera.getPhoto({ -<<<<<<< HEAD - quality: 50, - width:50, - height:50, -======= quality: 20, ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 allowEditing: false, resultType: CameraResultType.Uri, source: CameraSource.Camera // Camera, Photos or Prompt! }); - if (image) { this.saveImage(image) } 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 797982d9b..32001f7d2 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -39,11 +39,7 @@ (click)="goToPublicationDetail(publication.DocumentId)" >
-<<<<<<< HEAD - image -======= ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
image 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 01681f05f..2d453c187 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -69,22 +69,10 @@ export class ViewPublicationsPage implements OnInit { this.folderId = this.folderId['ProcessId'] } -<<<<<<< HEAD - - if (typeof (this.id) == 'object') { - this.id = this.id['ProcessId'] - } - - this.getPublicationDetail(); - setTimeout(() => { - this.testForkJoin() - // this.getPublications(); -======= this.getPublicationsIds() this.getPublicationDetail(); setTimeout(() => { this.getPublicationsIds(); ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 }, 1000); this.backgroundservice.registerBackService('Online', () => { @@ -106,23 +94,14 @@ export class ViewPublicationsPage implements OnInit { // } this.testForkJoin() this.getPublicationDetail(); -<<<<<<< HEAD - // this.getPublications(); - -======= this.getPublicationsIds(); ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 } doRefresh = (event) => { setTimeout(() => { this.testForkJoin() this.getPublicationDetail(); -<<<<<<< HEAD - // this.getPublications(); -======= this.getPublicationsIds(); ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 event.target.complete(); }, 3000); @@ -161,51 +140,24 @@ export class ViewPublicationsPage implements OnInit { this.publicationList = new Array(); -<<<<<<< HEAD - res.forEach(element => { - console.log('getPublications', element) - let item: Publication = this.publicationPipe.itemList(element) - this.publicationList.push(item); - }); - this.sqliteservice.updateactions(this.id, JSON.stringify(this.publicationList)); + // getPublicationsIds() { - // this.publicationListStorage.add(id, this.publicationList) - // this.getpublication = this.publicationList; + // this.showLoader = true; + // const folderId = this.folderId - // this.showLoader = false; - // }, (error) => { + // this.publications.GetPublicationsID(this.folderId).subscribe(res => { - // if(error.status == '0') { - // this.getFromDB(); - // } - // if (error.status == '404') { - // this.error = 'Sem publicações disponíveis!'; - // this.publicationList = []; - // this.publicationListStorage.add(id, this.publicationList) - // } - this.showLoader = false; - }); - } -// goes to fork -======= - getPublicationsIds() { + // console.log('publications ids', res) + // this.publicationList = new Array(); - this.showLoader = true; - const folderId = this.folderId - - this.publications.GetPublicationsID(this.folderId).subscribe(res => { - - console.log('publications ids', res) - this.publicationList = new Array(); - - for(let i of res) { - this.publications.GetPublicationById(i).subscribe(ress => { - console.log('publications by ids', ress) - let item: Publication = this.publicationPipe.itemList(ress) - console.log('publications by ids 2', item) - this.publicationList.push(item); - }) - } + // for(let i of res) { + // this.publications.GetPublicationById(i).subscribe(ress => { + // console.log('publications by ids', ress) + // let item: Publication = this.publicationPipe.itemList(ress) + // console.log('publications by ids 2', item) + // this.publicationList.push(item); + // }) + // } /* res.forEach(element => { console.log('publications elements', element) @@ -239,7 +191,6 @@ export class ViewPublicationsPage implements OnInit { }); } ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 getPublications() { this.showLoader = true; diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts index 2bbea80b7..491effd8c 100644 --- a/src/app/services/publications.service.ts +++ b/src/app/services/publications.service.ts @@ -84,9 +84,6 @@ export class PublicationsService { return this.http.delete(`${geturl}`, options); } -<<<<<<< HEAD - //this worker obervable goes to ForkJoin as a second api call -======= GetPublicationsID(folder:any) { const geturl = environment.apiURL + 'presidentialActions/'+ folder +'/posts/ids'; let params = new HttpParams(); @@ -101,7 +98,6 @@ export class PublicationsService { } ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 GetPublications(id:any){ const geturl = environment.apiURL + 'presidentialActions/'+ id +'/posts'; let params = new HttpParams(); diff --git a/src/global.scss b/src/global.scss index 36f1f07f1..3e9a49fe0 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1340,19 +1340,12 @@ ngx-mat-datetime-content{ .ldio-rpinwye8j0b div { box-sizing: content-box; } .transparent-modal { -<<<<<<< HEAD --background: #f1eaeae7; --margin: 0; --padding: 0; ion-content { --background:#f1f0ebe7; -======= - --background: #000000; - - ion-content { - --background:#2e2121; ->>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771 } }