artfully_ose 1.1.0 → 1.2.0.alpha.1

data/app/views/households/_edit_modal.html.haml

@@ -0,0 +1,143 @@
+#edit-household.modal
+  .modal-header
+    = link_to '×'.html_safe, '#', :class => 'close', 'data-dismiss' => 'modal'
+    %h3 Edit #{@household.name} Household Info
+  = form_for(@household, :html => {:class => 'form-horizontal'}) do |form|
+    .modal-body
+      .row
+        .span2
+          %ul.nav.nav-accordion
+            %li.active.tab= link_to 'Basics', '#basics', 'data-toggle' => 'tab'
+            %li.tab= link_to 'Address', '#address', 'data-toggle' => 'tab'
+            %li.tab-add-individual= link_to 'Add Individual', '#add-individual'
+            %li.tab-delete= link_to 'Delete', '#delete'
+        .span7
+          .tab-content
+            #basics.tab-pane.active
+              .controls
+                = form.label :name, :class => 'control-label'
+                .control= form.text_field :name
+
+            #address.tab-pane
+              - @household.address = Address.new if @household.address.nil?
+              = form.fields_for :address do |address_form|
+                .wide
+                  .controls
+                    = label_tag :address_id, "Populate From", :class => 'control-label'
+                    .control
+                      = select_tag :address_id, options_for_select(household_addresses_for_select(@household), (@household.address.id if @household.address))
+
+                .controls
+                  = form.label :overwrite_member_addresses, 'Overwrite member addresses', :class => 'control-label wide'
+                  .control
+                    = form.check_box :overwrite_member_addresses
+
+                %br
+
+                .controls
+                  = address_form.label :address, :class => 'control-label'
+                  .control
+                    = address_form.text_field :address1
+                .controls
+                  %label{:class => 'control-label'}
+                  .control
+                    = address_form.text_field :address2
+                .controls
+                  = address_form.label :country, :class => 'control-label'
+                  .control
+                    = address_form.select :country, [@household.address.country], :selected => @household.address.country
+                .controls
+                  = address_form.label :state, "State / Province", :class => 'control-label'
+                  .control
+                    = address_form.select :state, [@household.address.state], :selected => @household.address.state, :class => "region"
+                .controls
+                  = address_form.label :city, :class => 'control-label'
+                  .control
+                    = address_form.text_field :city
+                .controls
+                  = address_form.label :zip, "Zip / Postal Code", :class => 'control-label'
+                  .control
+                    = address_form.text_field :zip
+
+            #add-individual.tab-pane
+              .controls
+                #add-to-household-search
+                  = text_field_tag :search, "", :placeholder => "Email, name, or tag...", :class => "span6 query-string"
+                  = link_to "Search", "#", :class => 'btn', :onclick => "performSearch($('#add-to-household-search .query-string')); return false;"
+
+              %table.table.search-results
+                 
+
+            #delete.tab-pane
+              %p
+                Delete
+                = @household.name
+                from Artful.ly.
+              = link_to "Delete", @household, :method => :delete, :class => "btn btn-danger delete-household", :confirm => "Are you sure you want to delete #{@household.name}?"
+
+    .modal-footer
+      = form.submit 'Save', :class => 'btn btn-primary save-household'
+      = link_to 'Cancel', '#', :class => 'btn', 'data-dismiss' => 'modal'
+
+
+- content_for :custom_js do
+  // change modal based on tab
+  :javascript
+    $(document).ready(function() {
+      $('.tab-merge a, .tab-delete a').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        $('#edit-household .save-household').hide();
+      })
+      $('.tab-add-individual a, .tab-delete a').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+      })
+      $('.tab a').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        $('#edit-household .save-household').show();
+      })
+    });
+
+    $(document).on('click', '[data-add-individual]', function(){
+      var id = $(this).attr('data-add-individual');
+
+      if($(this).hasClass('active')){
+        $('#add-to-household-search').append('<input type="hidden" name="individual_ids[]" value="'+ id + '"/>')
+      } else {
+        $('#add-to-household-search input[type=hidden][value=' + id + ']').remove();
+      }
+    });
+
+    function performSearch(element) {
+      $.getJSON("/people?utf8=%E2%9C%93&type=Individual&commit=Search", { search: $(element).val() }, function(people) {
+        responsePeople = new Array();
+
+        $.each(people, function (i, person) {
+          person = cleanJsonPerson(person)
+          responsePeople[i]  = "<tr>"
+          responsePeople[i] += "  <td class='controls'><input name='individual_ids[]' value='" + person.id + "' type='checkbox' id='add-individual-" + person.id + "' data-add-individual='" + person.id + "'/></td>"
+          responsePeople[i] += "  <td class='name'><label for='add-individual-" + person.id + "'>" + person.first_name + " " + person.last_name + "</label><br/>" + person.email + "</td>"
+          responsePeople[i] += "</tr>"
+        });
+        $("#add-individual .search-results").html(responsePeople);
+      });
+    }
+
+    $(document).on('keyup.autocomplete', '#add-to-household-search .query-string', function(){
+      performSearch(this);
+    });
+
+    var addresses = #{@household.addresses.map { |a| {a.id => a } }.reduce({}, :merge).to_json};
+
+    $("#edit-household #address_id").on("change", function(ev){
+      var id = $(this).val();
+      var address = addresses[id];
+      var keys = ['address1', 'address2', 'city', 'country', 'state', 'zip'];
+      for(var i = 0; i < keys.length; i++){
+        var key = keys[i];
+        $('#edit-household #address [name="household[address_attributes]['+key+']"]').val(addresses[id][key]);
+      }
+    });
+

data/app/views/households/_form.html.haml

@@ -0,0 +1,26 @@
+= form_for(household, :html => {:class => 'form-vertical'}) do |form|
+  %ul
+    %li
+      = form.label :name, "Household Name"
+      = form.text_field :name
+    %li
+      - household.individuals.each do |individual|
+        .fields.individual-fields
+          .control-group
+            .controls
+              = text_field_tag :individual_name, individual, :class => 'input-medium', :readonly => true
+              = hidden_field_tag "individuals[]", individual.id, :class => 'individual-id'
+              %span.remove-fields-link
+                %i.fa.fa-minus-circle.icon-gray
+                = link_to "remove", "#", :onclick => "$(this).closest('.individual-fields').remove(); return false;"
+
+      = render :partial => "individual_fields", :locals => {:form => form}
+
+      .control-group
+        %label.control-label
+        .controls
+          %i.fa.fa-plus-circle.icon-gray
+          = link_to_add_fields 'Add another individual', form, :individuals
+
+  .form-actions
+    = render :partial => 'shared/submit_cancel', :locals => { :form => form, :cancel_path => households_path }

data/app/views/households/_header.html.haml

@@ -0,0 +1,25 @@
+.row
+  .span12
+    .household-header
+      .household-avatar
+        = image_tag "household-default-avatar.png"
+
+      .household-values-and-tags
+        %ul.household-values
+          %li
+            %h3= number_as_cents(@household.lifetime_ticket_value)
+            %h6= pluralize(@household.lifetime_ticket_count, 'tickets')
+          %li
+            %h3= number_as_cents(@household.lifetime_donations)
+            %h6= pluralize(@household.lifetime_donations_count, 'donation')
+          %li
+            %h3= number_as_cents(@household.lifetime_value)
+            %h6 lifetime
+
+        .household-tags
+          %ul.detailed-list.tags
+            - @household.individuals.map(&:tag_list).flatten.uniq.each do |tag_name|
+              %li.tag.rounder= tag_name
+
+      %h1
+        = @household.name

data/app/views/households/_individual_fields.html.haml

@@ -0,0 +1,8 @@
+.fields.individual-fields
+  .control-group
+    .controls
+      = text_field_tag "", "", :placeholder => "Individual", :class => 'input-medium individual-name-input'
+      = hidden_field_tag "individuals[]", "", :class => 'individual-id'
+      %span.remove-fields-link
+        %i.fa.fa-minus-circle.icon-gray
+        = link_to "remove", "#", :onclick => "$(this).closest('.individual-fields').remove(); return false;"

data/app/views/households/_list.html.haml

@@ -0,0 +1,10 @@
+- if households.empty?
+  %p No results found.
+- else
+  %table.table.households-list
+    - households.each do |household|
+      %tr
+        %td.name
+          = link_to household.name, household
+          %br
+          == #{household.individuals.count} members

data/app/views/households/_note.html.haml

@@ -0,0 +1,33 @@
+%tr
+  %td.starred.starable{"data-person-id" => note.person.id, "data-type" => 'note', "data-action-id" => note.id, :class => (note.starred? ? "active" : "not-active") }
+    ✭
+  %td.toggle-truncated
+    .view
+      %span
+        = link_to note.person, note.person
+        —
+      %span.truncated
+        = truncate(note.text, :length => 100, :separator => ' ', :omission => '...')
+      %span.not-truncated{:style => 'display: none;'}
+        = simple_format(note.text)
+        %p.muted
+          = l note.created_at, :format => :short unless note.created_at.nil?
+        %p
+          = link_to("Edit", edit_person_note_path(note.person, note, :format => :html), :class => "btn btn-mini edit-note-link")
+
+  %td.person-inline-form.edit-note-form{:style => 'display:none;', :colspan => 2}
+    %h4 Edit Note
+    = form_for [note.person, note] do |form|
+      = form.text_area :text, :size => "125x5", :class => 'input-xxlarge'
+      = link_to "delete", "#delete-confirm-note-#{note.id}", :class => "delete-confirm-link delete-with-trash", "data-toggle" => "modal"
+      = form.submit "Save", :class => "btn btn-primary"
+      = link_to 'Cancel', '#', :onclick => "$(this).parents('tr').find('td').show(); $(this).parents('tr').find('.edit-note-form').hide()", :class => 'btn'
+
+  .modal{:id => "delete-confirm-note-#{note.id}"}
+    .modal-header
+      = link_to '×'.html_safe, '#', :class => 'close', 'data-dismiss' => 'modal'
+      %h3 Delete note
+    .modal-body
+      = simple_format "Are you sure you want to delete this note?  This cannot be undone."
+    .modal-footer
+      = link_to "Delete this note", person_note_path(note.person, note), :method => :delete, :class => "delete-confirm-link btn btn-danger"

data/app/views/households/edit.html.haml

@@ -0,0 +1 @@
+...

data/app/views/households/index.html.haml

@@ -0,0 +1,13 @@
+- in_section :households
+- content_for :title do
+  Households
+- content_for :header do
+  %h1 Households
+
+.row
+  .span8.super-search-results
+    - if @households.empty?
+       
+    -else
+      = render :partial => 'list', :locals => { :households => @households } unless @households.empty?
+      = will_paginate @households, :inner_window => 2, :outer_window => 0

data/app/views/households/new.html.haml

@@ -0,0 +1,14 @@
+- in_section :households
+- content_for :title do
+  New Household
+- content_for :header do
+  %h1 Create a New Household
+
+- content_for :custom_js do
+  = javascript_include_tag "households"
+
+.row{"ng-controller" => "NewHouseholdCtrl"}
+  .span6.offset3
+    = render :partial => "shared/error_messages", :locals => { :target => @household }
+    = render :partial => 'form', :locals => { :household => @household }
+

data/app/views/households/show.html.haml

@@ -0,0 +1,72 @@
+- content_for :custom_js do
+  = javascript_include_tag "relationships"
+- in_section :households
+- content_for :title do
+  #{@household.name}
+
+= render "header"
+
+.row
+  .span4
+    %p
+      = link_to "Edit Household", '#edit-household', 'data-toggle' => 'modal'
+
+    = render(@household.address) if @household.address
+
+    %ul
+      - @household.individuals.each do |individual|
+        %li{:style => "padding-top: 0.5em;"}
+          = link_to(individual, polymorphic_url(individual))
+        - individual.phones.each do |phone|
+          %li
+            %span.muted= phone.kind
+            = phone.number
+
+  .span8
+    #notes
+    .row-fluid
+      .span3
+        %h3 Notes
+    %table.table-condensed.table#notes-list
+      %tbody
+        - notes = @household.notes.includes(:person)
+        - if notes.empty?
+          %tr
+            %td
+              No notes for individuals in this household
+        - else
+          = render :partial => 'households/note', :collection =>  notes[0..2]
+        - if notes[3]
+          %tr#more-notes-link
+            %td.triangle ▸
+            %td= link_to pluralize(notes.length-3, 'more note'), "#"
+          %tbody#more-notes{:style => 'display:none'}
+            = render :partial => 'households/note', :collection =>  notes[3..-1]
+
+    #actions
+      .row-fluid
+        .span3
+          %h3 Action Feed
+      %table.table-condensed.sortedstar.table#action-list
+        %thead
+          %tr
+            %th
+            %th{:style => 'width:60px;'} Date
+            %th{:style => 'width:25px'}
+            %th #{@household.name} individuals...
+        %tbody
+          - if @actions.empty?
+            %tr
+              %td
+              %td
+              %td
+              %td
+                No actions for individuals in this household
+          - else
+            = render :partial => 'households/action', :collection => @actions
+
+      = will_paginate @actions, :id => 'endless-scroll-pagination'
+
+%div{"ng-controller" => "EditHouseholdCtrl"}
+  = render 'edit_modal'
+  #edit-order-popup.modal

data/app/views/households/suggested.html.haml

@@ -0,0 +1,38 @@
+.suggested-households
+  - if @by_address.count < 1 && @by_spouse.count < 1
+    %h3 Suggested Households
+    %p
+      There are no suggested households.
+
+  - if @by_address.count > 0
+    %h4 Similar Addresses
+    %table.by-address.table
+      - @by_address.each do |row|
+        - next if row.individuals.empty?
+        %tr
+          %td.people
+            - row.individuals.each do |person|
+              .well.span3
+                %h5= person
+                = person.address
+
+          %td.controls{:style => "width: 80px;"}
+            = link_to "Join", suggested_household_new_household_path(row), :class => "btn btn-primary btn-block"
+            %br
+            = link_to "Ignore", ignore_suggested_households_path(row), :method => :put, :class => "btn btn-danger btn-block"
+
+
+  - if @by_spouse.count > 0
+    %h4 Spouses
+    %table.by-spouse.table
+      - @by_spouse.each do |row|
+        %tr
+          %td.people
+            - row.individuals.each do |person|
+              .well.span3
+                %h5= person
+
+          %td.controls{:style => "width: 80px;"}
+            = link_to "Join", suggested_household_new_household_path(row), :class => "btn btn-primary btn-block"
+            %br
+            = link_to "Ignore", ignore_suggested_households_path(row), :method => :put, :class => "btn btn-danger btn-block"

data/app/views/imports/_export_links.html.haml

@@ -0,0 +1,3 @@
+%p= link_to "Export People", contacts_export_index_path, :class => "btn btn3"
+%p= link_to "Export Donations", donations_export_index_path, :class => "btn btn3"
+%p= link_to "Export Sales", ticket_sales_export_index_path, :class => "btn btn3"

data/app/views/imports/donations/_new.html.haml

@@ -60,6 +60,11 @@
       %tr 
         %td.field-slim Email
         %td The email address of the person  
+      %tr
+        %td.field-slim Company Name
+        %td
+          If this is a company record, the name of the company. Otherwise,
+          it's the name of the company that the person works for.
       
     %h3 Optional Fields
     %table.table.table-bordered.table-striped.docs
@@ -75,6 +80,7 @@
           %span.label.label-success
             Important!
           &nbsp This is the non-deductible portion of the donation (i.e. the fair market value of <a href='http://www.irs.gov/publications/p526/ar02.html#en_US_2011_publink1000229650' target=_blank>something the donor received in return</a>).  If this is not included, the non-deductible amount will be equal to the value in Amount minus any value in Deductible.  Don't include a '$' or other currency symbols.   
+    %p You can also use all of the field names in People imports.
   
   .span3
     %h2

data/app/views/imports/donations/_pending.html.haml

@@ -6,7 +6,7 @@
     %p To pause this import and come back later, click "Back"
 
     .btn-group
-      = icon_link_to "Back", new_import_path(:type => import.kind), 'icon-share-alt', 'btn', ''
+      = icon_link_to "Back", new_import_path(:type => import.kind), 'fa-share', 'btn', ''
       = link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"
 
   .span9
@@ -18,24 +18,8 @@
         .span3
           = link_to "Approve", approve_import_path(import), :data => {:confirm => "Are you sure you want to approve this import?"}, :class => "btn btn-success btn-large"
     
-    %table.table.table-bordered.table-striped
-      %tr
-        %th Email
-        %th First
-        %th Last
-        %th Date
-        %th Amount
-        %th Type
-        %th 
-      - @parsed_rows.each_with_index do |row, index|
-        %tr
-          %td=row.email
-          %td=row.first
-          %td=row.last
-          %td=row.donation_date
-          %td=number_as_cents row.amount
-          %td=row.donation_type
-          %td
-            =icon_link_to("", "#row#{index}", ' icon-zoom-in', '', '', {'data-toggle' => 'modal'})
-            =render :partial => "imports/shared/inspect_modal", :locals => {:row => row, :index => index, :keys => ParsedRow::DONATION_FIELDS.keys }
-    = will_paginate @parsed_rows
+    %center
+      .alert.alert-info
+        Import previews are temporarily not available.  
+        %br
+        You can still apporve your import by clicking the green "Approve" button above.