c80_estate 0.1.0.19 → 0.1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606728f116f37187d185f9278f7c0ad8190e983c
-  data.tar.gz: 83b98586222f9051c675234c7650c9127e367a2f
+  metadata.gz: a4e89d64f1f216b65d06a87e02e3b026ddf25ce7
+  data.tar.gz: 1218f83763a3a9dd8d94e50e0325d74cda6c520c
 SHA512:
-  metadata.gz: 7685f707657c138eb975d53ce6072a9cc720eab820380898f23ac27247e83e01b3827d6d5cf1915acf32fccf261d383bcb5a70999e5c740c92ad3755304899d4
-  data.tar.gz: 1023a25ae7b3698b411121aa7bdc7e2c3b4a1b96a4d1df973a1745fc0492be03e7b899fc3a93958fb849fe41e6d70b24ac1133dc913468cd9b569b98543846c4
+  metadata.gz: f13201dc5240646a00b483102d1e4695483b9927507c0fb0b0b95d62ca756fb4f9393d06f0787f767017f385c6d337ea469dcc46c8096e40574d3f228ef4a834
+  data.tar.gz: 9cd8dfdf5252228d4b4af62f77c9250fcbb4f9364420f109c5a73c68537209dae775b900c5a6f096429b62555704f30a238b1b540c35a0e036b8f23b087f55c9

data/app/admin/c80_estate/admin_user.rb

@@ -34,6 +34,9 @@ ActiveAdmin.register AdminUser do
     column :role do |user|
       user.role_type_title
     end
+    column 'Площадей' do |user|
+      user.assigned_areas_count
+    end
     actions
   end
 

data/app/admin/c80_estate/areas.rb

@@ -127,10 +127,10 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
          :input_html => {:class => 'selectpicker', 'data-size' => "3", 'data-width' => '100%'}
 
   # filter :title
-  filter :assigned_person_id,
+  filter :assigned_person_id_in,
          :label => 'Назначенный пользователь',
          :as => :select,
-         :collection => -> { AdminUser.all.map { |u| ["#{u.email}", u.id] } },
+         :collection => -> { AdminUser.all.map { |u| ["#{u.email} (#{u.assigned_areas_count})", u.id] } },
          :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
   filter :created_at
   filter :updated_at
@@ -147,9 +147,12 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
     column :atype do |area|
       area.atype_title
     end
-    column 'Цена' do |area|
+    column '<abbr title="За м.кв. в месяц">Цена м.кв.</abbr>'.html_safe do |area|
       "#{area.price_value} руб"
     end
+    column '<abbr title="Стоимость всей площади в месяц. Число PxS, где P - цена за м.кв. в месяц, S - метраж площади в м.кв.">Цена площади</abbr>'.html_safe do |area|
+      "#{area.power_price_value} руб"
+    end
     column 'Метраж' do |area|
       "#{area.square_value} м<sup>2</sup>".html_safe
     end

data/app/admin/c80_estate/properties.rb

@@ -44,11 +44,23 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
       <span></span><img src='#{image_path(prop.logo_path)}'>
       </div>".html_safe
     end
-    column :title
-    column :address
-    column :gps do |prop|
-      "#{prop.latitude},#{prop.longitude}"
+    # column :title
+    column :title do |prop|
+      link_to prop.title, "/admin/properties/#{prop.id}", title: I18n.t("active_admin.view")
     end
+    column 'Площадей' do |prop|
+      prop.areas.count
+    end
+    column 'Метраж' do |prop|
+      "#{prop.square_value} м.кв."
+    end
+    column '<abbr title="Сумма всех цен площадей">Цена объекта</abbr>'.html_safe do |prop|
+      "#{prop.power_price_value} руб"
+    end
+    # column :address
+    # column :gps do |prop|
+    #   "#{prop.latitude},#{prop.longitude}"
+    # end
     column :assigned_person do |prop|
       prop.assigned_person_title
     end
@@ -57,9 +69,9 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
     # end
     # actions
 
-    column '' do |property|
-      link_to I18n.t("active_admin.view"), "/admin/properties/#{property.id}", class: 'member_link'
-    end
+    # column '' do |property|
+    #   link_to I18n.t("active_admin.view"), "/admin/properties/#{property.id}", class: 'member_link'
+    # end
     column '' do |property|
       if current_admin_user.can_edit_property?(property)
         link_to I18n.t("active_admin.edit"), "/admin/properties/#{property.id}/edit", class: 'member_link'

data/app/assets/javascript/c80_estate/backend/admin/common/collapse.js

@@ -0,0 +1,14 @@
+$(document).ready(function(){
+
+    var $divfaq = $(".wrap_collapse");
+    var $div_anser = $divfaq.find('.collapse');
+
+    $div_anser.on("hide.bs.collapse", function(){
+        //$(".btn").html('<span class="glyphicon glyphicon-collapse-down"></span> Open');
+        $divfaq.find(".btn").find("span").attr("class","fa fa-chevron-right");
+    });
+    $div_anser.on("show.bs.collapse", function(){
+        //$(".btn").html('<span class="glyphicon glyphicon-collapse-up"></span> Close');
+        $divfaq.find(".btn").find("span").attr("class","fa fa-chevron-down");
+    });
+});

data/app/assets/javascript/c80_estate/lib/sorttable.js

@@ -0,0 +1,495 @@
+/*
+  SortTable
+  version 2
+  7th April 2007
+  Stuart Langridge, http://www.kryogenix.org/code/browser/sorttable/
+
+  Instructions:
+  Download this file
+  Add <script src="sorttable.js"></script> to your HTML
+  Add class="sortable" to any table you'd like to make sortable
+  Click on the headers to sort
+
+  Thanks to many, many people for contributions and suggestions.
+  Licenced as X11: http://www.kryogenix.org/code/browser/licence.html
+  This basically means: do what you want with it.
+*/
+
+
+var stIsIE = /*@cc_on!@*/false;
+
+sorttable = {
+  init: function() {
+    // quit if this function has already been called
+    if (arguments.callee.done) return;
+    // flag this function so we don't do the same thing twice
+    arguments.callee.done = true;
+    // kill the timer
+    if (_timer) clearInterval(_timer);
+
+    if (!document.createElement || !document.getElementsByTagName) return;
+
+    sorttable.DATE_RE = /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/;
+
+    forEach(document.getElementsByTagName('table'), function(table) {
+      if (table.className.search(/\bsortable\b/) != -1) {
+        sorttable.makeSortable(table);
+      }
+    });
+
+  },
+
+  makeSortable: function(table) {
+    if (table.getElementsByTagName('thead').length == 0) {
+      // table doesn't have a tHead. Since it should have, create one and
+      // put the first table row in it.
+      the = document.createElement('thead');
+      the.appendChild(table.rows[0]);
+      table.insertBefore(the,table.firstChild);
+    }
+    // Safari doesn't support table.tHead, sigh
+    if (table.tHead == null) table.tHead = table.getElementsByTagName('thead')[0];
+
+    if (table.tHead.rows.length != 1) return; // can't cope with two header rows
+
+    // Sorttable v1 put rows with a class of "sortbottom" at the bottom (as
+    // "total" rows, for example). This is B&R, since what you're supposed
+    // to do is put them in a tfoot. So, if there are sortbottom rows,
+    // for backwards compatibility, move them to tfoot (creating it if needed).
+    sortbottomrows = [];
+    for (var i=0; i<table.rows.length; i++) {
+      if (table.rows[i].className.search(/\bsortbottom\b/) != -1) {
+        sortbottomrows[sortbottomrows.length] = table.rows[i];
+      }
+    }
+    if (sortbottomrows) {
+      if (table.tFoot == null) {
+        // table doesn't have a tfoot. Create one.
+        tfo = document.createElement('tfoot');
+        table.appendChild(tfo);
+      }
+      for (var i=0; i<sortbottomrows.length; i++) {
+        tfo.appendChild(sortbottomrows[i]);
+      }
+      delete sortbottomrows;
+    }
+
+    // work through each column and calculate its type
+    headrow = table.tHead.rows[0].cells;
+    for (var i=0; i<headrow.length; i++) {
+      // manually override the type with a sorttable_type attribute
+      if (!headrow[i].className.match(/\bsorttable_nosort\b/)) { // skip this col
+        mtch = headrow[i].className.match(/\bsorttable_([a-z0-9]+)\b/);
+        if (mtch) { override = mtch[1]; }
+	      if (mtch && typeof sorttable["sort_"+override] == 'function') {
+	        headrow[i].sorttable_sortfunction = sorttable["sort_"+override];
+	      } else {
+	        headrow[i].sorttable_sortfunction = sorttable.guessType(table,i);
+	      }
+	      // make it clickable to sort
+	      headrow[i].sorttable_columnindex = i;
+	      headrow[i].sorttable_tbody = table.tBodies[0];
+	      dean_addEvent(headrow[i],"click", sorttable.innerSortFunction = function(e) {
+
+          if (this.className.search(/\bsorttable_sorted\b/) != -1) {
+            // if we're already sorted by this column, just
+            // reverse the table, which is quicker
+            sorttable.reverse(this.sorttable_tbody);
+            this.className = this.className.replace('sorttable_sorted',
+                                                    'sorttable_sorted_reverse');
+            this.removeChild(document.getElementById('sorttable_sortfwdind'));
+            sortrevind = document.createElement('span');
+            sortrevind.id = "sorttable_sortrevind";
+            sortrevind.innerHTML = stIsIE ? '&nbsp<font face="webdings">5</font>' : '&nbsp;&#x25B4;';
+            this.appendChild(sortrevind);
+            return;
+          }
+          if (this.className.search(/\bsorttable_sorted_reverse\b/) != -1) {
+            // if we're already sorted by this column in reverse, just
+            // re-reverse the table, which is quicker
+            sorttable.reverse(this.sorttable_tbody);
+            this.className = this.className.replace('sorttable_sorted_reverse',
+                                                    'sorttable_sorted');
+            this.removeChild(document.getElementById('sorttable_sortrevind'));
+            sortfwdind = document.createElement('span');
+            sortfwdind.id = "sorttable_sortfwdind";
+            sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
+            this.appendChild(sortfwdind);
+            return;
+          }
+
+          // remove sorttable_sorted classes
+          theadrow = this.parentNode;
+          forEach(theadrow.childNodes, function(cell) {
+            if (cell.nodeType == 1) { // an element
+              cell.className = cell.className.replace('sorttable_sorted_reverse','');
+              cell.className = cell.className.replace('sorttable_sorted','');
+            }
+          });
+          sortfwdind = document.getElementById('sorttable_sortfwdind');
+          if (sortfwdind) { sortfwdind.parentNode.removeChild(sortfwdind); }
+          sortrevind = document.getElementById('sorttable_sortrevind');
+          if (sortrevind) { sortrevind.parentNode.removeChild(sortrevind); }
+
+          this.className += ' sorttable_sorted';
+          sortfwdind = document.createElement('span');
+          sortfwdind.id = "sorttable_sortfwdind";
+          sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
+          this.appendChild(sortfwdind);
+
+	        // build an array to sort. This is a Schwartzian transform thing,
+	        // i.e., we "decorate" each row with the actual sort key,
+	        // sort based on the sort keys, and then put the rows back in order
+	        // which is a lot faster because you only do getInnerText once per row
+	        row_array = [];
+	        col = this.sorttable_columnindex;
+	        rows = this.sorttable_tbody.rows;
+	        for (var j=0; j<rows.length; j++) {
+	          row_array[row_array.length] = [sorttable.getInnerText(rows[j].cells[col]), rows[j]];
+	        }
+	        /* If you want a stable sort, uncomment the following line */
+	        //sorttable.shaker_sort(row_array, this.sorttable_sortfunction);
+	        /* and comment out this one */
+	        row_array.sort(this.sorttable_sortfunction);
+
+	        tb = this.sorttable_tbody;
+	        for (var j=0; j<row_array.length; j++) {
+	          tb.appendChild(row_array[j][1]);
+	        }
+
+	        delete row_array;
+	      });
+	    }
+    }
+  },
+
+  guessType: function(table, column) {
+    // guess the type of a column based on its first non-blank row
+    sortfn = sorttable.sort_alpha;
+    for (var i=0; i<table.tBodies[0].rows.length; i++) {
+      text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]);
+      if (text != '') {
+        if (text.match(/^-?[Ј$¤]?[\d,.]+%?$/)) {
+          return sorttable.sort_numeric;
+        }
+        // check for a date: dd/mm/yyyy or dd/mm/yy
+        // can have / or . or - as separator
+        // can be mm/dd as well
+        possdate = text.match(sorttable.DATE_RE)
+        if (possdate) {
+          // looks like a date
+          first = parseInt(possdate[1]);
+          second = parseInt(possdate[2]);
+          if (first > 12) {
+            // definitely dd/mm
+            return sorttable.sort_ddmm;
+          } else if (second > 12) {
+            return sorttable.sort_mmdd;
+          } else {
+            // looks like a date, but we can't tell which, so assume
+            // that it's dd/mm (English imperialism!) and keep looking
+            sortfn = sorttable.sort_ddmm;
+          }
+        }
+      }
+    }
+    return sortfn;
+  },
+
+  getInnerText: function(node) {
+    // gets the text we want to use for sorting for a cell.
+    // strips leading and trailing whitespace.
+    // this is *not* a generic getInnerText function; it's special to sorttable.
+    // for example, you can override the cell text with a customkey attribute.
+    // it also gets .value for <input> fields.
+
+    if (!node) return "";
+
+    hasInputs = (typeof node.getElementsByTagName == 'function') &&
+                 node.getElementsByTagName('input').length;
+
+    if (node.getAttribute("sorttable_customkey") != null) {
+      return node.getAttribute("sorttable_customkey");
+    }
+    else if (typeof node.textContent != 'undefined' && !hasInputs) {
+      return node.textContent.replace(/^\s+|\s+$/g, '');
+    }
+    else if (typeof node.innerText != 'undefined' && !hasInputs) {
+      return node.innerText.replace(/^\s+|\s+$/g, '');
+    }
+    else if (typeof node.text != 'undefined' && !hasInputs) {
+      return node.text.replace(/^\s+|\s+$/g, '');
+    }
+    else {
+      switch (node.nodeType) {
+        case 3:
+          if (node.nodeName.toLowerCase() == 'input') {
+            return node.value.replace(/^\s+|\s+$/g, '');
+          }
+        case 4:
+          return node.nodeValue.replace(/^\s+|\s+$/g, '');
+          break;
+        case 1:
+        case 11:
+          var innerText = '';
+          for (var i = 0; i < node.childNodes.length; i++) {
+            innerText += sorttable.getInnerText(node.childNodes[i]);
+          }
+          return innerText.replace(/^\s+|\s+$/g, '');
+          break;
+        default:
+          return '';
+      }
+    }
+  },
+
+  reverse: function(tbody) {
+    // reverse the rows in a tbody
+    newrows = [];
+    for (var i=0; i<tbody.rows.length; i++) {
+      newrows[newrows.length] = tbody.rows[i];
+    }
+    for (var i=newrows.length-1; i>=0; i--) {
+       tbody.appendChild(newrows[i]);
+    }
+    delete newrows;
+  },
+
+  /* sort functions
+     each sort function takes two parameters, a and b
+     you are comparing a[0] and b[0] */
+  sort_numeric: function(a,b) {
+    aa = parseFloat(a[0].replace(/[^0-9.-]/g,''));
+    if (isNaN(aa)) aa = 0;
+    bb = parseFloat(b[0].replace(/[^0-9.-]/g,''));
+    if (isNaN(bb)) bb = 0;
+    return aa-bb;
+  },
+  sort_alpha: function(a,b) {
+    if (a[0]==b[0]) return 0;
+    if (a[0]<b[0]) return -1;
+    return 1;
+  },
+  sort_ddmm: function(a,b) {
+    mtch = a[0].match(sorttable.DATE_RE);
+    y = mtch[3]; m = mtch[2]; d = mtch[1];
+    if (m.length == 1) m = '0'+m;
+    if (d.length == 1) d = '0'+d;
+    dt1 = y+m+d;
+    mtch = b[0].match(sorttable.DATE_RE);
+    y = mtch[3]; m = mtch[2]; d = mtch[1];
+    if (m.length == 1) m = '0'+m;
+    if (d.length == 1) d = '0'+d;
+    dt2 = y+m+d;
+    if (dt1==dt2) return 0;
+    if (dt1<dt2) return -1;
+    return 1;
+  },
+  sort_mmdd: function(a,b) {
+    mtch = a[0].match(sorttable.DATE_RE);
+    y = mtch[3]; d = mtch[2]; m = mtch[1];
+    if (m.length == 1) m = '0'+m;
+    if (d.length == 1) d = '0'+d;
+    dt1 = y+m+d;
+    mtch = b[0].match(sorttable.DATE_RE);
+    y = mtch[3]; d = mtch[2]; m = mtch[1];
+    if (m.length == 1) m = '0'+m;
+    if (d.length == 1) d = '0'+d;
+    dt2 = y+m+d;
+    if (dt1==dt2) return 0;
+    if (dt1<dt2) return -1;
+    return 1;
+  },
+
+  shaker_sort: function(list, comp_func) {
+    // A stable sort function to allow multi-level sorting of data
+    // see: http://en.wikipedia.org/wiki/Cocktail_sort
+    // thanks to Joseph Nahmias
+    var b = 0;
+    var t = list.length - 1;
+    var swap = true;
+
+    while(swap) {
+        swap = false;
+        for(var i = b; i < t; ++i) {
+            if ( comp_func(list[i], list[i+1]) > 0 ) {
+                var q = list[i]; list[i] = list[i+1]; list[i+1] = q;
+                swap = true;
+            }
+        } // for
+        t--;
+
+        if (!swap) break;
+
+        for(var i = t; i > b; --i) {
+            if ( comp_func(list[i], list[i-1]) < 0 ) {
+                var q = list[i]; list[i] = list[i-1]; list[i-1] = q;
+                swap = true;
+            }
+        } // for
+        b++;
+
+    } // while(swap)
+  }
+}
+
+/* ******************************************************************
+   Supporting functions: bundled here to avoid depending on a library
+   ****************************************************************** */
+
+// Dean Edwards/Matthias Miller/John Resig
+
+/* for Mozilla/Opera9 */
+if (document.addEventListener) {
+    document.addEventListener("DOMContentLoaded", sorttable.init, false);
+}
+
+/* for Internet Explorer */
+/*@cc_on @*/
+/*@if (@_win32)
+    document.write("<script id=__ie_onload defer src=javascript:void(0)><\/script>");
+    var script = document.getElementById("__ie_onload");
+    script.onreadystatechange = function() {
+        if (this.readyState == "complete") {
+            sorttable.init(); // call the onload handler
+        }
+    };
+/*@end @*/
+
+/* for Safari */
+if (/WebKit/i.test(navigator.userAgent)) { // sniff
+    var _timer = setInterval(function() {
+        if (/loaded|complete/.test(document.readyState)) {
+            sorttable.init(); // call the onload handler
+        }
+    }, 10);
+}
+
+/* for other browsers */
+window.onload = sorttable.init;
+
+// written by Dean Edwards, 2005
+// with input from Tino Zijdel, Matthias Miller, Diego Perini
+
+// http://dean.edwards.name/weblog/2005/10/add-event/
+
+function dean_addEvent(element, type, handler) {
+	if (element.addEventListener) {
+		element.addEventListener(type, handler, false);
+	} else {
+		// assign each event handler a unique ID
+		if (!handler.$$guid) handler.$$guid = dean_addEvent.guid++;
+		// create a hash table of event types for the element
+		if (!element.events) element.events = {};
+		// create a hash table of event handlers for each element/event pair
+		var handlers = element.events[type];
+		if (!handlers) {
+			handlers = element.events[type] = {};
+			// store the existing event handler (if there is one)
+			if (element["on" + type]) {
+				handlers[0] = element["on" + type];
+			}
+		}
+		// store the event handler in the hash table
+		handlers[handler.$$guid] = handler;
+		// assign a global event handler to do all the work
+		element["on" + type] = handleEvent;
+	}
+};
+// a counter used to create unique IDs
+dean_addEvent.guid = 1;
+
+function removeEvent(element, type, handler) {
+	if (element.removeEventListener) {
+		element.removeEventListener(type, handler, false);
+	} else {
+		// delete the event handler from the hash table
+		if (element.events && element.events[type]) {
+			delete element.events[type][handler.$$guid];
+		}
+	}
+};
+
+function handleEvent(event) {
+	var returnValue = true;
+	// grab the event object (IE uses a global event object)
+	event = event || fixEvent(((this.ownerDocument || this.document || this).parentWindow || window).event);
+	// get a reference to the hash table of event handlers
+	var handlers = this.events[event.type];
+	// execute each event handler
+	for (var i in handlers) {
+		this.$$handleEvent = handlers[i];
+		if (this.$$handleEvent(event) === false) {
+			returnValue = false;
+		}
+	}
+	return returnValue;
+};
+
+function fixEvent(event) {
+	// add W3C standard event methods
+	event.preventDefault = fixEvent.preventDefault;
+	event.stopPropagation = fixEvent.stopPropagation;
+	return event;
+};
+fixEvent.preventDefault = function() {
+	this.returnValue = false;
+};
+fixEvent.stopPropagation = function() {
+  this.cancelBubble = true;
+}
+
+// Dean's forEach: http://dean.edwards.name/base/forEach.js
+/*
+	forEach, version 1.0
+	Copyright 2006, Dean Edwards
+	License: http://www.opensource.org/licenses/mit-license.php
+*/
+
+// array-like enumeration
+if (!Array.forEach) { // mozilla already supports this
+	Array.forEach = function(array, block, context) {
+		for (var i = 0; i < array.length; i++) {
+			block.call(context, array[i], i, array);
+		}
+	};
+}
+
+// generic enumeration
+Function.prototype.forEach = function(object, block, context) {
+	for (var key in object) {
+		if (typeof this.prototype[key] == "undefined") {
+			block.call(context, object[key], key, object);
+		}
+	}
+};
+
+// character enumeration
+String.forEach = function(string, block, context) {
+	Array.forEach(string.split(""), function(chr, index) {
+		block.call(context, chr, index, string);
+	});
+};
+
+// globally resolve forEach enumeration
+var forEach = function(object, block, context) {
+	if (object) {
+		var resolve = Object; // default
+		if (object instanceof Function) {
+			// functions have a "length" property
+			resolve = Function;
+		} else if (object.forEach instanceof Function) {
+			// the object implements a custom forEach method so use that
+			object.forEach(block, context);
+			return;
+		} else if (typeof object == "string") {
+			// the object is a string
+			resolve = String;
+		} else if (typeof object.length == "number") {
+			// the object is array-like
+			resolve = Array;
+		}
+		resolve.forEach(object, block, context);
+	}
+};
+

data/app/assets/stylesheets/c80_estate/backend/admin_areas.scss

@@ -136,44 +136,6 @@ body.admin_areas {
       /*display: none;*/
     }
 
-    span.status_free {
-      display: block;
-      position: relative;
-      padding: 0 0 0 17px;
-
-      &:after {
-        display: block;
-        position: absolute;
-        top:0;
-        left:0;
-        width: 20px;
-        height: 20px;
-        font-family: FontAwesome;
-        content: '\f059';
-        color: #51e471;
-      }
-
-    }
-
-    span.status_busy {
-      display: block;
-      position: relative;
-      padding: 0 0 0 17px;
-
-      &:after {
-        display: block;
-        position: absolute;
-        top:0;
-        left:0;
-        width: 20px;
-        height: 20px;
-        font-family: FontAwesome;
-        content: '\f058';
-        color: #ff2d2d;
-      }
-
-    }
-
     .blank_slate_container {
       display: none !important;
     }

data/app/assets/stylesheets/c80_estate/backend/common/collapse.scss

@@ -0,0 +1,45 @@
+.wrap_collapse {
+
+  clear:both;
+  background: none !important;
+  filter: none !important;
+  border: none;
+  margin-bottom: 20px;
+
+  .fa {
+    margin-right: 5px;
+    color: #FBCB17;
+    width: 14px;
+  }
+
+  .btn {
+    width: 100%;
+    max-width: 100%;
+    white-space: normal;
+    text-align: left;
+    font-weight: bold;
+    color: #43474f;
+    background-color: transparent;
+    outline: 0;
+    font-size: 20px !important;
+    text-shadow: none !important;
+
+  }
+
+  p, ul, ol {
+    margin-left: 35px;
+    margin-right: 15px;
+
+  }
+
+  table {
+    margin-top: 20px;
+  }
+
+}
+
+button:not(.disabled):hover {
+  background: #f4f4f4;
+  filter: none !important;
+
+}

data/app/assets/stylesheets/c80_estate/backend/common/free_busy.scss

@@ -0,0 +1,38 @@
+
+span.status_free {
+  display: block;
+  position: relative;
+  padding: 0 0 0 17px;
+
+  &:after {
+    display: block;
+    position: absolute;
+    top:0;
+    left:0;
+    width: 20px;
+    height: 20px;
+    font-family: FontAwesome;
+    content: '\f059';
+    color: #51e471;
+  }
+
+}
+
+span.status_busy {
+  display: block;
+  position: relative;
+  padding: 0 0 0 17px;
+
+  &:after {
+    display: block;
+    position: absolute;
+    top:0;
+    left:0;
+    width: 20px;
+    height: 20px;
+    font-family: FontAwesome;
+    content: '\f058';
+    color: #ff2d2d;
+  }
+
+}

data/app/assets/stylesheets/c80_estate/backend/shared/areas/stroitelnye_materialy_item/div_main.scss

@@ -55,6 +55,20 @@ div#div_main_show_area {
 
       li {
 
+        > a {
+          text-decoration: none !important;
+          color: #6f6c79 !important;
+          display: inline !important;
+          border: none !important;
+          font-size: 16px !important;
+          font-weight: bold;
+          margin: 0 !important;
+          float: none !important;
+          &:hover {
+            text-decoration: underline !important;
+          }
+        }
+
         abbr {
           font-size: 16px;
         }

data/app/helpers/c80_estate/areas_helper.rb

@@ -13,9 +13,13 @@ module C80Estate
       #   result += "<li><span class='ptitle bold'>#{title}</span>: <span class='pvalue'>#{value}</span> <span class='puom'>#{uom}</span></li>"
       # end
 
-      result += "<li><span class='ptitle bold'>Объект недвижимости</span>: <span class='pvalue'>#{area.property.title}</span></li>"
-      result += "<li><span class='ptitle bold'>Объём площади</span>: <span class='pvalue'>#{area.square_value}</span> <span class='puom'>м.кв.</span></li>"
-      result += "<li><span class='ptitle bold'><abbr title='За м.кв. в месяц'>Цена</abbr></span>: <span class='pvalue'>#{area.price_value} </span> <span class='puom'>руб</span></li>"
+      result += "<li><span class='ptitle bold'>Объект недвижимости</span>: "
+      result += "<a href='/admin/properties/#{area.property.id}'"
+      result += "<span class='pvalue'>"
+      result += "#{ area.property.title }"
+      result += "</a></span></li>"
+      # result += "<li><span class='ptitle bold'>Объём площади</span>: <span class='pvalue'>#{area.square_value}</span> <span class='puom'>м.кв.</span></li>"
+      # result += "<li><span class='ptitle bold'><abbr title='За м.кв. в месяц'>Цена</abbr></span>: <span class='pvalue'>#{area.price_value} </span> <span class='puom'>руб</span></li>"
 
       area.atype.prop_names.each do |atype_propname|
           title = atype_propname.title
@@ -105,5 +109,68 @@ module C80Estate
 
     end
 
+    # для подкатегории strsubcat сформировать список цен, которые выводятся под картинкой
+    def smiph_render_price_props(area)
+
+      result = ""
+
+      # rows = PriceProp.gget_pprops_for_strsubcat(strsubcat_id)
+      # rows.each(:as => :hash) do |row|
+
+      rows = [
+          {
+              title: 'Метраж',
+              abbr: 'Объем площади',
+              value: area.square_value,
+              uom: 'м.кв.'
+          },
+          {
+              title: 'Цена',
+              abbr: 'За метр квадратный в месяц',
+              value: area.price_value,
+              uom: 'руб'
+          },
+          {
+              title: 'Цена площади',
+              abbr: 'Стоимость всей площади в месяц. Число PxS, где P - цена за м.кв. в месяц, S - метраж площади в м.кв.',
+              value: area.power_price_value,
+              uom: 'руб'
+          }
+      ]
+      rows.each do |row|
+
+        title = row[:title]
+        value = row[:value]
+        abbr = row[:abbr]
+        uom = row[:uom]
+
+        # нормальная цена
+        result += '<li>'
+        result += "<p class='ptitle medium'><abbr title='#{abbr}'>#{title}</abbr></p>" # Цена за шт | Цена за м²
+        result += "<p><span class='pvalue bold'>#{value}<span> <span class='puom'>#{uom}</span></p>" # 1212,80 руб
+
+        # старая цена
+
+        # if item_as_hash['is_sale'] == 1
+        #   if related.present?
+        #     related_value = item_as_hash['prop_'+related.to_s]
+        #     if related_value.present?
+        #       v = related_value.gsub(',', '.')
+        #       if v.to_f > 0
+        #         result += "<p class='old'><span class='pvalue bold'>#{related_value}</span> <span class='puom'>#{uom}</span></p>" # 1212,80 руб
+        #       end
+        #     end
+        #   end
+        # end
+
+        result += '</li>'
+
+      end
+
+      result = "<ul>#{result}</ul>"
+      result.html_safe
+
+    end
+
   end
 end

data/app/helpers/c80_estate/properties_helper.rb

@@ -12,22 +12,26 @@ module C80Estate
       #   result += "<li><span class='ptitle bold'>#{title}</span>: <span class='pvalue'>#{value}</span> <span class='puom'>#{uom}</span></li>"
       # end
 
-      result += "<li><span class='ptitle bold'>Объём</span>: <span class='pvalue'>#{property.square_value}</span> <span class='puom'>м.кв.</span></li>"
-      result += "<li><span class='ptitle bold'>Доход при 100% занятости</span>: <span class='pvalue'>#{property.power_price_value}</span> <span class='puom'>руб</span></li>"
-      result += "<li><span class='ptitle bold'>Всего площадей</span>: <span class='pvalue'>#{property.areas.all.count}</span></li>"
+      # result += "<li><span class='ptitle bold'>Объём</span>: <span class='pvalue'>#{property.square_value}</span> <span class='puom'>м.кв.</span></li>"
+      # result += "<li><span class='ptitle bold'>Доход при 100% занятости</span>: <span class='pvalue'>#{property.power_price_value}</span> <span class='puom'>руб</span></li>"
+      # result += "<li><span class='ptitle bold'>Всего площадей</span>: <span class='pvalue'>#{property.areas.all.count}</span></li>"
+
       result += "<li><span class='ptitle bold'>Свободно площадей</span>: <span class='pvalue'>#{property.areas.free_areas.count}</span></li>"
       result += "<li><span class='ptitle bold'>Занято площадей</span>: <span class='pvalue'>#{property.areas.busy_areas.count}</span></li>"
-      result += "<li><span class='ptitle bold'>Свободно метров</span>: <span class='pvalue'>#{property.areas.free_areas_sq}</span> <span class='puom'>м.кв.</span></li>"
-      result += "<li><span class='ptitle bold'>Занято метров</span>: <span class='pvalue'>#{property.areas.busy_areas_sq}</span> <span class='puom'>м.кв.</span></li>"
+      result += "<li><span class='ptitle bold'>Свободно метров</span>: <span class='pvalue'>#{property.areas.free_areas_sq.to_s(:rounded, precision: 2)}</span> <span class='puom'>м.кв.</span></li>"
+      result += "<li><span class='ptitle bold'>Занято метров</span>: <span class='pvalue'>#{property.areas.busy_areas_sq.to_s(:rounded, precision: 2)}</span> <span class='puom'>м.кв.</span></li>"
+      result += '<li style="opacity:0.0">.</li>'
       result += "<li><span style='font-weight:bold;'>Площади объекта по типам:</span></li><ul>"
 
       Atype.all.each do |atype|
-        aa = Area.where_atype(atype.id)
+        aa = Area.where(:property_id => property.id).where_atype(atype.id)
         c = aa.count
-        cb = aa.busy_areas.count
-        result +=
-            "<li><span class='ptitle bold'>#{atype.title}</span>: <span class='pvalue'>#{c}</span>
-              <abbr title='Занятых'><span class='puom'>(#{cb})</span></abbr></li>"
+        if c > 0
+          cb = aa.free_areas.count
+          result +=
+              "<li><span class='ptitle bold'>#{atype.title}</span>: <span class='pvalue'>#{c}</span>
+              <abbr title='Свободно'><span class='puom'>(#{cb})</span></abbr></li>"
+        end
       end
 
       result = "<ul>#{result}</ul></ul>"
@@ -63,5 +67,109 @@ module C80Estate
 
     end
 
+    #
+    def ph_render_price_props(property)
+
+      result = ''
+
+      # rows = PriceProp.gget_pprops_for_strsubcat(strsubcat_id)
+      # rows.each(:as => :hash) do |row|
+
+      rows = [
+          {
+              title: 'Метраж',
+              abbr: 'Объем площади: сумма по всем площадям объекта',
+              value: property.square_value.to_s(:rounded, precision: 2),
+              uom: 'м.кв.'
+          },
+          {
+              title: 'Площадей',
+              abbr: 'Количество площадей на объекте',
+              value: property.areas.count,
+              uom: ''
+          },
+          {
+              title: 'Цена объекта',
+              abbr: 'Сумма всех цен площадей объекта',
+              value: property.power_price_value.to_s(:rounded, precision: 2),
+              uom: 'руб'
+          }
+      ]
+      rows.each do |row|
+
+        title = row[:title]
+        value = row[:value]
+        abbr = row[:abbr]
+        uom = row[:uom]
+
+        # нормальная цена
+        result += '<li>'
+        result += "<p class='ptitle medium'><abbr title='#{abbr}'>#{title}</abbr></p>" # Цена за шт | Цена за м²
+        result += "<p><span class='pvalue bold'>#{value}<span> <span class='puom'>#{uom}</span></p>" # 1212,80 руб
+
+        # старая цена
+
+        # if item_as_hash['is_sale'] == 1
+        #   if related.present?
+        #     related_value = item_as_hash['prop_'+related.to_s]
+        #     if related_value.present?
+        #       v = related_value.gsub(',', '.')
+        #       if v.to_f > 0
+        #         result += "<p class='old'><span class='pvalue bold'>#{related_value}</span> <span class='puom'>#{uom}</span></p>" # 1212,80 руб
+        #       end
+        #     end
+        #   end
+        # end
+
+        result += '</li>'
+
+      end
+
+      result = "<ul>#{result}</ul>"
+      result.html_safe
+
+    end
+
+    #
+    def ph_render_areas_table(property)
+
+      result = '<thead>
+                  <tr>
+                    <th class="col col-title"><a href="/admin/areas?order=title_desc">Название</a></th>
+                    <th class="col col-atype">Тип</th>
+                    <th class="col col-abbr_title_abbr"><abbr title="За м.кв. в месяц">Цена м.кв.</abbr></th>
+                    <th class="col"><abbr title="Стоимость всей площади в месяц. Число PxS, где P - цена за м.кв. в месяц, S - метраж площади в м.кв.">Цена площади</abbr></th>
+                    <th class="col col-">Метраж</th>
+                    <th class="col col-astatuses">Статус</th>
+                    <th class="col col-assigned_person">Ответственный</th>
+                    <th class="col"></th>
+                  </tr>
+                </thead>'
+
+      result += '<tbody>'
+      property.areas.all.each_with_index do |area,index|
+        klass = 'odd'
+        if index%2 == 0
+          klass = 'even'
+        end
+        result += '<tr>'
+        result += "<td>#{ link_to area.title, "/admin/areas/#{area.id}", title: I18n.t("active_admin.view") }</td>"
+        result += "<td>#{ area.atype_title }</td>"
+        result += "<td style='white-space: nowrap;'>#{area.price_value} руб</td>"
+        result += "<td style='white-space: nowrap;'>#{area.power_price_value} руб</td>"
+        result += "<td style='white-space: nowrap;'>#{area.square_value} м.кв.</td>"
+        result += "<td><span class='status_#{area.astatus_tag}'>#{area.astatus_title}</span></td>"
+        result += "<td>#{area.property.assigned_person_title}</td>"
+        result += '</tr>'
+      end
+      result += '</tbody>'
+
+      result = "<table class='sortable index_table index'>#{result}</table>"
+      result += "<div class='table_footer'>"
+      result += "<span>Количество: #{ property.areas.all.count }</span>"
+      result += '</div>'
+      result.html_safe
+    end
+
   end
 end

data/app/models/c80_estate/area.rb

@@ -108,6 +108,12 @@ module C80Estate
           .where(c80_estate_item_props: {value: v})
     end
 
+    def self.where_assigned_person_id(id)
+      # Rails.logger.debug "\t\t [2]: v = #{v}"
+      C80Estate::Area.joins(:property)
+          .where(:c80_estate_properties => {assigned_person_id: id})
+    end
+
     def self.import_excel(file)
 
       Rails.logger.debug "------------------------------------------------------------- self.import [BEGIN] "
@@ -289,6 +295,14 @@ module C80Estate
       parent.table[:id]
     end
 
+    ransacker :assigned_person_id,
+              formatter: proc { |v|
+                results = C80Estate::Area.where_assigned_person_id(v).map(&:id)
+                results = results.present? ? results : nil
+              }, splat_params: true do |parent|
+      parent.table[:id]
+    end
+
     ransacker :item_prop_oenter,
               formatter: proc { |option|
                 # Неважно: -1

data/app/models/c80_estate/owner.rb

@@ -48,6 +48,10 @@ module C80Estate
             roles << r
           end
 
+          def assigned_areas_count
+            assigned_properties.areas_count
+          end
+
           def can_view_statistics?
             r1 = roles.where(role_type: 1)
             r2 = roles.where(role_type: 2)

data/app/models/c80_estate/property.rb

@@ -21,6 +21,15 @@ module C80Estate
     has_many :sevents, :dependent => :destroy
     has_many :pstats, :dependent => :destroy
 
+    # этот метод для ActiveRecordCollection of Properties
+    def self.areas_count
+      ac = 0
+      self.all.each do |prop|
+        ac += prop.areas.count
+      end
+      ac
+    end
+
     def assigned_person_title
       res = "-"
       if assigned_person.present?

data/app/views/c80_estate/ajax_view/table_properties_coef_busy.js.erb

@@ -1,3 +1,4 @@
 var $cc = $("#ajax_div");
 var html_str = "<%= j render_table_prop_busy_coef(atype_id: @atype_id) %>";
 $cc.html(html_str);
+sorttable.makeSortable(document.getElementById('table_properties_coef_busy'));

data/app/views/c80_estate/ajax_view/table_properties_coef_busy_sq.js.erb

@@ -1,3 +1,4 @@
 var $cc = $("#ajax_div2");
 var html_str = "<%= j render_table_prop_busy_coef_sq(atype_id: @atype_id) %>";
 $cc.html(html_str);
+sorttable.makeSortable(document.getElementById('table_properties_coef_busy_sq'));

data/app/views/c80_estate/shared/_table_properties_coef_busy.html.erb

@@ -1,4 +1,4 @@
-<table border="0" cellspacing="0" cellpadding="0" id="index_table_sevents" class="index_table index" paginator="true">
+<table border="0" cellspacing="0" cellpadding="0" id="table_properties_coef_busy" class="index_table index sortable" paginator="true">
   <thead>
   <tr>
     <th class="col col-prop">Объект</th>

data/app/views/c80_estate/shared/_table_properties_coef_busy_sq.html.erb

@@ -1,4 +1,4 @@
-<table border="0" cellspacing="0" cellpadding="0" id="index_table_sevents" class="index_table index" paginator="true">
+<table border="0" cellspacing="0" cellpadding="0" id="table_properties_coef_busy_sq" class="sortable index_table index" paginator="true">
   <thead>
   <tr>
     <th class="col col-prop">Объект</th>

data/app/views/c80_estate/shared/areas/_single_area_on_page.html.erb

@@ -25,8 +25,8 @@
   <div id="gallery_block" class="hidden"><%= lh_render_gallery4(@vparams[:galleries]) %></div>
 </div>
 
-<div id="price_info hidden" class="clearfix">
-  <%# smiph_render_price_props(@item,@sub_cat.id) %>
+<div id="price_info" class="clearfix">
+  <%= smiph_render_price_props(@item) %>
 </div>
 
 <div id="div_button_order" class="hidden">

data/app/views/c80_estate/shared/properties/_single_property_on_page.html.erb

@@ -24,6 +24,10 @@
   </div>
 </div>
 
+<div id="price_info" class="clearfix">
+  <%= ph_render_price_props(@item) %>
+</div>
+
 <div id="div_desc">
   <%= @item.desc.html_safe if @item.desc.present? %>
 </div>
@@ -33,6 +37,16 @@
   <%= ph_render_tech_props(@item) %>
 </div>
 
+<div id="div_all_areas_table" class="wrap_collapse">
+  <button type="button" class="btn" data-toggle="collapse" data-target="#iid">
+    <span class="fa fa-chevron-right"></span>
+    Площади объекта <%= @item.title %> (<%= @item.areas.count %>)
+  </button>
+  <div class="collapse" id="iid">
+    <%= ph_render_areas_table(@item) %>
+  </div>
+</div>
+
 <div id="related_items" class="hidden">
   <%# smiph_render_related_items(@item) %>
 </div>

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = "0.1.0.19"
+  VERSION = "0.1.0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.19
+  version: 0.1.0.20
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - app/assets/images/property_default_logo.png
 - app/assets/images/w227x182px.gif
 - app/assets/images/w621x377.gif
+- app/assets/javascript/c80_estate/backend/admin/common/collapse.js
 - app/assets/javascript/c80_estate/backend/admin/shared/areas/_area_show_common.js
 - app/assets/javascript/c80_estate/backend/admin/shared/areas/area_show.js
 - app/assets/javascript/c80_estate/backend/admin/shared/areas/gallery3.js
@@ -98,6 +99,7 @@ files:
 - app/assets/javascript/c80_estate/lib/jalert.js
 - app/assets/javascript/c80_estate/lib/jquery.canvasjs.min.js
 - app/assets/javascript/c80_estate/lib/jquery.magnific-popup.js
+- app/assets/javascript/c80_estate/lib/sorttable.js
 - app/assets/javascript/c80_estate_active_admin.js.coffee
 - app/assets/stylesheets/c80_estate/backend/admin_areas.scss
 - app/assets/stylesheets/c80_estate/backend/admin_prop_names.scss
@@ -106,6 +108,8 @@ files:
 - app/assets/stylesheets/c80_estate/backend/admin_sevents.scss
 - app/assets/stylesheets/c80_estate/backend/admin_users.scss
 - app/assets/stylesheets/c80_estate/backend/common.scss
+- app/assets/stylesheets/c80_estate/backend/common/collapse.scss
+- app/assets/stylesheets/c80_estate/backend/common/free_busy.scss
 - app/assets/stylesheets/c80_estate/backend/common/minor_fix.scss
 - app/assets/stylesheets/c80_estate/backend/common/panel.scss
 - app/assets/stylesheets/c80_estate/backend/dashboard/atype_in_list.scss