jinda 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a17b43b4b898dae67bb7c0f10f5ac9b0b4dc804b4d724a98de77575aff7a6122
-  data.tar.gz: e9e61b49a95d6a88ded3051d4b2f9f55d74fca6be0ee8f07b99f3103bd3e4d6d
+  metadata.gz: 22a5bc38b0cb1b8d762c12992113c2c7ff7a32a561ffa40e2d0bffc33c4ef3ab
+  data.tar.gz: 72e62d233e7caf07a108b7a2a1cdfba7b837724215332a66e625c950f806c9f7
 SHA512:
-  metadata.gz: 8490aa2e9ef93bdd6b7fadfd6a49fbdf53b4799e11b1b3f26de526b6e4d06aaf83f82cb22081c885951c2097c5e4fbd68241413bc3a55d1e2c3d81afc694d896
-  data.tar.gz: a29f70fc72a7785a8997720e9231aed38ba145fee7e17fccc5fdbb83af99404c7e912f397129eb656b45f0909eea209f7e35ed0a8f879d0b3415422112d560e6
+  metadata.gz: 1eb303b8a9a49ff57fc98dcbceeb12982bd2f7686fc653b996da5212ee8189a9d3a66f7809db839d85f5e45e278f43c54e90deeab74b83aa268b0fbae0ef220d
+  data.tar.gz: 9ce2e36e149bcde4620bcdb1cb29a0b38847055c8ae746af0dfc4201e866cdfbe4a07460f9957354fc1f5023427ed4348c012233b50e648d847d6f28068817b6

data/README.md

@@ -40,7 +40,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.5.4'
+    gem 'jinda', '~> 0.5.5'
 
 For Development (most updated)
 

data/lib/generators/jinda/install_generator.rb

@@ -130,6 +130,7 @@ module Jinda
         route "post '/jinda/init' => 'jinda#init'"
         route "jinda_methods.each do \|aktion\| get \"/jinda/\#\{aktion\}\" => \"jinda#\#\{aktion\}\" end"
         route "jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']"
+        route "jinda_methods += ['run_redirect', 'run_direct_to']"
         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"

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

@@ -1,14 +1,19 @@
 
+#article-title {
+  text-align: left;
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  color:#333;
+}
+
 #title {
   font-size: 14pt;
   font-weight: bold;
-  text-align: center;
-  background: #d2f0ff;
+  text-align: left;
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
   color:#333;
 
 }
-#text {
+#text{
   font-size: 14pt;
   font-weight: bold;
   text-align:left;
@@ -41,7 +46,6 @@
 #table th {
   background-color: #bcecff;
   color:#333;
-;
   width:100%;
 }
 
@@ -59,12 +63,14 @@
   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-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: 7px 75px 7px 7px; 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;
+  margin: 2% 2% 0 0;
+
 }
 label.ui-select {
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;

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

@@ -1,16 +1,28 @@
 
-#article-title {
+
+#article-table {
   font-size: 14pt;
   font-weight: bold;
-  text-align: center;
-  background: #d2f0ff;
+  text-align: left;
+  background:#f7f7f7;
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  padding:2px 5px;
   color:#333;
 
 }
-#article-text {
+
+#article-title {
   font-size: 14pt;
   font-weight: bold;
+  text-align: left;
+  background:#f7f7f7;
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  padding:2px 5px;
+  color:#333;
+
+}
+#article-text {
+  font-size: 8pt;
   text-align:left;
   border:1px solid #c1c1c1;
   background:#f7f7f7;
@@ -28,7 +40,6 @@
 
 #comment-body {
   font-size: 10pt;
-  font-weight: bold;
   text-align:left;
   color:#333;
 }
@@ -41,7 +52,6 @@
 #article-table th {
   background-color: #bcecff;
   color:#333;
-;
   width:100%;
 }
 

data/lib/generators/jinda/templates/app/controllers/concerns/jinda_run_concern.rb

@@ -60,6 +60,20 @@ module JindaRunConcern
     end_action(next_runseq)
   end
 
+  # redirect when finish last runseq
+  # eg: http://localhost:3000/notes/my
+  def run_direct_to
+    init_vars(params[:id])
+    next_runseq= @xmain.runseqs.where(:id.ne=>@runseq.id, :code=>@runseq.code).first
+    if !@runseq.code.blank? 
+      @xvars['p']['return'] = @runseq.code
+    else
+      flash[:notice]= "Error: missing required forward path in Freemind"
+      ma_log "Error: require forward path in Freemind"
+    end
+    end_action(next_runseq)
+  end
+
   def run_redirect
     init_vars(params[:id])
     # next_runseq= @xmain.runseqs.first :conditions=>["id != ? AND code = ?",@runseq.id, @runseq.code]

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

@@ -14,6 +14,7 @@ class DocsController < ApplicationController
   end
 
   def doc_update
+    # Instead of creaete, Doc record was created in form, when upload file
     
     if Jinda::Doc.where(:runseq_id => $xvars["doc_form"]["runseq_id"]).exists?
       @doc = Jinda::Doc.where(:runseq_id => $xvars["doc_form"]["runseq_id"]).first

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

@@ -23,6 +23,7 @@ class JindaController < ApplicationController
       #Above line cause error update_attribute in heroku shown in logs and it was proposed to fixed in github:'kul1/g241502'
       # Main action run with :id
       redirect_to :action=>'run', :id=>xmain.id
+      
     else
       refresh_to "/", :alert => "Error: cannot process"
       error_run_xmain = "Error_run_xmain"

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

@@ -3,7 +3,8 @@ class NotesController < ApplicationController
   # before_action :xload_current_ma_user, only: [:destroy]
 
   def index
-    @notes = Note.desc(:created_at).page(params[:page]).per(10)
+    # @notes = Note.desc(:created_at).page(params[:page]).per(10)
+    @notes = Note
   end
 
   def my

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

@@ -87,11 +87,11 @@
 </node>
 </node>
 </node>
-<node CREATED="1493393619430" ID="ID_554831343" MODIFIED="1584996526651" TEXT="notes: Notes">
+<node CREATED="1493393619430" FOLDED="true" ID="ID_554831343" MODIFIED="1591392794806" TEXT="notes: Notes">
 <node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1589772615102" TEXT="link:My Notes: /notes/my">
 <node CREATED="1493490295677" ID="ID_514416082" MODIFIED="1493490302239" TEXT="role:m"/>
 </node>
-<node CREATED="1493419257021" FOLDED="true" ID="ID_553734932" MODIFIED="1589772585873" TEXT="new: New Note">
+<node CREATED="1493419257021" ID="ID_553734932" MODIFIED="1591278856955" 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"/>
@@ -99,8 +99,13 @@
 <node CREATED="1493419491125" ID="ID_1125779183" MODIFIED="1581180747700" TEXT="create: Create">
 <icon BUILTIN="bookmark"/>
 </node>
+<node CREATED="1591278861459" ID="ID_985992723" MODIFIED="1591319329198" TEXT="/notes/my">
+<arrowlink DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<linktarget COLOR="#b0b0b0" DESTINATION="ID_985992723" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_650435572" SOURCE="ID_985992723" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<icon BUILTIN="forward"/>
 </node>
-<node CREATED="1493419562726" ID="ID_1241171950" MODIFIED="1581180788218" TEXT="edit: Edit">
+</node>
+<node CREATED="1493419562726" FOLDED="true" ID="ID_1241171950" MODIFIED="1591278847249" 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"/>
@@ -113,7 +118,7 @@
 <icon BUILTIN="bookmark"/>
 </node>
 </node>
-<node CREATED="1495246388313" ID="ID_320521408" MODIFIED="1581340759604" STYLE="fork" TEXT="delete:Delete">
+<node CREATED="1495246388313" FOLDED="true" ID="ID_320521408" MODIFIED="1591278851391" 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"/>
@@ -123,7 +128,7 @@
 <icon BUILTIN="bookmark"/>
 </node>
 </node>
-<node CREATED="1581531446494" ID="ID_1325232876" MODIFIED="1581715693485" TEXT="mail: Mail">
+<node CREATED="1581531446494" FOLDED="true" ID="ID_1325232876" MODIFIED="1591278853597" 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"/>
@@ -146,16 +151,12 @@
 </node>
 </node>
 </node>
-<node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1589327646872" TEXT="articles: Article">
+<node CREATED="1493393619430" FOLDED="true" ID="ID_328863650" MODIFIED="1591392789585" TEXT="articles: Article">
 <node CREATED="1493419096527" ID="ID_1521905276" MODIFIED="1493478060121" TEXT="link: All Articles: /articles"/>
 <node CREATED="1493489768542" FOLDED="true" ID="ID_1376361427" MODIFIED="1589757167952" 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="1588619429446" TEXT="new_article: New Article">
-<node CREATED="1588958814863" ID="ID_576640224" MODIFIED="1589053904119" TEXT="display: DisplayFile">
-<icon BUILTIN="idea"/>
-<node CREATED="1588959451085" ID="ID_779920893" MODIFIED="1588959473698" TEXT="display: Option"/>
-</node>
 <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"/>
@@ -163,6 +164,11 @@
 <node CREATED="1493419491125" ID="ID_1687683396" MODIFIED="1493483244848" TEXT="create: Create Article">
 <icon BUILTIN="bookmark"/>
 </node>
+<node CREATED="1591278861459" ID="ID_657878492" MODIFIED="1591319807025" TEXT="/articles/my">
+<arrowlink DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<linktarget COLOR="#b0b0b0" DESTINATION="ID_657878492" ENDARROW="Default" ENDINCLINATION="0;0;" ID="Arrow_ID_883618983" SOURCE="ID_657878492" STARTARROW="None" STARTINCLINATION="0;0;"/>
+<icon BUILTIN="forward"/>
+</node>
 </node>
 <node CREATED="1493419562726" ID="ID_922854639" MODIFIED="1590180584955" TEXT="edit_article: Edit Article">
 <node CREATED="1493419577933" ID="ID_938626803" MODIFIED="1538329139586" TEXT="select_article: Select Article">
@@ -188,8 +194,10 @@
 </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="1493664700564" FOLDED="true" ID="ID_704959130" MODIFIED="1591392798294" TEXT="comments: Comment">
+<icon BUILTIN="button_cancel"/>
+<node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1591392666652" TEXT="new_comment: New Comment">
+<icon BUILTIN="button_cancel"/>
 <node CREATED="1493665192413" ID="ID_345629058" MODIFIED="1493665226422" TEXT="create">
 <icon BUILTIN="bookmark"/>
 <node CREATED="1493665231940" ID="ID_1645532530" MODIFIED="1493665237018" TEXT="role:m"/>
@@ -223,7 +231,7 @@
 <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="1493393619430" FOLDED="true" ID="ID_35210833" MODIFIED="1591392800862" TEXT="api/v1/notes: Notes API ">
 <node CREATED="1493489768542" ID="ID_1053900670" MODIFIED="1591074318558" TEXT="link:My Notes: /api/v1/notes/my">
 <icon BUILTIN="button_cancel"/>
 <node CREATED="1493490295677" ID="ID_1597553308" MODIFIED="1493490302239" TEXT="role:m"/>
@@ -263,7 +271,7 @@
 <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="1273819456867" FOLDED="true" ID="ID_1677010054" MODIFIED="1591392810437" 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"/>

data/lib/generators/jinda/templates/app/views/articles/new_article/form_article.html.erb

@@ -2,6 +2,7 @@
 <%
   article = @article
 %>
+<div id="article-table">
 <%= fields_for article do |f| %>
   <%= f.label :title, "Title" %>
   <%= f.text_field :title %>
@@ -12,3 +13,4 @@
   <%= f.label :body, "Body Content" %>
   <%= f.text_area :body %>
 <% end %>
+</div>

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

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

data/lib/jinda/helpers.rb

@@ -199,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
@@ -840,7 +841,8 @@ module Jinda
       when 'help' # Question
         'if'
       when 'forward' # Forward
-        'redirect'
+        # 'redirect'
+        'direct_to'
       when 'kaddressbook' #Phone
         'invoke' # invoke new service along the way
       when 'idea' # output

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler