dynamic_fieldsets 0.0.3 → 0.0.4

data/app/views/dynamic_fieldsets/fields/_form.html.erb

@@ -10,22 +10,20 @@
       </ul>
     </div>
   <% end %>
+  
+  <%= hidden_field_tag :parent, params[:parent] %>
 
   <div class="field">
-    <%= f.label :fieldset_id %><br />
-    <%= f.select :fieldset_id, options_for_select(DynamicFieldsets::Fieldset.parent_fieldset_list), :include_blank => "Choose One"  %>
-  </div>
-  <div class="field">
-    <%= f.label :name %><br />
+    <%= f.label :name %>: (internal)<br/>
     <%= f.text_field :name %>
   </div>
   <div class="field">
-    <%= f.label :label %><br />
+    <%= f.label :label %>: (displayed on the form)<br/>
     <%= f.text_field :label %>
   </div>
 
   <div class="field">
-    <%= f.label :field_type %><br />
+    <%= f.label :field_type %>: 
     <%= f.select :field_type, options_for_select(DynamicFieldsets::Field.field_types, @field.field_type), :include_blank => "Choose One" %>
   </div>
   <% @field.field_options.each do |field_option| %>
@@ -36,21 +34,17 @@
   <p><%= link_to_add_fields "Add Field Option", f, :field_options %></p>
 
   <div class="field">
-    <%= f.label :required %><br />
+    <%= f.label :required %>
     <%= f.check_box :required %>
   </div>
   <div class="field">
-    <%= f.label :enabled %><br />
+    <%= f.label :enabled %>
     <%= f.check_box :enabled %>
   </div>
-  <div class="field">
-    <%= f.label :order_num, "Order Number" %><br />
-    <%= f.text_field :order_num %>
-  </div>
 
   <% @field.field_defaults.each do |field_default| %>
     <%= f.fields_for :field_defaults, field_default do |field_default_form| %>
-      <%= render :partial => "field_default_fields", :locals => {:f => field_default_form} %>
+      <%= render :partial => "field_default_fields", :locals => {:f => field_default_form, :obj => field_default} %>
     <% end %>
   <% end %>
   <p><%= link_to_add_fields "Add Default Value", f, :field_defaults %></p>
@@ -66,16 +60,4 @@
     <%= f.submit %>
   </div>
 <% end %>
-
-<script>
-function remove_fields(link) {  
-  $(link).prev("input[type=hidden]").val("1");  
-  $(link).closest(".fields").hide();  
-}  
-  
-function add_fields(link, association, content) {  
-  var new_id = new Date().getTime();  
-  var regexp = new RegExp("new_" + association, "g");  
-  $(link).parent().before(content.replace(regexp, new_id));  
-}  
-</script>
+<%= render :partial => "/dynamic_fieldsets/shared/nested_model_javascript" %>

data/app/views/dynamic_fieldsets/fields/index.html.erb

@@ -2,10 +2,8 @@
 
 <table>
   <tr>
-    <th>Fieldset</th>
     <th>Name</th>
     <th>Type</th>
-    <th>Order num</th>
     <th></th>
     <th></th>
     <th></th>
@@ -13,13 +11,18 @@
 
 <% @fields.each do |field| %>
   <tr>
-    <td><%= field.fieldset.name if field.fieldset %></td>
     <td><%= field.name %></td>
     <td><%= field.field_type %></td>
-    <td><%= field.order_num %></td>
     <td><%= link_to 'Show', dynamic_fieldsets_field_path(field) %></td>
     <td><%= link_to 'Edit', edit_dynamic_fieldsets_field_path(field) %></td>
-    <td><%= link_to 'Destroy', dynamic_fieldsets_field_path(field), :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= render :partial => "disable_field_form", :locals => { :field => field } %></td>
+    <td>
+      <% if field.in_use? %>
+        <del>Destroy</del>
+      <% else %>
+        <%= button_to 'Destroy', dynamic_fieldsets_field_path(field), :method => :delete %>
+      <% end %>
+    </td>
   </tr>
 <% end %>
 </table>

data/app/views/dynamic_fieldsets/fields/new.html.erb

@@ -2,4 +2,8 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', dynamic_fieldsets_fields_path %>
+<% if params[:parent].nil? %>
+  <%= link_to 'Back', dynamic_fieldsets_fields_path %>
+<% else %>
+  <%= link_to 'Back', dynamic_fieldsets_children_dynamic_fieldsets_fieldset_path(params[:parent]) %>
+<% end %>

data/app/views/dynamic_fieldsets/fields/show.html.erb

@@ -1,10 +1,3 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <b>Fieldset:</b>
-  <%= @field.fieldset_id %>
-</p>
-
 <p>
   <b>Name:</b>
   <%= @field.name %>
@@ -40,16 +33,11 @@
   <%= @field.enabled %>
 </p>
 
-<p>
-  <b>Order Number:</b>
-  <%= @field.order_num %>
-</p>
-
 <% if @field.field_defaults.length > 0 %>
   <p>
     <b>Default values:</b><br />
     <% @field.field_defaults.each do |fd| %>
-      <%= fd.value %>
+      <%= fd.pretty_value %>
       <br />
     <% end %>
   </p>

data/app/views/dynamic_fieldsets/fieldset_children/_dependency_clause_fields.html.erb

@@ -0,0 +1,25 @@
+<div>
+  <p class="fields">
+    <%= f.label "Clause" %>
+    <%= f.hidden_field :_destroy %>
+    <%= link_to_function "remove", {:class => "remove_dependency_group", :onclick => "remove_fields_and_parent_fields(this)"} %>
+
+    <table style='outline: 1px solid black;margin:5px;'>
+      <tr>
+        <th>Field</th>
+        <th>Relationship</th>
+        <th>Value</th>
+        <th></th>
+      </tr>
+      <% obj.dependencies.each do |dependency| %>
+        <%= f.fields_for :dependencies, dependency do |dependency_form| %>
+          <%= render :partial => "dependency_fields", :locals => {:f => dependency_form, :obj => dependency} %>
+        <% end %>
+      <% end %>
+      <tr>
+        <td colspan='4'><%= link_to_add_fields "Add Rule", f, :dependencies, "add_fields_to_table" %></td>
+      </tr>
+    </table>
+    AND<br />
+  </p>
+</div>

data/app/views/dynamic_fieldsets/fieldset_children/_dependency_fields.html.erb

@@ -0,0 +1,12 @@
+<tr>
+  <td><%= f.select :fieldset_child_id, options_for_select(DynamicFieldsets::FieldsetChild.all.collect { |c| [c.child.name, c.id]})%></td>
+  <td><%= f.select :relationship, obj.relationship_list %></td>
+  <td><%= f.text_field :value %></td>
+  <td>
+    <%= f.hidden_field :_destroy %>
+    <%= link_to_function "remove", {:class => "remove_dependency", :onclick => "remove_fields_from_table(this)"} %>
+  </td>
+</tr>
+<tr>
+  <td colspan='4'>OR</td>
+</tr>

data/app/views/dynamic_fieldsets/fieldset_children/_dependency_group_fields.html.erb

@@ -0,0 +1,16 @@
+<div>
+  <p class="fields">
+    <%= f.hidden_field :_destroy %>
+    <%= link_to_function "remove", {:class => "remove_dependency_group", :onclick => "remove_fields_and_parent_fields(this)"} %>
+    <%= f.select :action, obj.action_list %> this field when:
+
+    <div style='outline: 1px solid black;'>
+      <% obj.dependency_clauses.each do |dependency_clause| %>
+        <%= f.fields_for :dependency_clauses, dependency_clause do |dependency_clause_form| %>
+          <%= render :partial => "dependency_clause_fields", :locals => {:f => dependency_clause_form, :obj => dependency_clause} %>
+        <% end %>
+      <% end %>
+      <p><%= link_to_add_fields "Add Clause", f, :dependency_clauses %></p>
+    </div>
+  </p>
+</div>

data/app/views/dynamic_fieldsets/fieldset_children/_form.html.erb

@@ -0,0 +1,34 @@
+<%= form_for(@fieldset_child) do |f| %>
+  <% if @fieldset_child.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@fieldset_child.errors.count, "error") %> prohibited this field from being saved:</h2>
+
+      <ul>
+      <% @fieldset_child.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <p>
+    <b>Field:</b>
+    <%= @fieldset_child.child.name %>
+  </p>
+
+  <p>
+    <b>Dependencies:</b>
+    <br />
+  </p>
+
+  <%# only expecting a single dependency group for now %>
+  <%= f.fields_for :dependency_group, @fieldset_child.dependency_group do |dependency_group_form| %>
+    <%= render :partial => "dependency_group_fields", :locals => {:f => dependency_group_form, :obj => @fieldset_child.dependency_group} %>
+  <% end %>
+  <p><%= link_to_add_fields "Add Dependency", f, :dependency_group %></p>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>
+<%= render :partial => "/dynamic_fieldsets/shared/nested_model_javascript" %>

data/app/views/dynamic_fieldsets/fieldset_children/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing fieldset child</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @fieldset_child %> |
+<%= link_to 'Back', dynamic_fieldsets_fieldset_children_path %>

data/app/views/dynamic_fieldsets/fieldsets/_associate_child.html.erb

@@ -0,0 +1,4 @@
+<%= form_for fieldset, :method => :post, :url => dynamic_fieldsets_associate_child_to_fieldset_path(fieldset) do |f| %>
+  <%= select_tag :field, options_for_select(DynamicFieldsets::Field.all.collect { |f| [f.name, f.id] }) %>
+  <%= f.submit "Associate"  %>
+<% end %>

data/app/views/dynamic_fieldsets/fieldsets/_child.html.erb

@@ -0,0 +1,41 @@
+<% fieldset.children.each do |child| %>
+  <% if child.is_a? DynamicFieldsets::Fieldset then %>
+    <% fieldset_child = DynamicFieldsets::FieldsetChild.where( fieldset_id: fieldset.id, child_id: child.id, child_type: "DynamicFieldsets::Fieldset" ).first %>
+    <li id="child-<%= fieldset_child.id %>" class="fieldset">
+      <div>
+      <span class="name"><%= child.name %></span>
+      <span class="admin">
+        <span class="children">
+          <% if child.has_children? then %>
+            <%= link_to 'Children', dynamic_fieldsets_children_dynamic_fieldsets_fieldset_path(child) %>
+          <% else %>
+            <%= link_to 'Add to', dynamic_fieldsets_children_dynamic_fieldsets_fieldset_path(child) %>
+          <% end %>
+        </span>
+        <span class="show"><%= link_to 'Show', dynamic_fieldsets_fieldset_path(child) %></span>
+        <span class="edit"><%= link_to 'Edit', edit_dynamic_fieldsets_fieldset_path(child) %></span>
+        <span class="destroy"><%= button_to 'Remove', dynamic_fieldsets_remove_fieldset_child_path(fieldset_child), :method => :post %></span>
+      </span>
+      </div>
+    <% if child.has_children? then %>
+      <ol>
+        <%= render :partial => 'child', :locals => { :fieldset => child } %>
+      </ol>
+    <% end %>
+    </li>
+  <% elsif child.is_a? DynamicFieldsets::Field then %>
+  <% fieldset_child = DynamicFieldsets::FieldsetChild.where( fieldset_id: fieldset.id, child_id: child.id, child_type: "DynamicFieldsets::Field" ).first %>
+    <li id="child-<%= fieldset_child.id %>" class="field<%= ' required' if child.required? %>">
+    <div>
+      <span class="fieldtype"><%= child.field_type %>:</span>
+      <span class="name"><%= child.label %></span>
+      <span class="admin">
+        <span class="show"><%= link_to 'Show', dynamic_fieldsets_field_path(child) %></span>
+        <span class="edit"><%= link_to "Edit Dependency", edit_dynamic_fieldsets_fieldset_child_path(child) %></span>
+        <span class="edit"><%= link_to 'Edit Field', edit_dynamic_fieldsets_field_path(child) %></span>
+        <span class="destroy"><%= button_to 'Remove', dynamic_fieldsets_remove_fieldset_child_path(fieldset_child), :method => :post %></span>
+      </span>
+    </div>
+    </li>
+  <% end %>
+<% end %>

data/app/views/dynamic_fieldsets/fieldsets/_form.html.erb

@@ -10,6 +10,8 @@
       </ul>
     </div>
   <% end %>
+  
+  <%= hidden_field_tag :parent, params[:parent] %>
 
   <div class="field">
     <%= f.label :nkey %><br />
@@ -23,14 +25,6 @@
     <%= f.label :description %><br />
     <%= f.text_area :description %>
   </div>
-  <div class="field">
-    <%= f.label :parent_fieldset_id %><br />
-    <%= f.select :parent_fieldset_id, options_for_select(DynamicFieldsets::Fieldset.parent_fieldset_list), :include_blank => "Choose One"  %>
-  </div>
-  <div class="field">
-    <%= f.label :order_num, "Order Number" %><br />
-    <%= f.text_field :order_num %>
-  </div>
   <div class="actions">
     <%= f.submit %>
   </div>

data/app/views/dynamic_fieldsets/fieldsets/children.html.erb

@@ -1,45 +1,53 @@
-<h1>Listing fieldset children of <%= @parent_fieldset.name %></h1>
+<h3 class="fieldset name"><%= @fieldset.name %></h3>
+<p class="fieldset description"><%= @fieldset.description %></p>
 
-<table>
-  <tr>
-    <th>Type</th>
-    <th>Order Number</th>
-    <th>Name</th>
-    <th>Description/Field Type</th>
-    <th>Fieldset Children</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
+<script>
+$(function() {
 
-<% @fieldset_family.each do |child| %>
-  <% if child.is_a?(DynamicFieldsets::Fieldset) %>
-    <tr>
-      <td>Fieldset</td>
-      <td><%= child.order_num %></td>
-      <td><%= child.name %></td>
-      <td><%= child.description %></td>
-      <td><%= link_to 'Children', dynamic_fieldsets_children_dynamic_fieldsets_fieldset_path(child) %></td>
-      <td><%= link_to 'Show', dynamic_fieldsets_fieldset_path(child) %></td>
-      <td><%= link_to 'Edit', edit_dynamic_fieldsets_fieldset_path(child) %></td>
-      <td><%= link_to 'Destroy', dynamic_fieldsets_fieldset_path(child), :confirm => 'Are you sure?', :method => :delete %></td>
-    </tr>
-  <% elsif child.is_a?(DynamicFieldsets::Field) %>
-    <tr>
-      <td>Field</td>
-      <td><%= child.order_num %></td>
-      <td><%= child.name %></td>
-      <td><%= child.field_type %></td>
-      <td>N/A</td>
-      <td><%= link_to 'Show', dynamic_fieldsets_fieldset_path(child) %></td>
-      <td><%= link_to 'Edit', edit_dynamic_fieldsets_fieldset_path(child) %></td>
-      <td><%= link_to 'Destroy', dynamic_fieldsets_fieldset_path(child), :confirm => 'Are you sure?', :method => :delete %></td>
-    </tr>
-  <% end %>
-<% end %>
+    $( "#enable-sorting" ).toggle( function() {
+      // Enable sorting
+      $( "#children" ).sortable('enable');
+      $( "#children" ).addClass('sort');
+      $( "#children" ).find('.admin').css('visibility','hidden');
+      $("#enable-sorting").html('Save');
+    }, function() {
+      // Disable sorting, save results
+      $( "#children" ).sortable('disable');
+      $( "#children" ).removeClass('sort');
+      $( "#children" ).find('.admin').css('visibility','visible');
+      $("#enable-sorting").html('Change Ordering');
+      $.post( "children/reorder",
+              $('#children').nestedSortable('serialize')
+            );
+    });
+    
+    $( "#children" ).nestedSortable({
+        forcePlaceholderSize: true,
+        disableNesting: 'field',
+        handle: 'div',
+        helper: 'clone',
+        items: 'li',
+        opacity: .75,
+        placeholder: 'placeholder',
+        revert: 250,
+        tabSize: 25,
+        toleranceElement: 'div'
+      }).sortable('disable');
+});
+</script>
 
-</table>
+<button type="button" id="enable-sorting">Change Ordering</button>
 
-<%= link_to 'Return to Main Show', dynamic_fieldsets_fieldset_path(@parent_fieldset) %>
+<div id="result"></div>
+
+<ol id="children">
+<%= render :partial => 'child', :locals => { :fieldset => @fieldset } %>
+</ol>
+
+<%= render :partial => "associate_child", :locals => {:fieldset => @fieldset} %>
+<%= link_to 'Add Field', new_dynamic_fieldsets_field_path(:parent => @fieldset.id) %> | 
+<%= link_to 'Add Fieldset', new_dynamic_fieldsets_fieldset_path(:parent => @fieldset.id) %> | 
+<%= link_to 'Show Parent Fieldset', dynamic_fieldsets_fieldset_path(@fieldset) %> | 
+<%= link_to 'Return to Manager', :controller => :fieldsets, :action => :roots %>
 
 <br />

data/app/views/dynamic_fieldsets/fieldsets/index.html.erb

@@ -1,11 +1,12 @@
-<h1>Listing fieldsets</h1>
+<h1>Listing Fieldsets</h1>
+
+<p id="notice"><%= notice %></p>
 
 <table>
   <tr>
     <th>Nkey</th>
     <th>Name</th>
     <th>Description</th>
-    <th>Parent fieldset</th>
     <th></th>
     <th></th>
     <th></th>
@@ -17,11 +18,10 @@
     <td><%= fieldset.nkey %></td>
     <td><%= fieldset.name %></td>
     <td><%= fieldset.description %></td>
-    <td><%= fieldset.parent_fieldset_id %></td>
     <td><%= link_to 'Children', dynamic_fieldsets_children_dynamic_fieldsets_fieldset_path(fieldset) %></td>
     <td><%= link_to 'Show', dynamic_fieldsets_fieldset_path(fieldset) %></td>
     <td><%= link_to 'Edit', edit_dynamic_fieldsets_fieldset_path(fieldset) %></td>
-    <td><%= link_to 'Destroy', dynamic_fieldsets_fieldset_path(fieldset), :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= button_to 'Destroy', dynamic_fieldsets_fieldset_path(fieldset), :confirm => 'Are you sure?', :method => :delete %></td>
   </tr>
 <% end %>
 </table>

data/app/views/dynamic_fieldsets/fieldsets/new.html.erb

@@ -2,4 +2,8 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', dynamic_fieldsets_fieldsets_path %>
+<% if params[:parent].nil? %>
+  <%= link_to 'Back', dynamic_fieldsets_fieldsets_path %>
+<% else %>
+  <%= link_to 'Back', dynamic_fieldsets_children_dynamic_fieldsets_fieldset_path(params[:parent]) %>
+<% end %>

data/app/views/dynamic_fieldsets/fieldsets/reorder.html.erb

@@ -0,0 +1,4 @@
+<h3>order:</h3>
+<p>
+  <%= @order.inspect %>
+</p>

data/app/views/dynamic_fieldsets/fieldsets/show.html.erb

@@ -15,17 +15,6 @@
   <%= @fieldset.description %>
 </p>
 
-<% if @fieldset.parent_fieldset %>
-  <p>
-    <b>Parent fieldset:</b>
-    <%= @fieldset.parent_fieldset.name %>
-  </p>
-
-  <p>
-    <b>Order num:</b>
-    <%= @fieldset.order_num %>
-  </p>
-<% end %>
-
+<%= link_to 'Children', dynamic_fieldsets_children_dynamic_fieldsets_fieldset_path(@fieldset) %> |
 <%= link_to 'Edit', edit_dynamic_fieldsets_fieldset_path(@fieldset) %> |
 <%= link_to 'Back', dynamic_fieldsets_fieldsets_path %>