Change a lot things include frontend and backend pages.

app/controllers/admin/venue_management_contracts_controller.rb

@@ -24,7 +24,10 @@ class Admin::VenueManagementContractsController < Admin::VenueAdminController
     @table_fields = [
       'venue_management.title',
       'vm_contract.case_no',
+      'vm_inviting.type',
       'vm_contract.vendor',
+      'vm_inviting.rents',
+      'vm_inviting.royalty',
       'vm_contract.start_end',
       'vm_contract.renewal_permission',
       'vm_contract.note',
@@ -68,6 +71,8 @@ class Admin::VenueManagementContractsController < Admin::VenueAdminController
   end
 
   def venue_management_contract_params
-    params.require(:venue_management_contract).permit!
+    contract_params = params.require(:venue_management_contract).permit!
+    contract_params["contractor_ids"] = [] if contract_params["contractor_ids"].nil?
+    return contract_params
   end
 end

app/controllers/admin/venue_management_invitings_controller.rb

@@ -14,18 +14,20 @@ class Admin::VenueManagementInvitingsController <  Admin::VenueAdminController
     @table_fields = [
       'venue_management.title',
       'vm_inviting.case_no',
+      'vm_inviting.type',
       'vm_inviting.publish_times',
+      'vm_inviting.start_end',
       'vm_inviting.rents',
       'vm_inviting.royalty',
-      'vm_inviting.house_tax_payer',
+      'vm_inviting.house_land_tax_payer',
-      'vm_inviting.land_tax_payer',
       'vm_inviting.contractor_manager',
       'vm_inviting.bid_result',
     ]
     @tags = @module_app.tags
     @filter_fields = {}
     @filter_fields['vm_inviting.type'] = @tags.map{|t| {:title => t.name,:id => t.id} }
-    @invitings = VenueManagementInviting.with_tags(filters("tag")).order(updated_at: :desc).page(params[:page]).per(10)
+    filter_tags = params[:filters]["type"].to_a rescue []
+    @invitings = VenueManagementInviting.with_tags(filter_tags).order(updated_at: :desc).page(params[:page]).per(10)
     @venue_management_page_url = Page.where(:module =>"venue_management").last.url rescue ""
     if request.xhr?
       render :partial => 'index'
@@ -68,6 +70,8 @@ class Admin::VenueManagementInvitingsController <  Admin::VenueAdminController
   end
 
   def venue_management_inviting_params
-    params.require(:venue_management_inviting).permit!
+    inviting_params = params.require(:venue_management_inviting).permit!
+    inviting_params["tags"] = [] if inviting_params["tags"].nil?
+    return inviting_params
   end
 end

app/controllers/admin/venue_management_memorabilias_controller.rb

@@ -16,6 +16,7 @@ class Admin::VenueManagementMemorabiliasController < Admin::VenueAdminController
       'vm_memorabilia.details',
     ]
     @memorabilias = VenueManagementMemorabilia.order(updated_at: :desc).page(params[:page]).per(10)
+    @venue_management_page_url = Page.where(:module =>"venue_management").last.url rescue ""
   end
 
   def new

app/controllers/admin/venue_managements_controller.rb

@@ -21,7 +21,9 @@ class Admin::VenueManagementsController < Admin::VenueAdminController
     @categories = @module_app.categories.enabled
     @filter_fields = filter_fields(@categories)
     @table_fields = [ :category,
+      'vm_inviting.type',
       'venue_management.title',
+      "venue_management.contractor",
       'venue_management.event_during',
       'venue_management.signup_during',
       'venue_management.contract_history',
@@ -29,7 +31,7 @@ class Admin::VenueManagementsController < Admin::VenueAdminController
       'venue_management.memorabilia',
       'venue_management.export'
     ]
-
+    @filter_fields["vm_inviting.type"] = @module_app.tags.map{|t| {:title => t.name,:id => t.id} }
     if !params[:sort].blank?
       if params[:sort] == 'event_during'
         sort = {:venue_management_start_date.to_sym=>params[:order]}
@@ -41,10 +43,17 @@ class Admin::VenueManagementsController < Admin::VenueAdminController
     else
       sort = {:signup_start_date=>"desc"}
     end
-
+    filter_tags = params[:filters][:type].to_a rescue []
-    @venue_managements = VenueManagementMain.all.order_by(sort).with_categories(filters("category"))
+    if filter_tags.empty?
-
+      @venue_managements = VenueManagementMain.all.order_by(sort).with_categories(filters("category"))
-    @venue_managements = search_data(@venue_managements,[:title]).page(params[:page]).per(10)
+      @venue_managements = search_data(@venue_managements,[:title]).page(params[:page]).per(10)
+    else
+      @venue_managements = VenueManagementMain.all.order_by(sort).with_categories(filters("category"))
+      @venue_managements = search_data(@venue_managements,[:title])
+      @venue_management_inviting_ids = @venue_managements.map{|v| v.venue_management_invitings.desc(:id).first.id rescue ""}
+      @venue_management_ids = VenueManagementInviting.where(:id.in=>@venue_management_inviting_ids).with_tags(filter_tags).map{|v| v.venue_management_main_id}
+      @venue_managements = VenueManagementMain.where(:id.in=>@venue_management_ids).page(params[:page]).per(10)
+    end
 
     if request.xhr?
       render :partial => "index"
@@ -253,15 +262,17 @@ class Admin::VenueManagementsController < Admin::VenueAdminController
   def venue_management_invitings
     @table_fields = [
       'vm_inviting.case_no',
+      'vm_inviting.type',
       'vm_inviting.publish_times',
+      'vm_inviting.start_end',
       'vm_inviting.rents',
       'vm_inviting.royalty',
-      'vm_inviting.house_tax_payer',
+      'vm_inviting.house_land_tax_payer',
-      'vm_inviting.land_tax_payer',
       'vm_inviting.contractor_manager',
       'vm_inviting.bid_result',
     ]
-    @invitings = @venue_management.venue_management_invitings.with_tags(filters("tag")).page(params[:page]).per(10)
+    filter_tags = params[:filters]["type"].to_a rescue []
+    @invitings = @venue_management.venue_management_invitings.with_tags(filter_tags).page(params[:page]).per(10)
     @tags = @module_app.tags
     @filter_fields = {}
     @filter_fields['vm_inviting.type'] = @tags.map{|t| {:title => t.name,:id => t.id} }
@@ -278,12 +289,16 @@ class Admin::VenueManagementsController < Admin::VenueAdminController
       'vm_memorabilia.details',
     ]
     @memorabilias = @venue_management.venue_management_memorabilias.page(params[:page]).per(10)
+    @venue_management_page_url = Page.where(:module =>"venue_management").last.url rescue ""
   end
 
   def venue_management_contracts
     @table_fields = [
       'vm_contract.case_no',
+      'vm_inviting.type',
       'vm_contract.vendor',
+      'vm_inviting.rents',
+      'vm_inviting.royalty',
       'vm_contract.start_end',
       'vm_contract.renewal_permission',
       'vm_contract.note',

app/controllers/venue_managements_controller.rb

@@ -70,8 +70,8 @@ class VenueManagementsController < ApplicationController
       'contribute_action' => contribute_action,
       'time_now' => time_now,
       'contribute_time_range' => VenueManagementMain.time_range(venue_management.contribute_start_date, venue_management.contribute_end_date),
-      'sign_up_time_range' => VenueManagementMain.time_range(venue_management.signup_start_date, venue_management.signup_end_date),
+      'sign_up_time_range' => venue_management.display_signup_during,
-      'venue_management_time_range' => VenueManagementMain.time_range(venue_management.venue_management_start_date, venue_management.venue_management_end_date),
+      'venue_management_time_range' => venue_management.display_event_during,
       'params' => params
     }
 
@@ -84,6 +84,14 @@ class VenueManagementsController < ApplicationController
       'params' => params
     }
   end
+  def show_memorabilia
+    params = OrbitHelper.params
+    venue_management_memorabilia = VenueManagementMemorabilia.find(params[:uid]) rescue nil
+    {
+      'venue_management_memorabilia' => venue_management_memorabilia,
+      'params' => params
+    }
+  end
   def show_contract
     params = OrbitHelper.params
     venue_management_contract = VenueManagementContract.find(params[:uid]) rescue nil

app/models/venue_management_contract.rb

@@ -14,6 +14,7 @@ class VenueManagementContract
   field :renewal_permission, type: Boolean,default: false
   field :renewal_deadline, type: Date
   field :case_no, type: String
+  field :contractor_ids, type: Array,default: []
   field :publish_times, type: Integer
   field :start_date, type: Date, default: Time.now
   field :end_date, type: Date
@@ -22,7 +23,7 @@ class VenueManagementContract
   field :evaluation_date, type: Date
   field :early_rent, type: Integer
   field :operation_rent, type: Integer
-  field :royalty, type: Integer
+  field :royalty, type: String
   field :contractor_manager  # save user_id
   enum :house_tax_payer, PAYERS
   enum :land_tax_payer, PAYERS
@@ -79,6 +80,15 @@ class VenueManagementContract
       self.save
     end
   end
+  def contractors
+    return( MemberProfile.where(:id.in=>self.contractor_ids).to_a rescue [])
+  end
+  def display_contractors
+    return self.contractors.map{|m| m.name}.join(" , ")
+  end
+  def display_tags
+    self.venue_management_inviting.tags.map{|t| t.name}.join(" , ") rescue ""
+  end
   before_save do
     org_contract = VenueManagementContract.find(self.id) rescue nil
     inviting = VenueManagementInviting.find(self.venue_management_inviting_id) rescue nil

app/models/venue_management_inviting.rb

@@ -19,7 +19,7 @@ class VenueManagementInviting
   field :evaluation_date, type: Date
   field :early_rent, type: Integer
   field :operation_rent, type: Integer
-  field :royalty, type: Integer
+  field :royalty, type: String
   field :contractor_manager  # save user_id
   enum :house_tax_payer, PAYERS
   enum :land_tax_payer, PAYERS

app/models/venue_management_main.rb

@@ -57,25 +57,48 @@ class VenueManagementMain
   accepts_nested_attributes_for :venue_management_email_sets, :allow_destroy => true
   accepts_nested_attributes_for :venue_management_signup_field_customs, :allow_destroy => true
   include VenueLinkFile
-  def manager_emails
-    MemberProfile.where(:id.in => self.manager_ids).collect{|v| v.email}
-  end
   def self.time_range(date1 = null, date2 = null)
-
     if !date1.blank?
-
       r = "#{date1.strftime('%Y-%m-%d')}"
-
       if date2
         r += " - #{date2.strftime('%Y-%m-%d')}"
       else
         r += " - #{I18n.t(:no_deadline)}"
       end
-
       r
-
     end
-
+  end
+  def contractors
+    last_contract = self.venue_management_contracts.desc(:id).first
+    last_contract.contractors rescue []
+  end
+  def display_contractors
+    last_contract = self.venue_management_contracts.desc(:id).first
+    contractors = last_contract.contractors rescue []
+    contractors.map{|m| m.name}.join(" , ")
+  end
+  def display_tags
+    last_inviting = self.venue_management_invitings.desc(:id).first
+    last_inviting.tags.map{|t| t.name}.join(" , ") rescue ""
+  end
+  def display_event_during
+    last_contract = self.venue_management_contracts.desc(:id).first
+    if last_contract.nil?
+      "" #self.class.time_range(self.venue_management_start_date, self.venue_management_end_date)
+    else
+      self.class.time_range(last_contract.contract_start_date, last_contract.contract_end_date)
+    end
+  end
+  def display_signup_during
+    last_inviting = self.venue_management_invitings.desc(:id).first
+    if last_inviting.nil?
+      "" #self.class.time_range(self.signup_start_date, self.signup_end_date)
+    else
+      self.class.time_range(last_inviting.start_date, last_inviting.end_date)
+    end
+  end
+  def manager_emails
+    MemberProfile.where(:id.in => self.manager_ids).collect{|v| v.email}
   end
 
   def get_attribute_value(attribute_field, signup_id)

app/models/venue_management_memorabilia.rb

@@ -10,7 +10,7 @@ class VenueManagementMemorabilia
     if !inviting.nil?
       inviting.case_no
     else
-      nil
+      I18n.t("empty")
     end
   end
   belongs_to :venue_management_inviting

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

@@ -24,6 +24,18 @@
           <%= f.select :venue_management_inviting_id, @venue_management.venue_management_invitings.map { |i| [ i.case_no, i.id ] }, :include_blank => true %>
         </div>
       </div>
+      <div class="control-group">
+        <label class="control-label muted"><%= t('vm_inviting.type') %></label>
+        <div class="controls">
+          <div id="vm_inviting_type" style="padding-top: 0.3em;"><%= @venue_management_contract.venue_management_inviting.tags.map{|t| t.name}.join(" , ") rescue "" %></div>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label muted"><%= t('venue_management.contractor') %></label>
+        <div class="controls">
+          <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'venue_management_contract[contractor_ids][]', email_members:Array(@venue_management_contract.contractors), index:'2',select_name:'contractors'} %>
+        </div>
+      </div>
       <div class="control-group">
         <label class="control-label muted"><%= t('vm_inviting.early_rent') %></label>
         <div class="controls">
@@ -39,7 +51,7 @@
       <div class="control-group">
         <label class="control-label muted"><%= t('vm_inviting.royalty') %></label>
         <div class="controls">
-          <%= f.number_field :royalty %>
+          <%= f.text_field :royalty %>
         </div>
       </div>
       <div class="control-group">
@@ -135,7 +147,9 @@
       <div class="control-group">
         <label class="control-label muted"><%= t('vm_contract.deposit_type') %></label>
         <div class="controls">
-          <%= f.text_field :deposit_type %>
+          <% select_fields = ["現金(支票)","設定質權之金融機構定期存款單","銀行書面連帶保證","其他(可填入資料)"] %>
+          <%= f.select :deposit_type, options_for_select(select_fields,(select_fields.include?(@venue_management_contract.deposit_type) ? @venue_management_contract.deposit_type : "其他(可填入資料)")) %>
+          <%= f.text_field :deposit_type , :value => (select_fields.include?(@venue_management_contract.deposit_type) ? "" : @venue_management_contract.deposit_type) ,:style => (select_fields.include?(@venue_management_contract.deposit_type) ? "display:none" : "") , :id => 'venue_management_contract_deposit_type_text'  %>
         </div>
       </div>
       <div class="control-group">
@@ -241,5 +255,29 @@
           }
         })
     })
+    var venue_management_inviting_tags_relations = JSON.parse('<%=VenueManagementInviting.all.select{|v| !v.case_no.blank?}.map{|v| [v.id.to_s,(v.tags.map{|t| t.name}.join(" , ") rescue "")]}.to_h.to_json.html_safe %>');
+    $('[name="venue_management_contract[venue_management_inviting_id]"]').click(function(){
+      var tag_names = venue_management_inviting_tags_relations[$(this).val()];
+      if(tag_names != undefined){
+        $("#vm_inviting_type").html(tag_names);
+      }else{
+        $("#vm_inviting_type").html("");
+      }
+    })
+    $('select[name="venue_management_contract[deposit_type]"]').click(function(){
+      var select_index = $(this).find('option[value="'+$(this).val()+'"]').index();
+      if(select_index == $(this).find("option").eq(-1).index()){
+        $("#venue_management_contract_deposit_type_text").css("display",'');
+      }else{
+        $("#venue_management_contract_deposit_type_text").css("display",'none');
+      }
+    })
+    $(".wrap-inner form").submit(function(){
+      var $select = $('select[name="venue_management_contract[deposit_type]"]');
+      var select_index = $select.find('option[value="'+$select.val()+'"]').index();
+      if(select_index != $select.find("option").eq(-1).index()){
+        $("#venue_management_contract_deposit_type_text").remove();
+      }
+    })
   })
 </script>

app/views/admin/venue_management_contracts/_index.html.erb

@@ -30,7 +30,13 @@
             </ul>
           </div>
         </td>
-        <td><%= contract.vendor %></td>
+        <td><%= contract.display_tags %></td>
+        <td><%= contract.display_contractors %></td>
+
+        <td><%= "#{contract.early_rent} / #{contract.operation_rent}" %></td>
+
+        <td><%= contract.royalty %></td>
+
         <td><%= "#{contract.contract_start_date} / #{contract.contract_end_date}" %></td>
         <td><%= contract.renewal_permission.present? ? t("vm_contract.renewal.#{contract.renewal_permission}") : t("vm_contract.renewal.false") %></td>
         <td><%= contract.note %></td>

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

@@ -80,7 +80,7 @@
       <div class="control-group">
         <label class="control-label muted"><%= t('vm_inviting.royalty') %></label>
         <div class="controls">
-          <%= f.number_field :royalty %>
+          <%= f.text_field :royalty %>
         </div>
       </div>
       <div class="control-group">

app/views/admin/venue_management_invitings/_index.html.erb

@@ -30,11 +30,12 @@
             </ul>
           </div>
         </td>
+        <td><%= inviting.tags.map{|t| t.name}.join(" , ") rescue "" %></td>
         <td><%= inviting.publish_times %></td>
+        <td><%= inviting.start_date.to_s + "/" + inviting.end_date.to_s %></td>
         <td><%= "#{inviting.early_rent} / #{inviting.operation_rent}" %></td>
         <td><%= inviting.royalty %></td>
-        <td><%= t("vm_inviting.enums.#{inviting.house_tax_payer}") %></td>
+        <td><%= t("vm_inviting.enums.#{inviting.house_tax_payer}") + "/" + t("vm_inviting.enums.#{inviting.land_tax_payer}") %></td>
-        <td><%= t("vm_inviting.enums.#{inviting.land_tax_payer}") %></td>
         <td><%= inviting.contractor_manager %></td>
         <td><%= t("vm_inviting.enums.bid_result.#{inviting.bid_result}") %></td>
       </tr>

app/views/admin/venue_management_memorabilias/_index.html.erb

@@ -19,7 +19,7 @@
           <td><%= memorabilia.venue_management_main.title %></td>
         <% end %>
         <td>
-          <%= link_to memorabilia.case_no, admin_venue_management_memorabilia_path(memorabilia.id), :target => '_blank' %>
+          <%= link_to (memorabilia.case_no.blank? ? t("empty") : @venue_management_page_url.blank? ? "" :  memorabilia.case_no), ("/#{I18n.locale}"+@venue_management_page_url+"/#{memorabilia.case_no.to_s.strip}-#{memorabilia.id}?method=show_memorabilia") , :target => '_blank' %>
           <div class="quick-edit">
             <ul class="nav nav-pills">
               <% if can_edit_or_delete?(memorabilia) %>

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

@@ -20,6 +20,19 @@
   .input-append input{
     width: 150px;
   }
+  .display_infos{
+    padding-top: 0.3em;
+  }
+  .venue_managementive-title-field{
+    font-size: 14px;
+    font-weight: normal;
+  }
+  .venue_managementive-title-value{
+    display: block;
+  }
+  tr.control-group{
+    display: block;
+  }
 </style>
 <!-- Input Area -->
 <div class="input-area">
@@ -34,7 +47,6 @@
 
   <ul class="nav nav-pills module-nav">
     <li class="active"><a href="#basic" data-toggle="tab"><%= t(:basic) %></a></li>
-    <li><a href="#signup" data-toggle="tab"><%= t('venue_management.signup') %></a></li>
     <!--
     <li><a href="#review" data-toggle="tab"><%# t('venue_management.review') %></a></li>
     -->
@@ -42,8 +54,10 @@
     <li><a href="#signup_set" data-toggle="tab"><%# t('venue_management.signup_set') %></a></li>
     <li><a href="#submission_set" data-toggle="tab"><%# t('venue_management.submission_set') %></a></li>
     -->
+    <!--
     <li><a href="#custom_set" data-toggle="tab"><%= t('venue_management.custom_set') %></a></li>
     <li><a href="#auto_send_email_set" data-toggle="tab"><%= t('venue_management.auto_send_email_set') %></a></li>
+    -->
   </ul>
 
   <!-- Module -->
@@ -68,91 +82,129 @@
       </div>
 
       <div class="control-group">
-        <label class="control-label muted"><%= t('venue_management.contractor') %></label>
+        <label class="control-label muted"><%= t('venue_management.event_during') %></label>
-        <div class="controls">
+        <div class="controls display_infos">
-          <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'venue_management_main[contractor_ids][]', email_members:Array(@contractors), index:'2',select_name:'contractors'} %>
+          <%= f.object.display_event_during %>
         </div>
       </div>
-
-      <!-- VenueManagement Date Time Picker -->
       <div class="control-group">
-        <label class="control-label muted"><%= t('venue_management.venue_management_start_date') %></label>
+        <label class="control-label muted"><%= t('venue_management.signup_during') %></label>
-        <div class="controls">
+        <div class="controls display_infos">
-          <%= f.datetime_picker :venue_management_start_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => @venue_management.new_record? %>
+          <%= f.object.display_signup_during %>
         </div>
       </div>
-
+      <% @venue_management_contract = f.object.venue_management_contracts.desc(:id).first %>
-      <div class="control-group">
+      <% if !@venue_management_contract.nil? %>
-        <label class="control-label muted"><%= t('venue_management.venue_management_end_date') %></label>
+        <table>
-        <div class="controls">
+          <tbody>
-          <%= f.datetime_picker :venue_management_end_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => @venue_management.new_record? %>
+          <tr class="control-group">
-        </div>
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_contract.case_no') %></th>
-      </div>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.venue_management_inviting.case_no %></td>
-
+          </tr>
-    </div>
+          <tr class="control-group">
-
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_inviting.type') %></th>
-    <!-- Sign up Module -->
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.display_tags %></td>
-    <div class="tab-pane fade in " id="signup">
+          </tr>
-
+          <tr class="control-group">
-      <!-- host -->
+            <th class="venue_managementive-title-field control-label muted"><%= t('venue_management.contractor') %></th>
-      <!--
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.display_contractors %></td>
-      <div class="control-group">
+          </tr>
-        <label class="control-label muted"><%# t("venue_management.registration_status") %></label>
+          <tr class="control-group">
-        <div class="controls">
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_inviting.rents') %></th>
-         <%# ['G','C'].each do |t| %>
+            <td class="venue_managementive-title-value controls display_infos"><%= "#{@venue_management_contract.early_rent} / #{@venue_management_contract.operation_rent}" %></td>
-            <label class="checkbox inline">
+          </tr>
-              <input type="checkbox" name="venue_management_main[registration_status][]" value="<%#=t%>" <%#=(!@venue_management.registration_status.blank? and @venue_management.registration_status.include?(t)) ? "checked" : "" %> ><%# t("venue_management.registration_status_#{t}") %>
+          <tr class="control-group">
-            </label>
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_inviting.royalty') %></th>
-         <%# end %>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.royalty %></td>
-        </div>
+          </tr>
-      </div>
+          <tr class="control-group">
-      -->
+          <tr class="control-group">
-
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_inviting.house_land_tax_payer') %></th>
-      <div class="control-group">
+            <td class="venue_managementive-title-value controls display_infos"><%= t("vm_inviting.enums.#{@venue_management_contract.house_tax_payer}")+"/"+t("vm_inviting.enums.#{@venue_management_contract.land_tax_payer}") %></td>
-        <label class="control-label muted"><%= t('venue_management.coordinator') %></label>
+          </tr>
-        <div class="controls">
+          <tr class="control-group">
-          <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'venue_management_main[coordinator_ids][]', email_members:Array(@coordinators), index:'3',select_name:'coordinators'} %>
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_contract.renewal_permission') %></th>
-        </div>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.renewal_permission.present? ? t("vm_contract.renewal.#{@venue_management_contract.renewal_permission}") : t("vm_contract.renewal.false") %></td>
-      </div>
+          </tr>
-
+          <tr class="control-group">
-      <!-- Sign up Date Time Picker -->
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.start_end') %></th>
-      <div class="control-group">
+            <td class="venue_managementive-title-value controls display_infos"><%= "#{@venue_management_contract.contract_start_date} ~ #{@venue_management_contract.contract_end_date}" %></td>
-        <label class="control-label muted"><%= t('venue_management.signup_start_date') %></label>
+          </tr>
-        <div class="controls">
+          <tr class="control-group">
-          <%= f.datetime_picker :signup_start_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => @venue_management.new_record? %>
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.construction_start_end') %></th>
-        </div>
+            <td class="venue_managementive-title-value controls display_infos"><%= "#{@venue_management_contract.construction_start_date} ~ #{@venue_management_contract.construction_end_date}" %></td>
-      </div>
+          </tr>
-
+          <tr class="control-group">
-      <div class="control-group">
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.operation_start_end') %></th>
-        <label class="control-label muted"><%= t('venue_management.signup_end_date') %></label>
+            <td class="venue_managementive-title-value controls display_infos"><%= "#{@venue_management_contract.operation_start_date} ~ #{@venue_management_contract.operation_end_date}" %></td>
-        <div class="controls">
+          </tr>
-          <%= f.datetime_picker :signup_end_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => @venue_management.new_record? %>
+          <tr class="control-group">
-        </div>
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.free_period_start_end') %></th>
-      </div>
+            <td class="venue_managementive-title-value controls display_infos"><%= "#{@venue_management_contract.free_period_start_date} ~ #{@venue_management_contract.free_period_end_date}" %></td>
-
+          </tr>
-      <!-- Contribute Date Time Picker -->
+          <tr class="control-group">
-      <div class="control-group">
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.sign_date') %></th>
-        <label class="control-label muted"><%= t('venue_management.contribute_start_date') %></label>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.sign_date %></td>
-        <div class="controls">
+          </tr>
-          <%= f.datetime_picker :contribute_start_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => @venue_management.new_record? %>
+          <tr class="control-group">
-        </div>
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.handover_date') %></th>
-      </div>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.handover_date %></td>
-
+          </tr>
-      <div class="control-group">
+          <tr class="control-group">
-        <label class="control-label muted"><%= t('venue_management.contribute_end_date') %></label>
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.deposit_payment_date') %></th>
-        <div class="controls">
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.deposit_payment_date %></td>
-          <%= f.datetime_picker :contribute_end_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => @venue_management.new_record? %>
+          </tr>
-        </div>
+          <tr class="control-group">
-      </div>
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_contract.deposit_type') %></th>
-
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.deposit_type %></td>
-      <div class="control-group">
+          </tr>
-        <label class="control-label muted"><%= t('venue_management.contribute_file_count') %></label>
+          <tr class="control-group">
-        <div class="controls">
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.deposit_exp_date') %></th>
-          <%= f.text_field :contribute_file_count %>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.deposit_exp_date %></td>
-          (<%= t('venue_management.blank_no_limit') %>)
+          </tr>
-        </div>
+          <tr class="control-group">
-      </div>
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_contract.insurance_type') %></th>
-
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.insurance_type %></td>
+          </tr>
+          <tr class="control-group">
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.insurance_payment_deadline') %></th>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.insurance_payment_deadline %></td>
+          </tr>
+          <tr class="control-group">
+            <th class="venue_managementive-title-field control-label muted"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.insurance_payment_date') %></th>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.insurance_payment_date %></td>
+          </tr>
+          <tr class="control-group">
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_contract.other_commitment') %></th>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.other_commitment %></td>
+          </tr>
+          <tr class="control-group">
+            <th class="venue_managementive-title-field control-label muted"><%= t('vm_contract.note') %></th>
+            <td class="venue_managementive-title-value controls display_infos"><%= @venue_management_contract.note %></td>
+          </tr>
+          <% if !@venue_management_contract.venue_management_files.blank? %>
+            <tr class="control-group">
+              <th class="venue_managementive-title-field control-label muted"><i class="fa fa-fw fa-paperclip"></i><%= t(:file_) %></th>
+              <td class="venue_managementive-title-value controls display_infos">        
+                <% @venue_management_contract.venue_management_files.map do |file| %>
+                <%= link_to (file.title.blank? ? File.basename(file.file.path) : file.title) , file.file.url, {:target => '_blank', :title => file.description} if file.file.file %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+          <% if !@venue_management_contract.venue_management_links.blank? %>
+            <tr class="control-group">
+              <th class="venue_managementive-title-field control-label muted"><i class="fa fa-fw fa-link"></i><%= t(:link) %></th>
+              <td class="venue_managementive-title-value controls display_infos">
+                <% @venue_management_contract.venue_management_links.map do |link| %>
+                <%= link_to (link.title.blank? ? link.url : link.title), link.url, :target => '_blank' %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+        </table>
+      <% end %>
     </div>
     <!-- Review Module -->
     <!--
@@ -196,7 +248,7 @@
         </thead>
         <tbody>
           <%# @signup_sets.each_with_index do |attr_signup,signup_index| %>
-            <tr>
+            <tr class="control-group">
               <td>
                 <%#= t("venue_management_signup.#{attr_signup.field_name}") %>
               </td>
@@ -237,7 +289,7 @@
         </thead>
         <tbody>
           <%# @submission_set.each_with_index do |attr_signup,submission_index| %>
-            <tr>
+            <tr class="control-group">
               <td>
                 <%#= t("venue_management_signup.#{attr_signup.field_name}") %>
               </td>
@@ -271,7 +323,7 @@
         </thead>
         <tbody>
           <% @custom_set.each_with_index do |attr_custom,custom_index| %>
-            <tr>
+            <tr class="control-group">
               <td>
                 <%= VenueManagementSignupField.where(id:attr_custom.venue_management_signup_field_id).first.title rescue '' %>
               </td>
@@ -315,7 +367,7 @@
           <div class="tab-pane<%= active_email_set %>" id="email_set<%= index1 %>" style="padding: 1.2em;">
             <table style="width:100%;">
             <tbody>
-              <tr>
+              <tr class="control-group">
                 <td>
                   <%= t('venue_management.disable') %>
                 </td>
@@ -324,7 +376,7 @@
                   <%= check_box_tag("venue_management_main[venue_management_email_sets][#{index1}][disabled]", true ,@email_set[index1].disabled) %>
                 </td>
               </tr>
-              <tr>
+              <tr class="control-group">
                 <td>
                   <%= t('venue_management.email_title') %>
                 </td>
@@ -332,7 +384,7 @@
                   <%= venue_method.show_set_field(@email_set[index1],'venue_management_email_sets',index1,'title','text_field') %>
                 </td>
               </tr>
-              <tr>
+              <tr class="control-group">
                 <td>
                   <%= t('venue_management.email_content') %>
                 </td>

app/views/admin/venue_managements/_index.html.erb

@@ -17,7 +17,9 @@
   <tbody>
     <% @venue_managements.each do |venue_management| %>
       <tr>
+        
         <td><%= venue_management.category.title %></td>
+        <td><%= venue_management.display_tags %></td>
         <td>
             <a href="<%= page_for_venue_management(venue_management) %>?method=show_data" target="_blank"><%= venue_management.title %></a>
           <div class="quick-edit">
@@ -25,15 +27,18 @@
               <% if can_edit_or_delete?(venue_management) %>
                 <li><a href="/admin/venue_managements/<%=venue_management.id.to_s%>/edit"><%= t(:edit) %></a></li>
                 <li><a href="<%= admin_venue_management_item_contents_path(:venue_management_main_id=>venue_management.id.to_s) %>"><%= t('venue_management.set_venue_management_item_content') %></a></li>
+                <!--
                 <li><a href="/admin/venue_managements/<%=venue_management.id.to_s%>/venue_management_signup_field"><%= t('venue_management.set_venue_management_signup_field') %></a></li>
                 <li><a href="/admin/venue_managements/<%=venue_management.id.to_s%>/venue_management_submission_field"><%= t('venue_management.set_venue_management_submission_field') %></a></li>
+                -->
                 <li><a href="#" class="delete text-error" rel="/admin/venue_managements/<%=venue_management.id.to_s%>"><%= t(:delete_) %></a></li>
               <% end %>
             </ul>
           </div>
         </td>
-        <td><%= VenueManagementMain.time_range(venue_management.venue_management_start_date, venue_management.venue_management_end_date) %></td>
+        <td><%= venue_management.display_contractors %></td>
-        <td><%= VenueManagementMain.time_range(venue_management.signup_start_date, venue_management.signup_end_date) %></td>
+        <td><%= venue_management.display_event_during %></td>
+        <td><%= venue_management.display_signup_during %></td>
         <td>
           <%= link_to venue_management.venue_management_contracts.count, venue_management_contracts_admin_venue_management_path(venue_management.id) %>
         </td>

app/views/venue_managements/index.html.erb

@@ -13,10 +13,11 @@
 	<thead>
 		<tr>
 			<th class="col-md-2"><%= t(:category) %></th>
+            <th class="col-md-2"><%= t('vm_inviting.type') %></th>
 			<th class="col-md-3"><%= t('venue_management.title') %></th>
-			<th class="col-md-2"><%= t('venue_management_signup.time') %></th>
+            <th class="col-md-3"><%= t('venue_management.contractor') %></th>
-			<th class="col-md-2"><%= t('venue_management_signup.place') %></th>
+            <th class="col-md-3"><%= t('venue_management.event_during') %></th>
-			<th class="col-md-2"><%= t('venue_management.signup') %></th>
+            <th class="col-md-3"><%= t('venue_management.signup_during') %></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -34,28 +35,16 @@
 			  end
 		%>
 		<tr>
-			<td><%= venue_management.category.title %></td>
+        
-			<td><%= ('<a href="'+ OrbitHelper.url_to_show(venue_management.to_param) + '?method=show_data" target="_blank">' + venue_management.title + '</a>').html_safe %></td>
+        <td><%= venue_management.category.title %></td>
-			<td><%= VenueManagementMain.time_range(venue_management.venue_management_start_date, venue_management.venue_management_end_date) %></td>
+        <td><%= venue_management.display_tags %></td>
-			<td><%= venue_management.act_place %></td>
+        <td>
-			<td>
+            <a href="<%= page_for_venue_management(venue_management) %>?method=show_data" target="_blank"><%= venue_management.title %></a>
-				<%= sign_up %> <br />
+        </td>
-
+        <td><%= venue_management.display_contractors %></td>
-				<%= 
+        <td><%= venue_management.display_event_during %></td>
-				if !venue_management.registration_status.blank? and venue_management.registration_status.include?('C') and venue_management.contribute_start_date <= @time_now and ( venue_management.contribute_end_date.nil? or venue_management.contribute_end_date+1 >= @time_now )
+        <td><%= venue_management.display_signup_during %></td>
-					if !session[:venue_management_signup_id].blank? 
+      </tr>
-						if session[:venue_management_main_id] == venue_management.id
-						('<a href="'+ OrbitHelper.url_to_show(venue_management.to_param) + '?method=con_upload">' + t('venue_management_signup.uploads') + '</a>').html_safe
-						else
-							('<a href="'+ OrbitHelper.url_to_show(venue_management.to_param) + '?method=con_login">' + t('venue_management_signup.con_login') + '</a>').html_safe
-						end
-					else
-						('<a href="'+ OrbitHelper.url_to_show(venue_management.to_param) + '?method=con_login">' + t('venue_management_signup.con_login') + '</a>').html_safe
-					end
-				end
-				 %>
-			</td>
-		</tr>
 		<% end %>
 	</tbody>
 </table>

app/views/venue_managements/show_contract.html.erb

@@ -13,6 +13,14 @@
       <th class="venue_managementive-title-field"><%= t('vm_contract.case_no') %></th>
       <td class="venue_managementive-title-value"><%= @venue_management_contract.venue_management_inviting.case_no %></td>
     </tr>
+    <tr>
+      <th class="venue_managementive-title-field"><%= t('vm_inviting.type') %></th>
+      <td class="venue_managementive-title-value"><%= @venue_management_contract.display_tags %></td>
+    </tr>
+    <tr>
+      <th class="venue_managementive-title-field"><%= t('venue_management.contractor') %></th>
+      <td class="venue_managementive-title-value"><%= @venue_management_contract.display_contractors %></td>
+    </tr>
     <tr>
       <th class="venue_managementive-title-field"><%= t('vm_inviting.rents') %></th>
       <td class="venue_managementive-title-value"><%= "#{@venue_management_contract.early_rent} / #{@venue_management_contract.operation_rent}" %></td>
@@ -23,12 +31,8 @@
     </tr>
     <tr>
     <tr>
-      <th class="venue_managementive-title-field"><%= t('vm_inviting.house_tax_payer') %></th>
+      <th class="venue_managementive-title-field"><%= t('vm_inviting.house_land_tax_payer') %></th>
-      <td class="venue_managementive-title-value"><%= t("vm_inviting.enums.#{@venue_management_contract.house_tax_payer}") %></td>
+      <td class="venue_managementive-title-value"><%= t("vm_inviting.enums.#{@venue_management_contract.house_tax_payer}")+"/"+t("vm_inviting.enums.#{@venue_management_contract.land_tax_payer}") %></td>
-    </tr>
-    <tr>
-      <th class="venue_managementive-title-field"><%= t('vm_inviting.land_tax_payer') %></th>
-      <td class="venue_managementive-title-value"><%= t("vm_inviting.enums.#{@venue_management_contract.land_tax_payer}") %></td>
     </tr>
     <tr>
       <th class="venue_managementive-title-field"><%= t('vm_contract.renewal_permission') %></th>

app/views/venue_managements/show_data.html.erb

@@ -85,16 +85,126 @@
       <td class="venue_managementive-title-value"><%= item_content.content.html_safe %></td>
     </tr>
     <% end %>
+    <!-- 履約紀錄 -->
+    <% @venue_management_contract = @venue_management.venue_management_contracts.desc(:id).first %>
+    <% if !@venue_management_contract.nil? %>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_contract.case_no') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.venue_management_inviting.case_no %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_inviting.type') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.display_tags %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('venue_management.contractor') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.display_contractors %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_inviting.rents') %></th>
+        <td class="venue_managementive-title-value"><%= "#{@venue_management_contract.early_rent} / #{@venue_management_contract.operation_rent}" %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_inviting.royalty') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.royalty %></td>
+      </tr>
+      <tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_inviting.house_land_tax_payer') %></th>
+        <td class="venue_managementive-title-value"><%= t("vm_inviting.enums.#{@venue_management_contract.house_tax_payer}")+"/"+t("vm_inviting.enums.#{@venue_management_contract.land_tax_payer}") %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_contract.renewal_permission') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.renewal_permission.present? ? t("vm_contract.renewal.#{@venue_management_contract.renewal_permission}") : t("vm_contract.renewal.false") %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.start_end') %></th>
+        <td class="venue_managementive-title-value"><%= "#{@venue_management_contract.contract_start_date} ~ #{@venue_management_contract.contract_end_date}" %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.construction_start_end') %></th>
+        <td class="venue_managementive-title-value"><%= "#{@venue_management_contract.construction_start_date} ~ #{@venue_management_contract.construction_end_date}" %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.operation_start_end') %></th>
+        <td class="venue_managementive-title-value"><%= "#{@venue_management_contract.operation_start_date} ~ #{@venue_management_contract.operation_end_date}" %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.free_period_start_end') %></th>
+        <td class="venue_managementive-title-value"><%= "#{@venue_management_contract.free_period_start_date} ~ #{@venue_management_contract.free_period_end_date}" %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.sign_date') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.sign_date %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.handover_date') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.handover_date %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.deposit_payment_date') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.deposit_payment_date %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_contract.deposit_type') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.deposit_type %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.deposit_exp_date') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.deposit_exp_date %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_contract.insurance_type') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.insurance_type %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.insurance_payment_deadline') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.insurance_payment_deadline %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('vm_contract.insurance_payment_date') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.insurance_payment_date %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_contract.other_commitment') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.other_commitment %></td>
+      </tr>
+      <tr>
+        <th class="venue_managementive-title-field"><%= t('vm_contract.note') %></th>
+        <td class="venue_managementive-title-value"><%= @venue_management_contract.note %></td>
+      </tr>
+      <% if !@venue_management_contract.venue_management_files.blank? %>
+        <tr>
+          <th class="venue_managementive-title-field"><i class="fa fa-fw fa-paperclip"></i><%= t(:file_) %></th>
+          <td class="venue_managementive-title-value">        
+            <% @venue_management_contract.venue_management_files.map do |file| %>
+            <%= link_to (file.title.blank? ? File.basename(file.file.path) : file.title) , file.file.url, {:target => '_blank', :title => file.description} if file.file.file %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+      <% if !@venue_management_contract.venue_management_links.blank? %>
+        <tr>
+          <th class="venue_managementive-title-field"><i class="fa fa-fw fa-link"></i><%= t(:link) %></th>
+          <td class="venue_managementive-title-value">
+            <% @venue_management_contract.venue_management_links.map do |link| %>
+            <%= link_to (link.title.blank? ? link.url : link.title), link.url, :target => '_blank' %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    <% end %>
   </tbody>
 </table>
 
 <br />
 <ul class="venue_management-plugins nav nav-pills" role="tablist" data-list="plugins" data-level="0">
-  <li class="active"><a href="#signup_count" role="tab" data-toggle="tab" title="<%=t('venue_management.signup_count')%>" aria-expanded="true"><%=t('venue_management.signup_count')%></a></li> 
+  <li class="active"><a href="#contract_history" role="tab" data-toggle="tab" title="<%=t('venue_management.contract_history')%>" aria-expanded="true"><%=t('venue_management.contract_history')%></a></li> 
   <li class=""><a href="#inviting_history" role="tab" data-toggle="tab" title="<%=t('venue_management.inviting_history')%>" aria-expanded="false"><%=t('venue_management.inviting_history')%></a></li>
+  <li class=""><a href="#memorabilia" role="tab" data-toggle="tab" title="<%=t('venue_management.memorabilia')%>" aria-expanded="false"><%=t('venue_management.memorabilia')%></a></li>
 </ul>
 <div class="tab-content" data-list="plugins" data-level="0">
-    <div class="tab-pane active" id="signup_count">
+    <div class="tab-pane active" id="contract_history">
 
       <div class="info" data-list="plugin_data_intro" data-level="1">
       </div>
@@ -121,7 +231,7 @@
               <td>
                 <%= link_to contract.case_no, "/#{I18n.locale}"+@params[:url]+"/#{contract.case_no.strip}-#{contract.id}?method=show_contract" , :target => '_blank' %>
               </td>
-              <td><%= contract.vendor %></td>
+              <td><%= contract.display_contractors %></td>
               <td><%= "#{contract.contract_start_date} / #{contract.contract_end_date}" %></td>
               <td><%= contract.renewal_permission.present? ? t("vm_contract.renewal.#{contract.renewal_permission}") : t("vm_contract.renewal.false") %></td>
               <td><%= contract.note %></td>
@@ -130,6 +240,41 @@
         </tbody>
       </table>
 
+    </div>
+    <div class="tab-pane" id="memorabilia">
+
+      <div class="info" data-list="plugin_data_intro" data-level="1">
+        
+      </div>
+      <% 
+        @table_fields = [
+          'vm_memorabilia.case_no',
+          'vm_memorabilia.event_date',
+          'vm_memorabilia.details'
+        ]
+        @memorabilias = @venue_management.venue_management_memorabilias.to_a
+      %>
+      <table class="table table-hover table-striped dt-responsive nowrap dataTable" id="table0">
+        <thead>
+          <tr data-list="pd_title" data-level="1">
+            <%  @table_fields.each do |th| %>
+              <th><%=t(th)%></th>
+            <% end %>
+          </tr>
+        </thead>
+        <tbody data-level="1" data-list="plugin_datas">
+          <% @memorabilias.each do |memorabilia| %>
+            <tr data-level="2" data-list="pd_datas">
+              <td>
+                <%= link_to memorabilia.case_no, "/#{I18n.locale}"+@params[:url]+"/#{memorabilia.case_no.to_s.strip}-#{memorabilia.id}?method=show_memorabilia", :target => '_blank' %> 
+              </td>
+              <td><%= memorabilia.event_date %></td>
+              <td><%= memorabilia.details %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+
     </div>
     <div class="tab-pane" id="inviting_history">
 
@@ -142,8 +287,7 @@
           'vm_inviting.publish_times',
           'vm_inviting.rents',
           'vm_inviting.royalty',
-          'vm_inviting.house_tax_payer',
+          'vm_inviting.house_land_tax_payer',
-          'vm_inviting.land_tax_payer',
           'vm_inviting.contractor_manager',
           'vm_inviting.bid_result',
         ]
@@ -166,8 +310,7 @@
               <td><%= inviting.publish_times %></td>
               <td><%= "#{inviting.early_rent} / #{inviting.operation_rent}" %></td>
               <td><%= inviting.royalty %></td>
-              <td><%= t("vm_inviting.enums.#{inviting.house_tax_payer}") %></td>
+              <td><%= t("vm_inviting.enums.#{inviting.house_tax_payer}") + "/" + t("vm_inviting.enums.#{inviting.land_tax_payer}") %></td>
-              <td><%= t("vm_inviting.enums.#{inviting.land_tax_payer}") %></td>
               <td><%= inviting.contractor_manager %></td>
               <td><%= t("vm_inviting.enums.bid_result.#{inviting.bid_result}") %></td>
             </tr>

app/views/venue_managements/show_inviting.html.erb

@@ -30,12 +30,8 @@
       <td class="venue_managementive-title-value"><%= @venue_management_inviting.royalty %></td>
     </tr>
     <tr>
-      <th class="venue_managementive-title-field"><%= t('vm_inviting.house_tax_payer') %></th>
+      <th class="venue_managementive-title-field"><%= t('vm_inviting.house_land_tax_payer') %></th>
-      <td class="venue_managementive-title-value"><%= t("vm_inviting.enums.#{@venue_management_inviting.house_tax_payer}") %></td>
+      <td class="venue_managementive-title-value"><%= t("vm_inviting.enums.#{@venue_management_inviting.house_tax_payer}")+"/"+t("vm_inviting.enums.#{@venue_management_inviting.land_tax_payer}") %></td>
-    </tr>
-    <tr>
-      <th class="venue_managementive-title-field"><%= t('vm_inviting.land_tax_payer') %></th>
-      <td class="venue_managementive-title-value"><%= t("vm_inviting.enums.#{@venue_management_inviting.land_tax_payer}") %></td>
     </tr>
     <tr>
       <th class="venue_managementive-title-field"><%= t('vm_inviting.contractor_manager') %></th>

app/views/venue_managements/show_memorabilia.html.erb

@@ -0,0 +1,47 @@
+<% # encoding: utf-8 %>
+<% @@session = session %>
+<%= yield %>
+<% 
+	data = action_data 
+  @venue_management_memorabilia = data["venue_management_memorabilia"]
+	@params = data['params']
+%>
+<table class="table table-striped venue_managementive-show-table">
+  <tbody>
+    <tr>
+      <th class="venue_managementive-title-field"><%= t('vm_memorabilia.case_no') %></th>
+      <td class="venue_managementive-title-value"><%= @venue_management_memorabilia.case_no %></td>
+    </tr>
+    <tr>
+      <th class="venue_managementive-title-field"><%= t('vm_memorabilia.event_date') %></th>
+      <td class="venue_managementive-title-value"><%= @venue_management_memorabilia.event_date %></td>
+    </tr>
+    <tr>
+      <th class="venue_managementive-title-field"><%= t('vm_memorabilia.details') %></th>
+      <td class="venue_managementive-title-value"><%= @venue_management_memorabilia.details %></td>
+    </tr>
+    <% if !@venue_management_memorabilia.venue_management_files.blank? %>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-fw fa-paperclip"></i><%= t(:file_) %></th>
+        <td class="venue_managementive-title-value">        
+          <% @venue_management_memorabilia.venue_management_files.map do |file| %>
+          <%= link_to (file.title.blank? ? File.basename(file.file.path) : file.title) , file.file.url, {:target => '_blank', :title => file.description} if file.file.file %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+    <% if !@venue_management_memorabilia.venue_management_links.blank? %>
+      <tr>
+        <th class="venue_managementive-title-field"><i class="fa fa-fw fa-link"></i><%= t(:link) %></th>
+        <td class="venue_managementive-title-value">
+          <% @venue_management_memorabilia.venue_management_links.map do |link| %>
+          <%= link_to (link.title.blank? ? link.url : link.title), link.url, :target => '_blank' %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br />
+<%= link_to t(:close), 'javascript:window.close();', :class => 'btn btn-primary' %>

config/locales/en.yml

@@ -9,6 +9,9 @@ en:
     venue_management_submission_field: VenueManagement Submission Field
     venue_management_signup_field: VenueManagement Signup Field
     venue_management_signup: Signup Analyze
+    venue_management_memorabilias: Memorabilia
+    venue_management_invitings: Inviting History
+    venue_management_contracts: Contract History
   module_name:
     venue_management: Outsourced Venue Management #場地管理系統
 
@@ -160,6 +163,8 @@ en:
     royalty: Royalty
     house_tax_payer: House Tax Payer
     land_tax_payer: Land Tax Payer
+    house_land_tax_payer: House Tax/Land Tax Payer
+    start_end: Start/End Date
     contractor_manager: Contractor Manager
     bid_result: Bid Result
     details: Details

config/locales/zh_tw.yml

@@ -9,6 +9,9 @@ zh_tw:
     venue_management_submission_field: 上傳介面欄位
     venue_management_signup_field: 報名欄位
     venue_management_signup: 報名統計
+    venue_management_memorabilias: 大事記
+    venue_management_invitings: 招商公告
+    venue_management_contracts: 履約記錄
   module_name:
     venue_management: 場地管理系統
 
@@ -160,6 +163,8 @@ zh_tw:
     royalty: 權利金
     house_tax_payer: 房屋稅負擔方
     land_tax_payer: 地價稅負擔方
+    house_land_tax_payer: 房屋稅/地價稅負擔方
+    start_end: 公告開始/結束日期
     contractor_manager: 招商承辦人
     bid_result: 開標結果
     details: 其他說明
@@ -169,7 +174,7 @@ zh_tw:
       bid_result:
         failure: 流標
         abandoned: 廢標
-        qualified: 合格續行評審
+        qualified: 決標
   vm_memorabilia:
     case_no: 相關案號
     event_date: 事件日期