Skip to content

AM - Compatibilidad para ios #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fabio-Ramirez wants to merge 3 commits into
base: master
Choose a base branch
from
Open

AM - Compatibilidad para ios #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5685e1a
AM - Compatibilidad para ios
andrrrl Jun 11, 2025
e4cbdf9
Se corrigue html
andrrrl Jun 12, 2025
bcde057
Se corrigue mapa
andrrrl Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,10 @@
},
"private": true,
"dependencies": {
"@agm/core": "^3.0.0-beta.0",
"@angular/common": "~12.2.17",
"@angular/core": "~12.2.17",
"@angular/forms": "~12.2.17",
"@angular/http": "^7.2.16",
"@angular/google-maps": "^12.2.0",
"@angular/platform-browser": "~12.2.17",
"@angular/platform-browser-dynamic": "~12.2.17",
"@angular/router": "~12.2.17",
Expand Down Expand Up @@ -95,12 +94,9 @@
"@google/maps": "^1.1.3",
"@ionic/angular": "^5.0.0",
"@ionic/storage-angular": "^3.0.6",
"@types/google-maps": "^3.2.2",
"agm-core": "^1.0.0-beta.5",
"angularx-qrcode": "^10.0.12",
"config-cordova": "^0.8.4",
"cordova-browser": "6.0.0",
"cordova.plugins.diagnostic": "^6.0.3",
"moment": "^2.29.1",
"mx.ferreyra.callnumber": "0.0.2",
"ng-recaptcha": "^6.1.0",
Expand All @@ -120,25 +116,23 @@
"@angular/compiler-cli": "~12.2.17",
"@angular/language-service": "~12.2.17",
"@ionic/angular-toolkit": "^4.0.0",
"@types/googlemaps": "3.39.13",
"@types/google.maps": "^3.49.2",
"@types/jasmine": "~3.8.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "^4.28.5",
"@typescript-eslint/eslint-plugin-tslint": "^4.28.5",
"@typescript-eslint/parser": "^4.28.5",
"@typescript-eslint/utils": "^8.3.0",
"barcodescanner-ec": "^8.1.2",
"call-number": "^1.0.1",
"codelyzer": "^6.0.0",
"com-badrit-base64": "^0.2.0",
"cordova-android": "^14.0.0",
"cordova-common": "^4.0.2",
"cordova-ios": "^6.2.0",
"cordova-ios": "^7.1.1",
"cordova-plugin-advanced-http": "^3.2.2",
"cordova-plugin-androidx": "^3.0.0",
"cordova-plugin-androidx-adapter": "^1.1.3",
"cordova-plugin-camera": "6.0.0",
"cordova-plugin-camera": "^7.0.0",
"cordova-plugin-device": "^2.0.2",
"cordova-plugin-email-composer": "^0.9.2",
"cordova-plugin-file": "^6.0.2",
Expand All @@ -155,6 +149,7 @@
"cordova-sqlite-storage": "^6.0.0",
"cordova-support-android-plugin": "^1.0.2",
"cordova-support-google-services": "^1.4.1",
"cordova.plugins.diagnostic": "^6.0.3",
"eslint": "^7.32.0",
"jasmine-core": "~3.8.0",
"jasmine-spec-reporter": "~5.0.0",
Expand Down Expand Up @@ -195,7 +190,8 @@
},
"cordova-plugin-firebase-messaging": {
"ANDROID_FIREBASE_MESSAGING_VERSION": "21.0.+",
"ANDROIDX_CORE_VERSION": "1.3.+"
"ANDROIDX_CORE_VERSION": "1.3.+",
"IOS_FIREBASE_POD_VERSION": "~> 8.8.0"
},
"cordova-plugin-advanced-http": {
"ANDROIDBLACKLISTSECURESOCKETPROTOCOLS": "SSLv3,TLSv1"
Expand All @@ -208,9 +204,6 @@
"cordova-plugin-camera": {
"ANDROIDX_CORE_VERSION": "1.6.+"
},
"barcodescanner-ec": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
"call-number": {}
},
"platforms": [
Expand Down
3 changes: 0 additions & 3 deletions src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import { registerLocaleData } from '@angular/common';
import * as moment from 'moment';
import { HttpClientModule } from '@angular/common/http';
import { VacunasPageModule } from './pages/vacunas/vacunas.module';
import { HttpModule } from '@angular/http';
import { DescargaArchivosProvider } from 'src/providers/library-services/descarga-archivos';
import { FirebaseMessaging } from '@awesome-cordova-plugins/firebase-messaging/ngx';
import { HTTP } from '@awesome-cordova-plugins/http/ngx';
Expand All @@ -60,8 +59,6 @@ moment.locale('es');
IonicModule.forRoot(),
AppRoutingModule,
IonicStorageModule.forRoot(),
// tslint:disable-next-line: deprecation
HttpModule,
HttpClientModule,
TurnosPageModule,
DatosUtilesPageModule,
Expand Down
71 changes: 39 additions & 32 deletions src/app/pages/datos-utiles/centros-salud/map/map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
<ion-content>
<agm-map *ngIf="myPosition && tipoMapa==='centro-salud'" #gm [latitude]="center.latitude"
[longitude]="center.longitude" [zoom]="zoom" [styles]="mapStyles">
<agm-marker [iconUrl]="userIcon" [latitude]="myPosition.latitude" [longitude]="myPosition.longitude">
</agm-marker>
<agm-marker *ngFor="let centro of centrosShow" (markerClick)="onClickCentro(centro, infoWindow);"
[iconUrl]="locationIcon" [latitude]="centro.direccion.geoReferencia[0]"
[longitude]="centro.direccion.geoReferencia[1]">
<agm-info-window [disableAutoPan]="false" #infoWindow>
<!-- Mapa para "centro-salud" -->
<google-map *ngIf="myPosition && tipoMapa==='centro-salud'" [center]="center" [zoom]="zoom" [options]="mapOptions"
height="100%" width="100%">

<!-- Marcador del usuario -->
<map-marker [position]="{lat: myPosition.latitude, lng: myPosition.longitude}">
</map-marker>

<!-- Marcadores de centros -->
<map-marker *ngFor="let centro of centrosShow"
[position]="{lat: centro.direccion.geoReferencia[0], lng: centro.direccion.geoReferencia[1]}"
(mapClick)="onClickCentro(centro)">

<!-- InfoWindow -->
<map-info-window>
<div class="infowindow">
<ion-row class="title">
<ion-col>
<ion-label color="dark">
<h2>
<b>{{centro.nombre}}</b>
</h2>
<h2><b>{{centro.nombre}}</b></h2>
</ion-label>
</ion-col>
</ion-row>
Expand All @@ -23,7 +28,7 @@ <h2>
<h2>Dirección:</h2>
<h3>{{centro.direccion.valor}}</h3>
<ion-chip color="primary"
(click)="navigateTo(centro.direccion.geoReferencia[0], centro.direccion.geoReferencia[1])">
(click)="navigateTo(centro.direccion.geoReferencia[0], centro.direccion.geoReferencia[1])">
<ion-icon name="navigate"></ion-icon>
<ion-label>Ver en mapa</ion-label>
</ion-chip>
Expand All @@ -42,10 +47,10 @@ <h3>{{c.valor}}</h3>
<ion-col *ngIf="prestaciones.length">
<ion-label color="dark">
<h2> Prestaciones: </h2>
<h3 *ngFor="let p of prestaciones.slice(0, 5-centro.contacto.length)">
<h3 *ngFor="let p of prestaciones.slice(0, 5 - centro.contacto.length)">
<span *ngIf="p.detalle" class="andes-capitalize">{{p.prestacion.term}} -
{{p.detalle}} </span>
<span *ngIf="!p.detalle" class="andes-capitalize">{{p.prestacion.term}} </span>
{{p.detalle}}</span>
<span *ngIf="!p.detalle" class="andes-capitalize">{{p.prestacion.term}}</span>
</h3>
</ion-label>
<div *ngIf="prestaciones.length + centro.contacto.length > 5">
Expand All @@ -56,24 +61,26 @@ <h3 *ngFor="let p of prestaciones.slice(0, 5-centro.contacto.length)">
</ion-col>
</ion-row>
</div>
</agm-info-window>
</agm-marker>
</agm-map>
</map-info-window>
</map-marker>
</google-map>

<!-- Mapa para "araucania" -->
<google-map *ngIf="myPosition && tipoMapa==='araucania'" [center]="centerAraucania" [zoom]="zoom"
[options]="mapOptions" height="100%" width="100%">

<map-marker [position]="{lat: myPosition.latitude, lng: myPosition.longitude}">
</map-marker>

<map-marker *ngFor="let centro of centrosShow" [position]="{lat: centro.latitud, lng: centro.longitud}"
(mapClick)="onClickCentro(centro)">

<agm-map *ngIf="myPosition && tipoMapa==='araucania'" #gm [latitude]="centerAraucania.latitude"
[longitude]="centerAraucania.longitude" [zoom]="zoom" [styles]="mapStyles">
<agm-marker [iconUrl]="userIcon" [latitude]="myPosition.latitude" [longitude]="myPosition.longitude">
</agm-marker>
<agm-marker *ngFor="let centro of centrosShow" (markerClick)="onClickCentro(centro, infoWindow);"
[iconUrl]="locationIcon" [latitude]="centro.latitud" [longitude]="centro.longitud">
<agm-info-window [disableAutoPan]="false" #infoWindow>
<map-info-window>
<div class="infowindow">
<ion-row class="title">
<ion-col>
<ion-label color="dark">
<h2>
<b>{{centro.nombre}}</b>
</h2>
<h2><b>{{centro.nombre}}</b></h2>
<h3>{{centro.complejidad}}</h3>
</ion-label>
</ion-col>
Expand All @@ -92,7 +99,7 @@ <h3>Región: {{centro.region}}</h3>
</ion-label>
</ion-col>
</ion-row>
<ion-row *ngIf="centro.telefono && centro.telefono != ''">
<ion-row *ngIf="centro.telefono && centro.telefono !== ''">
<ion-col class="no-padding">
<ion-label color="dark">
<h2>Teléfono:</h2>
Expand All @@ -101,7 +108,7 @@ <h3>(+56) {{centro.telefono}}</h3>
</ion-col>
</ion-row>
</div>
</agm-info-window>
</agm-marker>
</agm-map>
</map-info-window>
</map-marker>
</google-map>
</ion-content>
Loading