RubyGems - jinda - Versions diffs - 0.5.1 → 0.5.6 - Mend

jinda 0.5.1 → 0.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (38) hide show

data/lib/generators/jinda/templates/app/views/docs/index.haml ADDED

@@ -0,0 +1,21 @@
+- @title= "My Articles"
+%p
+- @page_title  = 'All Articlces'
+= paginate @articles
+%table#article-table
+  %tr
+    %th Title
+    %th Description
+    %th Created
+    %th Updated
+    %th Delete
+    %th Edit
+  - @articles.each do |article|
+    %tr
+      %td= link_to article.title, :controller=>"articles", :action=>"show", :id=>article.id
+      %td= article.text.html_safe
+      %td= article.created_at.strftime('%m/%d/%Y')
+      %td= article.updated_at.strftime('%m/%d/%Y')
+      %td(align='center')= link_to image_tag('delete.png', style:'border:none; float:none;'), "#", :onclick=>"if (confirm('Please Confirm')) {location.hash='/articles/destroy/#{article.id}';}"
+      %td(align='center')= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "jinda", action: "init", s: 'articles:xedit_article', article_id: article.id}, data: { confirm: "Please Confirm" }

data/lib/generators/jinda/templates/app/views/docs/my.haml ADDED

@@ -0,0 +1,27 @@
+- @title= "My Documents"
+%p
+- @page_title  = 'All Documents'
+= paginate @docs
+%table#document-table
+  %tr
+    %th File Name
+    %th Description
+    %th Category
+    %th Created
+    %th Delete
+    %th Edit
+  - @docs.each do |doc|
+    %tr
+      - @temp = doc.dscan
+      - if !@temp.blank?
+        - @dscan = @temp.scan(/document\/([^*]*)/).last.last
+        %td= link_to doc.filename, "#{jinda_document_path}?id=#{@dscan}", target: :_blank
+      - else
+        %td= doc.filename
+      %td= doc.description
+      %td= doc.category
+      %td= doc.created_at.strftime('%m/%d/%Y')
+      %td(align='center')= link_to image_tag('delete.png', style:'border:none; float:none;'), {controller: "docs", action: "destroy",  doc_id: doc.id}, data: { confirm: "Please Confirm" }
+      %td(align='center')= image_tag('pencil.png', style:'border:none; float:none;')
+      - # To do
+      - # %td(align='center')= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "jinda", action: "init", s: 'docs:xedit_doc', doc_id: doc.id}, data: { confirm: "Please Confirm" }

data/lib/generators/jinda/templates/app/views/jinda/index.html.haml CHANGED

@@ -13,15 +13,15 @@
   %h2 Recently tested with:
   %ul
-    %li Rubygems 2.6.3
-    %li Rails 6.0.1
+    %li Rubygems 2.7.1
+    %li Rails 6.0.3
     %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record --skip-javascript --skip-turbolinks
     %li (rails new YOURAPP -BOTJ)
   %h2 Installation
   %ul
-    %li add gem 'jinda', '0.5.1'
+    %li add gem 'jinda', '0.5.6'
     %li bundle
     %li rails generate jinda:install
     %li (run all with "sh install.sh" )

data/lib/generators/jinda/templates/app/views/jinda/run_output.haml CHANGED

@@ -22,7 +22,7 @@
       %th= t "user"
       %th= "date"
     - @xmain.docs.each do |doc|
-      - next unless doc.display
+      - next unless doc.ma_display
       %tr
         %td= doc.id
         %td
@@ -32,7 +32,7 @@
             = image_tag 'page_attach.png'
           = link_to_blank align_text(doc.name), :controller=>"jinda", :action=>:document, :id=>doc.id
         %td= doc.filename
-        %td= doc.user.name
-        %td= date_thai doc.updated_at
+        %td= doc.user.code
+        %td= doc.updated_at
   = submit_tag @message
 %p

data/lib/generators/jinda/templates/app/views/layouts/_head.html.erb CHANGED

@@ -1,13 +1,10 @@
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta name="distribution" content="global" />
-  <meta name="robots" content="follow, all" />
-  <meta name="language" content="en, th" />
-  <title>eLocal</title>
-  <link rel="shortcut icon" href="/assets/favicon.ico" />
-  <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1">
-  <%= stylesheet_link_tag "jinda", "sarabun" %>
+  <%= favicon_link_tag %>
+  <%= csrf_meta_tags %>
+  <%= meta_tags %>
   <meta name="description" content="Jinda" />
-  <%= javascript_include_tag "jquery.tools.min.js"  %>
-  <%= javascript_include_tag "application", "flashobject", "FusionCharts"  %>
+  <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track":"reload" %>
+  <%= javascript_include_tag "application", "data-turbolinks-track": "reload" %>
+  <%= stylesheet_link_tag "jinda", "sarabun" %>
+  <script src = "https://ajax.aspnetcdn.com/ajax/jquery.validate/1.12.0/jquery.validate.js" ></script>
 </head>

data/lib/generators/jinda/templates/app/views/layouts/{_metatag.html.erb → _meta_tag.html.erb} RENAMED

File without changes

data/lib/generators/jinda/templates/app/views/layouts/jqm/_full.haml CHANGED

@@ -1,15 +1,7 @@
 !!! 5
 %html
   %head
-    = favicon_link_tag
-    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
-    = javascript_include_tag "application", 'data-turbolinks-track': 'reload'
-    = csrf_meta_tags
-    = display_meta_tags
-    - if GMAP
-      = javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false"
-    -# if ADSENSE
-      = render :partial => 'custom/adsense'
+    = render :partial => "layouts/head"
   %body
     = render :partial => "jinda/menu"
     %div{"data-id" => "main", "data-role" => "panel", "data-backbtn"=>"false"}

data/lib/generators/jinda/templates/app/views/notes/new/new_note.html.erb CHANGED

@@ -6,7 +6,7 @@
   <%= fields_for doc, validate: true  do |f| %>
   <%= f.label :title, "Title" %>
-  <%= f.text_field :title %><Br>
+  <%= f.text_field :title, :required => true %><Br>
   <%= f.label :body, "Body Content" %>
   <%= f.text_area :body, :cols=>50, :rows=>6, required: true  %>
 <% end %>

data/lib/jinda/helpers.rb CHANGED

@@ -22,7 +22,7 @@ require 'active_support/core_ext'
 #
 # xvar is (become) global variable of current program including user, runseq, and services
 #
-################################################################################
+########################################################################]
 module Jinda
@@ -30,6 +30,142 @@ module Jinda
     require "rexml/document"
     include REXML
     # methods from application_controller
+    ########################################################################]
+    # Each Service at one moment will create one xmain
+    ########################################################################]
+    def create_xmain(service)
+      c = name2camel(service.module.code)
+      custom_controller= "#{c}Controller"
+      params["return"] = request.env['HTTP_REFERER']
+      Jinda::Xmain.create :service=>service,
+        :start=>Time.now,
+        :name=>service.name,
+        :ip=> get_ip,
+        :status=>'I', # init
+        :user=>current_ma_user,
+        :xvars=> {
+          :service_id=>service.id,
+          :p=>params.to_unsafe_h,
+          :id=>params[:id],
+          :user_id=>current_ma_user.try(:id),
+          :custom_controller=>custom_controller,
+          :host=>request.host,
+          :referer=>request.env['HTTP_REFERER']
+        }
+    end
+    def clear_xmains
+      Jinda::Xmain.where(:status =>{'$in'=>['R','I']}).update_all(:status=>'X')
+      redirect_to action:"pending"
+    end
+    def ajax_notice
+      if notice=Jinda::Notice.recent(current_ma_user, request.env["REMOTE_ADDR"])
+        notice.update_attribute :unread, false
+        js = "notice('#{notice.message}');"
+      else
+        js = ""
+      end
+      render plain: "<script>#{js}</script>"
+    end
+    ########################################################################]
+    #  Each xmain  will create many run_seq as many as steps and form_steps
+    ########################################################################]
+    #
+    ##############################  @runseq ################################]
+    #  @runseq => #<Jinda::Runseq _id: 5df31912a54d758417a7afc9,
+    #   created_at: 2019-12-13 04:52:34 UTC,
+    #   updated_at: 2019-12-13 04:52:43 UTC,
+    #   user_id: nil,
+    #   xmain_id: BSON::ObjectId('5df31912a54d758417a7afc7'),
+    #   action: "do",
+    #   status: "R",
+    #   code: "create",
+    #   name: "Create Article",
+    #   role: "",
+    #   rule: "true",
+    #   rstep: 2,
+    #   form_step: 1,
+    #   start: 2019-12-13 04:52:43 UTC,
+    #   stop: nil,
+    #   end: true,
+    #   xml: "<node CREATED='1493419491125' ID='ID_1687683396' MODIFIED='1493483244848' TEXT='create: Create Article'><icon BUILTIN='bookmark'/></node>",
+    #   ip: nil>
+    ########################################################################]
+    def create_runseq(xmain)
+      @xvars= xmain.xvars
+      default_role= get_default_role
+      xml= xmain.service.xml
+      root = REXML::Document.new(xml).root
+      i= 0; j= 0 # i= step, j= form_step
+      root.elements.each('node') do |activity|
+        text= activity.attributes['TEXT']
+        next if ma_comment?(text)
+        next if text =~/^rule:\s*/
+        action= freemind2action(activity.elements['icon'].attributes['BUILTIN']) if activity.elements['icon']
+        return false unless action
+        i= i + 1
+        output_ma_display= false
+        if action== ('output'|| 'list' ||'folder')
+          ma_display= get_option_xml("display", activity)
+          if ma_display && !affirm(ma_display)
+            output_ma_display= false
+          else
+            output_ma_display= true
+          end
+        end
+        j= j + 1 if (action=='form' || output_ma_display)
+        @xvars['referer'] = activity.attributes['TEXT'] if action=='redirect'
+        if action!= 'if' && !text.blank?
+          scode, name= text.split(':', 2)
+          name ||= scode; name.strip!
+          code= name2code(scode)
+        else
+          code= text
+          name= text
+        end
+        role= get_option_xml("role", activity) || default_role
+        rule= get_option_xml("rule", activity) || "true"
+        runseq= Jinda::Runseq.create :xmain=>xmain.id,
+          :name=> name, :action=> action,
+          :code=> code, :role=>role.upcase, :rule=> rule,
+          :rstep=> i, :form_step=> j, :status=>'I',
+          :xml=>activity.to_s
+        xmain.current_runseq= runseq.id if i==1
+      end
+      @xvars['total_steps']= i
+      @xvars['total_form_steps']= j
+    end
+    def init_vars(xmain)
+      @xmain= Jinda::Xmain.find xmain
+      @xvars= @xmain.xvars
+      @runseq= @xmain.runseqs.find @xmain.current_runseq
+      #    authorize?
+      @xvars['current_step']= @runseq.rstep
+      @xvars['referrer']= request.referrer
+      session[:xmain_id]= @xmain.id
+      session[:runseq_id]= @runseq.id
+      unless params[:action]=='run_call'
+        @runseq.start ||= Time.now
+        @runseq.status= 'R' # running
+        @runseq.save
+      end
+      $xmain= @xmain; $xvars= @xvars
+      $runseq_id= @runseq.id
+      $user_id= current_ma_user.try(:id)
+    end
+    def init_vars_by_runseq(runseq_id)
+      @runseq= Jinda::Runseq.find runseq_id
+      @xmain= @runseq.xmain
+      @xvars= @xmain.xvars
+      #@xvars[:current_step]= @runseq.rstep
+      @runseq.start ||= Time.now
+      @runseq.status= 'R' # running
+      @runseq.save
+    end
     def b(s)
       "<b>#{s}</b>".html_safe
     end
@@ -41,9 +177,9 @@ module Jinda
     end
     def refresh_to(url='/', option={})
-       if option[:alert]
-         ma_log option[:alert]
-       end
+      if option[:alert]
+        ma_log option[:alert]
+      end
       # skip #
       # Rails 5.2 not allow to use js inline call
       render inline: "<script>window.location.replace('#{url}')</script>"
@@ -63,6 +199,7 @@ module Jinda
     def redirect_to_root
       redirect_to root_path
     end
     # Todo refactor code
     def get_option(opt, runseq=@runseq)
       xml= REXML::Document.new(runseq.xml).root
@@ -156,7 +293,8 @@ module Jinda
       xml= @service.xml
       step1 = REXML::Document.new(xml).root.elements['node']
       role= get_option_xml("role", step1) || ""
-  #    rule= get_option_xml("rule", step1) || true
+      #    rule= get_option_xml("rule", step1) || true
+      rule= get_option_xml("rule", step1) || true
       return true if role==""
       unless current_ma_user
         return role.blank?
@@ -164,17 +302,18 @@ module Jinda
         return false unless current_ma_user.role
         return current_ma_user.has_role(role)
       end
     end
     def ma_log(message)
       #  Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
       #    :unread=> true, :ip=> ($ip || request.env["REMOTE_ADDR"])
-       if session[:user_id]
-         Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
-           :user_id => $user.id, :unread=> true, :ip=>request.env["REMOTE_ADDR"]
-       else
-         Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
-           :unread=> true, :ip=>request.env["REMOTE_ADDR"]
-       end
+      if session[:user_id]
+        Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
+          :user_id => $user.id, :unread=> true, :ip=>request.env["REMOTE_ADDR"]
+      else
+        Jinda::Notice.create :message => ERB::Util.html_escape(message.gsub("`","'")),
+          :unread=> true, :ip=>request.env["REMOTE_ADDR"]
+      end
     end
     alias :ma_notice :ma_log
@@ -241,7 +380,7 @@ module Jinda
       # end
       #@user ||= User.find_by_auth_token!(cookies[:auth_token]) if cookies[:auth_token]
       @user ||= User.where(:auth_token => cookies[:auth_token]).first if cookies[:auth_token]
-			return @user
+      return @user
     end
     def ui_action?(s)
@@ -256,7 +395,7 @@ module Jinda
     #     ""
     #   end
     # end
     # ##########################################################################
     #
     # Create / Update Modules, Runseqs, Services from XML
@@ -286,9 +425,9 @@ module Jinda
         module_code= code.to_code
         menu_icon = m_icon(m)
-    # ##########################################################################
-    # First Node eg: Module Name
-    # ##########################################################################
+        # ##########################################################################
+        # First Node eg: Module Name
+        # ##########################################################################
         # create or update to GmaModule
         ma_module= Jinda::Module.find_or_create_by :code=>module_code
         ma_module.update_attributes :uid=>ma_module.id.to_s, :icon=>menu_icon
@@ -298,9 +437,9 @@ module Jinda
         mseq += 1
         seq= 0
-    # ##########################################################################
-    # Second Nodes eg: Role, Link otherwise Services
-    # ##########################################################################
+        # ##########################################################################
+        # Second Nodes eg: Role, Link otherwise Services
+        # ##########################################################################
         m.each_element('node') do |s|
           service_name= s.attributes["TEXT"].to_s
           scode, sname= service_name.split(':', 2)
@@ -323,9 +462,9 @@ module Jinda
             protected_services << ma_service.uid
           else
-    # ##########################################################################
-    # Second and Third Nodes eg: Role, Normal Services
-    # ##########################################################################
+            # ##########################################################################
+            # Second and Third Nodes eg: Role, Normal Services
+            # ##########################################################################
             # normal service
             step1 = s.elements['node']
             role= get_option_xml("role", step1) || ""
@@ -381,7 +520,7 @@ module Jinda
     ########################################################################
     #                            Jinda Rake Task                           #
     ########################################################################
     def gen_views
       t = ["*** generate ui ***"]
@@ -394,7 +533,7 @@ module Jinda
           unless gen_view_file_exist?(dir)
             gen_view_mkdir(dir,t)
           end
           if s.code=='link'
             f= "app/views/#{s.module.code}/index.haml"
             $afile << f
@@ -405,7 +544,7 @@ module Jinda
             end
             next
           end
           dir ="app/views/#{s.module.code}/#{s.code}"
           unless gen_view_file_exist?(dir)
             gen_view_mkdir(dir,t)
@@ -449,18 +588,18 @@ module Jinda
     def process_models
-    # app= get_app
-    # t= ["process models"]
-    #  xml map sample from index.mm
-    #   node @CREATED=1273819432637 @ID=ID_1098419600 @MODIFIED=1334737006485 @TEXT=Jinda
-    #    node @CREATED=1273819462973 @ID=ID_282419531 @MODIFIED=1493705904561 @POSITION=right @TEXT=services
-    #     node @CREATED=1273819465949 @FOLDED=true @ID=ID_855471610 @MODIFIED=1493768913078 @POSITION=right @TEXT=roles
-    #      node @CREATED=1273819456867 @ID=ID_1677010054 @MODIFIED=1493418874718 @POSITION=left @TEXT=models
-    #       node @CREATED=1292122118499 @FOLDED=true @ID=ID_1957754752 @MODIFIED=1493705885123 @TEXT=person
-    #       node @CREATED=1292122236285 @FOLDED=true @ID=ID_959987887 @MODIFIED=1493768919147 @TEXT=address
-    #       node @CREATED=1493418879485 @ID=ID_1995497233 @MODIFIED=1493718770637 @TEXT=article
-    #       node @CREATED=1493418915637 @ID=ID_429078131 @MODIFIED=1493418930081 @TEXT=comment
+      # app= get_app
+      # t= ["process models"]
+      #  xml map sample from index.mm
+      #   node @CREATED=1273819432637 @ID=ID_1098419600 @MODIFIED=1334737006485 @TEXT=Jinda
+      #    node @CREATED=1273819462973 @ID=ID_282419531 @MODIFIED=1493705904561 @POSITION=right @TEXT=services
+      #     node @CREATED=1273819465949 @FOLDED=true @ID=ID_855471610 @MODIFIED=1493768913078 @POSITION=right @TEXT=roles
+      #      node @CREATED=1273819456867 @ID=ID_1677010054 @MODIFIED=1493418874718 @POSITION=left @TEXT=models
+      #       node @CREATED=1292122118499 @FOLDED=true @ID=ID_1957754752 @MODIFIED=1493705885123 @TEXT=person
+      #       node @CREATED=1292122236285 @FOLDED=true @ID=ID_959987887 @MODIFIED=1493768919147 @TEXT=address
+      #       node @CREATED=1493418879485 @ID=ID_1995497233 @MODIFIED=1493718770637 @TEXT=article
+      #       node @CREATED=1493418915637 @ID=ID_429078131 @MODIFIED=1493418930081 @TEXT=comment
       models= @app.elements["//node[@TEXT='models']"] || REXML::Document.new
       models.each_element('node') do |model|
         # t << "= "+model.attributes["TEXT"]
@@ -468,14 +607,14 @@ module Jinda
         next if model_name.comment?
         model_code= name2code(model_name)
         model_file= "#{Rails.root}/app/models/#{model_code}.rb"
         if File.exists?(model_file)
           doc= File.read(model_file)
         else
           system("rails generate model #{model_code}")
           doc= File.read(model_file)
         end
         doc = add_utf8(doc)
         attr_hash= make_fields(model)
         doc = add_jinda(doc, attr_hash)
@@ -492,14 +631,14 @@ module Jinda
     def add_jinda(doc, attr_hash)
       if doc =~ /#{@btext}/
         s1,s2,s3= doc.partition(/  #{@btext}.*#{@etext}\n/m)
-        s2= ""
+          s2= ""
       else
         s1,s2,s3= doc.partition("include Mongoid::Document\n")
       end
       doc= s1+s2+ <<-EOT
   #{@btext}
   include Mongoid::Timestamps
-  EOT
+      EOT
       attr_hash.each do |a|
         # doc+= "\n*****"+a.to_s+"\n"
@@ -592,8 +731,8 @@ module Jinda
     ########################################################################
     #                     END  code from jinda.rake                        #
     ########################################################################
     ########################################################################
     #                  Methods to be overrided by gemhelp                  #
     #                            for Rspec Test
@@ -613,7 +752,7 @@ module Jinda
       t << "create file #{f}"
     end
     ########################################################################
     def controller_exists?(modul)
       File.exists? "#{Rails.root}/app/controllers/#{modul}_controller.rb"
     end
@@ -659,7 +798,7 @@ module Jinda
       node.each_element("icon") do |mn|
         mcons << mn.attributes["BUILTIN"]
       end
-        ticon = mcons[0].to_s
+      ticon = mcons[0].to_s
       return ticon
     end
@@ -689,8 +828,8 @@ module Jinda
     def freemind2action(s)
       case s.downcase
-      #when 'bookmark' # Excellent
-      #  'call'
+        #when 'bookmark' # Excellent
+        #  'call'
       when 'bookmark' # Excellent
         'do'
       when 'attach' # Look here
@@ -702,11 +841,16 @@ module Jinda
       when 'help' # Question
         'if'
       when 'forward' # Forward
-        'redirect'
+        # 'redirect'
+        'direct_to'
       when 'kaddressbook' #Phone
         'invoke' # invoke new service along the way
-      when 'list' # Output
+      when 'idea' # output
         'output'
+      when 'list' # List
+        'list'
+      when 'folder' # Folder
+        'folder'
       when 'mail'
         'mail'
       when 'xmag' # Tobe discussed
@@ -741,9 +885,9 @@ class String
   end
   def to_code
     s= self.dup
-#    s.downcase!
-#    s.gsub! /[\s\-_]/, ""
-#    s
+    #    s.downcase!
+    #    s.gsub! /[\s\-_]/, ""
+    #    s
     code, name = s.split(':')
     code.downcase.strip.gsub(' ','_').gsub(/[^#_\/a-zA-Z0-9]/,'')
   end
@@ -759,9 +903,9 @@ module ActionView
       end
     end
     class FormBuilder
-     def date_select_thai(method)
-       self.date_select method, :use_month_names=>THAI_MONTHS, :order=>[:day, :month, :year]
-     end
+      def date_select_thai(method)
+        self.date_select method, :use_month_names=>THAI_MONTHS, :order=>[:day, :month, :year]
+      end
       def date_field(method, options = {})
         default= options[:default]  || self.object.send(method) || Date.today
         data_options= ({"mode"=>"calbox"}).merge(options)
@@ -852,7 +996,7 @@ module ActionView
       init_map();
     });
   </script>
-EOT
+        EOT
         out.html_safe
       end
     end