diff --git a/src/app/modals/crop-image/crop-image.page.ts b/src/app/modals/crop-image/crop-image.page.ts index e748cadaa..7476c9dae 100644 --- a/src/app/modals/crop-image/crop-image.page.ts +++ b/src/app/modals/crop-image/crop-image.page.ts @@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { NavParams } from '@ionic/angular'; import { ImageCroppedEvent, ImageCropperComponent } from 'ngx-image-cropper'; +import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; @Component({ selector: 'app-crop-image', @@ -19,7 +20,7 @@ export class CropImagePage implements OnInit { constructor( private navParams: NavParams, private modalController: ModalController, - ) { + ) { this.base64ToCroppe = this.navParams.get('base64ToCroppe') console.log('To cropp',this.base64ToCroppe) } @@ -31,15 +32,19 @@ export class CropImagePage implements OnInit { fileChangeEvent(event: any): void { this.imageChangedEvent = event; } - imageCropped(event: ImageCroppedEvent) { - this.croppedImage = event.base64; - - console.log('Croped image',event) - console.log('Croped image 22',this.croppedImage) - // event.blob can be used to upload the cropped image + + @XTracerAsync({name:'crop-image/imageCropped', bugPrint: true, autoFinish: true}) + imageCropped(event: ImageCroppedEvent, tracing?: TracingType) { + this.croppedImage = event.base64; + + console.log('Croped image', event) + console.log('Croped image 22', this.croppedImage) + tracing.addEvent('Croped image') + tracing.setAttribute('outcome','success') + // event.blob can be used to upload the cropped image } - imageLoaded($event){ + imageLoaded($event) { } @@ -47,10 +52,16 @@ export class CropImagePage implements OnInit { console.log('cropp iage faile') } - save() { + @XTracerAsync({name:'crop-image/save', bugPrint: true, autoFinish: true}) + save(tracing?: TracingType) { + this.modalController.dismiss({ base64ToCroppe: this.croppedImage }); + + tracing.addEvent('done') + + tracing.setAttribute('outcome','success') } cancel() { 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 c001cfb73..506c05798 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -777,8 +777,8 @@ export class NewPublicationPage implements OnInit { } else { this.capturedImage = 'data:image/jpeg;base64,' + content.data; - tracing.log("capture file from gallery", { base64: content.data }) - this.showCroppModal() + // tracing.log("capture file from gallery", { base64: content.data }) + this.showCroppModal(tracing) tracing.finish() /* const newAttachment = new PublicationAttachmentEntity( { @@ -812,8 +812,6 @@ export class NewPublicationPage implements OnInit { async shareContentIso(fullPath, FileExtension, filename) { - console.log({fullPath, FileExtension, filename}) - try { if (this.checkFileType.checkFileType(FileExtension) == 'image') { @@ -917,7 +915,7 @@ export class NewPublicationPage implements OnInit { } - async showCroppModal() { + async showCroppModal(tracing?: TracingType) { const modal = await this.modalController.create({ component: CropImagePage, componentProps: { @@ -928,6 +926,10 @@ export class NewPublicationPage implements OnInit { modal.onDidDismiss().then((res) => { if (res) { + + // tracing?.log('crop image', { + // base64: res.data.base64ToCroppe + // }) this.capturedImage = res.data this.filecontent = true; this.photoOrVideo = false; 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 a7ea49c36..7f43e848c 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -89,7 +89,7 @@ --> -
+
{{publication.Title}} diff --git a/src/app/services/monitoring/capture-log/worker.worker.ts b/src/app/services/monitoring/capture-log/worker.worker.ts index f587c10ab..4465de50d 100644 --- a/src/app/services/monitoring/capture-log/worker.worker.ts +++ b/src/app/services/monitoring/capture-log/worker.worker.ts @@ -19,7 +19,7 @@ class SocketLog { this.messageSubject$ = new Subject(); this.connectionStatus$ = new BehaviorSubject(false); this.setupVisibilityChangeHandler(); - // this.connect('https://5-180-182-151.cloud-xip.com:85/ws/') + // this.connect('https://185-229-224-75.cloud-xip.com:85/ws/') //console.log('connect1') } diff --git a/src/app/services/monitoring/opentelemetry/matrix.ts b/src/app/services/monitoring/opentelemetry/matrix.ts index 8c246873a..8be55bcc7 100644 --- a/src/app/services/monitoring/opentelemetry/matrix.ts +++ b/src/app/services/monitoring/opentelemetry/matrix.ts @@ -12,7 +12,10 @@ metrics.setGlobalMeterProvider(meterProvider); if (window.location.protocol !== 'https:' && environment.apiURL != 'https://gdqas-api.oapr.gov.ao/api/') { const metricReader = new PeriodicExportingMetricReader({ exporter: new OTLPMetricExporter({ - url: 'https://5-180-182-151.cloud-xip.com:85/collector2/v1/metrics', + //url: 'https://5-180-182-151.cloud-xip.com:85/collector2/v1/metrics', + url: 'https://185-229-224-75.cloud-xip.com:85/collector2/v1/metrics', + //url: 'http://5-180-182-151.cloud-xip.com:4318/v1/metrics', + //url: 'http://185-229-224-75.cloud-xip.com:4318/v1/metrics' // headers: { // 'Authorization': 'Basic ' + btoa('tabteste@006:tabteste@006'), // } diff --git a/src/app/services/monitoring/opentelemetry/opentelemetry.ts b/src/app/services/monitoring/opentelemetry/opentelemetry.ts index fa1461e83..813ab683c 100644 --- a/src/app/services/monitoring/opentelemetry/opentelemetry.ts +++ b/src/app/services/monitoring/opentelemetry/opentelemetry.ts @@ -15,7 +15,8 @@ function createProvider(serviceName) { // provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); provider.addSpanProcessor(new SimpleSpanProcessor(new ZipkinExporter({ - url: 'https://5-180-182-151.cloud-xip.com:85/zipkin-endpoint/api/v2/spans', + //url: 'https://5-180-182-151.cloud-xip.com:85/zipkin-endpoint/api/v2/spans', + url: 'https://185-229-224-75.cloud-xip.com:85/zipkin-endpoint/api/v2/spans', serviceName: serviceName, getExportRequestHeaders: () => { return { diff --git a/src/app/services/monitoring/socket/socket.ts b/src/app/services/monitoring/socket/socket.ts index a86c0886c..c252da365 100644 --- a/src/app/services/monitoring/socket/socket.ts +++ b/src/app/services/monitoring/socket/socket.ts @@ -12,7 +12,8 @@ export class WebSocketGraylogService { constructor() { } connect(): void { - this.adminSocketGlobal = new WebSocket('wss://5-180-182-151.cloud-xip.com:85/ws/'); + // this.adminSocketGlobal = new WebSocket('wss://5-180-182-151.cloud-xip.com:85/ws/'); + this.adminSocketGlobal = new WebSocket('wss://185-229-224-75.cloud-xip.com:85/ws/'); this.adminSocketGlobal.onopen = () => { console.log('Admin WebSocket is open now.'); diff --git a/src/app/shared/swiper/swiper.page.html b/src/app/shared/swiper/swiper.page.html index 6bc928f16..ad59838dd 100644 --- a/src/app/shared/swiper/swiper.page.html +++ b/src/app/shared/swiper/swiper.page.html @@ -6,7 +6,7 @@
- +
diff --git a/src/app/shared/swiper/swiper.page.scss b/src/app/shared/swiper/swiper.page.scss index 076aaae7b..bb934f0e1 100644 --- a/src/app/shared/swiper/swiper.page.scss +++ b/src/app/shared/swiper/swiper.page.scss @@ -155,7 +155,7 @@ ion-toolbar { justify-content: center; background: black; position: relative; - + } video { max-width: -webkit-fill-available; @@ -392,4 +392,14 @@ video::-webkit-media-controls-panel { cursor: pointer; border-radius: 100px; /* Add additional styles for your custom play button */ -} \ No newline at end of file +} + + +swiper-slide { + transition: 1s; + -webkit-transition: 1s; + -moz-transition: 1s; + -ms-transition: 1s; + -o-transition: 1s; + width: 100% !important; +} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 43c1647f5..0bd217c5f 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,4 +4,4 @@ import { environment as oaprProd } from './suport/oapr' import { DevDev } from './suport/dev' -export const environment: Environment = DevDev; +export const environment: Environment = oaprProd; diff --git a/version/git-version.ts b/version/git-version.ts index f7614b065..6b255507c 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "4cf87b809", - "SHA": "4cf87b809d2b30e3a19df6db00ea9f9437254f1b", + "shortSHA": "49a249ce7", + "SHA": "49a249ce725f03ca22c6722fa5e973c4217c9a65", "branch": "feature/agenda-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jul 26 18:21:49 2024 +0100'", - "lastCommitMessage": "add logs", - "lastCommitNumber": "5890", - "changeStatus": "On branch feature/agenda-api-peter\nYour branch is up to date with 'origin/feature/agenda-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts", + "lastCommitTime": "'Mon Jul 29 09:35:00 2024 +0100'", + "lastCommitMessage": "add logging to take picture on mobile", + "lastCommitNumber": "5891", + "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 1 commit.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/crop-image/crop-image.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/services/monitoring/capture-log/worker.worker.ts\n\tmodified: src/app/services/monitoring/opentelemetry/matrix.ts\n\tmodified: src/app/services/monitoring/opentelemetry/opentelemetry.ts\n\tmodified: src/app/services/monitoring/socket/socket.ts\n\tmodified: src/app/shared/swiper/swiper.page.html\n\tmodified: src/app/shared/swiper/swiper.page.scss\n\tmodified: src/environments/environment.prod.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file