admin_it 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8261d9f5d210ee88e9fd0451865fd20595e55e9d
-  data.tar.gz: 725141e13c0a686cdca30e5d098c53c5ae25f30e
+  metadata.gz: 59e741cf6aa0a6d0b798342724be6d44273202fa
+  data.tar.gz: c2e371c65ed2f758a74f12c63ea7cb0af0835200
 SHA512:
-  metadata.gz: 8cd3f0450666f047996c99895553fee547db7396d16862a3f49f45e657fbe52b71e29e1098e44c45048154af9277da3c573c967607b3acbd5f5d9c59c5a0d5de
-  data.tar.gz: 109f2522c4c74015807a502620ae4d578164e0c290719f1483d97e22eaeb78a23128c1c6c30948fbcd3de44ab612ab7ebe9d6a870ff5c96a62ef866f903bf0b4
+  metadata.gz: c85697942c88f327fd1079832ccdb1314c87ff8ecdff949e86c814c042b544f9075bfb5b730b484a288fad7bee9c1e7072a79ea3cfedd4c46d9b7c0cf6f56760
+  data.tar.gz: 61400cb10f7c364b000765ce7e3e393f641d01040ae068284adb37d076fade4a42cecd625a58457b127c8981c79b689e6104ef294b1988e9d5688e282c7ce907

data/README.md

@@ -36,7 +36,10 @@ bundle install
 
 # Changes
 
-`1.2.4`
+`1.2.6`
+* added: geo location picker
+
+`1.2.5`
 * fixed: Content-Length in production environment for UTF-8
 
 `1.2.4`

data/app/assets/javascript/admin_it/admin_it.js

@@ -126,6 +126,35 @@ var initSelects = function() {
   });
 }
 
+var initGeoPickers = function() {
+  $('[data-geo-picker]').each(function() {
+    var $this = $(this);
+    var $input = $($this.data('geoPicker'));
+    var arr = $input.val().split(',');
+    var lon = parseFloat(arr[0]);
+    var lat = parseFloat(arr[1]);
+    $this.geoLocationPicker({
+      gMapZoom: 13,
+      gMapMapTypeId: google.maps.MapTypeId.ROADMAP,
+      gMapMarkerTitle: 'Выбирите местоположение',
+      showPickerEvent: 'click',
+      defaultLat: lat || 55.751607, // center
+      defaultLng: lon || 37.617159, // of Moscow
+      defaultLocationCallback: function(lat, lon) {
+        $input.val(lon + ', ' + lat);
+        $input.parent().find('.x').text(lon);
+        $input.parent().find('.y').text(lat);
+      }
+    });
+  });
+}
+
+var initControls = function() {
+  initImageUploads();
+  initSelects();
+  initGeoPickers();
+}
+
 $(document).on('ready page:load', function() {
   initPartials();
   // initDialogs();
@@ -133,8 +162,7 @@ $(document).on('ready page:load', function() {
   initTabs();
   initPopups();
   initLinks();
-  initImageUploads();
-  initSelects();
+  initControls();
   // allow dialog content reloading
   $('.modal').on('hidden.bs.modal', function() { $(this).removeData(); })
              .on('loaded.bs.modal', function() {
@@ -150,7 +178,6 @@ $(document).on('ready page:load', function() {
                    $form.submit();
                  });
                }
-               initImageUploads();
-               initSelects();
+               initControls();
              })
 });

data/app/assets/javascript/admin_it/index.js

@@ -5,5 +5,6 @@
 //= require admin_it/jquery.fileupload
 //= require admin_it/jquery.fileupload-ui
 //= require admin_it/jquery.fileupload-process
+//= require admin_it/jquery.geolocationpicker.js
 //= require select2
 //= require admin_it/admin_it

data/app/assets/javascript/admin_it/jquery.geolocationpicker.js

@@ -0,0 +1,200 @@
+// Source: https://github.com/liskiew/jquery-geolocation-picker
+(function($) {
+
+    //Attach this new method to jQuery
+    $.fn.extend({
+
+        //This is where you write your plugin's name
+        geoLocationPicker: function(options) {
+
+            var geocoder = new google.maps.Geocoder();
+
+            var settings = {
+                width: "300px",
+                height: "200px",
+                backgroundColor: '#fff',
+                border: '1px solid #ccc',
+                borderRadius: 10,
+                padding: 10,
+                defaultLat: 52.229683, // Warsaw, Poland
+                defaultLng: 21.012175, // Warsaw, Poland
+                gMapMapTypeId: google.maps.MapTypeId.HYBRID,
+                gMapZoom: 15,
+                gMapMapTypeControl: false,
+                gMapDisableDoubleClickZoom: true,
+                gMapStreetViewControl: false,
+                gMapMarkerTitle: "Here I am.",
+                showPickerEvent: "focus",
+                left: options.left,
+                top: options.top
+            };
+
+            function RoundDecimal(num, decimals) {
+                var mag = Math.pow(10, decimals);
+                return Math.round(num * mag) / mag;
+            }
+
+
+            return this.each(function() {
+
+                var _this = this;
+                // merge default settings with options and default callback method
+                settings = $.extend({
+                    defaultAddressCallback: function() { return $(_this).val();},
+                    defaultLocationCallback: function(lat, lng) {$(_this).val(lat + "," + lng);}
+                }, settings, options);
+
+                var visible = false;
+                var id = $(this).attr('id');
+                var pickerId = "picker-" + id;
+                var mapDivId = "mapdiv-" + id;
+
+                var picker = $("<div id='" + pickerId + "' class='picker-map'></div>").css({
+                    width: settings.width,
+                    backgroundColor: settings.backgroundColor,
+                    border: settings.border,
+                    padding: settings.padding,
+                    borderRadius: settings.borderRadius,
+                    position: "absolute",
+                    display: "none",
+                    left: settings.left,
+                    top: settings.top,
+                    'z-index': 1
+                });
+
+                var mapDiv = $("<div class='picker-map-div' id='" + mapDivId + "'>Loading</div>").css({
+                    height: settings.height
+                });
+
+
+                $(this).after(picker);
+                picker.append(mapDiv);
+
+                
+                var defaultLocationLatLng = new google.maps.LatLng(settings.defaultLat, settings.defaultLng);
+//                    $(_this).val(lat + "," + lng);<
+
+                var gMapOptions = {
+                    zoom: settings.gMapZoom,
+                    center: defaultLocationLatLng,
+                    mapTypeId: settings.gMapMapTypeId,
+                    mapTypeControl: settings.gMapMapTypeControl,
+                    disableDoubleClickZoom: settings.gMapDisableDoubleClickZoom,
+                    streetViewControl: settings.gMapStreetViewControl
+                };
+                
+                var map = new google.maps.Map(mapDiv.get(0), gMapOptions);
+
+                var marker = new google.maps.Marker({
+                    title: settings.gMapMarkerTitle,
+                    map: map,
+                    position: defaultLocationLatLng,
+                    draggable: true
+                });
+
+
+                google.maps.event.addListener(map, 'dblclick', function(event) {
+                    setPosition(event.latLng);
+                });
+
+                google.maps.event.addListener(marker, 'dragend', function(event) {
+                    setPosition(marker.position);
+                });
+
+
+                var setPosition = function(latLng, viewport) {
+                    var lat = RoundDecimal(latLng.lat(), 6);
+                    var lng = RoundDecimal(latLng.lng(), 6);
+                    
+                    marker.setPosition(latLng);
+                    
+                    if (viewport) {
+                        map.fitBounds(viewport);
+                        map.setZoom(map.getZoom() + 2);
+                    } else {
+                        map.panTo(latLng);
+                    }
+
+                    settings.defaultLocationCallback(lat, lng);
+                };
+
+
+                function getCurrentPosition() {
+
+                    var posStr = $(_this).val();
+
+                    if (posStr != "") {
+                        var posArr = posStr.split(",");
+                        if (posArr.length == 2) {
+                            var lat = $.trim(posArr[0]);
+                            var lng = $.trim(posArr[1]);
+                            var latlng = new google.maps.LatLng(lat, lng);
+                            setPosition(latlng);
+                            return;
+                            
+                        }
+                    }
+                    
+                    resolveAddress();
+                              
+                  }
+                
+                function resolveAddress(){
+                    var address = "";
+                        
+                    // try to call callback function for default address
+                    if (settings.defaultAddressCallback != null) {
+                        address = settings.defaultAddressCallback();
+                    }
+                    geocoder.geocode({'address': address},
+                      function(results, status) {
+                        if (status == google.maps.GeocoderStatus.OK) {
+                          setPosition(results[0].geometry.location, results[0].geometry.viewport );
+                        }
+                      }
+                    );
+                }
+
+                function hidePicker() {
+                    picker.fadeOut('fast');
+                    visible = false;
+                }
+
+                function showPicker() {
+                    picker.fadeIn('fast');
+                    google.maps.event.trigger(map, 'resize');
+                    getCurrentPosition();
+                    map.setCenter(marker.position);
+                    visible = true;
+                }
+                
+                $(_this).keydown(function(event) {
+                    if (event.keyCode == '13' || event.keyCode == '10') { // enter
+                        resolveAddress();
+                    }
+                });
+
+                $(_this).bind(settings.showPickerEvent, function(event) {
+                    if (!visible) {
+                        showPicker();
+                    }
+                    event.stopPropagation();
+                });
+
+                $('html').click(function() {
+                    hidePicker();
+                });
+
+                $(picker).click(function(event) {
+                    event.stopPropagation();
+                });
+                $(_this).click(function(event) {
+                    event.stopPropagation();
+                });
+            });
+
+        }
+
+    });
+
+})(jQuery);

data/app/views/admin_it/editors/_geo_picker.html.slim

@@ -0,0 +1,14 @@
+- for_context ||= context
+- name ||= "#{for_context.resource.name}[#{field.name}]"
+- id ||= "#{for_context.resource.name}_#{field.name}"
+- value ||= field.read(for_context.entity)
+
+span
+  input type="hidden" id=id name=name value=field.show(for_context.entity)
+  = t('admin_it.longtitude') + ': '
+  span.x = value.respond_to?(:x) ? value.x : ''
+  = ', ' + t('admin_it.latitude') + ': '
+  span.y = value.respond_to?(:y) ? value.y : ''
+
+.btn.btn-warning.pull-right data-geo-picker="##{id}"
+  i.fa.fa-globe

data/app/views/layouts/admin_it.html.slim

@@ -4,23 +4,12 @@ html
     title Admin
     meta charset="utf-8"
     = csrf_meta_tags
-
-    /= stylesheet_link_tag 'admin_it/bootstrap.min', media: 'all'
-    /= stylesheet_link_tag 'admin_it/font-awesome.min', media: 'all'
-    /= stylesheet_link_tag 'admin_it/admin_it', media: 'all'
-    /= javascript_include_tag 'jquery', 'jquery_ujs'
-    /= javascript_include_tag 'admin_it/bootstrap.min'
-
-    / JQuery FileUpload
-    /= stylesheet_link_tag 'admin_it/jquery.fileupload'
-    /= stylesheet_link_tag 'admin_it/jquery.fileupload-ui'
-    /= javascript_include_tag 'admin_it/jquery.ui.widget'
-    /= javascript_include_tag 'admin_it/jquery.fileupload'
-    /= javascript_include_tag 'admin_it/jquery.fileupload-ui'
-    /= javascript_include_tag 'admin_it/jquery.fileupload-process'
-
     = stylesheet_link_tag 'admin_it/index', media: 'all'
     = javascript_include_tag 'admin_it/index'
+    - unless AdminIt.config.google_maps_key.nil?
+      = javascript_include_tag(raw( \
+        "//maps.googleapis.com/maps/api/js?" \
+        "key=#{AdminIt.config.google_maps_key}&sensor=false"))
     = yield :head
 
   body style="padding-top: 70px"

data/lib/admin_it/config.rb

@@ -30,5 +30,13 @@ module AdminIt
       fail ArgumentError, 'Wrong S3 options' unless value.is_a?(Hash)
       @s3 = value
     end
+
+    def self.google_maps_key
+      @google_maps_key
+    end
+
+    def self.google_maps_key=(value)
+      @google_maps_key = value
+    end
   end
 end

data/lib/admin_it/data/active_record/field.rb

@@ -20,21 +20,21 @@ module AdminIt
       protected
 
       def read_value(entity)
-        value = entity.send(name)
         if type == :relation
+          value = entity.send(name)
           if assoc.collection?
             value.nil? || value.empty? ? [] : value.map(&:id).to_json
           else
             value.nil? ? nil : value.id
           end
         else
-          value
+          super(entity)
         end
       end
 
       def show_value(entity)
-        value = entity.send(name)
         if type == :relation
+          value = entity.send(name)
           resource = AdminIt.resources.values.find do |r|
             r.entity_class == assoc.klass
           end
@@ -51,10 +51,8 @@ module AdminIt
           else
             context.read(value)
           end
-        elsif type == :enum
-          value.text
         else
-          value
+          super(entity)
         end
       end
 
@@ -65,8 +63,10 @@ module AdminIt
           else
             value = assoc.klass.find(value)
           end
+          entity.send("#{name}=", value)
+        else
+          super(entity, value)
         end
-        entity.send("#{name}=", value)
       end
     end
   end

data/lib/admin_it/data/object.rb

@@ -40,15 +40,7 @@ module AdminIt
 
     #
     module Field
-      protected
-
-      def read_value(entity)
-        entity.send(name)
-      end
-
-      def write_value(entity, value)
-        entity.send("#{name}=", value)
-      end
+#      protected
     end
   end
 end

data/lib/admin_it/field/field.rb

@@ -19,8 +19,8 @@ module AdminIt
     include ExtendIt::Callbacks
 
     TYPES = %i(unknown integer float string date datetime time relation enum
-               array hash range regexp symbol binary image)
-    EDITORS = %i(text combo radio image hidden)
+               array hash range regexp symbol binary image geo_point)
+    EDITORS = %i(text combo radio image hidden geo_picker)
 
     define_callbacks :initialize
 
@@ -116,6 +116,7 @@ module AdminIt
       return @editor unless @editor.nil?
       return @editor = :image if type == :image
       return @editor = :combo if type == :enum
+      return @editor = :geo_picker if type == :geo_point
       @editor = EDITORS[0]
     end
 
@@ -209,22 +210,45 @@ module AdminIt
 
     protected
 
-    def read_value(entity)
-      fail NotImplementedError,
-           "Attempt to read field #{name} with unimplemented reader"
-    end
+#    def read_value(entity)
+#      fail NotImplementedError,
+#           "Attempt to read field #{name} with unimplemented reader"
+#    end
+#
+#    def show_value(entity)
+#      fail NotImplementedError,
+#           "Attempt to show field #{name} with unimplemented show method"
+#    end
+#
+#    def write_value(entity, value)
+#      fail NotImplementedError,
+#           "Attempt to write to field #{name} with unimplemented writer"
+#    end
 
     def show_value(entity)
+      value = read_value(entity)
       if type == :enum
-        entity.send(name).text
+        value.text
+      elsif type == :geo_point
+        value.nil? ? '' : "#{value.x}, #{value.y}"
       else
-        read_value(entity)
+        value
       end
     end
 
+    def read_value(entity)
+      entity.send(name)
+    end
+
     def write_value(entity, value)
-      fail NotImplementedError,
-           "Attempt to write to field #{name} with unimplemented writer"
+      if type == :geo_point
+        point = entity.send(name)
+        x, y = value.split(',', 2)
+        factory = entity_class.const_get(:FACTORY, true)
+        point = factory.point(x.to_f, y.to_f)
+        value = point
+      end
+      entity.send("#{name}=", value)
     end
   end
 

data/lib/admin_it/locales/en.yml

@@ -15,6 +15,8 @@ en:
     filters: 'Filters'
     details: 'Details'
     destroying: 'Deletion'
+    latitude: 'Latitude'
+    longtitude: 'Longtitude'
     confirm:
       destroy:
         header: 'You are going to delete following record:'

data/lib/admin_it/locales/ru.yml

@@ -15,6 +15,8 @@ ru:
     filters: 'Фильтры'
     details: 'Подробная информация'
     destroying: 'Удаление'
+    latitude: 'Широта'
+    longtitude: 'Долгота'
     confirm:
       destroy:
         header: 'Вы собираетесь удалить следующую запись:'

data/lib/admin_it/version.rb

@@ -1,5 +1,5 @@
 #
 module AdminIt
   # Current gem version
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admin_it
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Alexey Ovchinnikov
@@ -252,6 +252,7 @@ files:
 - app/assets/javascript/admin_it/jquery.fileupload-process.js
 - app/assets/javascript/admin_it/jquery.fileupload-ui.js
 - app/assets/javascript/admin_it/jquery.fileupload.js
+- app/assets/javascript/admin_it/jquery.geolocationpicker.js
 - app/assets/javascript/admin_it/jquery.ui.widget.js
 - app/assets/stylesheets/admin_it/admin_it.css
 - app/assets/stylesheets/admin_it/bootstrap-theme.min.css
@@ -267,6 +268,7 @@ files:
 - app/views/admin_it/context/_tiles.html.slim
 - app/views/admin_it/edit.html.slim
 - app/views/admin_it/editors/_combo.html.slim
+- app/views/admin_it/editors/_geo_picker.html.slim
 - app/views/admin_it/editors/_hidden.html.slim
 - app/views/admin_it/editors/_image.html.slim
 - app/views/admin_it/editors/_text.html.slim