Fix bug.

Add email regex feature.
Edit defined_by_applicant feature.
Add agree and disagree record time and let admin can click in backend page.
Edit frontend select email feature.
Remove items and enquiry_for_applicants page.

app/views/admin/application_forms/_application_form_signup_render_table.html.erb

@@ -51,7 +51,7 @@
                           val += "<div class=\"quick-edit\">
                             <ul class=\"nav nav-pills\">"
                            if @can_edit
-                                val += "<li><a href=\"/admin/application_form_signups/#{application_form_signup.id}/edit\">#{t(:edit)}</a></li>
+                                val += "<li><a href=\"/admin/application_form_signups/#{application_form_signup.id}/view\">#{t('application_form.view')}</a></li>
                                     <li><a href=\"#{print_admin_application_form_path(application_form_signup.id)}\" target=\"_blank\">#{t('application_form.print')}</a></li>
                                     <li><a href=\"#{admin_application_form_signup_path(application_form_signup.id)}\" class=\"delete text-error\" rel=\"nofollow\" data-method=\"delete\" data-confirm=\"Are you sure?\">#{t(:delete_)}</a></li>"
                            end
@@ -69,7 +69,7 @@
                           val += "<div class=\"quick-edit\">
                             <ul class=\"nav nav-pills\">"
                            if @can_edit
-                                val += "<li><a href=\"/admin/application_form_signups/#{application_form_signup.id}/edit\">#{t(:edit)}</a></li>
+                                val += "<li><a href=\"/admin/application_form_signups/#{application_form_signup.id}/view\">#{t('application_form.view')}</a></li>
                                     <li><a href=\"#{admin_application_form_signup_path(application_form_signup.id)}\" class=\"delete text-error\" rel=\"nofollow\" data-method=\"delete\" data-confirm=\"Are you sure?\">#{t(:delete_)}</a></li>"
                            end
                            val += "</ul>
@@ -115,6 +115,7 @@
                      end %>
                 <% elsif  names[0] == "application_form_signup" %>
                   <% val = (application_form_signup.send("display_"+names[1]) rescue application_form_signup.send(names[1])) rescue nil %>
+                  <% val = val.strftime('%Y/%m/%d %H:%M') if names[1] == 'created_at' %>
                 <% elsif  names[0] == "application_form_review_result" %>
                   <% if names[1] == "review" %>
                     <% val = contribute_ids.map{|contribute_id| "<a href=\"#{edit_admin_application_form_review_result_path(contribute_id)}\" class=\"btn\">#{t("application_form.review")}</a>"} %>

app/views/admin/application_forms/_form.html.erb

@@ -107,6 +107,7 @@
           <th><%= t('application_form.name') %></th>
           <th><%= t('application_form.placeholder') %></th>
           <th><%= t('application_form.disable') %></th>
+          <th></th>
           <!-- <th><%= t('application_form.hidden') %></th> -->
         </thead>
         <tbody>
@@ -126,8 +127,23 @@
                 <input type="hidden" class="field_set" name='<%= "application_form_main[application_form_signup_field_sets][#{signup_index}][disabled]" %>' value="false">
                 <%= check_box_tag("application_form_main[application_form_signup_field_sets][#{signup_index}][disabled]", true ,attr_signup.disabled) %>
               </td>
-              <td>
-                <% if attr_signup.field_name != 'recaptcha' %>
+              <td style="padding-left: 1em;">
+                <% if attr_signup.field_name == 'email' %>
+                  <label for="application_form_email_regex" style="float: left;margin-right: 0.3em;"><%= t("application_form.email_regex") %>:</label>
+                  <%= f.check_box :email_regex_enable, {:id=>"email_regex_enable", :style=>"float: left;"} %><%= t("ask.enable") %>
+                  <div style="clear: both;"></div>
+                  <%= f.text_field :email_regex, {:id=>"application_form_email_regex", :style => "width: 30em;"}.merge(f.object.email_regex_enable ? {} : {:disabled=>"disabled"}) %>
+                  <script>
+                    $("#email_regex_enable").click(function(){
+                      if($(this).prop("checked")){
+                        $("#application_form_email_regex").removeAttr("disabled");
+                      }else{
+                        $("#application_form_email_regex").attr("disabled","disabled");
+                      }
+                    })
+                  </script>
+                <% end %>
+                <% if false #attr_signup.field_name != 'recaptcha' %>
                   <!-- <input type="hidden" class="field_set" name='<%= "application_form_main[application_form_signup_field_sets][#{signup_index}][hidden]" %>' value="false"> -->
                   <%= hidden_field_tag("application_form_main[application_form_signup_field_sets][#{signup_index}][hidden]",attr_signup.hidden) %>
                   <%#= check_box_tag("application_form_main[application_form_signup_field_sets][#{signup_index}][hidden]", true ,attr_signup.hidden) %>
@@ -370,13 +386,13 @@
 <% content_for :page_specific_javascript do %>
   <script>
     function check_members_button(){
-      $('.controls>.members').each(function(){
-        if ($(this).parent().find('select[name="application_form_main[reviewer_type_list][]"]').val()=='fixed'){
-          $(this).removeClass('hide');
-        }else{
-          $(this).addClass('hide');
-        }
-      })
+      // $('.controls>.members').each(function(){
+      //   if ($(this).parent().find('select[name="application_form_main[reviewer_type_list][]"]').val()=='fixed'){
+      //     $(this).removeClass('hide');
+      //   }else{
+      //     $(this).addClass('hide');
+      //   }
+      // })
     }
     $(function() {
       $("#main-wrap").after("");

app/views/admin/application_forms/_get_display_fields.html.erb

@@ -2,19 +2,27 @@
 <% @field_name_translations = [] %>
 <% default_hidden = [] %>
 <%
-    default_application_form_signup_fields = ["serial_number", "review_progress"]
+    default_show = []
+    default_application_form_signup_fields = ApplicationFormMain::DefaultSignupFields
     default_application_form_signup_fields.each do |f|
         @field_names << "application_form_signup.#{f}"
         @field_name_translations << t("application_form_signup.#{f}")
+        default_show << "application_form_signup.#{f}"
     end
 %>
 <% if @application_form.present? %>
     <% @max_stage = @application_form.get_max_stage %>
     <% if @application_form.application_form_signup_field_sets.count != 0 %>
        <% @application_form.application_form_signup_field_sets.each do |field_set| %>
-            <% next if field_set.field_name == "password" %>
-            <% default_hidden << "application_form_signup_field_set.#{field_set.field_name}" if (field_set.hidden) %>
-            <% @field_names << "application_form_signup_field_set.#{field_set.field_name}" %>
+            <%
+                field_name = field_set.field_name
+                if ApplicationFormMain::ExceptFieldSetDisplays.include?(field_name)
+                    default_hidden << "application_form_signup_field_set.#{field_name}"
+                    next
+                end
+            %>
+            <% default_hidden << "application_form_signup_field_set.#{field_name}" if (field_set.hidden) %>
+            <% @field_names << "application_form_signup_field_set.#{field_name}" %>
             <% @field_name_translations << field_set.name[I18n.locale] %>
        <% end %>
     <% else %>
@@ -28,17 +36,6 @@
       <% @field_names << "application_form_signup_fields.#{s.key}" %>
       <% @field_name_translations << s.title %>
     <% end %>
-    <% if @application_form.application_form_submission_field_sets.count != 0 %>
-        <% show1 = !(@application_form.application_form_submission_field_sets.select{|v| v.field_name=='title'}[0].hidden)
-        show2 = !(@application_form.application_form_submission_field_sets.select{|v| v.field_name=='file'}[0].hidden)
-        show3 = !(@application_form.application_form_submission_field_sets.select{|v| v.field_name=='description'}[0].hidden)
-    %>
-    <% else %>
-        <% show1 = true
-        show2 = true
-        show3 = true
-    %>
-    <% end %>
     <% @application_form.application_form_submission_fields.each do |s| %>
       <% @field_names << "application_form_submission_fields.#{s.key}" %>
       <% if s.markup != "application_form_preferred_session"
@@ -48,8 +45,12 @@
          end %>
     <% end %>
     <% @display_field = @application_form_signup_admin_setting.display_field rescue [] %>
-    <% if @display_field.blank? 
+    <%
+       if @display_field.blank?
         @display_field = @field_names - default_hidden
+       else
+        @display_field = @display_field - ApplicationFormMain::ExceptFieldSetDisplays.map{|f| "application_form_signup_field_set.#{f}"}
+        @display_field = (ApplicationFormMain::StaticSignupFields + @display_field).uniq
        end %>
     <% if @enable_review_result
         @field_names.insert(1,"application_form_review_result.review")
@@ -65,13 +66,10 @@
         @display_field << "application_form_review_result.presentation_type"
        end%>
 <% else %>
-    <% @field_names = [] %>
-    <% @field_name_translations = [] %>
-    <% default_show = [] %>
     <% application_form_signup_field_sets = ApplicationFormSignupFieldSet.all.uniq{|s| s.field_name} %>
     <% if application_form_signup_field_sets.count != 0 %>
        <% application_form_signup_field_sets.each do |field_set| %>
-            <% next if field_set.field_name == "password" %>
+            <% next if ApplicationFormMain::ExceptFieldSetDisplays.include?(field_set) %>
             <% default_show << "application_form_signup_field_set.#{field_set.field_name}" if !(field_set.hidden) %>
             <% @field_names << "application_form_signup_field_set.#{field_set.field_name}" %>
             <% @field_name_translations << field_set.name[I18n.locale] %>
@@ -87,19 +85,17 @@
       <% @field_names << "application_form_signup_fields.#{s.key}" %>
       <% @field_name_translations << s.title %>
     <% end %>
-    <% show1 = true
-        show2 = true
-        show3 = true
-    %>
     <% application_form_submission_fields = ApplicationFormSignupField.all.uniq{|s| s.key} %>
     <% application_form_submission_fields.each do |s| %>
       <% @field_names << "application_form_submission_fields.#{s.key}" %>
       <% @field_name_translations << s.title %>
     <% end %>
     <% @display_field = @application_form_signup_admin_setting.display_field %>
-    <% @display_field.delete("application_form_signup_field_set.password") %>
-    <% @display_field.delete("application_form_signup_field_set.recaptcha") %>
-    <% if @display_field.blank? 
-            @display_field = default_show
+    <%
+       if @display_field.blank?
+        @display_field = default_show
+       else
+        @display_field = @display_field - ApplicationFormMain::ExceptFieldSetDisplays.map{|f| "application_form_signup_field_set.#{f}"}
+        @display_field = (ApplicationFormMain::StaticSignupFields + @display_field).uniq
        end %>
 <% end %>

app/views/admin/application_forms/application_form_signup_admin_setting.html.erb

@@ -38,7 +38,7 @@
               </thead>
               <tbody>
                   <% @field_names[((i/max_length) *max_length) ..i].each do |fn|%>
-                    <td><%= check_box_tag "#{f.object_name}[display_field][]",fn , @display_field.include?(fn) %></td>
+                    <td><%= check_box_tag "#{f.object_name}[display_field][]",fn , @display_field.include?(fn), (ApplicationFormMain::StaticSignupFields.include?(fn) ? {disabled: 'disabled'} : {}) %></td>
                   <% end %>
               </tbody>
             </table>