chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1232 from jloguercio/1.11.x

Browse Source 
Added maps handle for every geolocalization extra_field - Refs BT#10992
ofaj
José Loguercio 9 years ago committed by GitHub
parent e96a6fe873 21a59e55c8
commit 525d2d84e9
3 changed files with 139 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      main/auth/inscription.php
  2. 12
      main/auth/profile.php
  3. 122
      main/inc/lib/extra_field.lib.php

10
main/auth/inscription.php
Unescape View File

@ -48,11 +48,12 @@ if (!empty($_SESSION['user_language_choice'])) {
} else {
$user_selected_language = api_get_setting('platformLanguage');
}
$htmlHeadXtra[] = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true" ></script>';
if ($userGeolocalization) {
$htmlHeadXtra[] = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true" ></script>';
$htmlHeadXtra[] = '<script>
$(document).ready(function() {
initializeGeo(false, false);
$("#geolocalization").on("click", function() {
@ -65,6 +66,13 @@ if ($userGeolocalization) {
myLocation();
return false;
});
$("#address").keypress(function (event) {
if (event.which == 13) {
$("#geolocalization").click();
return false;
}
});
});
function myLocation() {

12
main/auth/profile.php
Unescape View File

@ -35,9 +35,7 @@ $userGeolocalization = api_get_setting('enable_profile_user_address_geolocalizat
$htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1');
$htmlHeadXtra[] = '<link href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
if ($userGeolocalization) {
$htmlHeadXtra[] = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true" ></script>';
}
$htmlHeadXtra[] = '<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true" ></script>';
$htmlHeadXtra[] = '<script>
$(document).ready(function() {
var $image = $("#previewImage");
@ -153,6 +151,7 @@ $user_data['api_key_generate'] = $value_array;
if ($userGeolocalization) {
$htmlHeadXtra[] = '<script>
$(document).ready(function() {
var address = "' . $user_data['address'] . '";
initializeGeo(address, false);
@ -166,6 +165,13 @@ if ($userGeolocalization) {
myLocation();
return false;
});
$("#address").keypress(function (event) {
if (event.which == 13) {
$("#geolocalization").click();
return false;
}
});
});
function myLocation() {

122
main/inc/lib/extra_field.lib.php
Unescape View File

@ -1599,7 +1599,7 @@ EOF;
'text',
'extra_'.$field_details['variable'],
$field_details['display_text'],
array()
['id' => 'extra_'.$field_details['variable']]
);
$form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
$form->applyFilter('extra_'.$field_details['variable'], 'trim');
@ -1610,6 +1610,126 @@ EOF;
);
}
}
$form->addHtml(
'<script>
$(document).ready(function() {
var address = "' . $extraData['extra_'.$field_details['variable']] . '";
initializeGeo'.$field_details['variable'].'(address, false);
$("#geolocalization_extra_'.$field_details['variable'].'").on("click", function() {
var address = $("#extra_'.$field_details['variable'].'").val();
initializeGeo'.$field_details['variable'].'(address, false);
return false;
});
$("#myLocation_extra_'.$field_details['variable'].'").on("click", function() {
myLocation'.$field_details['variable'].'();
return false;
});
$("#extra_'.$field_details['variable'].'").keypress(function (event) {
if (event.which == 13) {
$("#geolocalization_extra_'.$field_details['variable'].'").click();
return false;
}
});
});
function myLocation'.$field_details['variable'].'() {
if (navigator.geolocation) {
var geoPosition = function(position) {
var lat = position.coords.latitude;
var lng = position.coords.longitude;
var latLng = new google.maps.LatLng(lat, lng);
initializeGeo'.$field_details['variable'].'(false, latLng)
};
var geoError = function(error) {
alert("Geocode ' . get_lang('Error') . ': " + error);
};
var geoOptions = {
enableHighAccuracy: true
};
navigator.geolocation.getCurrentPosition(geoPosition, geoError, geoOptions);
}
}
function initializeGeo'.$field_details['variable'].'(address, latLng) {
var geocoder = new google.maps.Geocoder();
var latlng = new google.maps.LatLng(-34.397, 150.644);
var myOptions = {
zoom: 15,
center: latlng,
mapTypeControl: true,
mapTypeControlOptions: {
style: google.maps.MapTypeControlStyle.DROPDOWN_MENU
},
navigationControl: true,
mapTypeId: google.maps.MapTypeId.ROADMAP
};
map_'.$field_details['variable'].' = new google.maps.Map(document.getElementById("map_extra_'.$field_details['variable'].'"), myOptions);
var parameter = address ? { "address": address } : latLng ? { "latLng": latLng } : false;
if (geocoder && parameter) {
geocoder.geocode(parameter, function(results, status) {
if (status == google.maps.GeocoderStatus.OK) {
if (status != google.maps.GeocoderStatus.ZERO_RESULTS) {
map_'.$field_details['variable'].'.setCenter(results[0].geometry.location);
if (!address) {
$("#extra_'.$field_details['variable'].'").val(results[0].formatted_address);
}
var infowindow = new google.maps.InfoWindow({
content: "<b>" + $("#extra_'.$field_details['variable'].'").val() + "</b>",
size: new google.maps.Size(150, 50)
});
var marker = new google.maps.Marker({
position: results[0].geometry.location,
map: map_'.$field_details['variable'].',
title: $("#extra_'.$field_details['variable'].'").val()
});
google.maps.event.addListener(marker, "click", function() {
infowindow.open(map_'.$field_details['variable'].', marker);
});
} else {
alert("' . get_lang("NotFound") . '");
}
} else {
alert("Geocode ' . get_lang('Error') . ': " + status);
}
});
}
}
</script>
');
$form->addHtml('
<div class="form-group">
<label for="geolocalization_extra_'.$field_details['variable'].'" class="col-sm-2 control-label"></label>
<div class="col-sm-8">
<button class="null btn btn-default " id="geolocalization_extra_'.$field_details['variable'].'" name="geolocalization_extra_'.$field_details['variable'].'" type="submit"><em class="fa fa-map-marker"></em> '.get_lang('Geolocalization').'</button>
<button class="null btn btn-default " id="myLocation_extra_'.$field_details['variable'].'" name="myLocation_extra_'.$field_details['variable'].'" type="submit"><em class="fa fa-crosshairs"></em> '.get_lang('MyLocation').'</button>
</div>
</div>
');
$form->addHtml('
<div class="form-group">
<label for="map_extra_'.$field_details['variable'].'" class="col-sm-2 control-label">
'.$field_details['display_text'].' - '.get_lang('Map').'
</label>
<div class="col-sm-8">
<div name="map_extra_'.$field_details['variable'].'" id="map_extra_'.$field_details['variable'].'" style="width:100%; height:300px;">
</div>
</div>
</div>
');
break;
}
}

Write Preview
Loading…
Cancel
Save