jinda 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 042bb6fc61b659ff7b4a49552b2b12235d78f5330d87f45d41c372a4babd13da
-  data.tar.gz: a7e2f7d48ff8586ae259d58f182e0508c18c16f2f00ea36ad333e8ed6a85c16e
+  metadata.gz: ecac4f20399ba16041c265028b66ed5121fc564fcd1d03232bc63c49bae06d59
+  data.tar.gz: 040c63dd43667737d2388b89eb4c682ae77c27b859308730f957b4505cc0cf1d
 SHA512:
-  metadata.gz: 2463085a390a255b882fc7e0f3fe4107a079d13bbbc65988ee3148a4934dbf636e4a1d11dea8ae2c224c40144fec6fce585965e5b2c339b0b684e0e60207ef95
-  data.tar.gz: 58406a110bf6c497f6355e0673bc73b26da51bc12d39909c868cdee4b73fb4d3b5717abc5cdfb3ad63bb89ca16490bc2f403bb0517a4f34b758d7a67aa141235
+  metadata.gz: ca4d56c87c21ee29adea2d9068ff6bbd7f272dc3da85dfef033e05895ea9d905e7fdeeda28acb4184c4271aca81028240e7e6cd48f078539d86484f6c6532a6e
+  data.tar.gz: a30945796a4c41f85fbc859260e54867a0db663247c5ef5318da374d4d0ec6c5cdc386371f62f895076eccd8de2420b77156d8ec27fcbd31545895f89577b45c

data/lib/generators/jinda/install_generator.rb

@@ -92,9 +92,9 @@ module Jinda
         inside("app/controllers") {(File.file? "sitemap_controller.rb") ? ( say "Please merge existing jinda_org/sitemap_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/sitemap_controller.rb', 'sitemap_controller.rb')}
         inside("app/controllers") {(File.file? "notes_controller.rb") ? ( say "Please merge existing jinda_org/notes_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/notes_controller.rb', 'notes_controller.rb')}
       end
-      # routes created each line as reversed order button up in routes
+      # routes created each line as reversed order in routes
       def setup_routes
-        route "end"
+      #  route "end"
         route "  end"
         route "    namespace :v1 do resources :notes, :only => [:index] end"
         route "  namespace :api do"
@@ -119,14 +119,16 @@ module Jinda
         route "get '/auth/:provider/callback' => 'sessions#create'"
         route "post '/auth/:provider/callback' => 'sessions#create'"        
 		    route "\# end jinda method routes"
+        route "post '/jinda/end_output' => 'jinda#end_output'"
         route "post '/jinda/end_form' => 'jinda#end_form'"
         route "post '/jinda/pending' => 'jinda#index'"
         route "post '/jinda/init' => 'jinda#init'"
         route "jinda_methods.each do \|aktion\| get \"/jinda/\#\{aktion\}\" => \"jinda#\#\{aktion\}\" end"
-        route "jinda_methods += ['init','run','run_mail','document','run_do','run_form','end_form','error_logs', 'notice_logs', 'cancel']"
-        route "jinda_methods = ['pending','status','search','doc','logs','ajax_notice']"  
+        route "jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']"
+        route "jinda_methods += ['init', 'run', 'run_mail', 'document', 'run_do', 'run_form', 'end_form']"
+        route "jinda_methods = ['pending', 'status', 'search', 'doc', 'doc_print', 'logs', 'ajax_notice']"  
         route "\# start jiinda method routes"
-	  end
+	    end
 
       def setup_env
         FileUtils.mv "README.md", "README.md.bak"

data/lib/generators/jinda/templates/README.md

@@ -15,8 +15,8 @@ Rails Application Generator using Freemind
 
 These versions works for sure but others may do.
 
-* Ruby 2.5.5
-* Rails 5.2.3
+* Ruby 2.7.0
+* Rails 6.0.2
 * MongoDB 6
 * Freemind 1.0.1
 
@@ -36,7 +36,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.3.9'
+    gem 'jinda', '~> 0.5.0'
 
 For Development (most updated)
 

data/lib/generators/jinda/templates/app/assets/stylesheets/modules.scss

@@ -0,0 +1,84 @@
+
+.module-title {
+  font-size: 14pt;
+  font-weight: bold;
+  text-align: center;
+  background: #d2f0ff;
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  color:#333;
+
+}
+.module-text {
+  font-size: 14pt;
+  font-weight: bold;
+  text-align:left;
+  border:1px solid #c1c1c1;
+  background:#f7f7f7;
+  padding:2px 5px;
+  color:#333;
+}
+.module-comment {
+  font-size: 8pt;
+  text-align:left;
+  border:1px solid #c1c1c1;
+  background:#f7f7f7;
+  padding:2px 5px;
+  color:#333;
+}
+
+.comment-body {
+  font-size: 10pt;
+  font-weight: bold;
+  text-align:left;
+  color:#333;
+}
+.module-table {
+  width:100%;
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+
+}
+
+.module-table th {
+  background-color: #bcecff;
+  color:#333;
+;
+  width:100%;
+}
+
+.module-table td {
+  border: 1px;
+  padding: 8px;
+  witdth:100%;
+}
+
+
+.ui-btn-inner { padding: 2px 25px; }
+.ui-btn-up-c,
+.ui-btn-hover-c,
+.ui-btn-down-c {
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  /*font-size: 110%;*/
+}
+.ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: 7px 75px 7px 15px; display: block; }
+.ui-link-inherit { font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;}
+label.ui-input-text {
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  /*font-size: 110%;*/
+  text-shadow: none;
+}
+label.ui-select {
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  /*font-size: 110%;*/
+  text-shadow: none;
+}
+.ui-body-c {
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  /*font-size: 1.4em;*/
+  text-shadow: none;
+}
+.ui-header .ui-title, .ui-footer .ui-title { font-family: 'TH SarabunPSK'; text-align: center; display: block; margin: .2em 90px .3em;  padding: 0;  text-overflow: ellipsis; overflow: hidden; white-space: nowrap; outline: 0 !important; }
+
+
+
+
+

data/lib/generators/jinda/templates/app/controllers/jinda_org/jinda_controller.rb

@@ -86,8 +86,8 @@ class JindaController < ApplicationController
   end
   ####################################################################################################]
   # run if, form, mail, output etc depend on icon in freemind
-  # action from @runseq.action == do,     form,			if,     output
-  # Then will call				def run_do, run_form, run_if, run_output
+  # action from @r.action == do, form, if, output
+  # Then will call def run_do, run_form, run_if, run_output
   ####################################################################################################]
   def run
     init_vars(params[:id])
@@ -111,6 +111,9 @@ class JindaController < ApplicationController
         if service
           @title= "Transaction ID #{@xmain.xid}: #{@xmain.name} / #{@runseq.name}"
           fhelp= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.md"
+        ###############################################################################################
+        # Check if help file available for this form
+        ###############################################################################################
           @help = File.read(fhelp) if File.exists?(fhelp)
           f= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
           if File.file?(f)
@@ -120,8 +123,8 @@ class JindaController < ApplicationController
           ma_log "Error: Can not find the view file for this controller"
           redirect_to_root
           end
-
         end
+        init_vars(params[:id])
       end
     else
       redirect_to_root
@@ -189,6 +192,7 @@ class JindaController < ApplicationController
   def run_output
     init_vars(params[:id])
     service= @xmain.service
+    # disp= get_option("ma_display")
     disp= get_option("ma_display")
     ma_display = (disp && !affirm(disp)) ? false : true
     if service
@@ -209,7 +213,8 @@ class JindaController < ApplicationController
       end
       @message = defined?(MSG_NEXT) ? MSG_NEXT : "Next &gt;"
       @message = "Finish" if @runseq.end
-      eval "@xvars[@runseq.code] = url_for(:controller=>'Jinda', :action=>'document', :id=>@doc.id)"
+      ma_log("Todo defined?(NSG_NEXT : Next >>)")
+      eval "@xvars[@runseq.code] = url_for(:controller=>'jinda', :action=>'document', :id=>@doc.id)"
     else
       # flash[:notice]= "Error: Can not find the view file for this controller"
       ma_log "Error: Can not find the view file for this controller"
@@ -273,30 +278,37 @@ class JindaController < ApplicationController
 
 
   def end_form
-    init_vars(params[:xmain_id])
-    eval "@xvars[@runseq.code] = {} unless @xvars[@runseq.code]"
-    # Search for uploaded file name if exist
-    params.each { |k,v|
-      if params[k].respond_to? :original_filename
-        get_image(k, params[k])
-        # check if params of array in form eg: edit_article	
-      elsif params[k].is_a?(ActionController::Parameters)
-        params[k].each { |k1,v1|
-          # eval "@xvars[@runseq.code][k1] = params.require(k1).permit(k1)"
-          eval "@xvars[@runseq.code][k1] = v1" 
-          next unless v1.respond_to?(:original_filename)
-          get_image1(k, k1, params[k][k1])
-        }
+    # Check error using xmain_id to redirect_to_root and return
+      if params[:xmain_id]
+        init_vars(params[:xmain_id])
       else
-        # bug in to_unsalfe_h rails 5.1.6 https://github.com/getsentry/raven-ruby/issues/799
-        # Solution:
-        # https://stackoverflow.com/questions/34949505/rails-5-unable-to-retrieve-hash-values-from-parameter
-        # v = v.to_unsafe_h unless v.class == String
-        # v = params.require[k] unless v.class == String
-        v = v.to_s unless v.class == String
-        eval "@xvars[@runseq.code][k] = v"
+        ma_log "Known Bug : repeated end_form "
+        redirect_to_root and return
       end
-    }
+      eval "@xvars[@runseq.code] = {} unless @xvars[@runseq.code]"
+      # Search for uploaded file name if exist
+      params.each { |k,v|
+        if params[k].respond_to? :original_filename
+          get_image(k, params[k])
+          # check if params of array in form eg: edit_article	
+        elsif params[k].is_a?(ActionController::Parameters)
+          params[k].each { |k1,v1|
+            # eval "@xvars[@runseq.code][k1] = params.require(k1).permit(k1)"
+            eval "@xvars[@runseq.code][k1] = v1" 
+            next unless v1.respond_to?(:original_filename)
+            get_image1(k, k1, params[k][k1])
+          }
+        else
+      # https://stackoverflow.com/questions/34949505/rails-5-unable-to- retrieve-hash-values-from-parameter     # bug in to_unsalfe_h rails 5.1.6 https://github.com/getsentry/raven-ruby/issues/799
+          # Solution:
+          # https://stackoverflow.com/questions/34949505/rails-5-unable-to-retrieve-hash-values-from-parameter
+          # v = v.to_unsafe_h unless v.class == String
+          # v = params.require[k] unless v.class == String
+          v = v.to_s unless v.class == String
+          # Create @xvars[@runseq.code]
+          eval "@xvars[@runseq.code][k] = v"
+        end
+      }
     end_action
   end
 
@@ -383,6 +395,7 @@ class JindaController < ApplicationController
     @intro = File.read('README.md')
     @print= "<div align='right'><img src='/assets/printer.png'/> <a href='/jinda/doc_print' target='_blank'/>Print</a></div>"
     doc= render_to_string 'doc.md', :layout => false
+
     html= Maruku.new(doc).to_html
     File.open('public/doc.html','w') {|f| f.puts html }
     respond_to do |format|
@@ -457,6 +470,9 @@ class JindaController < ApplicationController
   end
 
   private
+ ###############################################################################################
+ # Each Service at one moment will create one xmain
+ ###############################################################################################
   def create_xmain(service)
     c = name2camel(service.module.code)
     custom_controller= "#{c}Controller"
@@ -477,6 +493,9 @@ class JindaController < ApplicationController
         :referer=>request.env['HTTP_REFERER']
       }
   end
+ ###############################################################################################
+ # Each xmain  will create many run_seq as many as steps and form_steps 
+ ###############################################################################################
   def create_runseq(xmain)
     @xvars= xmain.xvars
     default_role= get_default_role
@@ -521,6 +540,7 @@ class JindaController < ApplicationController
     @xvars['total_steps']= i
     @xvars['total_form_steps']= j
   end
+
   def init_vars(xmain)
     @xmain= Jinda::Xmain.find xmain
     @xvars= @xmain.xvars

data/lib/generators/jinda/templates/app/models/jinda/doc.rb

@@ -1,22 +1,31 @@
-# encoding: utf-8
+# -*- encoding : utf-8 -*-
 class Jinda::Doc
   include Mongoid::Document
-  # jinda begin
   include Mongoid::Timestamps
-  field :a, :type => String
-  field :b, :type => String
-  field :c, :type => String
-  field :d, :type => String
-  field :x, :type => String
-  field :y, :type => String
-  field :z, :type => String
-  field :s, :type => String
-  field :t, :type => String
-  field :u, :type => String
-  field :w, :type => String
-  field :yes, :type => Boolean
-  field :dscan, :type => String
-  field :process_at, :type => Date
-  field :issue_on, :type => Date
-  # jinda end
+  field :name, :type => String
+  field :filename, :type => String
+  field :content_type, :type => String
+  field :data_text, :type => String
+  field :url, :type => String
+  field :basename, :type => String
+  field :cloudinary, :type => Boolean
+  belongs_to :xmain, :class_name => "Jinda::Xmain"
+  belongs_to :runseq, :class_name => "Jinda::Runseq"
+  belongs_to :user
+  belongs_to :service, :class_name => "Jinda::Service"
+  field :ip, :type => String
+  field :ma_display, :type => Boolean
+  field :ma_secured, :type => Boolean
+
+  def self.search(q, page, per_page=PER_PAGE)
+    paginate :per_page=>per_page, :page => page, :conditions =>
+      ["content_type=? AND data_text LIKE ? AND (ma_secured=? OR ma_user_id=?)",
+      "output", "%#{q}%", false, session[:user_id] ],
+      :order=>'ma_xmain_id DESC', :select=>'DISTINCT ma_xmain_id'
+  end
+  def self.search_ma_secured(q, page, per_page=PER_PAGE)
+    paginate :per_page=>per_page, :page => page, :conditions =>
+      ["content_type=? AND data_text LIKE ?", "output", "%#{q}%" ],
+      :order=>'ma_xmain_id DESC', :select=>'DISTINCT ma_xmain_id'
+  end
 end

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

@@ -21,7 +21,7 @@
 
   %h2 Installation
   %ul
-    %li add gem 'jinda', '0.4.9'
+    %li add gem 'jinda', '0.5.0'
     %li bundle
     %li rails generate jinda:install
     %li (run all with "sh install.sh" )

data/lib/generators/jinda/templates/app/views/notes/my.haml

@@ -2,7 +2,7 @@
 %P
 - @page_title  = 'My Notes'
 = paginate @notes
-%table{:id=>"note-table", :data-mode => "reflow", :data-role => "table"}
+%table{:class=>"module-table", :data-mode => "reflow", :data-role => "table"}
   %tr
     %th Title
     %th Body 

data/lib/jinda/app/jinda/index.mm

@@ -0,0 +1,308 @@
+<map version="1.0.1">
+<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
+<node CREATED="1273819432637" ID="ID_1098419600" MODIFIED="1334737006485" TEXT="Jinda">
+<node CREATED="1273819462973" ID="ID_282419531" MODIFIED="1583088810861" POSITION="right" TEXT="services">
+<node CREATED="1275756501221" FOLDED="true" ID="ID_1720745721" MODIFIED="1583097151076" TEXT="users:User">
+<node CREATED="1278491598711" ID="ID_1662699954" MODIFIED="1494393920347" TEXT="role:m"/>
+<node CREATED="1279700865182" ID="ID_1266797279" MODIFIED="1357798847781" TEXT="link:info: /users"/>
+<node CREATED="1319015338880" ID="ID_189841353" MODIFIED="1528215866339" TEXT="link:pending tasks: /jinda/pending"/>
+<node CREATED="1275905802131" ID="ID_154000410" MODIFIED="1355422418892" TEXT="user:edit">
+<node CREATED="1275756515843" ID="ID_1108188320" MODIFIED="1330477833918" TEXT="enter_user:edit">
+<icon BUILTIN="attach"/>
+<node CREATED="1282816887988" ID="ID_1767357871" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
+</node>
+<node CREATED="1275756530989" ID="ID_1221806432" MODIFIED="1282822205361" TEXT="update_user">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1275756504750" ID="ID_1382277695" MODIFIED="1355422424108" TEXT="pwd:change password">
+<node CREATED="1275756515843" ID="ID_1559014937" MODIFIED="1330477842311" TEXT="enter: edit">
+<icon BUILTIN="attach"/>
+<node CREATED="1282816887988" ID="ID_2948144" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
+</node>
+<node CREATED="1275756530989" ID="ID_1566171053" MODIFIED="1275756553762" TEXT="change_password">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+</node>
+<node CREATED="1275752678377" FOLDED="true" ID="ID_1348489452" MODIFIED="1583097147577" TEXT="admins:Admin">
+<node CREATED="1275752688167" ID="ID_229996461" MODIFIED="1275752690948" TEXT="role:a"/>
+<node CREATED="1282722836614" ID="ID_1213363124" MODIFIED="1330477902602" TEXT="edit_role:edit user role">
+<node CREATED="1282722862918" ID="ID_1190117882" MODIFIED="1330477922159" TEXT="select_user:select user">
+<icon BUILTIN="attach"/>
+<node CREATED="1282722901932" ID="ID_1859523490" MODIFIED="1282722903469" TEXT="role:a"/>
+</node>
+<node CREATED="1282722868801" ID="ID_1325872490" MODIFIED="1330477926538" TEXT="edit_role:edit role">
+<icon BUILTIN="attach"/>
+<node CREATED="1282722901932" ID="ID_1992100954" MODIFIED="1282722903469" TEXT="role:a"/>
+</node>
+<node CREATED="1282722907306" ID="ID_1709875397" MODIFIED="1282722922669" TEXT="update_role">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1273913393454" ID="ID_1088166839" MODIFIED="1511159690490" TEXT="link: pending tasks: /jinda/pending"/>
+<node CREATED="1275790679363" ID="ID_829325467" MODIFIED="1511159696044" TEXT="link: logs: /jinda/logs"/>
+<node CREATED="1507573166973" ID="ID_351025910" MODIFIED="1511159700908" TEXT="link: docs: /jinda/doc"/>
+</node>
+<node CREATED="1273706796854" FOLDED="true" ID="ID_1003882979" MODIFIED="1583097155227" TEXT="devs: Developer">
+<node CREATED="1275373154914" ID="ID_340725299" MODIFIED="1275373158632" TEXT="role:d"/>
+<node CREATED="1275788317299" ID="ID_716276608" MODIFIED="1511159716471" TEXT="link: error_logs: /jinda/error_logs"/>
+</node>
+<node CREATED="1493393619430" ID="ID_554831343" MODIFIED="1584996526651" TEXT="notes: Notes">
+<node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1581383331288" TEXT="link:My Notes: /notes/my">
+<node CREATED="1493490295677" ID="ID_514416082" MODIFIED="1493490302239" TEXT="role:m"/>
+</node>
+<node CREATED="1493419257021" ID="ID_553734932" MODIFIED="1581180635669" TEXT="new: New Note">
+<node CREATED="1493419299004" ID="ID_723334321" MODIFIED="1581351169990" TEXT="new_note: New ">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479075294" ID="ID_1009521360" MODIFIED="1493479079687" TEXT="role:m"/>
+</node>
+<node CREATED="1493419491125" ID="ID_1125779183" MODIFIED="1581180747700" TEXT="create: Create">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1493419562726" ID="ID_1241171950" MODIFIED="1581180788218" TEXT="edit: Edit">
+<node CREATED="1493419577933" ID="ID_1790163920" MODIFIED="1581350888992" TEXT="select_note: Select">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479602815" ID="ID_1289003986" MODIFIED="1493479606921" TEXT="role:m"/>
+</node>
+<node CREATED="1493419612720" ID="ID_938262436" MODIFIED="1581350996674" TEXT="edit_note: Edit">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479557266" ID="ID_211108947" MODIFIED="1493479561055" TEXT="role:m"/>
+</node>
+<node CREATED="1493419735921" ID="ID_1581002301" MODIFIED="1581180869775" TEXT="update: Update">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1495246388313" ID="ID_320521408" MODIFIED="1581340759604" STYLE="fork" TEXT="delete:Delete">
+<edge COLOR="#808080" STYLE="bezier" WIDTH="thin"/>
+<node CREATED="1493419577933" ID="ID_1631275659" MODIFIED="1581350942681" TEXT="select_note: Select">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479602815" ID="ID_851238107" MODIFIED="1493479606921" TEXT="role:m"/>
+</node>
+<node CREATED="1495246466176" ID="ID_1347765598" MODIFIED="1581799929028" TEXT="delete: Delete">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1581531446494" ID="ID_1325232876" MODIFIED="1581715693485" TEXT="mail: Mail">
+<node CREATED="1493419577933" FOLDED="true" ID="ID_1817148049" MODIFIED="1581531563343" TEXT="select_note: Select">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479602815" ID="ID_1650154281" MODIFIED="1493479606921" TEXT="role:m"/>
+</node>
+<node CREATED="1581531468872" ID="ID_379926448" MODIFIED="1581564690354" TEXT="display_mail: Dsiplay Mail">
+<icon BUILTIN="attach"/>
+</node>
+<node CREATED="1581564346466" ID="ID_1981382192" MODIFIED="1581564388041" TEXT="mail: Mail">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1495246388313" ID="ID_807216843" MODIFIED="1585001129104" TEXT="xedit: Future use">
+<icon BUILTIN="button_cancel"/>
+<node CREATED="1493419612720" ID="ID_6864095" MODIFIED="1584999031935" TEXT="edit_note: Edit">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479557266" ID="ID_297597260" MODIFIED="1493479561055" TEXT="role:m"/>
+</node>
+<node CREATED="1581400438157" ID="ID_1206027492" MODIFIED="1581400464170" TEXT="update: Update">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+</node>
+<node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1585001518753" TEXT="articles: Article">
+<node CREATED="1493419096527" ID="ID_1521905276" MODIFIED="1493478060121" TEXT="link: All Articles: /articles"/>
+<node CREATED="1493489768542" ID="ID_1376361427" MODIFIED="1493768994418" TEXT="link: My article: /articles/my">
+<node CREATED="1493490295677" ID="ID_628476988" MODIFIED="1493490302239" TEXT="role:m"/>
+</node>
+<node CREATED="1493419257021" ID="ID_1355420049" MODIFIED="1493489729876" TEXT="new_article: New Article">
+<node CREATED="1493419299004" ID="ID_1468250197" MODIFIED="1493419428686" TEXT="form_article: New Article">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479075294" ID="ID_1145618514" MODIFIED="1493479079687" TEXT="role:m"/>
+</node>
+<node CREATED="1493419491125" ID="ID_1687683396" MODIFIED="1493483244848" TEXT="create: Create Article">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1493419562726" ID="ID_922854639" MODIFIED="1493490306480" TEXT="edit_article: Edit Article">
+<node CREATED="1493419577933" ID="ID_938626803" MODIFIED="1538329139586" TEXT="select_article: Select Article">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479602815" ID="ID_753056881" MODIFIED="1493479606921" TEXT="role:m"/>
+</node>
+<node CREATED="1493419612720" ID="ID_661682947" MODIFIED="1493524438941" TEXT="edit_article: Edit Article">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479557266" ID="ID_1681993437" MODIFIED="1493479561055" TEXT="role:m"/>
+</node>
+<node CREATED="1493419735921" ID="ID_1575963748" MODIFIED="1493489477505" TEXT="update: Update Article">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1495246388313" ID="ID_1861034169" MODIFIED="1585001527103" TEXT="xedit_article: xEdit Article">
+<icon BUILTIN="button_cancel"/>
+<node CREATED="1495246432533" ID="ID_91386173" MODIFIED="1495267233398" TEXT="edit_article: Edit Article">
+<icon BUILTIN="attach"/>
+<node CREATED="1495246517185" ID="ID_1224073606" MODIFIED="1495246522964" TEXT="role:m"/>
+</node>
+<node CREATED="1495246466176" ID="ID_1635586443" MODIFIED="1495266959360" TEXT="update: Update Article">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+</node>
+<node CREATED="1493664700564" FOLDED="true" ID="ID_704959130" MODIFIED="1583091848193" TEXT="comments: Comment">
+<node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1493665186791" TEXT="new_comment: New Comment">
+<node CREATED="1493665192413" ID="ID_345629058" MODIFIED="1493665226422" TEXT="create">
+<icon BUILTIN="bookmark"/>
+<node CREATED="1493665231940" ID="ID_1645532530" MODIFIED="1493665237018" TEXT="role:m"/>
+</node>
+</node>
+<node CREATED="1494393494180" ID="ID_1101205873" MODIFIED="1495275996686" TEXT="role:m"/>
+</node>
+<node CREATED="1489875563330" FOLDED="true" ID="ID_1495015891" MODIFIED="1507248509212" TEXT="ctrs: ctrs&amp; Menu">
+<node CREATED="1489875583646" ID="ID_1796125628" MODIFIED="1494393464288" TEXT="role:a"/>
+<node CREATED="1275905802131" ID="ID_1960607342" MODIFIED="1489938927874" TEXT="vfolder1:Sub Menu 1">
+<node CREATED="1275756515843" ID="ID_328242903" MODIFIED="1489939229748" TEXT="viewfile1: Title 1">
+<icon BUILTIN="attach"/>
+<node CREATED="1282816887988" ID="ID_1479413309" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
+</node>
+<node CREATED="1275756515843" ID="ID_1316819449" MODIFIED="1490683859703" TEXT="viewfile2: Title 2">
+<icon BUILTIN="attach"/>
+<node CREATED="1282816887988" ID="ID_1510989172" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
+</node>
+<node CREATED="1275756530989" ID="ID_171099141" MODIFIED="1489939276491" TEXT="update_viewfile1">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1275756504750" ID="ID_914236141" MODIFIED="1489939000929" TEXT="vfolder2:Title 2">
+<node CREATED="1275756515843" ID="ID_1222970183" MODIFIED="1489939293714" TEXT="viewfile2: Title 2">
+<icon BUILTIN="attach"/>
+<node CREATED="1282816887988" ID="ID_1312913420" MODIFIED="1282817769412" TEXT="rule:login? &amp;&amp; own_xmain?"/>
+</node>
+</node>
+</node>
+<node CREATED="1494172726642" ID="ID_925257043" MODIFIED="1494172755433" TEXT="sitemap: Sitemap">
+<node CREATED="1494172758253" ID="ID_961056168" MODIFIED="1494172797972" TEXT="sitemap: Sitemap"/>
+<node CREATED="1494393494180" ID="ID_242460166" MODIFIED="1494393504971" TEXT="role:a"/>
+</node>
+<node CREATED="1493393619430" ID="ID_35210833" MODIFIED="1585089057213" TEXT="api/v1/notes: Notes API ">
+<node CREATED="1493489768542" ID="ID_1053900670" MODIFIED="1582131857208" TEXT="link:My Notes: /api/v1/notes/my">
+<node CREATED="1493490295677" ID="ID_1597553308" MODIFIED="1493490302239" TEXT="role:m"/>
+</node>
+<node CREATED="1493419257021" ID="ID_1182560700" MODIFIED="1581180635669" TEXT="new: New Note">
+<node CREATED="1493419299004" ID="ID_840380967" MODIFIED="1581351169990" TEXT="new_note: New ">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479075294" ID="ID_10690659" MODIFIED="1493479079687" TEXT="role:m"/>
+</node>
+<node CREATED="1493419491125" ID="ID_924027059" MODIFIED="1581180747700" TEXT="create: Create">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1493419562726" ID="ID_963001770" MODIFIED="1581180788218" TEXT="edit: Edit">
+<node CREATED="1493419577933" ID="ID_1640736660" MODIFIED="1581350888992" TEXT="select_note: Select">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479602815" ID="ID_1623444138" MODIFIED="1493479606921" TEXT="role:m"/>
+</node>
+<node CREATED="1493419612720" ID="ID_1362613316" MODIFIED="1581350996674" TEXT="edit_note: Edit">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479557266" ID="ID_1838104057" MODIFIED="1493479561055" TEXT="role:m"/>
+</node>
+<node CREATED="1493419735921" ID="ID_1445882396" MODIFIED="1581180869775" TEXT="update: Update">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+<node CREATED="1495246388313" ID="ID_918406528" MODIFIED="1581340759604" STYLE="fork" TEXT="delete:Delete">
+<edge COLOR="#808080" STYLE="bezier" WIDTH="thin"/>
+<node CREATED="1493419577933" ID="ID_809771470" MODIFIED="1581350942681" TEXT="select_note: Select">
+<icon BUILTIN="attach"/>
+<node CREATED="1493479602815" ID="ID_1160875526" MODIFIED="1493479606921" TEXT="role:m"/>
+</node>
+<node CREATED="1495246466176" ID="ID_506410154" MODIFIED="1581799929028" TEXT="delete: Delete">
+<icon BUILTIN="bookmark"/>
+</node>
+</node>
+</node>
+</node>
+<node CREATED="1273819465949" FOLDED="true" ID="ID_855471610" MODIFIED="1583097143651" POSITION="right" TEXT="roles">
+<node CREATED="1273819847470" ID="ID_1681080231" MODIFIED="1330477307826" TEXT="m: member"/>
+<node CREATED="1273819855875" ID="ID_1429503284" MODIFIED="1330477311102" TEXT="a: admin"/>
+<node CREATED="1273819859775" ID="ID_568365839" MODIFIED="1330477315009" TEXT="d: developer"/>
+</node>
+<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="1292122135809" ID="ID_1617970069" MODIFIED="1332878659106" TEXT="fname"/>
+<node CREATED="1292122150362" ID="ID_1200135538" MODIFIED="1332878662388" TEXT="lname"/>
+<node CREATED="1332876694150" ID="ID_1770958985" MODIFIED="1332876730552" TEXT="sex: integer">
+<node CREATED="1332878665790" ID="ID_793089342" MODIFIED="1332878668499" TEXT="1: male"/>
+<node CREATED="1332878669085" ID="ID_1796007763" MODIFIED="1332878673144" TEXT="2: female"/>
+</node>
+<node CREATED="1292123322429" ID="ID_1509464300" MODIFIED="1332878620176" TEXT="belongs_to :address">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1292122156430" ID="ID_604231613" MODIFIED="1292122161324" TEXT="dob: date"/>
+<node CREATED="1286576968143" ID="ID_936807610" MODIFIED="1332878681362" TEXT="phone"/>
+<node CREATED="1290823140269" ID="ID_1957301629" MODIFIED="1332878684453" TEXT="photo"/>
+</node>
+<node CREATED="1292122236285" FOLDED="true" ID="ID_959987887" MODIFIED="1493768919147" TEXT="address">
+<node CREATED="1292122254622" ID="ID_430517150" MODIFIED="1355422372241" TEXT="address_street"/>
+<node CREATED="1355422373525" ID="ID_1797865138" MODIFIED="1355422378352" TEXT="city"/>
+<node CREATED="1355422378959" ID="ID_1964490487" MODIFIED="1355422380765" TEXT="state"/>
+<node CREATED="1355422381231" ID="ID_1226075540" MODIFIED="1355422382748" TEXT="zip"/>
+<node CREATED="1332876680122" ID="ID_65427990" MODIFIED="1332876682148" TEXT="phone"/>
+<node CREATED="1292243471343" ID="ID_1859608350" MODIFIED="1310195256623" TEXT="lat: float"/>
+<node CREATED="1292243477436" ID="ID_48497260" MODIFIED="1310195262534" TEXT="lng: float"/>
+</node>
+<node CREATED="1493418879485" FOLDED="true" ID="ID_1995497233" MODIFIED="1583097163789" TEXT="article">
+<node CREATED="1493418891110" ID="ID_364756011" MODIFIED="1493418905253" TEXT="title"/>
+<node CREATED="1493418906868" ID="ID_1676483995" MODIFIED="1493418911919" TEXT="text"/>
+<node CREATED="1493487131376" ID="ID_1334057464" MODIFIED="1538328284823" TEXT="belongs_to :user, :class_name =&gt; &quot;User&quot;">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1493705838166" ID="ID_408271104" MODIFIED="1493705877062" TEXT="has_many :comments">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1493718773517" ID="ID_944554146" MODIFIED="1493718808965" TEXT="validates :title, :text, :user_id, presence: true">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1494181636998" ID="ID_229502630" MODIFIED="1494181660419" TEXT="body"/>
+<node CREATED="1497913676275" ID="ID_404103076" MODIFIED="1497913685065" TEXT="keywords"/>
+</node>
+<node CREATED="1493418915637" FOLDED="true" ID="ID_429078131" MODIFIED="1583097162517" TEXT="comment">
+<node CREATED="1493418939760" ID="ID_1251093062" MODIFIED="1493418943423" TEXT="body"/>
+<node CREATED="1493418945686" ID="ID_911071644" MODIFIED="1493418986711" TEXT="belongs_to :article">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1493643129947" ID="ID_588013696" MODIFIED="1493643146424" TEXT="belongs_to :user">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1493718512191" ID="ID_173203253" MODIFIED="1493718583874" TEXT="validates :body, :user_id, :article_id, presence: true">
+<icon BUILTIN="edit"/>
+</node>
+</node>
+<node CREATED="1494040082403" FOLDED="true" ID="ID_864577403" MODIFIED="1583097161145" TEXT="picture">
+<node CREATED="1494040091583" ID="ID_679208099" MODIFIED="1494040119098" TEXT="picture"/>
+<node CREATED="1494040120208" ID="ID_1266154874" MODIFIED="1494040125130" TEXT="description"/>
+<node CREATED="1493487131376" ID="ID_1422817360" MODIFIED="1493487186856" TEXT="belongs_to :user">
+<icon BUILTIN="edit"/>
+</node>
+</node>
+<node CREATED="1581177067029" FOLDED="true" ID="ID_1450593753" MODIFIED="1583089083450" TEXT="note">
+<node CREATED="1581243923100" ID="ID_537548385" MODIFIED="1581243965554" TEXT="include Mongoid::Attributes::Dynamic">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1581177848957" ID="ID_1611227370" MODIFIED="1581177857470" TEXT="title"/>
+<node CREATED="1581177867775" ID="ID_88547965" MODIFIED="1581177883555" TEXT="body"/>
+<node CREATED="1493643129947" ID="ID_1655403736" MODIFIED="1493643146424" TEXT="belongs_to :user">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1581984419312" ID="ID_1934899110" MODIFIED="1581985586488" TEXT="before_validation :ensure_title_has_a_value ">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1581495182445" ID="ID_1430552418" MODIFIED="1581985664674" TEXT="validates :title, length: { maximum: (MAX_TITLE_LENGTH = 30), message: &quot;Must be less   than 30 characters&quot; }, presence: true">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1581495221779" ID="ID_1231500988" MODIFIED="1581985709585" TEXT="validates :body, length: { maximum: (MAX_BODY_LENGTH = 1000), message: &quot;Must be less   than 1000 characters&quot;} ">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1581986280028" ID="ID_1069060625" MODIFIED="1581987310544" TEXT="private&#xa;  def ensure_title_has_a_value&#xa;    if title.blank?&#xa;      self.title = body[0..(MAX_TITLE_LENGTH-1)] unless body.blank?&#xa;    end&#xa;  end&#xa;  &#xa;">
+<icon BUILTIN="edit"/>
+</node>
+</node>
+</node>
+</node>
+</map>

data/lib/jinda/helpers.rb

@@ -63,13 +63,22 @@ module Jinda
     def redirect_to_root
       redirect_to root_path
     end
+    # Todo refactor code
     def get_option(opt, runseq=@runseq)
+      ma_log("Todo in def get_option(opt, runseq=@runseq)")
       xml= REXML::Document.new(runseq.xml).root
       url=''
-      xml.each_element('///node') do |n|
-        text= n.attributes['TEXT']
-        url= text if text =~/^#{opt}:\s*/
+      # xml.each_element('///node') do |n|
+      xml.each_element('/node') do |n|
+        if n.attributes['TEXT']
+          text = n.attributes['TEXT']
+          puts "text = " + text
+          url= text if text =~ /^#{opt}:\s*/
+          puts "url = " + url
+          ma_log("Todo in def get_option(opt, runseq=@runseq)")
+        end
       end
+      return nil if url.blank?
       c, h= url.split(':', 2)
       opt= h ? h.strip : false
     end

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-	VERSION = "0.4.9"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,7 +157,7 @@ files:
 - lib/generators/jinda/templates/app/assets/javascripts/application.js
 - lib/generators/jinda/templates/app/assets/javascripts/application.js-jqm
 - lib/generators/jinda/templates/app/assets/javascripts/cable.js
-- lib/generators/jinda/templates/app/assets/javascripts/disable_enter_key.js-org
+- lib/generators/jinda/templates/app/assets/javascripts/disable_enter_key.js
 - lib/generators/jinda/templates/app/assets/javascripts/iscroll-wrapper.js
 - lib/generators/jinda/templates/app/assets/javascripts/iscroll.js
 - lib/generators/jinda/templates/app/assets/javascripts/jinda.js
@@ -202,6 +202,7 @@ files:
 - lib/generators/jinda/templates/app/assets/stylesheets/jquery.mobile.splitview.css
 - lib/generators/jinda/templates/app/assets/stylesheets/kul-4.2.css
 - lib/generators/jinda/templates/app/assets/stylesheets/kul-4.2.min.css
+- lib/generators/jinda/templates/app/assets/stylesheets/modules.scss
 - lib/generators/jinda/templates/app/assets/stylesheets/sarabun.css
 - lib/generators/jinda/templates/app/assets/stylesheets/social.scss
 - lib/generators/jinda/templates/app/channels/application_cable/channel.rb
@@ -372,6 +373,7 @@ files:
 - lib/generators/jinda/templates/test/test_helper.rb
 - lib/jinda.rb
 - lib/jinda/ template/view.html.erb
+- lib/jinda/app/jinda/index.mm
 - lib/jinda/app/jinda/template/view.html.erb
 - lib/jinda/gemhelpers.rb
 - lib/jinda/helpers.rb