ezframe 0.3.0 → 0.4.0

data/lib/ezframe/sub_page_kit.rb

@@ -0,0 +1,213 @@
+module Ezframe
+  module SubPageKit
+    module Default
+      def public_default_post
+        return { inject: "##{@class_snake}_tab", body: Html.convert(make_index_page) }
+      end
+    end
+
+    module Index
+      # 一覧表の生成
+      def make_index_page
+        list = list_for_index
+        target_keys = @index_keys
+        unless target_keys
+          target_keys = @column_set.keys.select { |k| !@column_set[k].no_view? }
+        end
+        # 項目名欄の生成
+        if @table_labels
+          thead = Ht.thead(Ht.tr(@table_labels.map { |label| Ht.th(label) }))
+        else
+          thead = Ht.thead(Ht.tr(target_keys.map { |key|
+            if @column_set[key].respond_to?(:label)
+              Ht.th(@column_set[key].label(force: true))
+            else
+              nil
+            end
+          })).compact
+        end
+
+        tr_a = list.map do |data|
+          view_a = make_index_line(target_keys, data)
+          td_a = view_a.map { |view| Ht.td(view) }
+          Ht.tr(id: "tr-#{@class_snake}-#{data[:id]}", child: td_a, ezevent: "on=click:url=#{make_base_url(data[:id])}/detail")
+        end
+        tbody = Ht.tbody(tr_a)
+        return [
+                 area_for_create,
+                 Ht.table(id: "enable_datatable_#{@class_snake}", child: [thead, tbody], ezload: "command=enable_datatable:target=#enable_datatable_#{@class_snake}"),
+                 Ht.div(id: edit_inject_element),
+               ]
+      end
+
+      # 一覧表示の１行を生成
+      def make_index_line(target_keys, data)
+        @column_set.clear
+        @column_set.set_values(data, from_db: true)
+        return target_keys.map { |key| make_index_column(key) }
+      end
+
+      # 一覧表示の１カラムを生成
+      def make_index_column(key)
+        column = @column_set[key.to_sym]
+        return column.view(force: true)
+      end
+
+      # 一覧ページ用のデータリスト生成
+      def list_for_index
+        return @column_set.dataset.where(@parent_key.to_sym => get_parent_id, deleted_at: nil).order(@sort_key).all
+      end
+
+      # 一覧ページ用ボタン
+      def button_for_index_line(data)
+        Ht.button(class: %w[btn right], ezevent: "on=click:url=#{make_base_url(data[:id])}/edit", child: [Ht.icon("edit"), Message[:edit_button_label]])
+      end
+    end
+
+    module Edit
+      # 新規データ登録
+      def public_create_post
+        @form = @event[:form]
+        # EzLog.debug("public_create_post: form=#{@form}")
+        unless @form
+          { inject: "##{@class_snake}-create-area", body: Html.convert(make_edit_form(:create)) }
+        else
+          # 値の保存
+          @column_set.clear
+          form_values = @form
+          form_values.update(@env["url_params"])
+          # @column_set.values = form_values
+          @column_set[:id].value = @id = @column_set.create(form_values)
+          # return { redirect: "#{make_base_url}/#{@id}" }
+          return public_default_post
+        end
+      end
+
+      # データ編集受信
+      def public_edit_post
+        @id ||= get_id
+        unless @event[:form]
+          data = @column_set.set_from_db(@id)
+          # データが空ならエラーページ
+          return { inject: "##{edit_inject_element}", body: "データがありません: #{@id}" } unless data
+          # フォームの表示
+          form = make_edit_form
+          found_a = Ht.search(form, tag: "input")
+          found_a.each { |h| h.add_class("#{@class_snake}-edit-box") if h[:size] }
+          return { inject: "##{edit_inject_element}", body: Html.convert(form) }
+        else
+          if @event[:cancel]
+            # キャンセルの場合
+            data = @column_set.set_from_db(@id)
+            return act_after_cancel
+          else
+            # 値を保存
+            @column_set.update(@id, @event[:form])
+          end
+          return act_after_edit
+        end
+      end
+
+      #--------------------------------------------------------------------------------------------------------
+      # 新規データ追加欄
+      def area_for_create(extra_buttons = nil)
+        create_button = make_create_button
+        create_button[:ezevent] = "on=click:url=#{make_base_url}/create"
+        return Ht.div(id: "#{@class_snake}-create-area", child: [create_button, extra_buttons].compact)
+      end
+
+      # 編集フォームの生成
+      def make_edit_form(command = :edit)
+        @id ||= get_id
+        if command == :edit && !@id
+          EzLog.error "make_edit_form: @id is not defined"
+        end
+        target_keys = @edit_keys || @column_set.keys
+        list = target_keys.map do |colkey|
+          column = @column_set[colkey.to_sym]
+          unless column
+            EzLog.error("undefined column entry: #{colkey}")
+            next
+          end
+          make_edit_line(column)
+        end.compact
+        event = "on=click:url=#{make_base_url(@id)}/#{command}:with=form"
+        send_button = Ht.button(id: "#{@class_snake}-#{command}-finish-button", class: %w[btn], child: [Ht.icon("check"), Message[:edit_finish_button_label]], ezevent: event)
+        cancel_button = make_cancel_button("on=click:url=#{make_base_url(@id)}/#{command}:cancel=true:with=form")
+        list.push(Ht.p(class: %w[edit-finish-buttons], child: [send_button, cancel_button]))
+        return make_form("#{make_base_url}/edit", list)
+      end
+
+      def make_edit_line(column)
+        form = column.form
+        if form
+          return Ht.p(class: %w[form-line], child: [Ht.small(column.label), form])
+        else
+          return nil
+        end
+      end
+
+      def edit_inject_element
+        return "#{@class_snake}_show"
+      end
+
+      def act_after_edit
+        return [public_default_post, public_detail_post]
+        # return { inject: edit_inject_element, body: Html.convert(make_index_line(@column_set.get_hash(:value))) }
+      end
+
+      def act_after_cancel
+        return public_detail_post
+      end
+    end
+
+    module Detail
+      # データ詳細表示
+      def public_detail_post
+        @id = get_id
+        data = @column_set.set_from_db(@id)
+        target_keys = @show_keys || @column_set.keys.select { |key| !@column_set[key].attribute[:no_view] }
+        line_a = []
+        target_keys.each do |key|
+          column = @column_set[key]
+          v = make_detail_line(column)
+          line_a.push(v) if v
+        end
+        table = Ht.div(line_a)
+        collection = Materialize::Collection.new
+        # 詳細表示用のblockを追加
+        collection.push(Ht.div(class: "detail-box", child: [button_for_detail_box(data), table]))
+        return { inject: "##{edit_inject_element}", body: Html.convert(collection.to_h) }
+      end
+
+      # 詳細表示欄の一行を生成
+      def make_detail_line(column)
+        view = column.view
+        if view
+          view = Ht.pre(view) if view.index("\n")
+          return Ht.p([Ht.small(column.label), view])
+        end
+        return nil
+      end
+
+      # 詳細ページ用ボタン
+      def button_for_detail_box(data)
+        buttons = [Ht.button(class: %w[btn right], ezevent: "on=click:url=#{make_base_url(data[:id])}/edit", child: [Ht.icon("edit"), Message[:edit_button_label]])]
+        if @show_delete_button
+          buttons.push(make_delete_button)
+        end
+        return Ht.div(class: %w[button-box], child: buttons)
+      end
+    end
+
+    module Delete
+      # 削除ボタン押下時の処理
+      def public_delete_post
+        @id = get_id
+        dataset = DB.dataset(@column_set.name)
+        DB.delete(dataset, @id)
+        return public_default_post
+      end
+    end
+  end
+end

data/lib/ezframe/version.rb

@@ -1,3 +1,3 @@
 module Ezframe
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezframe
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - KAMACHI Masayuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,7 @@ executables:
 - console
 - create_table
 - dbmigrate
+- html2ruby
 extensions: []
 extra_rdoc_files: []
 files:
@@ -174,6 +175,7 @@ files:
 - exe/console
 - exe/create_table
 - exe/dbmigrate
+- exe/html2ruby
 - ezframe.gemspec
 - lib/ezframe.rb
 - lib/ezframe/auth.rb
@@ -182,7 +184,6 @@ files:
 - lib/ezframe/config.rb
 - lib/ezframe/controller.rb
 - lib/ezframe/database.rb
-- lib/ezframe/editor.rb
 - lib/ezframe/editor_common.rb
 - lib/ezframe/email.rb
 - lib/ezframe/ezlog.rb
@@ -192,13 +193,16 @@ files:
 - lib/ezframe/jquery-ui.rb
 - lib/ezframe/loader.rb
 - lib/ezframe/main_editor.rb
+- lib/ezframe/main_page_kit.rb
 - lib/ezframe/materialize.rb
 - lib/ezframe/message.rb
 - lib/ezframe/page_base.rb
 - lib/ezframe/route.rb
 - lib/ezframe/server.rb
 - lib/ezframe/single_page_editor.rb
+- lib/ezframe/single_page_kit.rb
 - lib/ezframe/sub_editor.rb
+- lib/ezframe/sub_page_kit.rb
 - lib/ezframe/template.rb
 - lib/ezframe/util.rb
 - lib/ezframe/version.rb

data/lib/ezframe/editor.rb

@@ -1,176 +0,0 @@
-# frozen_string_literal: true
-
-module Ezframe
-  class DataEditor < PageBase
-    # 一覧ページ生成
-    def public_default_get
-      id = get_id
-      if id
-        return show_detail_page
-      else
-        data_a = @dataset.all
-        htb = make_index_table(data_a)
-        layout = index_layout(center: Ht.form(child: htb))
-        return show_base_template(title: Message[:index_page_title], body: Html.convert(layout))
-      end
-    end
-
-    # 一覧テーブルの生成
-    def make_index_table(data_a)
-      # @column_set.each { |col| col.attribute.delete(:hidden) }
-      idx_keys = @index_keys || @column_set.keys
-      puts "idx_keys=#{idx_keys.inspect}"
-      a_element = Proc.new { |key, id, text|
-        if key.to_s.index("_name")
-          Ht.a(href: "#{make_base_url(id)}", child: text)
-        else
-          text
-        end
-      }
-      tr_a = data_a.map do |data|
-        @column_set.clear
-        @column_set.set_value(data, from_db: true)
-        line = idx_keys.map do |key| 
-          view = @column_set[key].view
-          Ht.td(Ht.a(href: "#{make_base_url(data[:id])}", child: view))
-        end
-        Ht.tr(line)
-      end
-      th_a = idx_keys.map {|key| Ht.th(@column_set[key.to_sym].label) }
-      thead = Ht.thead(Ht.tr(th_a))
-      tbody = Ht.tbody(tr_a)
-      table_id = "enable_datatable_#{@class_snake}"
-      return Ht.table(id: table_id, class: %w[enable_datatable], child: [ thead, tbody ], ezload: "command=enable_datatable:target=##{table_id}:size=10")
-    end
-
-    # 新規登録フォーム表示
-    def public_create_get
-      @column_set.clear
-      table = make_edit_form(:create)
-      layout = main_layout(center: Ht.form(child: table), type: 2)
-      show_base_template(title: Message[:parent_create_page_title], body: Html.convert(layout))
-    end
-
-    # 新規登録受信
-    def public_create_post
-      unless @event[:form]
-        { inject: "#center-panel", body: Ht.form(child: make_edit_form(:create)) }
-      else
-        # 値の保存
-        @column_set.clear
-        @column_set.values = @event[:form]
-        @column_set[:id].value = id = @column_set.create
-        return { redirect: make_base_url(id) }
-      end
-    end
-
-    # データ編集受信
-    def public_edit_post
-      id = get_id
-      unless @event[:form]
-        data = @column_set.set_from_db(id)
-        return show_message_page("no data", "data is not defined: #{id}") unless data
-        { inject: "#center-panel", body: Html.convert(Ht.form(make_edit_form)) }
-      else
-        # 値を保存
-        @column_set.update(id, @event[:form])
-        { redirect: make_base_url(id) }
-      end
-    end
-
-    # 編集フォームの生成
-    def make_edit_form(command = :edit)
-      @id = get_id
-      table = []
-      matrix = @column_set.map do |column|
-        form = column.form
-        table.push Ht.p([ Ht.small(column.label), form ]) if form
-      end
-      send_button = Ht.button(child: Message[:edit_finish_button_label], class: %w[btn], event: "on=click:url=#{make_base_url(@id)}/#{command}:with=form") 
-      table.push(send_button)
-      return Ht.table(Ht.tr(table))
-    end
-
-    #--------------------------------------------------------------------------------------------------------
-    # 検索
-    def public_search_post
-      EzLog.info "public_search_post: #{@parsed_body.inspect}"
-      sch_keys = @search_keys || @column_set.keys
-      word = @params["word"]
-      pattern = "%#{word}%"
-      pattern_a = sch_keys.map {|key| Sequel.like(key, pattern) }
-      data_a = @dataset.where(Sequel.|(*pattern_a)).all
-      puts data_a.inspect
-      layout = index_layout(center: make_index_table(data_a))
-      show_base_template(title: Message[:search_result_page_title], body: Html.convert(layout))
-    end
-
-    # 詳細表示
-    def show_detail_page
-      EzLog.info "show_detail_page: #{@request.params.inspect}"
-      id = get_id(@class_snake)
-      unless @column_set.set_from_db(id)
-        return show_message_page("no data", "data is not defined: #{id}")
-      end
-      layout = main_layout(center: make_detail_table)
-      return show_base_template(title: Message[:detail_page_title], body: Html.convert(layout))
-    end
-
-    private
-
-    # 詳細ページの表の生成
-    def make_detail_table
-      @id = get_id
-      table = []
-      array = @column_set.map do |column|
-        edit_btn = nil
-        if @column_edit_mode
-          edit_btn = edit_button(column)
-          edit_btn[:event] = "on=click:branch=edit_column:key=#{column.key}" if edit_btn
-        end
-        table.push(Ht.p(class: %w[hover-button-box], child: [ Ht.small(column.label), column.view, edit_btn ].compact))
-      end
-      unless @column_edit_mode
-        edit_btn = Ht.button(class: %w[btn], child: [ Ht.icon("edit"), Message[:edit_button_label] ], event: "on=click:url=#{make_base_url(@id)}/edit")
-        table.push(edit_btn)
-      end
-      return Ht.table(Ht.tr(table))
-    end
-
-    def edit_cancel_button
-      Ht.span(class: %w[btn red small waves-effect waves-light switch-button],  child: Ht.icon("cancel"))
-    end
-
-    # URLからのIDの取得
-    def get_id(class_name = nil)
-      class_name ||= @class_snake
-      params = @request.env['url_params']
-      return nil unless params
-      # EzLog.info "get_id: #{params.inspect}, #{class_name}"
-      return params[class_name.to_sym]
-    end
-
-    # 値の更新
-    def update_value
-      form = @event[:form]
-      @column_set.update(get_id, form)
-    end
-
-    # ラベル付きで1カラムのviewを表示
-    def show_label_view(key)
-      col = @column_set[key]
-      Ht.span([Ht.small(col.label), col.view(force: true)])
-    end
-
-    # ラベル付きで1カラムのformを表示
-    def show_label_edit(key)
-      col = @column_set[key]
-      Ht.span([Ht.small(col.label), col.form(force: true)])
-    end
-
-    # エラーページの表示
-    def show_message_page(title, body)
-      return show_base_template(title: title, body: Html.convert(body))
-    end
-  end
-end